equal
deleted
inserted
replaced
189 #endif |
189 #endif |
190 // Open CAN devices |
190 // Open CAN devices |
191 if(strcmp( SlaveBoard.baudrate, "none")){ |
191 if(strcmp( SlaveBoard.baudrate, "none")){ |
192 |
192 |
193 TestSlave_Data.heartbeatError = TestSlave_heartbeatError; |
193 TestSlave_Data.heartbeatError = TestSlave_heartbeatError; |
194 TestSlave_Data.SDOtimeoutError = TestSlave_SDOtimeoutError; |
|
195 TestSlave_Data.initialisation = TestSlave_initialisation; |
194 TestSlave_Data.initialisation = TestSlave_initialisation; |
196 TestSlave_Data.preOperational = TestSlave_preOperational; |
195 TestSlave_Data.preOperational = TestSlave_preOperational; |
197 TestSlave_Data.operational = TestSlave_operational; |
196 TestSlave_Data.operational = TestSlave_operational; |
198 TestSlave_Data.stopped = TestSlave_stopped; |
197 TestSlave_Data.stopped = TestSlave_stopped; |
199 TestSlave_Data.post_sync = TestSlave_post_sync; |
198 TestSlave_Data.post_sync = TestSlave_post_sync; |
207 } |
206 } |
208 |
207 |
209 if(strcmp( MasterBoard.baudrate, "none")){ |
208 if(strcmp( MasterBoard.baudrate, "none")){ |
210 |
209 |
211 TestMaster_Data.heartbeatError = TestMaster_heartbeatError; |
210 TestMaster_Data.heartbeatError = TestMaster_heartbeatError; |
212 TestMaster_Data.SDOtimeoutError = TestMaster_SDOtimeoutError; |
|
213 TestMaster_Data.initialisation = TestMaster_initialisation; |
211 TestMaster_Data.initialisation = TestMaster_initialisation; |
214 TestMaster_Data.preOperational = TestMaster_preOperational; |
212 TestMaster_Data.preOperational = TestMaster_preOperational; |
215 TestMaster_Data.operational = TestMaster_operational; |
213 TestMaster_Data.operational = TestMaster_operational; |
216 TestMaster_Data.stopped = TestMaster_stopped; |
214 TestMaster_Data.stopped = TestMaster_stopped; |
217 TestMaster_Data.post_sync = TestMaster_post_sync; |
215 TestMaster_Data.post_sync = TestMaster_post_sync; |
232 |
230 |
233 // Stop timer thread |
231 // Stop timer thread |
234 StopTimerLoop(); |
232 StopTimerLoop(); |
235 |
233 |
236 // Close CAN devices (and can threads) |
234 // Close CAN devices (and can threads) |
237 if(SlaveBoard.baudrate) canClose(&TestSlave_Data); |
235 if(strcmp( SlaveBoard.baudrate, "none")) canClose(&TestSlave_Data); |
238 fail_master: |
236 fail_master: |
239 if(MasterBoard.baudrate) canClose(&TestMaster_Data); |
237 if(strcmp( MasterBoard.baudrate, "none")) canClose(&TestMaster_Data); |
240 fail_slave: |
238 fail_slave: |
241 |
239 |
242 |
240 |
243 return 0; |
241 return 0; |
244 } |
242 } |