diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2020-03-12 12:59:38 +0200 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2020-03-12 12:59:38 +0200 |
| commit | 4a82ab8485eebc548fef4fd48d44ae7447aa047e (patch) | |
| tree | d08f4b0455e50e9c86b5f8e6dadf6112880d4426 /Software/Embedded_SW/Embedded/Drivers | |
| parent | 0208e9f1800c044ec3bd002b7aa7fd00621c81be (diff) | |
| download | Tango-4a82ab8485eebc548fef4fd48d44ae7447aa047e.tar.gz Tango-4a82ab8485eebc548fef4fd48d44ae7447aa047e.zip | |
Version 1.4.6.17 - PACK 1. (support for new TFU and bug fixes)
Diffstat (limited to 'Software/Embedded_SW/Embedded/Drivers')
4 files changed, 14 insertions, 3 deletions
diff --git a/Software/Embedded_SW/Embedded/Drivers/FPGA/Full_Vme/FPGA_Programming_Up.c b/Software/Embedded_SW/Embedded/Drivers/FPGA/Full_Vme/FPGA_Programming_Up.c index 04a52a6af..aa645baa6 100644 --- a/Software/Embedded_SW/Embedded/Drivers/FPGA/Full_Vme/FPGA_Programming_Up.c +++ b/Software/Embedded_SW/Embedded/Drivers/FPGA/Full_Vme/FPGA_Programming_Up.c @@ -23,6 +23,7 @@ extern short int main_vme(); +bool FPGABurningActive = false; FPGA_JTAG_GPIO FPGA_JTAG; FIL *FileHandlevme = 0; @@ -96,13 +97,14 @@ FRESULT FPGA_Programming_Up(FPGA_ID FPGA_Id, char * FullPath, bool IncludeReboot { return(fresult); } + FPGABurningActive = true; Report(FullPath,__FILE__,__LINE__,CurrentFileSize,RpWarning,0,0); StopInitSequence(); HeatersEnd(); fresult = main_vme(); CurrentRunningFile++; Report(FullPath,__FILE__,__LINE__,CurrentRunningFile,RpWarning,1,0); - + FPGABurningActive = false; } diff --git a/Software/Embedded_SW/Embedded/Drivers/FPGA/Full_Vme/FPGA_Programming_Up.h b/Software/Embedded_SW/Embedded/Drivers/FPGA/Full_Vme/FPGA_Programming_Up.h index b752f24b3..75e712497 100644 --- a/Software/Embedded_SW/Embedded/Drivers/FPGA/Full_Vme/FPGA_Programming_Up.h +++ b/Software/Embedded_SW/Embedded/Drivers/FPGA/Full_Vme/FPGA_Programming_Up.h @@ -36,6 +36,7 @@ typedef struct FRESULT FPGA_Programming_Request(FPGA_ID FPGA_Id, char * FullPath, bool IncludeReboot); //direct blocking call FRESULT FPGA_Programming_Up(FPGA_ID FPGA_Id, char * FullPath, bool IncludeReboot); +extern bool FPGABurningActive; #endif /* DRIVERS_FPGA_FULL_VME_FPGA_PROGRAMMING_UP_H_ */ diff --git a/Software/Embedded_SW/Embedded/Drivers/Heater/TemperatureSensor.c b/Software/Embedded_SW/Embedded/Drivers/Heater/TemperatureSensor.c index 9d7cdbe4c..0b5d8ebc2 100644 --- a/Software/Embedded_SW/Embedded/Drivers/Heater/TemperatureSensor.c +++ b/Software/Embedded_SW/Embedded/Drivers/Heater/TemperatureSensor.c @@ -202,6 +202,14 @@ int TemperatureListString(char* str) ,TempSensorResponse[MIXER_PT100].Temperature_C_mult_by_100/100); //Prepare H1: 78 H2: 111 H3: 137 H4: 135 H5: 144 H6: 75 D1: 120 D2: 167 D3: 158 M: 129 } + if(Head_Type == HEAD_TYPE_STAPLE_SPUN) + { + len = usnprintf(str, 160, "Prepare H1: ,%d, H2: ,%d, H3: ,%d, AL1: AR1: M: ,%d, D: ,%d,", + TempSensorResponse[HEAD_PT100_ZONE_1_0X80_0].Temperature_C_mult_by_100/100, TempSensorResponse[HEAD_PT100_ZONE_2_0X80_1].Temperature_C_mult_by_100/100, + TempSensorResponse[HEAD_PT100_ZONE_3_0X82_0].Temperature_C_mult_by_100/100, + TempSensorResponse[HEAD_PT100_AIR_HEATER_1_0X8C_0].Temperature_C_mult_by_100/100, TempSensorResponse[HEAD_PT100_AIR_HEATER_2_0X8C_1].Temperature_C_mult_by_100/100, + TempSensorResponse[HEAD_PT100_MIXER_0X8E_0].Temperature_C_mult_by_100/100, TempSensorResponse[TEMP_SENSE_ANALOG_DRYER_TEMP1].Temperature_C_mult_by_100/100); + } else { len = usnprintf(str, 150, "Unknown head type"); diff --git a/Software/Embedded_SW/Embedded/Drivers/Motors/MotorActions.c b/Software/Embedded_SW/Embedded/Drivers/Motors/MotorActions.c index d679cbb01..fc8d29b56 100644 --- a/Software/Embedded_SW/Embedded/Drivers/Motors/MotorActions.c +++ b/Software/Embedded_SW/Embedded/Drivers/Motors/MotorActions.c @@ -70,7 +70,7 @@ FPGA_GPI_ENUM Motor_Id_to_LS_IdDown[NUM_OF_MOTORS] = { // limit switch for n GPI_LS_SCREW_RIGHT, //MOTO_SCREW = 14, MAX_GPI, //MOTO_WINDER = 15, GPI_LS_LDANCER1_DOWN, //MOTO_LDANCER1 = 16, - GPI_LS_LDANCER2_DOWN, //MOTO_LDANCER2 = 17, + GPI_LS_LSPARE2, //MOTO_LDANCER2 = 17, MAX_GPI, //MOTO_LDRIVING = 18, GPI_LS_LLOADMOTOR_DOWN, //MOTO_LLOADING = 19, GPI_LS_LPIVOT_DOWN, //MOTO_LPIVOT1 = 20, @@ -97,7 +97,7 @@ FPGA_GPI_ENUM Motor_Id_to_LS_IdUp[NUM_OF_MOTORS] = { // limit switch for nor GPI_LS_SCREW_LEFT, //MOTO_SCREW = 14, MAX_GPI, //MOTO_WINDER = 15, GPI_LS_LDANCER1_UP, //MOTO_LDANCER1 = 16, - GPI_LS_LDANCER2_UP, //MOTO_LDANCER2 = 17, + GPI_LS_LSPARE1, //MOTO_LDANCER2 = 17, MAX_GPI, //MOTO_LDRIVING = 18, GPI_LS_LLOADMOTOR_UP, //MOTO_LLOADING = 19, GPI_LS_LPIVOT_UP, //MOTO_LPIVOT1 = 20, |