diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2019-09-16 18:22:51 +0300 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2019-09-16 18:22:51 +0300 |
| commit | bf91c4fdf69848e929c2a20f52fb21b5df119b03 (patch) | |
| tree | 9a2b4a00a363b8d35c84e757cbe92063774d9b26 /Software/Embedded_SW/Embedded | |
| parent | 161fe6f6d2b29ba3deb641cdc049ad0d8f58004e (diff) | |
| download | Tango-bf91c4fdf69848e929c2a20f52fb21b5df119b03.tar.gz Tango-bf91c4fdf69848e929c2a20f52fb21b5df119b03.zip | |
new magnet handling
Diffstat (limited to 'Software/Embedded_SW/Embedded')
4 files changed, 14 insertions, 3 deletions
diff --git a/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c b/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c index 4396f6da1..caad43712 100644 --- a/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c +++ b/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c @@ -604,6 +604,8 @@ uint32_t GetFilesRequestFunc(MessageContainer* requestContainer) Data[i].lastmodifieddate = fno[i]->fdate; Data[i].has_lastmodifiedtime = true; Data[i].lastmodifiedtime = fno[i]->ftime; + //Report(Data[i].name, __FILE__, __LINE__, Data[i].lastmodifieddate, RpWarning, (int)Data[i].lastmodifiedtime, 0); + if (i==0) usnprintf(&FullPath[i], 50, "%s", request->path); else diff --git a/Software/Embedded_SW/Embedded/DataDef.h b/Software/Embedded_SW/Embedded/DataDef.h index 3000ec012..dbfd6eb94 100644 --- a/Software/Embedded_SW/Embedded/DataDef.h +++ b/Software/Embedded_SW/Embedded/DataDef.h @@ -134,6 +134,9 @@ enum #define DRIER_LID_OPEN 0 #define DRIER_LID_CLOSE 2 +#define DH_LID_OPEN 0 +#define DH_LID_CLOSE 2 + #define DOUBLE_BUFFER 2 diff --git a/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_GPIO/FPGA_GPIO.c b/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_GPIO/FPGA_GPIO.c index c16b1f21f..d9bd639c4 100644 --- a/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_GPIO/FPGA_GPIO.c +++ b/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_GPIO/FPGA_GPIO.c @@ -501,7 +501,8 @@ uint32_t ActivateHeadMagnet() F2_CTRL = F2_CTRL_Reg.ushort; if (isMotorConfigured(HARDWARE_MOTOR_TYPE__MOTO_RLOADARM)) { - MotorGotoWithCallback(HARDWARE_MOTOR_TYPE__MOTO_RLOADARM, DRIER_LID_OPEN, Motor_Id_to_LS_IdUp[HARDWARE_MOTOR_TYPE__MOTO_RLOADARM], NULL,1000); + Report("ActivateHeadMagnet",__FILE__,__LINE__,(int)HARDWARE_MOTOR_TYPE__MOTO_RLOADARM,RpWarning,(int)DH_LID_OPEN,0); + MotorGotoWithCallback(HARDWARE_MOTOR_TYPE__MOTO_RLOADARM, DH_LID_OPEN, Motor_Id_to_LS_IdUp[HARDWARE_MOTOR_TYPE__MOTO_RLOADARM], NULL,1000); } return OK; } @@ -510,7 +511,8 @@ uint32_t DeActivateHeadMagnet() { if (isMotorConfigured(HARDWARE_MOTOR_TYPE__MOTO_RLOADARM)) { - MotorGotoWithCallback(HARDWARE_MOTOR_TYPE__MOTO_RLOADARM, DRIER_LID_CLOSE, Motor_Id_to_LS_IdDown[HARDWARE_MOTOR_TYPE__MOTO_RLOADARM], NULL,1000); + Report("DeActivateHeadMagnet",__FILE__,__LINE__,(int)HARDWARE_MOTOR_TYPE__MOTO_RLOADARM,RpWarning,(int)DH_LID_CLOSE,0); + MotorGotoWithCallback(HARDWARE_MOTOR_TYPE__MOTO_RLOADARM, DH_LID_CLOSE, Motor_Id_to_LS_IdDown[HARDWARE_MOTOR_TYPE__MOTO_RLOADARM], NULL,1000); } F2_CTRL_Reg.ushort |= SPARE_SSR13_CTRL; F2_CTRL = F2_CTRL_Reg.ushort; diff --git a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c index 95327e45d..2dcc65087 100644 --- a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c +++ b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c @@ -130,6 +130,11 @@ uint32_t HWConfigurationInit(void) if (status !=OK) { SetMachineState(MACHINE_STATE_HW_CONFIG_FAILED); + STATUS_GREEN_LED_OFF; + } + else + { + STATUS_RED_LED_OFF; } upload_hardware_configuration_request__free_unpacked(UploadRequest,NULL); } @@ -143,7 +148,6 @@ uint32_t HWConfigurationInit(void) ADC_MUX_Init(); GeneralHwReady = true; - STATUS_RED_LED_OFF; return status; } |