procedure stub, read all hardware stub, some debug code (read addtional PT100 on ARC, change jog speed stub)

3 files changed, 44 insertions, 5 deletions

diff --git a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c
index 9d9c36623..6d811bc2d 100644
--- a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c
+++ b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c
@@ -532,10 +532,10 @@ void CopyTemperaturesToMonitor(void)
         DiagnosticsMonitor.n_headzone12temperature =
                 HeaterCounterIndex[HEATER_TYPE__HeaterZone12];
 
-        DiagnosticsMonitor.n_headblower1airflow = HeaterCounterIndex[HEATER_TYPE__HeaterZone7];
-        DiagnosticsMonitor.n_headblower2airflow = HeaterCounterIndex[HEATER_TYPE__HeaterZone5];
-        headblower1airflow = PressureSensorGetPressure(HEAD_FAN_RIGHT);
-        headblower2airflow = PressureSensorGetPressure(HEAD_FAN_LEFT);
+        DiagnosticsMonitor.n_headblower1airflow = HeaterCounterIndex[HEATER_TYPE__HeaterZone5];
+        DiagnosticsMonitor.n_headblower2airflow = HeaterCounterIndex[HEATER_TYPE__HeaterZone7];
+        headblower1airflow = PressureSensorGetPressure(HEAD_PT100_ZONE_5_0X84_0);
+        headblower2airflow = PressureSensorGetPressure(HEAD_PT100_ZONE_7_0X86_0);
         DiagnosticsMonitor.headblower1airflow = &headblower1airflow;
         DiagnosticsMonitor.headblower2airflow = &headblower2airflow;
 
@@ -545,6 +545,28 @@ void CopyTemperaturesToMonitor(void)
         headblowervoltage2 = HeadBlowersGetRPM(HEAD_FAN_LEFT);
         DiagnosticsMonitor.headblowervoltage1 = &headblowervoltage1;
         DiagnosticsMonitor.headblowervoltage2 = &headblowervoltage2;
+#warning machine to machine test
+        DiagnosticsMonitor.headzone4temperature =
+                HeaterTemperature[HEATER_TYPE__HeaterZone4];
+        DiagnosticsMonitor.headzone6temperature =
+                HeaterTemperature[HEATER_TYPE__HeaterZone6];
+        DiagnosticsMonitor.headzone8temperature =
+                HeaterTemperature[HEATER_TYPE__HeaterZone8];
+        DiagnosticsMonitor.headzone9temperature =
+                HeaterTemperature[HEATER_TYPE__HeaterZone9];
+        DiagnosticsMonitor.headzone10temperature =
+                HeaterTemperature[HEATER_TYPE__HeaterZone10];
+        DiagnosticsMonitor.n_headzone4temperature =
+                HeaterCounterIndex[HEATER_TYPE__HeaterZone4];
+        DiagnosticsMonitor.n_headzone6temperature =
+                HeaterCounterIndex[HEATER_TYPE__HeaterZone6];
+        DiagnosticsMonitor.n_headzone8temperature =
+                HeaterCounterIndex[HEATER_TYPE__HeaterZone8];
+        DiagnosticsMonitor.n_headzone9temperature =
+                HeaterCounterIndex[HEATER_TYPE__HeaterZone9];
+        DiagnosticsMonitor.n_headzone10temperature =
+                HeaterCounterIndex[HEATER_TYPE__HeaterZone10];
+
     }
 #ifdef FOUR_WINDERS
 //    double dancer2,dancer3,dancer4;
@@ -989,6 +1011,13 @@ void DiagnosticOneSecCollection(void)
         //DiagnosticLoadTemperature(HEATER_TYPE__HeaterZone8, MillisecGetTemperatures(HEAD_PT100_ZONE_8_0X86_1));
         DiagnosticLoadTemperature(HEATER_TYPE__HeaterZone11, MillisecGetTemperatures(HEAD_PT100_ZONE_11_0X8A_0));
         DiagnosticLoadTemperature(HEATER_TYPE__HeaterZone12, MillisecGetTemperatures(HEAD_PT100_ZONE_12_0X8A_1));
+#warning MACHINE TO MACHINE TEST
+        DiagnosticLoadTemperature(HEATER_TYPE__HeaterZone4, MillisecGetTemperatures(HEAD_PT100_ZONE_4_0X82_1));
+        DiagnosticLoadTemperature(HEATER_TYPE__HeaterZone6, MillisecGetTemperatures(HEAD_PT100_ZONE_6_0X84_1));
+        DiagnosticLoadTemperature(HEATER_TYPE__HeaterZone8, MillisecGetTemperatures(HEAD_PT100_ZONE_8_0X86_1));
+        DiagnosticLoadTemperature(HEATER_TYPE__HeaterZone9, MillisecGetTemperatures(HEAD_PT100_ZONE_9_0X88_0));
+        DiagnosticLoadTemperature(HEATER_TYPE__HeaterZone10, MillisecGetTemperatures(HEAD_PT100_ZONE_10_0X88_1));
+
     }
     DiagnosticLoadTemperature(HARDWARE_PID_CONTROL_TYPE__DryerAirTemperature, MillisecGetTemperatures(TEMP_SENSE_ANALOG_DRYER_TEMP1));
     DiagnosticLoadTemperature(HARDWARE_PID_CONTROL_TYPE__DryerHeaterMain, MillisecGetTemperatures(TEMP_SENSE_ANALOG_DRYER_TEMP2));
diff --git a/Software/Embedded_SW/Embedded/Modules/General/buttons.c b/Software/Embedded_SW/Embedded/Modules/General/buttons.c
index 0dda71d16..833530536 100644
--- a/Software/Embedded_SW/Embedded/Modules/General/buttons.c
+++ b/Software/Embedded_SW/Embedded/Modules/General/buttons.c
@@ -62,6 +62,7 @@ uint32_t ButtonLoadCBFunction(uint32_t IfIndex, uint32_t ReadValue);
 //uint32_t LoadLongPress( button *pBtn);
 bool get_pbAction ( button *pBtn, PB_Status ReadValue);
 
+int JogSpeed = 40;
 #define LOADLONGPRESS 3
 
 int PowerDown()
@@ -325,7 +326,7 @@ uint32_t ButtonJogCBFunction(uint32_t IfIndex, uint32_t ReadValue)
                     ReportWithPackageFilter(GeneralFilter,"------------ joggingMachine: Jogging is sttENABLE and  PRESS-----------------", __FILE__,__LINE__,jog.state, RpMessage, jog.Action, 0);
                     jog.color =  colorON;
                     jog.color =  BLINK;
-                    ThreadJoggingFunc(40);
+                    ThreadJoggingFunc(JogSpeed);
                     jog.state = sttJOGGING;
                 }
             }
diff --git a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c
index c6cfbb1d1..0ce6474cc 100644
--- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c
+++ b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c
@@ -1254,6 +1254,15 @@ void Stub_ProgressRequest(MessageContainer* requestContainer)
         response.has_progress = true;
     }
     else
+    if(request->amount == 0xB25)  //Set loading arm cycles
+    {
+        REPORT_MSG(request->delay,"Change jog speed");
+        if (request->delay<100)
+            JogSpeed = request->delay;
+        response.progress = JogSpeed;
+        response.has_progress = true;
+    }
+    else
     if(request->amount == 0xC3)  //suspend I2C task
     {
         if (request->delay == 0)