warning removed!

6 files changed, 11 insertions, 76 deletions

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++)
         {