blower control in configuration and diagnostics

4 files changed, 20 insertions, 11 deletions

diff --git a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c
index 0e0e7a886..68a651426 100644
--- a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c
+++ b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c
@@ -364,7 +364,8 @@ void SendDiagnostics(void)
     DiagnosticsMonitor.n_dryerzone1temperature = HeaterCounterIndex[HARDWARE_PID_CONTROL_TYPE__DryerHeater1000w];
     DiagnosticsMonitor.n_dryerzone2temperature = HeaterCounterIndex[HARDWARE_PID_CONTROL_TYPE__DryerHeater200w1];
     DiagnosticsMonitor.n_dryerzone3temperature = HeaterCounterIndex[HARDWARE_PID_CONTROL_TYPE__DryerHeater200w2];
-
+    DiagnosticsMonitor.n_blowervoltage = 1;
+    DiagnosticsMonitor.blowervoltage = &voltage;
     memset(HeaterCounterIndex,0,sizeof(HeaterCounterIndex));
 
     if (JobIsActive())
@@ -399,20 +400,21 @@ void SendDiagnostics(void)
     //response.digitalpins = DigitalPinArray;
     response.n_events = 0;
     response.n_componentsstates = 0;
-    if (blowervolatgedisplay == true)
+/*    if (blowervolatgedisplay == true)
     {
         ValueComponentState *BlowerValue = malloc(sizeof(ValueComponentState));
         if (BlowerValue)
         {
             response.n_componentsstates++;
+            response.componentsstates = malloc(sizeof(ValueComponentState *));
             BlowerValue->has_component = true;
             BlowerValue->component = VALUE_COMPONENT__BlowerVoltage;
             BlowerValue->has_value = true;
             BlowerValue->value = voltage;
-            response.componentsstates = BlowerValue;
+            response.componentsstates[0] = BlowerValue;
         }
     }
-
+*/
     responseContainer = createContainer(MESSAGE_TYPE__StartDiagnosticsResponse,  DiagnosticsToken, false, &response, &start_diagnostics_response__pack, &start_diagnostics_response__get_packed_size);
     responseContainer.continuous = true;
 
diff --git a/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsHoming.c b/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsHoming.c
index 176281c77..2a943017c 100644
--- a/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsHoming.c
+++ b/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsHoming.c
@@ -420,7 +420,7 @@ uint32_t SetComponentValueRequestRequestFunc(MessageContainer* requestContainer)
     MessageContainer responseContainer;
     uint8_t* container_buffer;
     uint32_t status = 0;
-
+    uint32_t intvoltage;
     SetComponentValueRequest* request = set_component_value_request__unpack(NULL, requestContainer->data.len, requestContainer->data.data);
 
 
@@ -436,9 +436,14 @@ uint32_t SetComponentValueRequestRequestFunc(MessageContainer* requestContainer)
         case VALUE_COMPONENT__BlowerVoltage:
               blowervolatgedisplay = true;
               voltage = request->value;
-              Control_Voltage_To_Blower(voltage);
               if (voltage == 0.0)
                   Turn_the_Blower_Off();
+              else
+              {
+                  Turn_the_Blower_On();
+                  intvoltage = voltage;
+                  Control_Voltage_To_Blower(intvoltage);
+              }
             break;
         default:
             break;
diff --git a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c
index 27d17f044..0e5afe780 100644
--- a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c
+++ b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c
@@ -183,7 +183,6 @@ uint32_t  HeaterCommandRequestMessage(int HeaterId, bool OnOff, int Temperature)
         LOG_ERROR (HeaterId,"HeaterControl not configured");
         return ERROR;
     }
-//    Turn_the_Blower_On();
 
     if (HeaterId< MAX_HEATERS_NUM)
     {
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_init.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_init.c
index 1b960dada..e4a5b362c 100644
--- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_init.c
+++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_init.c
@@ -103,10 +103,13 @@ uint32_t DancerConfigMessage(HardwareDancer * request)
 uint32_t ThreadConfigBreakSensor(void *request)
 {
     HardwareBreakSensor  *SensorCfg = (HardwareBreakSensor*)request;
-    BreakSensorenabled = SensorCfg->enabled;
-    BreakSensordebouncetimemilli = SensorCfg->debouncetimemilli;
-
-    return OK;
+    if (SensorCfg)
+    {
+        BreakSensorenabled = SensorCfg->enabled;
+        BreakSensordebouncetimemilli = SensorCfg->debouncetimemilli;
+        return OK;
+    }
+    return ERROR;
 }
 uint32_t thread_init(void)
 {