version 1.4.6.0 - going forward

4 files changed, 24 insertions, 9 deletions

diff --git a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c
index 58d1e1c37..dcbd6b9b0 100644
--- a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c
+++ b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c
@@ -214,7 +214,7 @@ void LoadConfigurationParameters(ConfigurationParameters *Params)
                 EmbeddedParameters->generalparameters[7] = AutoHoming_JobEnd_PowerOn_off; //
             }
             EmbeddedParameters->has_currentalarmlowlimit = true;
-            EmbeddedParameters->currentalarmlowlimit = 0.80;
+            EmbeddedParameters->currentalarmlowlimit = 0.77;
             EmbeddedParameters->has_currentalarmhighlimit = true;
             EmbeddedParameters->currentalarmhighlimit= 1.07;
             EmbeddedParameters->has_ids_segmentrefilltimeout = true;
@@ -485,7 +485,7 @@ uint32_t HWConfiguration(UploadHardwareConfigurationRequest* UploadRequest)
         Enable_MidTank_Pressure_Reading(Dispenser_i);
         Valve_Set(IDS_Id_to_AirValve[Dispenser_i], Atm_MidTank_ON );   //Atm_MidTank_OFF/ON
     }
-    GenHWControlId = AddControlCallback( GenHWInitCallBackFunction, 2* eOneSecond, TemplateDataReadCBFunction,0,0, 0 );
+    GenHWControlId = AddControlCallback(NULL, GenHWInitCallBackFunction, 2* eOneSecond, TemplateDataReadCBFunction,0,0, 0 );
 */
     ControlStart();
     AlarmHandlingStart();
diff --git a/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c b/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c
index ff4909438..4958139e6 100644
--- a/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c
+++ b/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c
@@ -68,7 +68,7 @@ int MachineUpdateResponseFunc(void)
             double dispcapacity = (1.00-(IDS_Dispenser_Data[i].consumedinnanolitter/5800000))*130*1000*1000;
             IDS_Level[i].dispenserlevel = (int32_t)dispcapacity;
             IDS_Level[i].has_midtanklevel = true;
-            IDS_Level[i].midtanklevel = Get_MidTank_Int100_Sensor(i);
+            IDS_Level[i].midtanklevel = Get_MidTank_Int1000_Sensor(i);
             MachineStatus.idspackslevels[MachineStatus.n_idspackslevels] = &IDS_Level[i];
             MachineStatus.n_idspackslevels++;
         }
diff --git a/Software/Embedded_SW/Embedded/Modules/General/Safety.c b/Software/Embedded_SW/Embedded/Modules/General/Safety.c
index a5a586e07..6a0b9a67b 100644
--- a/Software/Embedded_SW/Embedded/Modules/General/Safety.c
+++ b/Software/Embedded_SW/Embedded/Modules/General/Safety.c
@@ -33,7 +33,7 @@ bool AirFilterAlarmState = false;
 bool WasteOverflowAlarmState = false;
 void Safety_Init(void)
 {
-    SafetyControlId = AddControlCallback( Safety_Main_State, eOneSecond, TemplateDataReadCBFunction,0,0, 0 );
+    SafetyControlId = AddControlCallback("Safety", Safety_Main_State, eOneSecond, TemplateDataReadCBFunction,0,0, 0 );
     //return;
 }
 uint32_t Safety_Main_State(uint32_t IfIndex, uint32_t BusyFlag)
@@ -110,6 +110,10 @@ uint32_t Safety_Main_State(uint32_t IfIndex, uint32_t BusyFlag)
                        //report dispenser over pressure
                        AlarmHandlingSetAlarm(EVENT_TYPE__DISPENSER_1_OVERPRESSURE+Disp_i, true);
                        DispenserAlarm[Disp_i] = EVENT_TYPE__DISPENSER_1_OVERPRESSURE+Disp_i;
+                       if (DispenserAlarm[Disp_i] == false)
+                       {
+                           IDS_Dispenser_Alarm_On(Disp_i);
+                       }
                        DispenserOverPressure[Disp_i] = true;
                        Report("Dispenser Safety - over pressure", __FILE__,__LINE__,Disp_i, RpFatalError, (int)(1000*GetDispenserPressure(Disp_i)), 0);
                    }
