merge

2 files changed, 47 insertions, 27 deletions

diff --git a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c
index 2c6040bab..4f6a40c90 100644
--- a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c
+++ b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c
@@ -187,7 +187,7 @@ void LoadConfigurationParameters(ConfigurationParameters *Params)
             EmbeddedParameters->has_initialdispenserpressure = true;
             EmbeddedParameters->initialdispenserpressure = 0.25;
             EmbeddedParameters->has_initialdispensertimeout = true;
-            EmbeddedParameters->initialdispensertimeout = 60000;
+            EmbeddedParameters->initialdispensertimeout = 180000;
             EmbeddedParameters->has_initialdispensertimelag = true;
             EmbeddedParameters->initialdispensertimelag = 100;
             EmbeddedParameters->has_dispenserbuildpressurespeed = true;
@@ -209,7 +209,7 @@ void LoadConfigurationParameters(ConfigurationParameters *Params)
             EmbeddedParameters->has_midtankpressurecorrection = true;
             EmbeddedParameters->midtankpressurecorrection = 0.0;
             EmbeddedParameters->has_dispenserpresegmentwfcf = true;
-            EmbeddedParameters->dispenserpresegmentwfcf = 80;
+            EmbeddedParameters->dispenserpresegmentwfcf = 40;
             EmbeddedParameters->has_startheatingoninitsequence = true;
             EmbeddedParameters->startheatingoninitsequence = true; //set to true shlomo 14/5/2019
             EmbeddedParameters->n_generalparameters = 8;
@@ -252,7 +252,7 @@ void LoadConfigurationParameters(ConfigurationParameters *Params)
             EmbeddedParameters->has_idlemixertemperature = true;
             EmbeddedParameters->idlemixertemperature = 0;
             EmbeddedParameters->has_powerofftemperaturelimit = true;
-            EmbeddedParameters->powerofftemperaturelimit = 50;
+            EmbeddedParameters->powerofftemperaturelimit = 90;
             EmbeddedParameters->has_ids_presegment_wfcf_timebeforesegment = true;
             EmbeddedParameters->ids_presegment_wfcf_timebeforesegment = 20000;
             uint8_t* response_buffer = my_malloc(configuration_parameters__get_packed_size(EmbeddedParameters));
@@ -494,7 +494,7 @@ uint32_t HWConfiguration(UploadHardwareConfigurationRequest* UploadRequest)
     }
 
     BlowerCfg.enabled = true;
-    BlowerCfg.voltage = 3000;
+    BlowerCfg.voltage = 2650;
     BlowerCfg.heatingvoltage = 3000;
     if (WHS_Type == WHS_TYPE_UNKNOWN)
         blowerType = HARDWARE_BLOWER_TYPE__WHSBlower2;
diff --git a/Software/Embedded_SW/Embedded/Modules/General/buttons.c b/Software/Embedded_SW/Embedded/Modules/General/buttons.c
index 50fd0ad16..7326dc039 100644
--- a/Software/Embedded_SW/Embedded/Modules/General/buttons.c
+++ b/Software/Embedded_SW/Embedded/Modules/General/buttons.c
@@ -280,36 +280,57 @@ uint32_t ButtonJogCBFunction(uint32_t IfIndex, uint32_t ReadValue)
         case sttDISABLE:
            if (JobIsActive() == false)
            {
+               ReportWithPackageFilter(GeneralFilter,"------------ joggingMachine: jog.state=sttDISABLE , JobIsActive() == false-----------------", __FILE__,__LINE__,jog.state, RpMessage, jog.Action, 0);
                jog.color =  colorON;
                Pannel_Leds(THREAD_JOGGING, MODE_ON);
                jog.state = sttENABLE;
            }
            break;
         case sttENABLE:
-            if (jog.Action == COUNTPB)
+            if (JobIsActive() == true)
             {
-                ReportWithPackageFilter(GeneralFilter,"------------ joggingMachine: Jogging is sttENABLE and  PRESS-----------------", __FILE__,__LINE__,0, RpMessage, 0, 0);    jog.state = sttJOGGING;
-                jog.color =  colorON;
-                jog.color =  BLINK;
-                ThreadJoggingFunc(40);
-                jog.state = sttJOGGING;
+                 ReportWithPackageFilter(GeneralFilter,"------------ joggingMachine: Jogging is Disable -----------------", __FILE__,__LINE__,jog.state, RpMessage, jog.Action, 0);
+                 jog.Action = OFFPB;
+                 jog.color =  colorOFF;
+                 Pannel_Leds(THREAD_JOGGING,MODE_OFF);
+                 jog.state = sttDISABLE;
             }
             else
             {
-                if (JobIsActive() == true)
+                if (jog.Action == COUNTPB)
                 {
-                     ReportWithPackageFilter(GeneralFilter,"------------ joggingMachine: Jogging is Disable -----------------", __FILE__,__LINE__,0, RpMessage, 0, 0);
-                     jog.Action = OFFPB;
-                     jog.color =  colorOFF;
-                     Pannel_Leds(THREAD_JOGGING,MODE_OFF);
-                     jog.state = sttDISABLE;
+                    ReportWithPackageFilter(GeneralFilter,"------------ joggingMachine: Jogging is sttENABLE and  PRESS-----------------", __FILE__,__LINE__,jog.state, RpMessage, jog.Action, 0);
+                    jog.color =  colorON;
+                    jog.color =  BLINK;
+                    ThreadJoggingFunc(40);
+                    jog.state = sttJOGGING;
                 }
             }
