warning removed!

18 files changed, 29 insertions, 90 deletions

diff --git a/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c b/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c
index b59194af6..76c2fe9f2 100644
--- a/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c
+++ b/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c
@@ -726,7 +726,7 @@ uint32_t    GetFilesRequestFunc(MessageContainer* requestContainer)
                   usnprintf(&FullPath[i], 50,  "%s%s", request->path, fno[i]->fname);
               else
                usnprintf(&FullPath[i], 50,  "%s%s%s", request->path,"/", fno[i]->fname);
-           Data[i].fullpath = &FullPath[i];
+           Data[i].fullpath = &FullPath[i][0];
 
         }
         response.n_items = NumOfFiles;
diff --git a/Software/Embedded_SW/Embedded/Common/Utilities/RFIDTagHandling.c b/Software/Embedded_SW/Embedded/Common/Utilities/RFIDTagHandling.c
index 7bc1c2e54..6d15afc6a 100644
--- a/Software/Embedded_SW/Embedded/Common/Utilities/RFIDTagHandling.c
+++ b/Software/Embedded_SW/Embedded/Common/Utilities/RFIDTagHandling.c
@@ -191,7 +191,7 @@ CartridgeTagContent * NFCTag_Tag2PPC(NFCTag_t *Tag)
      PpcTag->has_fillsysid = true;
      PpcTag->fillsysid = Tag->fillingSystem;
      PpcTag->has_inkcategory = true;
-     PpcTag->inkcategory = Tag->catagory;
+     PpcTag->inkcategory = Tag->catagory[0]<<8+Tag->catagory[1];
      PpcTag->has_type_rev = true;
      PpcTag->type_rev = Tag->type;
      PpcTag->has_cartridgesize = true;