@@ -117,6 +121,10 @@ uint32_t Safety_Main_State(uint32_t IfIndex, uint32_t BusyFlag)
                    {
                        AlarmHandlingSetAlarm(EVENT_TYPE__DISPENSER_1_UPPER_HARD_LIMIT+Disp_i, true);
                        DispenserAlarm[Disp_i] = EVENT_TYPE__DISPENSER_1_UPPER_HARD_LIMIT+Disp_i;
+                       if (DispenserAlarm[Disp_i] == false)
+                       {
+                           IDS_Dispenser_Alarm_On(Disp_i);
+                       }
                        DispenserOverPressure[Disp_i] = true;
                        Report("Dispenser upper hard limit", __FILE__,__LINE__,Disp_i, RpFatalError, Get_Notification_Disp_UP(Disp_i), 0);
                    }
@@ -124,12 +132,16 @@ uint32_t Safety_Main_State(uint32_t IfIndex, uint32_t BusyFlag)
                    {
                        AlarmHandlingSetAlarm(EVENT_TYPE__DISPENSER_1_LOWER_HARD_LIMIT+Disp_i, true);
                        DispenserAlarm[Disp_i] = EVENT_TYPE__DISPENSER_1_LOWER_HARD_LIMIT+Disp_i;
+                       if (DispenserAlarm[Disp_i] == false)
+                       {
+                           IDS_Dispenser_Alarm_On(Disp_i);
+                       }
                        DispenserOverPressure[Disp_i] = true;
                        Report("Dispenser lower hard limit", __FILE__,__LINE__,Disp_i, RpFatalError, Get_Notification_Disp_Down(Disp_i), 0);
                    }
                    else
                    {
-                       Report("Dispenser unknown safety alarm", __FILE__,__LINE__,Disp_i, RpFatalError, 1-DispenserBypass, 0);
+                       Report("Dispenser unknown safety alarm", __FILE__,__LINE__,Disp_i, RpFatalError,Get_Notification_Disp_Full(Disp_i), 0);
                    }
 
                }
@@ -144,8 +156,11 @@ uint32_t Safety_Main_State(uint32_t IfIndex, uint32_t BusyFlag)
            {
                if (Check_Disp_Safety_Stop_Indication(Disp_i) == false)
                {
-                   //report dispenser over pressure
                    AlarmHandlingSetAlarm(DispenserAlarm[Disp_i], false);
+                   if (DispenserAlarm[Disp_i] == true)
+                   {
+                       IDS_Dispenser_Alarm_Off(Disp_i);
+                   }
                    DispenserAlarm[Disp_i] = 0;
                    DispenserOverPressure[Disp_i] = false;
                }
diff --git a/Software/Embedded_SW/Embedded/Modules/General/buttons.c b/Software/Embedded_SW/Embedded/Modules/General/buttons.c
index d5ed5cef9..0a5cfc2f3 100644
--- a/Software/Embedded_SW/Embedded/Modules/General/buttons.c
+++ b/Software/Embedded_SW/Embedded/Modules/General/buttons.c
@@ -210,7 +210,7 @@ uint32_t Buttons_Init(void)
     power.state = sttON; //sttOFF, sttON, sttDISABLE, sttENABLE, sttIDLE, sttJOGGING
     power.count = 0;
 
-    AddControlCallback( ButtonPowerCBFunction, BUTTONS_SAMPLE_TIME, ButtonPowerCallBackFunction, 0,0,0 ); // eFiftyMillisecond
+    AddControlCallback("ButtonPowerCB", ButtonPowerCBFunction, BUTTONS_SAMPLE_TIME, ButtonPowerCallBackFunction, 0,0,0 ); // eFiftyMillisecond
 
     strcpy(jog.bttn_name, "jog");
     jog.bttn_status = RELEASE;    // 0=RELEASE 1=PRESS
@@ -220,7 +220,7 @@ uint32_t Buttons_Init(void)
     jog.state = sttENABLE; // sttDISABLE, sttENABLE, sttJOGGING
     jog.count = 0;
 
-    AddControlCallback( ButtonJogCBFunction, BUTTONS_SAMPLE_TIME, ButtonJogCallBackFunction, 0,0,0 ); //
+    AddControlCallback("ButtonJogCB", ButtonJogCBFunction, BUTTONS_SAMPLE_TIME, ButtonJogCallBackFunction, 0,0,0 ); //
 
     strcpy(load.bttn_name, "load");
     load.bttn_status = RELEASE;    // 0=RELEASE 1=PRESS
@@ -229,7 +229,7 @@ uint32_t Buttons_Init(void)
     load.state = sttRDY; //
     load.count = 0;
 
-    AddControlCallback( ButtonLoadCBFunction, BUTTONS_SAMPLE_TIME, ButtonLoadCallBackFunction, 0,0,0 ); //
+    AddControlCallback("ButtonLoadCB", ButtonLoadCBFunction, BUTTONS_SAMPLE_TIME, ButtonLoadCallBackFunction, 0,0,0 ); //
 return OK;
 }