+
+//            if (jog.Action == COUNTPB)
+//            {
+//                ReportWithPackageFilter(GeneralFilter,"------------ joggingMachine: Jogging is sttENABLE and  PRESS-----------------", __FILE__,__LINE__,0, RpMessage, 0, 0);
+//                jog.color =  colorON;
+//                jog.color =  BLINK;
+//                ThreadJoggingFunc(40);
+//                jog.state = sttJOGGING;
+//            }
+//            else
+//            {
+//                if (JobIsActive() == true)
+//                {
+//                     ReportWithPackageFilter(GeneralFilter,"------------ joggingMachine: Jogging is Disable -----------------", __FILE__,__LINE__,0, RpMessage, 0, 0);
+//                     jog.Action = OFFPB;
+//                     jog.color =  colorOFF;
+//                     Pannel_Leds(THREAD_JOGGING,MODE_OFF);
+//                     jog.state = sttDISABLE;
+//                }
+//            }
             break;
         case sttJOGGING:
             if (jog.Action == SHORTPB) //PB is OFF
             {
-                ReportWithPackageFilter(GeneralFilter,"------------ joggingMachine: sttJOGGING action->SHORTPB-----------------", __FILE__,__LINE__,0, RpMessage, 0, 0);    jog.state = sttJOGGING;
+                ReportWithPackageFilter(GeneralFilter,"------------ joggingMachine: sttJOGGING action SHORTPB, sttJOGGING -> sttENABLE,  stop JOGGING----------------", __FILE__,__LINE__,jog.state, RpMessage, jog.Action, 0);
                 ThreadAbortJoggingFunc(); 
                 jog.color =  colorON;
                 Pannel_Leds(THREAD_JOGGING, MODE_ON);
@@ -317,26 +338,25 @@ uint32_t ButtonJogCBFunction(uint32_t IfIndex, uint32_t ReadValue)
             }
             else if (jog.Action == LONGPB)
             {
-                ReportWithPackageFilter(GeneralFilter,"------------ joggingMachine: sttJOGGING action->LONGPB-----------------", __FILE__,__LINE__,0, RpMessage, 0, 0);    jog.state = sttJOGGING;
+                ReportWithPackageFilter(GeneralFilter,"------------ joggingMachine: sttJOGGING action LONGPB,  sttJOGGING -> sttLONG_JOGGING-----------------", __FILE__,__LINE__, jog.state, RpMessage, jog.Action, 0);
                 jog.state = sttLONG_JOGGING;
-                if (JobIsActive() == false) // added because sometimes the jog stops because of another reason and the button s stucked blinking
-                {
-                    jog.color =  colorON;
-                    Pannel_Leds(THREAD_JOGGING, MODE_ON);
-                    jog.state = sttENABLE;
-                }
-
             }
             break;
         case sttLONG_JOGGING:
              if (jog.Action == COUNTPB)
              {
-                ReportWithPackageFilter(GeneralFilter,"------------ joggingMachine: sttLONG_JOGGING action->COUNTPB-----------------", __FILE__,__LINE__,0, RpMessage, 0, 0);    jog.state = sttJOGGING;ThreadAbortJoggingFunc(); // to do!!!!
+                ReportWithPackageFilter(GeneralFilter,"------------ joggingMachine: sttLONG_JOGGING action COUNTPB,  sttLONG_JOGGING -> sttENABLE, stop JOGGING-----------------", __FILE__,__LINE__, jog.state, RpMessage, jog.Action, 0);
                 ThreadAbortJoggingFunc();
                 jog.color =  colorON;
                 Pannel_Leds(THREAD_JOGGING, MODE_ON);
                 jog.state = sttENABLE;
              }
+             if (JobIsActive() == false) // added because sometimes the jog stops because of another reason and the button s stucked blinking
+             {
+                 jog.color =  colorON;
+                 Pannel_Leds(THREAD_JOGGING, MODE_ON);
+                 jog.state = sttENABLE;
+             }
             break;
         default:
             break;
@@ -556,7 +576,7 @@ return OK;
 uint32_t LoadStatMachine( button *pBtn)
 {
 
-    ReportWithPackageFilter(GeneralFilter,"------------ start loading -----------------", __FILE__,__LINE__,pBtn->state, RpMessage, pBtn->color, 0);
+    ReportWithPackageFilter(GeneralFilter,"------------ (state) (color) -----------------", __FILE__,__LINE__,pBtn->state, RpMessage, pBtn->color, 0);
     switch (pBtn->state)
     {
         case sttRDY :