Skip to content

Commit

Permalink
Merge branch 'dev1116' of github.com:project-rig/nengo_spinnaker into…
Browse files Browse the repository at this point in the history
… dev1116
  • Loading branch information
mundya committed Nov 23, 2016
2 parents 23c9977 + 4b03588 commit d4636b6
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 1 deletion.
Binary file modified nengo_spinnaker/binaries/nengo_ensemble.aplx
Binary file not shown.
Binary file modified nengo_spinnaker/binaries/nengo_ensemble_profiled.aplx
Binary file not shown.
2 changes: 1 addition & 1 deletion spinnaker_components/ensemble/ensemble.c
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ static inline void decode_output_and_transmit(const ensemble_state_t *ensemble)
uint delay = (spin1_get_core_id() - 1) +
(spin1_get_chip_id() & 0x1) +
((spin1_get_chip_id() >> 7) & 0x2);
spin1_delay_us(3 * delay);
spin1_delay_us(5 * delay);

profiler_write_entry(PROFILER_ENTER | PROFILER_DECODE);

Expand Down

0 comments on commit d4636b6

Please sign in to comment.