Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango

4 files changed, 35 insertions, 17 deletions

diff --git a/Software/Embedded_SW/Embedded/Modules/General/buttons.c b/Software/Embedded_SW/Embedded/Modules/General/buttons.c
index 3ffb63508..b44cba8b4 100644
--- a/Software/Embedded_SW/Embedded/Modules/General/buttons.c
+++ b/Software/Embedded_SW/Embedded/Modules/General/buttons.c
@@ -54,7 +54,7 @@ uint32_t joggingMachine(  button *pBtn);    //uint8_t OnOffPB,
 uint32_t ButtonLoadCallBackFunction(uint32_t IfIndex, uint32_t ReadValue);
 uint32_t ButtonLoadCBFunction(uint32_t IfIndex, uint32_t ReadValue);
 uint32_t LoadStatMachine( button *pBtn);
-
+uint32_t LoadLongPress( button *pBtn);
 
 /*
 void Power_Reset();
@@ -63,6 +63,7 @@ uint8_t Buzzer(OPERATION_MODE Buzzer_Mode);
 bool Read_PWR_Button();//TODO move to GPIO folder
 */
 
+#define LOADLONGPRESS 3
 
 int PowerDown()
 {
@@ -197,7 +198,7 @@ uint32_t ButtonJogCBFunction(uint32_t IfIndex, uint32_t ReadValue)
         //setJoggingEnableCondition(&jog);
         joggingMachine(&jog);
     }
-    return 0;
+    return OK;
 }
 
 
@@ -208,13 +209,23 @@ uint32_t ButtonLoadCBFunction(uint32_t IfIndex, uint32_t ReadValue)
     if ((load.bttn_status == release) && (ReadValue == press))
     {
         REPORT_MSG(parameter," ------------ Start thread loading empty function  ----------------- ");
-        load.bttn_status = press;
+        //load.bttn_status = press;
         LoadStatMachine(&load);
-
+        load.count=1;
+    }
+    else if ((load.bttn_status == press) && (ReadValue == press) )
+    {
+        if (load.count == LOADLONGPRESS) // todo
+        {
+            load.count = 0;
+            LoadLongPress( &load );
+        }
+        else load.count++;
     }
-    else load.bttn_status = ReadValue;
 
-    return 0;
+
+    load.bttn_status = ReadValue;
+    return OK;
 }
 
 /*---------------------------------------------------------------------------------*/
@@ -301,7 +312,7 @@ uint32_t ShortLongOffPB(uint8_t OnOffPB,  button *pBtn)
        default:
            break;
     }
-    return 0;
+    return OK;
 }
 
 
@@ -388,7 +399,7 @@ uint32_t StateMachine( button *pBtn) //short press(=0)/long press(=1)
             default:
                 break;
         }
-return 0;
+return OK;
 }
 
 
@@ -520,7 +531,7 @@ uint32_t joggingMachine(  button *pBtn) //uint8_t OnOffPB,
 //
 //        }
 //    }
-return 0;
+return OK;
 }
 
 
@@ -657,3 +668,9 @@ void test_avi()
 
 }
 
+uint32_t LoadLongPress( button *pBtn)
+{
+
+    return OK;
+}
+
diff --git a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_maint.c b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_maint.c
index 11ac84ea8..1baf9ceb9 100644
--- a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_maint.c
+++ b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_maint.c
@@ -150,7 +150,7 @@ uint32_t IDS_HomeDispenserBackMoveCallback(uint32_t motorId, uint32_t ReadValue)
         MotorStop(motorId,Hard_Hiz);
         CurrentDispenserSpeed[DispenserId] = 0;
         if (Extended_Motor_Param == true)
-            Combined_dispenser_Driver_Mode(DispenserId,Voltage);
+            Power_Step_01_Dispenser_Mode(DispenserId,Voltage);
         MotorSetMicroStep(motorId, KeepMicrostep[DispenserId]);
         HomingActive[DispenserId]= false;
         PrimingActive[DispenserId]= false;
