diff options
| author | Avi Levkovich <avi@twine-s.com> | 2018-08-08 16:38:27 +0300 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2018-08-08 16:38:27 +0300 |
| commit | be5c498b723efa8f8e02332e5af40ea0214b0fb7 (patch) | |
| tree | fac99de033373d1870177433b93eb065132413d1 /Software/Embedded_SW/Embedded/Modules/Thread/Thread_init.c | |
| parent | ddf8b4ad6edff6b9ac1e80d0a55cff5edb06a3e8 (diff) | |
| parent | a610818fef1bafdd75ab904d19fa7f206942ce97 (diff) | |
| download | Tango-be5c498b723efa8f8e02332e5af40ea0214b0fb7.tar.gz Tango-be5c498b723efa8f8e02332e5af40ea0214b0fb7.zip | |
merge conflicts
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Thread/Thread_init.c')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Thread/Thread_init.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_init.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_init.c index 1b960dada..e4a5b362c 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_init.c +++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_init.c @@ -103,10 +103,13 @@ uint32_t DancerConfigMessage(HardwareDancer * request) uint32_t ThreadConfigBreakSensor(void *request) { HardwareBreakSensor *SensorCfg = (HardwareBreakSensor*)request; - BreakSensorenabled = SensorCfg->enabled; - BreakSensordebouncetimemilli = SensorCfg->debouncetimemilli; - - return OK; + if (SensorCfg) + { + BreakSensorenabled = SensorCfg->enabled; + BreakSensordebouncetimemilli = SensorCfg->debouncetimemilli; + return OK; + } + return ERROR; } uint32_t thread_init(void) { |