fix dryer heaters

4 files changed, 11 insertions, 5 deletions

diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
index 559db0e79..25f826d92 100644
--- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
+++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
@@ -179,6 +179,7 @@ int32_t MillisecReadFromTempSensor(uint32_t TempSensorId,  MSecFptr Callback)
     PT100Activity++;  //get response
     PT100Activity++; //read request
     PT100Data[TempSensorId].Callback = Callback;
+    PT100Data[TempSensorId].WaitForData = true;
     PT100Data[TempSensorId].DataRequired = true;
     PT100Data[TempSensorId].Active = true;
 
@@ -343,7 +344,7 @@ uint32_t MillisecLoop(uint32_t tick)
            {
                TemperatureSendSensorDummyClk((TEMPERATURE_SENSOR_ID_ENUM)Sensor_i);
                PT100Data[Sensor_i].SyncRequired = false;
-               if (PT100Data[Sensor_i].DataRequired == true)
+               /*if (PT100Data[Sensor_i].DataRequired == true)
                {
                    PT100Data[Sensor_i].WaitForData = true; // mark the motor for data request next round
                }
@@ -351,7 +352,7 @@ uint32_t MillisecLoop(uint32_t tick)
                {
                    if (PT100Data[Sensor_i].Callback)
                        PT100Data[Sensor_i].Callback(Sensor_i,0); // call the callback to report execution
-               }
+               }*/
                PT100Activity--;
 
            }
diff --git a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c
index 1ca1e5f84..56e2d65bb 100644
--- a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c
+++ b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c
@@ -229,6 +229,10 @@ void Diagnostic100msecCollection(void)
     DiagnosticLoadTemperature(HARDWARE_PID_CONTROL_TYPE__HeadHeaterZ5, TemperatureSensorRead(TEMP_SENSE_ANALOG_DYEINGH_TEMP5));
     DiagnosticLoadTemperature(HARDWARE_PID_CONTROL_TYPE__HeadHeaterZ6, TemperatureSensorRead(TEMP_SENSE_ANALOG_MIXCHIP_TEMP));
 #ifndef DEMO_TEMPERATURE
+//#define DRYER_AIR_PT100  TEMP_SENSE_ANALOG_DRYER_TEMP2
+//#define DRYER_MAIN_PT100 TEMP_SENSE_ANALOG_DRYER_TEMP1
+//#define DRYER_SECONDARY_PT100 TEMP_SENSE_ANALOG_DRYER_TEMP3
+
     DiagnosticLoadTemperature(HARDWARE_PID_CONTROL_TYPE__DryerAirTemperature, TemperatureSensorRead(TEMP_SENSE_ANALOG_DRYER_TEMP1));
     DiagnosticLoadTemperature(HARDWARE_PID_CONTROL_TYPE__DryerHeaterMain, TemperatureSensorRead(TEMP_SENSE_ANALOG_DRYER_TEMP2));
     DiagnosticLoadTemperature(HARDWARE_PID_CONTROL_TYPE__DryerHeaterSecondary, TemperatureSensorRead(TEMP_SENSE_ANALOG_DRYER_TEMP3));
diff --git a/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsHoming.c b/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsHoming.c
index 4e573cb82..2d73379d6 100644
--- a/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsHoming.c
+++ b/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsHoming.c
@@ -456,5 +456,6 @@ uint32_t SetComponentValueRequestRequestFunc(MessageContainer* requestContainer)
     //free(requestContainer);
     set_component_value_request__free_unpacked(request,NULL);
 
+    return OK;
 }
 
diff --git a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c
index 01a08125a..861c77e3b 100644
--- a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c
+++ b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c
@@ -46,9 +46,9 @@ uint32_t    ControlIdtoHeaterId [MAX_HEATERS_NUM] = {0xFF,0xFF,0xFF,0xFF,0xFF,0x
 uint32_t    MainDryerHeaterMaxTempControl = 0xFF;
 uint32_t    SecondDryerHeaterMaxTempControl = 0xFF;
 
-#define DRYER_AIR_PT100  TEMP_SENSE_ANALOG_DRYER_TEMP3
-#define DRYER_MAIN_PT100 TEMP_SENSE_ANALOG_DRYER_TEMP1
-#define DRYER_SECONDARY_PT100 TEMP_SENSE_ANALOG_DRYER_TEMP2
+#define DRYER_AIR_PT100  TEMP_SENSE_ANALOG_DRYER_TEMP1
+#define DRYER_MAIN_PT100 TEMP_SENSE_ANALOG_DRYER_TEMP2
+#define DRYER_SECONDARY_PT100 TEMP_SENSE_ANALOG_DRYER_TEMP3
 
 uint32_t HeaterId2PT100Id[MAX_HEATERS_NUM] = {DRYER_AIR_PT100,DRYER_MAIN_PT100,DRYER_SECONDARY_PT100,TEMP_SENSE_ANALOG_DYEINGH_TEMP1,TEMP_SENSE_ANALOG_DYEINGH_TEMP2,TEMP_SENSE_ANALOG_DYEINGH_TEMP3,TEMP_SENSE_ANALOG_DYEINGH_TEMP4,TEMP_SENSE_ANALOG_DYEINGH_TEMP5,TEMP_SENSE_ANALOG_MIXCHIP_TEMP,TEMP_SENSE_AN_ENCLOSURETEMP3};
 uint32_t    DryerInternalPT100Id = DRYER_AIR_PT100;