@@ -226,7 +226,7 @@ uint32_t IDS_HomeDispenser (uint32_t DispenserId, uint32_t speed , callback_fptr
         Control3WayValvesWithCallback ((Valves_t)DispenserId, MidTank_Dispenser, NULL); //direction: MidTank_Dispenser or Dispenser_Mixer
         KeepMicrostep[DispenserId] = MotorsCfg[MotorId].microstep;
         if (Extended_Motor_Param == true)
-            Combined_dispenser_Driver_Mode(DispenserId,Current);
+            Power_Step_01_Dispenser_Mode(DispenserId,Current);
         MotorSetMicroStep(MotorId, 1);
         SysCtlDelay(180000);
         //open dry air valve in the dispenser
@@ -253,7 +253,7 @@ uint32_t IDS_Dispenser_Alarm_On (uint8_t DispenserId)
     Valve_Set(IDS_Id_to_AirValve[DispenserId], Atm_MidTank_OFF);
     Enable_MidTank_Pressure_Reading(DispenserId);
     if (Extended_Motor_Param == true)
-        Combined_dispenser_Driver_Mode(DispenserId,Voltage);
+        Power_Step_01_Dispenser_Mode(DispenserId,Voltage);
     status |= MotorSetMicroStep(MotorId, KeepMicrostep[DispenserId]);
     status |= MotorStop(DispenserId, Hard_Hiz);
     CurrentDispenserSpeed[DispenserId] = 0;
@@ -298,7 +298,7 @@ uint32_t IDS_StopHomeDispenser (uint32_t DispenserId)
         }
         PrimingActive[DispenserId] = false;
         if (Extended_Motor_Param == true)
-            Combined_dispenser_Driver_Mode(DispenserId,Voltage);
+            Power_Step_01_Dispenser_Mode(DispenserId,Voltage);
         MotorSetMicroStep(MotorId, KeepMicrostep[DispenserId]);
         CurrentDispenserSpeed[DispenserId] = 0;
         CurrentDispenserSpeed[DispenserId] = 0;
@@ -373,7 +373,7 @@ uint32_t IDS_EmptyDispenserCallback(uint32_t motorId, uint32_t ReadValue)
     MotorStop(motorId,Hard_Hiz);
     CurrentDispenserSpeed[DispenserId] = 0;
     if (Extended_Motor_Param == true)
-        Combined_dispenser_Driver_Mode(DispenserId,Voltage);
+        Power_Step_01_Dispenser_Mode(DispenserId,Voltage);
     MotorSetMicroStep(motorId, KeepMicrostep[DispenserId]);
     PrimingActive[DispenserId]= false;
     if (DispenserId == LUBRICANT_DISPENSER)
@@ -408,7 +408,7 @@ uint32_t IDS_EmptyDispenser (uint32_t DispenserId, uint32_t speed , callback_fpt
         //open dispenser valve dispenser to midtank direction
         Control3WayValvesWithCallback ((Valves_t)DispenserId, Dispenser_Mixer, NULL); //direction: MidTank_Dispenser or Dispenser_Mixer
         if (Extended_Motor_Param == true)
-            Combined_dispenser_Driver_Mode(DispenserId,Current);
+            Power_Step_01_Dispenser_Mode(DispenserId,Current);
         //Valve_Set((Valves_t) request->index, Dispenser_Mixer);
         KeepMicrostep[DispenserId] = MotorsCfg[MotorId].microstep;
         MotorSetMicroStep(MotorId, 1);
diff --git a/Software/Embedded_SW/Embedded/Modules/IFS/ifs.h b/Software/Embedded_SW/Embedded/Modules/IFS/ifs.h
index ad66520ab..f00ba7849 100644
--- a/Software/Embedded_SW/Embedded/Modules/IFS/ifs.h
+++ b/Software/Embedded_SW/Embedded/Modules/IFS/ifs.h
@@ -22,7 +22,7 @@
 #define CARTRIDGE_INK_TIMEOUTx2         (SECONDS_600 / SECONDS_5)             /**< TimeOut (5 minutes) for second try finishing transfer the Ink from Ink cartridge to MidTank  */
 #define CartridgeInkTimeOutCallBackTime (eOneSecond * SECONDS_5)
 #define CartridgeInkCallBackTime        eOneSecond
-#define MidTank_Pressure_EMPTY          200  //todo get from Moti the correct number
+#define MidTank_Pressure_EMPTY          0.4  //todo get from Moti the correct number
 #define CARTRIDGE_CAPATICY 1500 //todo get from Moti the correct number
 #define FULL 1000   //todo get from Moti the correct number
 
diff --git a/Software/Embedded_SW/Embedded/Modules/Waste/Waste_init.c b/Software/Embedded_SW/Embedded/Modules/Waste/Waste_init.c
index 3265fb56b..7796f09cf 100644
--- a/Software/Embedded_SW/Embedded/Modules/Waste/Waste_init.c
+++ b/Software/Embedded_SW/Embedded/Modules/Waste/Waste_init.c
@@ -897,7 +897,8 @@ bool WasteTankCBFunction()
                     cart1.color  = BLINK;
                     break;
             }
-            REPORT_MSG(WHS_full," ------------ close cartridge cover ----------------- ");
+#warning The messege removed (close cartridge cover)
+            //REPORT_MSG(WHS_full," ------------ close cartridge cover ----------------- ");
             IFS_info.INK_isOK_flag = true; // 1
 
             break;