diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2018-08-20 16:08:43 +0300 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2018-08-20 16:08:43 +0300 |
| commit | f468145c16b5c677201327feeb4f207c21df0b0b (patch) | |
| tree | 94790a1ae7eee69cec3759cf8eb73cc32a0a23d1 /Software/Embedded_SW/Embedded/Modules | |
| parent | 0b30384bd98a812f4ff318f1f889d9b406d7cb90 (diff) | |
| download | Tango-f468145c16b5c677201327feeb4f207c21df0b0b.tar.gz Tango-f468145c16b5c677201327feeb4f207c21df0b0b.zip | |
add motor configuration flag, used in alarm handling. reduced number of motors - removed spare motors
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules')
3 files changed, 6 insertions, 10 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c b/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c index c859bd778..f9f075477 100644 --- a/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c +++ b/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c @@ -361,6 +361,11 @@ uint32_t AlarmHandlingLoop(uint32_t tick) case CurrentAlarm: break; case MotorAlarm: + if (isMotorConfigured(AlarmItem[Alarm_i].DeviceId) == false) + { + Status = false; + break; + } value = MotorGetStatus(AlarmItem[Alarm_i].DeviceId); if (value && AlarmItem[Alarm_i].AlarmValue) // { diff --git a/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsHoming.c b/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsHoming.c index bb8da0b2e..ad26ad7c2 100644 --- a/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsHoming.c +++ b/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsHoming.c @@ -59,11 +59,6 @@ FPGA_GPI_ENUM Motor_Id_to_LS_Id[NUM_OF_MOTORS] = { MAX_GPI, //MOTO_RDRIVING = 22, GPI_LS_RLOADRAM_UP, //MOTO_RLOADARM = 23, GPI_LS_RLOADMOTOR_DOWN, //MOTO_RLOADING = 24, - MAX_GPI, //MOTO_SPARE1_1 = 25, - MAX_GPI, //MOTO_SPARE1_2 = 26, - MAX_GPI, //MOTO_SPARE2_1 = 27, - MAX_GPI, //MOTO_SPARE2_2 = 28 - }; typedef enum { MotorHomingDirectionUp, @@ -97,11 +92,6 @@ MotorHomingDirectionEnum Motor_Id_to_LS_Direction[NUM_OF_MOTORS] = { MotorHomingDirectionNoHoming, //MOTO_RDRIVING = 22, MotorHomingDirectionUp, //MOTO_RLOADARM = 23, MotorHomingDirectionDown, //MOTO_RLOADING = 24, - MotorHomingDirectionNoHoming, //MOTO_SPARE1_1 = 25, - MotorHomingDirectionNoHoming, //MOTO_SPARE1_2 = 26, - MotorHomingDirectionNoHoming, //MOTO_SPARE2_1 = 27, - MotorHomingDirectionNoHoming, //MOTO_SPARE2_2 = 28 - }; char HomingToken[NUM_OF_MOTORS][36+1]={0}; diff --git a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_SpeedSensor.c b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_SpeedSensor.c index a433be2ce..eea594817 100644 --- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_SpeedSensor.c +++ b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_SpeedSensor.c @@ -34,6 +34,7 @@ #include "drivers/SPI/SPI_Comm.h" #include "drivers/FPGA/FPGA_SSI_Comm.h" #include "Modules/Thread/Thread_ex.h" +#include <Drivers/SSI_Comm/Speed_Sensor/Speed_Sensor.h> #include "Modules/thread/thread.h" |