From 3dc226093ca74223e54b62c8a9c75bde54c49f1e Mon Sep 17 00:00:00 2001 From: Andrew Mundy Date: Mon, 23 Nov 2015 18:43:45 +0000 Subject: [PATCH] `ticks` argument from spin1 starts at 1 As identified in project-rig/rig_examples#4. --- nengo_spinnaker/binaries/nengo_ensemble.aplx | Bin 17612 -> 17612 bytes .../binaries/nengo_ensemble_profiled.aplx | Bin 18348 -> 18348 bytes nengo_spinnaker/binaries/nengo_filter.aplx | Bin 12704 -> 12704 bytes nengo_spinnaker/binaries/nengo_mc_player.aplx | Bin 8776 -> 8776 bytes nengo_spinnaker/binaries/nengo_rx.aplx | Bin 9352 -> 9352 bytes nengo_spinnaker/binaries/nengo_tx.aplx | Bin 11408 -> 11408 bytes .../binaries/nengo_value_sink.aplx | Bin 10932 -> 10932 bytes .../binaries/nengo_value_source.aplx | Bin 9800 -> 9800 bytes .../ensemble/ensemble_update.c | 2 +- spinnaker_components/filter/filter_main.c | 2 +- .../mc_player/mc_player_main.c | 2 +- spinnaker_components/sdp_rx/sdp-rx-main.c | 2 +- spinnaker_components/value_sink/value_sink.c | 2 +- .../value_source/value_source.c | 2 +- 14 files changed, 6 insertions(+), 6 deletions(-) diff --git a/nengo_spinnaker/binaries/nengo_ensemble.aplx b/nengo_spinnaker/binaries/nengo_ensemble.aplx index 556bc96817900356ba8dda0a5db0e01d887303d8..9dfc54f19ca2ac4bef307b4e06fe6755874cc378 100644 GIT binary patch delta 25 hcmX@p$#|xdal>goMyt(d_|}*(>%;|bu67P&1OSMa34s6r delta 25 hcmX@p$#|xdal>go##x)s@U1anmM*f`TOiMyt(F_)5%~_2Ys!N4o_w0sw>r2`&Ht delta 25 hcmZ3}&$yOi##x)6@RgV|%M@8`j&=)V1OSNk33LDe diff --git a/nengo_spinnaker/binaries/nengo_filter.aplx b/nengo_spinnaker/binaries/nengo_filter.aplx index adb522f11cb12b6c3f1e4f77e30429eae3950b35..b5e8cacf6a23cc8445a85f1899ba8940a8e348db 100644 GIT binary patch delta 23 fcmZ3GydZhQVOB<~%|}=}w3zkcf;amc1Tq2uaoGq? delta 23 fcmZ3GydZhQVOGXjn~$(|Xffv$T5R?=2xJ5Rc}xi8 diff --git a/nengo_spinnaker/binaries/nengo_mc_player.aplx b/nengo_spinnaker/binaries/nengo_mc_player.aplx index 6343514e99fdc4376f099958aeb0d4abcc81a607..4045b7b816ea0f121a357b9f0fef8ad4aaac5528 100644 GIT binary patch delta 23 ecmX@%a>8YUHVdQGW*wF*GR%5$!JC;CT^RvlVFv{O delta 23 fcmX@%a>8YUHVfmd%{nYsWSCzb6yMCO=*kEHZzc#w diff --git a/nengo_spinnaker/binaries/nengo_rx.aplx b/nengo_spinnaker/binaries/nengo_rx.aplx index 6673e7555fe6885585ee7d983dcd72e8f32db236..6f34e54ae66c9ba7f0154f652f5fc3f4f0fcb618 100644 GIT binary patch delta 23 ecmeD1?C{)B&BAE4xrXJ49J5|r@MdRaS4IG0O$TED delta 23 ecmeD1?C{)B&B8cqa}CQ8IcDi1i_Ol;u8aU@KL@D* diff --git a/nengo_spinnaker/binaries/nengo_tx.aplx b/nengo_spinnaker/binaries/nengo_tx.aplx index bbcf72538811e918f2263ecd0faa2eb6444db598..0373959e0e192d35ebb513f19815e659d8176304 100644 GIT binary patch delta 16 XcmbObIU#a`jW)AhT<~Ul?LbBVGTa3_ delta 16 XcmbObIU#a`jW)A%k;P_v?LbBVGA;!n diff --git a/nengo_spinnaker/binaries/nengo_value_sink.aplx b/nengo_spinnaker/binaries/nengo_value_sink.aplx index 84984447c9d945b5b15e680639d0f4d4d783991c..489e801d2f1ac9958d5c41d40a168f558d632af6 100644 GIT binary patch delta 23 ecmdlIx+QdjFbkvAW)T)2Rc5`o;LXXJfs6oK1qQ?b delta 23 ecmdlIx+QdjFbm_X%_1y5s?5?w7Mqhb0~rBd_Xi39 diff --git a/nengo_spinnaker/binaries/nengo_value_source.aplx b/nengo_spinnaker/binaries/nengo_value_source.aplx index fc5bd96c6a411bd60ea1c59c2a3736b04e5d5951..07dea536ce8b363126363fc4424427218358d6a5 100644 GIT binary patch delta 23 ecmX@%bHZnXHVdQGW*wF*3e0+O!JC;?T^Rvm= simulation_ticks) { + if (simulation_ticks != UINT32_MAX && ticks > simulation_ticks) { profiler_finalise(); spin1_exit(0); return; diff --git a/spinnaker_components/filter/filter_main.c b/spinnaker_components/filter/filter_main.c index 7bf2216..84d2513 100644 --- a/spinnaker_components/filter/filter_main.c +++ b/spinnaker_components/filter/filter_main.c @@ -122,7 +122,7 @@ void process_transform_page(uint transfer_id, uint tag) void filter_update(uint ticks, uint arg1) { use(arg1); - if (simulation_ticks != UINT32_MAX && ticks >= simulation_ticks) + if (simulation_ticks != UINT32_MAX && ticks > simulation_ticks) { spin1_exit(0); return; diff --git a/spinnaker_components/mc_player/mc_player_main.c b/spinnaker_components/mc_player/mc_player_main.c index ec4de09..13a2e3e 100644 --- a/spinnaker_components/mc_player/mc_player_main.c +++ b/spinnaker_components/mc_player/mc_player_main.c @@ -27,7 +27,7 @@ void transmit_packet_region(uint* packets_region) { void tick(uint ticks, uint arg1) { use(arg1); - if (simulation_ticks != UINT32_MAX && ticks >= simulation_ticks) { + if (simulation_ticks != UINT32_MAX && ticks > simulation_ticks) { // Transmit all packets assigned to be sent after the end of the simulation transmit_packet_region(end_packets); spin1_exit(0); diff --git a/spinnaker_components/sdp_rx/sdp-rx-main.c b/spinnaker_components/sdp_rx/sdp-rx-main.c index 6ad8e4a..a53ba8e 100644 --- a/spinnaker_components/sdp_rx/sdp-rx-main.c +++ b/spinnaker_components/sdp_rx/sdp-rx-main.c @@ -6,7 +6,7 @@ sdp_rx_parameters_t g_sdp_rx; */ void sdp_rx_tick(uint ticks, uint arg1) { use(arg1); - if (simulation_ticks != UINT32_MAX && ticks >= simulation_ticks) { + if (simulation_ticks != UINT32_MAX && ticks > simulation_ticks) { spin1_exit(0); return; } diff --git a/spinnaker_components/value_sink/value_sink.c b/spinnaker_components/value_sink/value_sink.c index 253bd59..70ed629 100644 --- a/spinnaker_components/value_sink/value_sink.c +++ b/spinnaker_components/value_sink/value_sink.c @@ -8,7 +8,7 @@ if_collection_t g_input; void sink_update(uint ticks, uint arg1) { use(arg1); - if (simulation_ticks != UINT32_MAX && ticks >= simulation_ticks) { + if (simulation_ticks != UINT32_MAX && ticks > simulation_ticks) { spin1_exit(0); return; } diff --git a/spinnaker_components/value_source/value_source.c b/spinnaker_components/value_source/value_source.c index 90c2028..e122b1c 100644 --- a/spinnaker_components/value_source/value_source.c +++ b/spinnaker_components/value_source/value_source.c @@ -12,7 +12,7 @@ uint us_delay; void valsource_tick(uint ticks, uint arg1) { use(arg1); - if (simulation_ticks != UINT32_MAX && ticks >= simulation_ticks) { + if (simulation_ticks != UINT32_MAX && ticks > simulation_ticks) { spin1_exit(0); return; }