change RAM FLASH SIZE and location. some progress on the machine

4 files changed, 25 insertions, 50 deletions

diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/I2C_Task.c b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/I2C_Task.c
index 29c44eac1..6a902f89d 100644
--- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/I2C_Task.c
+++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/I2C_Task.c
@@ -616,7 +616,7 @@ void I2C_ReadingTask_Init(void)
     I2C_ReadingMsgQ = Mailbox_create(sizeof(I2C_ReadingMessageStruc), 40, NULL,NULL);
     Task_Params_init(&taskParams);
     taskParams.instance->name = "I2C_Reading";
-    taskParams.priority = 8;
+    taskParams.priority = 17;
     taskParams.stackSize = 2048;
     I2C_Task_Handle = Task_create((Task_FuncPtr)I2C_ReadingTask, &taskParams, NULL);
 }
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 fff11f493..26c3d0b4f 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
@@ -353,44 +353,10 @@ bool SetWriteDisplayView(WHS_Left_Display_View view )
 
 double GetWHSAirFlow(uint8_t OR_Id)
 {
-    uint16_t value = 0;
     double Q_value = 0 ;
-    switch (OR_Id)
-    {
-        case DRIER_FLOW_METER:
-
-            /*if (display_view == AVERAGE)
-            {
-                Q_value = get_average_Q(DRIER_FLOW_METER);
-            }
-            else // CURRENT
-            {
-                //get_orf_3(&value);
-                //Q_value =  get_Q(value-orf3V0Value);
-                Q_value =  get_CurrentQ(DRIER_FLOW_METER);
-            }*/
-            Q_value =  get_CurrentQ(DRIER_FLOW_METER);
-            //Q_value = get_average_Q(HEAD_FLOW_METER);
-            break;
-        case NU_FLOW_METER:
-            get_orf_2(&value);
-            break;
-        case HEAD_FLOW_METER:
-            /*if (display_view == AVERAGE)
-            {
-                Q_value = get_average_Q(HEAD_FLOW_METER);
-            }
-            else //CURRENT
-            {
-                //get_orf_1(&value);
-                Q_value = get_CurrentQ(HEAD_FLOW_METER);
-            }*/
-            Q_value = get_CurrentQ(HEAD_FLOW_METER);
-            break;
-        default:
-            break;
-    }
-    ReportWithPackageFilter(WasteFilter,"------------ GetWHSAirFlow -----------------",__FILE__, OR_Id, (int)value, RpWarning, (int) Orf_zero_value[OR_Id], 0);
+    assert (OR_Id<=DRIER_FLOW_METER);
+    Q_value = get_CurrentQ(OR_Id);
+    ReportWithPackageFilter(WasteFilter,"------------ GetWHSAirFlow -----------------",__FILE__, OR_Id, (int)Q_value, RpWarning, (int) Orf_zero_value[OR_Id], 0);
     return Q_value ;
 }
 
diff --git a/Software/Embedded_SW/Embedded/Drivers/flash_ram/FlashProgram.c b/Software/Embedded_SW/Embedded/Drivers/flash_ram/FlashProgram.c
index c1a5bcc9f..10f65db1d 100644
--- a/Software/Embedded_SW/Embedded/Drivers/flash_ram/FlashProgram.c
+++ b/Software/Embedded_SW/Embedded/Drivers/flash_ram/FlashProgram.c
@@ -131,10 +131,19 @@ uint32_t ReadAppAndProgram(uint32_t ui32FlashStart,uint32_t ui32FileSize,void* b
     //
     return(1);
 }
+int base_flashErased = false;
 uint32_t EraseFlashSection(uint32_t ui32FlashStart)
 {
     volatile uint32_t ui32Idx = ui32FlashStart;
     uint32_t status;
+    if (ui32FlashStart<GENHWCFG_SECTION_FLASH)
+    {
+        if (base_flashErased == true)
+            return ERROR;
+        else
+            base_flashErased = true; //once in a run
+
+    }
 #ifdef FLASH_DEBUG
     Address[RxIndex] = ui32FlashStart;
     Size[RxIndex] = ui32FileSize;
diff --git a/Software/Embedded_SW/Embedded/Drivers/flash_ram/FlashProgram.h b/Software/Embedded_SW/Embedded/Drivers/flash_ram/FlashProgram.h
index 983c3954c..655a980db 100644
--- a/Software/Embedded_SW/Embedded/Drivers/flash_ram/FlashProgram.h
+++ b/Software/Embedded_SW/Embedded/Drivers/flash_ram/FlashProgram.h
@@ -8,23 +8,23 @@
 #ifndef DRIVERS_FLASH_RAM_FLASHPROGRAM_H_
 #define DRIVERS_FLASH_RAM_FLASHPROGRAM_H_
 
-#define FLASH_RAM_BASE 0x000F0000
+#define FLASH_RAM_BASE 0x000F8000
 
-#define EMBEDDED_PARAMETERS_SECTION_FLASH  (FLASH_RAM_BASE + 0X0000 )
-#define PROCESS_PARAMETERS_SECTION_FLASH   (FLASH_RAM_BASE + 0X0000 )
+#define EMBEDDED_PARAMETERS_SECTION_FLASH  (FLASH_RAM_BASE + 0X0000 ) //512
+#define PROCESS_PARAMETERS_SECTION_FLASH   (FLASH_RAM_BASE + 0X0000 )//512
 #define DANCERS_SECTION_FLASH  (FLASH_RAM_BASE + 0X0000)
-#define DISPENSERS_SECTION_FLASH (FLASH_RAM_BASE + 0X4000)
-#define ALARM_SECTION_FLASH    (FLASH_RAM_BASE + 0XC000 )
-#define GENHWCFG_SECTION_FLASH (FLASH_RAM_BASE + 0X8000)
+#define DISPENSERS_SECTION_FLASH (FLASH_RAM_BASE + 0X0000)
+#define GENHWCFG_SECTION_FLASH (FLASH_RAM_BASE + 0X2000)
+#define ALARM_SECTION_FLASH    (FLASH_RAM_BASE + 0X4000 )
 
 #define EMBEDDED_PARAMETERS_MAP_IN_FLASH  (FLASH_RAM_BASE + 0X0000 )
-#define PROCESS_PARAMETERS_MAP_IN_FLASH   (FLASH_RAM_BASE + 0X0400 )
-#define DANCERS_MAP_IN_FLASH  (FLASH_RAM_BASE + 0X0500)
-#define DISPENSERS_MAP_IN_FLASH (FLASH_RAM_BASE + 0X4000)
-#define ALARM_MAP_IN_FLASH    (FLASH_RAM_BASE + 0XC000 )
-#define GENHWCFG_MAP_IN_FLASH (FLASH_RAM_BASE + 0X8000)
+#define PROCESS_PARAMETERS_MAP_IN_FLASH   (FLASH_RAM_BASE + 0X0200 )
+#define DANCERS_MAP_IN_FLASH  (FLASH_RAM_BASE + 0X0400)
+#define DISPENSERS_MAP_IN_FLASH (FLASH_RAM_BASE + 0X500)
+#define GENHWCFG_MAP_IN_FLASH (FLASH_RAM_BASE + 0X2000)
+#define ALARM_MAP_IN_FLASH    (FLASH_RAM_BASE + 0X4000 )
 
-#define FLASH_SIZE 0X10000
+#define FLASH_SIZE 0X8000
 
 //*****************************************************************************
 //