diff --git a/Software/Embedded_SW/Embedded/Communication/CommunicationTask.c b/Software/Embedded_SW/Embedded/Communication/CommunicationTask.c
index aa514d17a..997175a5d 100644
--- a/Software/Embedded_SW/Embedded/Communication/CommunicationTask.c
+++ b/Software/Embedded_SW/Embedded/Communication/CommunicationTask.c
@@ -54,7 +54,7 @@ uint32_t initArray(size_t initialSize)
           if (SerialBufferUsed[10] == false)
           {
               SerialBufferUsed[10] = true;
-              inBuffer[10].buffer = CommRxBuffer;
+              inBuffer[10].buffer = (char *)&CommRxBuffer[0];
               inBuffer[10].used = 0;
               inBuffer[10].size = initialSize;
               //Report("initArray", __FILE__, 10, inBuffer[10].size, RpWarning,   (int)0, 0);
@@ -63,7 +63,7 @@ uint32_t initArray(size_t initialSize)
           else if (SerialBufferUsed[11] == false)
           {
               SerialBufferUsed[11] = true;
-              inBuffer[11].buffer = CommRxBuffer;
+              inBuffer[11].buffer = (char *)&CommRxBuffer[1];
               inBuffer[11].used = 0;
               inBuffer[11].size = initialSize;
               //Report("initArray", __FILE__, 10, inBuffer[10].size, RpWarning,   (int)0, 0);
diff --git a/Software/Embedded_SW/Embedded/Communication/Connection.c b/Software/Embedded_SW/Embedded/Communication/Connection.c
index 4bde97d46..7f4efdd1b 100644
--- a/Software/Embedded_SW/Embedded/Communication/Connection.c
+++ b/Software/Embedded_SW/Embedded/Communication/Connection.c
@@ -20,6 +20,7 @@
 #include "Common/SWUpdate/FileSystem.h"
 #include "Common/SW_Info/SW_Info.h"
 #include "Common/report/report.h"
+#include "Communication/CommunicationTask.h"
 #include <utils/ustdlib.h>
 #include "drivers/FPGA/FPGA.h"
 #include "Drivers/FPGA/FPGA_GPIO/FPGA_GPIO.h"
diff --git a/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_SSI_Comm.c b/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_SSI_Comm.c
index 782949fd0..765ba1a7a 100644
--- a/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_SSI_Comm.c
+++ b/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_SSI_Comm.c
@@ -14,8 +14,9 @@
 #include "PMR/Hardware/HardwareDancerType.pb-c.h"
 
 
+#ifdef FOUR_WINDERS
 static short DummyBusy = 0;
-
+#endif
 
 static FpgaDancerMap_t FpgaRotEncMap[NUM_OF_ROTENC] =
 {
diff --git a/Software/Embedded_SW/Embedded/Drivers/Flash_Memory/FATFS/ff.c b/Software/Embedded_SW/Embedded/Drivers/Flash_Memory/FATFS/ff.c
index bb1c66737..66f209421 100644
--- a/Software/Embedded_SW/Embedded/Drivers/Flash_Memory/FATFS/ff.c
+++ b/Software/Embedded_SW/Embedded/Drivers/Flash_Memory/FATFS/ff.c
@@ -4032,7 +4032,7 @@ FRESULT f_mkfs (
 	return (disk_ioctl(pdrv, CTRL_SYNC, 0) == RES_OK) ? FR_OK : FR_DISK_ERR;
 }
 
-#ifdef 0
+#ifdef OBSOLETE_CODE
 
 #if _MULTI_PARTITION
 /*-----------------------------------------------------------------------*/
diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_AD5272_Rheostat/WHS_Rheostat.c b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_AD5272_Rheostat/WHS_Rheostat.c
index ed5f5acde..77ba00be6 100644
--- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_AD5272_Rheostat/WHS_Rheostat.c
+++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_AD5272_Rheostat/WHS_Rheostat.c
@@ -16,6 +16,7 @@
 //#include <Drivers/I2C_Communication/WHS_Card/D_MAX11614/MAX11614_Driver.h>
 #include <Drivers/I2C_Communication/WHS_Card/IO_Extender_Ports_TCA9555/WHS_IO.h>
 #include "modules/control/control.h"
+#include "Modules/waste/waste_ex.h"
 
 
 #define Rheostat_nRST 0
diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_MAX11614_ADC/WHS_MAX11614_A2D.c b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_MAX11614_ADC/WHS_MAX11614_A2D.c
index 26c3d0b4f..a3ae5bba1 100644
--- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_MAX11614_ADC/WHS_MAX11614_A2D.c
+++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_MAX11614_ADC/WHS_MAX11614_A2D.c
@@ -207,18 +207,6 @@ bool Test_WHS_max11614()
 //#define Corf_flow    0.2485
 #define Corf_flow    0.239 //email from Sergey 3.2.2020
 
-//double get_Q(int16_t num)
-//{
-//    double Sqrt = 0;
-//    double calc = 0;
-// //   int16_t tmp = num-orf3V0Value;
-// //   if (tmp<0) tmp = 0;
-//
-//    Sqrt = sqrt((double)num);
-//    calc = Corf_flow*Sqrt;
-//    ReportWithPackageFilter(WasteFilter,"------------ calc Q value (calc)-----------------", __FILE__,__LINE__, calc, RpMessage, num, 0);
-//    return calc;
-//}
 double CurrentQ[DRIER_FLOW_METER+1];
 double get_CurrentQ(WHS_Flow_Meter num)
 {
diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_Max5805_ADC_Blower/WHS_Blower.c b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_Max5805_ADC_Blower/WHS_Blower.c
index 43b636f7a..1f2c304e8 100644
--- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_Max5805_ADC_Blower/WHS_Blower.c
+++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_Max5805_ADC_Blower/WHS_Blower.c
@@ -48,8 +48,8 @@ float WhsBlowerSamples[MAX_WHS_CONTROL_SAMPLES] ;
 int WhsBlowerSamplesPointer = 0;*/
 
 bool Read_Max5805_device_ID();
-double calc_Q_average(WHS_Flow_Meter ORF_id,double Q_temp);
-void set_new_Q_average(WHS_Flow_Meter ORF_id,double Q_temp);
+//double calc_Q_average(WHS_Flow_Meter ORF_id,double Q_temp);
+//void set_new_Q_average(WHS_Flow_Meter ORF_id,double Q_temp);
 
 uint8_t Read_Buf[2]  = {0};
 #define ORF_BUFF_SIZE 60
@@ -245,66 +245,11 @@ bool WHS_init_Blower()
 
 double WHS_Blower_Avarege(WHS_Flow_Meter ORF_id)
 {
-    //uint16_t orifice_hex_value = 0;
-    //uint16_t V0_value = 0;
-    double Q_temp = 0 ;
     double average_Q = 0.0;
-
-    /*switch (ORF_id)
-    {
-    case HEAD_FLOW_METER:
-       // get_orf_1( &orifice_hex_value );
-       // V0_value = Get_orf1_V0();
-        average_Q = average_Q_orifice1;
-        break;
-    case DRIER_FLOW_METER:
-       // get_orf_3( &orifice_hex_value );
-       // V0_value = Get_orf3_V0();
-        average_Q = average_Q_orifice3;
-        break;
-    default:
-        break;
-    }*/
-
-    Q_temp = get_Q(ORF_id);
-    /*if (fabs(Q_temp - average_Q) > 1.75)
-    {
-        Report("------------ set_new_Q_average :-----------------", __FILE__,__LINE__, (int)(Q_temp*100), RpMessage, (int)(average_Q*100), 0);
-        set_new_Q_average(ORF_id, Q_temp);
-        average_Q = Q_temp;
-    }
-    else
-    {
-        average_Q = calc_Q_average(ORF_id, Q_temp);
-    }*/
+    average_Q = get_Q(ORF_id);
     return average_Q;
 }
-
-/*void set_new_Q_average(WHS_Flow_Meter ORF_id,double Q_temp)
-{
-    uint8_t i = 0;
-
-    switch (ORF_id)
-    {
-        case HEAD_FLOW_METER:
-            average_Q_orifice1 = Q_temp;
-            for (i = 0; i < ORF_BUFF_SIZE; i+=1)
-                {
-                    average_orf1_Q_buff[i] = Q_temp;
-                }
-                break;
-        case DRIER_FLOW_METER:
-            average_Q_orifice3 = Q_temp;
-                for (i = 0; i < ORF_BUFF_SIZE; i+=1)
-                {
-                    average_orf3_Q_buff[i] = Q_temp;
-                }
-                break;
-        default:
-            break;
-    }
-}
-//char whs_str[150];
+/*
 double calc_Q_average(WHS_Flow_Meter ORF_id,double Q_temp)
 {
     static uint8_t i_head = 0 ;
@@ -351,7 +296,7 @@ double calc_Q_average(WHS_Flow_Meter ORF_id,double Q_temp)
     }
     return Q_average;
 }
-
+*/
 double get_average_Q(WHS_Flow_Meter ORF_id)
 {
     double average_Q = 0.0;
@@ -367,7 +312,7 @@ double get_average_Q(WHS_Flow_Meter ORF_id)
         break;
     }
     return average_Q;
-}*/
+}
 
 /*bool Test_WHS_blower()
 {
diff --git a/Software/Embedded_SW/Embedded/Drivers/flash_ram/MCU_E2Prom.c b/Software/Embedded_SW/Embedded/Drivers/flash_ram/MCU_E2Prom.c
index 3389d941c..f4b72bb0f 100644
--- a/Software/Embedded_SW/Embedded/Drivers/flash_ram/MCU_E2Prom.c
+++ b/Software/Embedded_SW/Embedded/Drivers/flash_ram/MCU_E2Prom.c
@@ -210,7 +210,7 @@ void MainCardStoredItemRequestFunc(MessageContainer* requestContainer)
     else
     {
         response.maincardstoreddata = &MainCardStoredDataInstance;
-        MainCardStoredDataInstance.maincards_n = &Serial;
+        MainCardStoredDataInstance.maincards_n = &Serial[0];
         MainCardStoredDataInstance.n_storeditem = MAX_EEPROM_STORAGE;
         for (i = 0;i<MAX_EEPROM_STORAGE;i++)
         {
diff --git a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c
index fef3f05a8..eb855fd4a 100644
--- a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c
+++ b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c
@@ -422,7 +422,7 @@ void DiagnosticLoadDancerError(int DancerId, double value)
 double Shinko_Sv = 12,Shinko_Pv = 15;
 void LoadChillerState(HeaterType HeaterType,HeaterState *HeaterState)
 {
-    int HeaterId = HeaterType;
+    //int HeaterId = HeaterType;
     HeaterState->has_heatertype = true;
     HeaterState->heatertype = HeaterType;
     HeaterState->has_setpoint = true;
@@ -611,7 +611,6 @@ void DiagnosticTenMsecCollection(void)
 void DiagnosticOneMinuteCollection(void)
 {
     int i;
-    bool status = OK;
 
     DiagnosticsMonitor.n_dispensersinklevel = 0;
     DiagnosticsMonitor.n_midtanksinklevel = 0;
@@ -677,7 +676,7 @@ void DiagnosticOneMinuteCollection(void)
             {
                 if (Get_Head_Heater_Current_Reading_State(i) == true)
                 {
-                    status = Get_Head_Current(i,&HeadCurrent[i][0]);
+                    Get_Head_Current(i,&HeadCurrent[i][0]);
                     switch(i)
                     {
                     case HEAD_CURRENT_ZONE_1:
diff --git a/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsHoming.c b/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsHoming.c
index 7f8c9b8d8..c7f8740d1 100644
--- a/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsHoming.c
+++ b/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsHoming.c
@@ -34,6 +34,7 @@
 
 #include "ids/ids_ex.h"
 #include "General/process.h"
+#include "Thread/Thread_ex.h"
 
 #include "StateMachines/Printing/PrintingSTM.h"
 
diff --git a/Software/Embedded_SW/Embedded/Modules/General/Safety.c b/Software/Embedded_SW/Embedded/Modules/General/Safety.c
index 422b4745f..ebbc3d326 100644
--- a/Software/Embedded_SW/Embedded/Modules/General/Safety.c
+++ b/Software/Embedded_SW/Embedded/Modules/General/Safety.c
@@ -46,7 +46,7 @@ uint32_t Safety_Main_State(uint32_t IfIndex, uint32_t BusyFlag)
    bool mDrierDoorAlarmState = false;
    bool mAirFlowAlarmState = false;
    bool mAirFilterAlarmState = false;
-   bool mWasteOverflowAlarmState = false;
+   //bool mWasteOverflowAlarmState = false;
 #ifdef CONTROL_DEBUG
     uint32_t tempp,tempq,delta;
     uint32_t sys_ticks_start = msec_millisecondCounter,sys_ticks_end,max = 0,dev = 0;
@@ -97,7 +97,7 @@ uint32_t Safety_Main_State(uint32_t IfIndex, uint32_t BusyFlag)
                    {
                        //report and handle waste overflow
                        AlarmHandlingSetAlarm(EVENT_TYPE__CHILLER_DRY_CONTACT, true);
-                       mWasteOverflowAlarmState = true;
+                       //mWasteOverflowAlarmState = true;
                        WasteOverflowAlarmState = true;
                    }
                }
diff --git a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c
index 051df3b05..b9b916eb6 100644
--- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c
+++ b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c
@@ -330,7 +330,7 @@ void Stub_ProgressRequest(MessageContainer* requestContainer)
         {
             uint16_t tempu16 = 0;
             double temp_double = 0.0;
-            uint8_t display_byte = 0;
+            //uint8_t display_byte = 0;
             uint16_t A2D_data = 0;
 
             if (WHS_Type == WHS_TYPE_NEW)
@@ -393,13 +393,13 @@ void Stub_ProgressRequest(MessageContainer* requestContainer)
                         tempu16 = 0;  //get_cur_vlv2(&tempu16);
                         break;
                     case 10:
-                        temp_double = get_Q(HEAD_FLOW_METER);
+                        temp_double = WHS_Blower_Avarege(HEAD_FLOW_METER);
                         break;
                     case 11:
-                        temp_double = get_Q(NU_FLOW_METER);
+                        temp_double = WHS_Blower_Avarege(NU_FLOW_METER);
                         break;
                     case 12:
-                        temp_double = get_Q(DRIER_FLOW_METER);
+                        temp_double = WHS_Blower_Avarege(DRIER_FLOW_METER);
                         break;
                     /*case 20:
                         //temp_double = get_average_Q(HEAD_FLOW_METER); //HEAD
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_ex.h b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_ex.h
index 5d69e2980..0861b677b 100644
--- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_ex.h
+++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_ex.h
@@ -90,5 +90,6 @@ uint32_t StopThreadLoadingFunc(MessageContainer* requestContainer);
 uint32_t TryThreadLoadingFunc(MessageContainer* requestContainer);
 void ThreadCheckArcHeadCovers(void);
 uint32_t Thread_Load_End(void);
+uint32_t ThreadLoadingRestartReport(void); //sending after a failure in the finalizing stage
 
 #endif
diff --git a/Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerIdle.c b/Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerIdle.c
index 988b6e806..df8f964fe 100644
--- a/Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerIdle.c
+++ b/Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerIdle.c
@@ -27,6 +27,7 @@
 
 #include "StateMachines/Printing/PrintingSTM.h"
 #include "StateMachines/Initialization/PowerOffSequence.h"
+#include "StateMachines/Initialization/PowerIdle.h"
 #include "InitSequence.h"
 
 #include "drivers/I2C_Communication/DAC/Blower.h"
diff --git a/Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerIdle.h b/Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerIdle.h
index 916252c3b..9df37092e 100644
--- a/Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerIdle.h
+++ b/Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerIdle.h
@@ -23,7 +23,7 @@ void PowerIdleInit(void);
 bool Set_Auto_Shutdown_Bypass (int value);
 bool Set_Auto_Idle_Bypass (int value);
 void  PowerIdleSetParameters(uint32_t switchtoidletimeinseconds,uint32_t idledriertemperature,uint32_t idleheadtemperature,uint32_t idlemixertemperature);
-uint32_t StandByRequestFunc(MessageContainer* requestContainer);
+void StandByRequestFunc(MessageContainer* requestContainer);
 
 
 #endif /* STATEMACHINES_INITIALIZATION_POWERIDLE_H_ */
diff --git a/Software/Embedded_SW/Embedded/StateMachines/Printing/PrintingSTM.c b/Software/Embedded_SW/Embedded/StateMachines/Printing/PrintingSTM.c
index 9e43bfb07..2a8cdc2ac 100644
--- a/Software/Embedded_SW/Embedded/StateMachines/Printing/PrintingSTM.c
+++ b/Software/Embedded_SW/Embedded/StateMachines/Printing/PrintingSTM.c
@@ -21,6 +21,7 @@
 
 #include "Drivers/Heater/Heater.h"
 #include <Drivers/I2C_Communication/RFID_NFC/I2C_IFS_Mux.h>
+#include <Drivers/I2C_Communication/WHS_Card/D_Max5805_ADC_Blower/WHS_Blower.h>
 
 #include "Modules/General/MachineStatus.h"
 #include "modules/General/process.h"