1 files changed, 23 insertions, 36 deletions

diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_init.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_init.c
index 88d62a495..fb3b78752 100644
--- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_init.c
+++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_init.c
@@ -11,7 +11,7 @@
 #include "PMR/Hardware/HardwareDancer.pb-c.h"
 #include "PMR/Hardware/HardwareWinder.pb-c.h"
 #include "PMR/Hardware/HardwareBreakSensor.pb-c.h"
-#include  <PMR/Diagnostics/EventType.pb-c.h>
+#include  "PMR/Diagnostics/EventType.pb-c.h"
 
 #include "Modules/AlarmHandling/AlarmHandling.h"
 #include "PMR/Printing/JobSpool.pb-c.h"
@@ -23,6 +23,7 @@
 #include "drivers/Flash_ram/FlashProgram.h"
 
 #include "drivers/Flash_ram/MCU_E2Prom.h"
+#include "modules/ids/ids_ex.h"
 
 #include "thread.h"
 MotorDriverConfigStruc  MotorsCfg[NUM_OF_MOTORS]={0};
@@ -105,6 +106,10 @@ uint32_t MotorsConfigMessage(HardwareConfiguration * HWrequest)
         MotorsCfg[Motor_i].toffmin  = request->toffmin ;
 
             status = MotorConfig( Motor_i,  &MotorsCfg[Motor_i]);
+            if ((Motor_i >= HARDWARE_MOTOR_TYPE__MOTO_DISPENSER_1)&&(Motor_i <= HARDWARE_MOTOR_TYPE__MOTO_DISPENSER_8))
+            {
+                IDS_Dispenser_Init(Motor_i-HARDWARE_MOTOR_TYPE__MOTO_DISPENSER_1);
+            }
 //        if (Motor_i == MOTOR_RDRIVING)
 //            ThreadInitialTestStub(request);
     }
@@ -148,11 +153,12 @@ char DancerConfigPath[50] = "0://SysInfo//DancCfg.cfg";
 
 uint32_t StoreDancerConfigMessage()
 {
-    FRESULT Fresult = FR_OK;
+    uint32_t status = OK;
+  //  FRESULT Fresult = FR_OK;
     HardwareConfiguration DancerConfig;
     HardwareDancer Dancers[MAX_SYSTEM_DANCERS];
-    uint8_t* response_buffer;
-    size_t response_size = 0;
+  //  uint8_t* response_buffer;
+  //  size_t response_size = 0;
     int Dancer_i;
 
     hardware_configuration__init(&DancerConfig);
@@ -164,15 +170,16 @@ uint32_t StoreDancerConfigMessage()
         Dancers[Dancer_i].has_zeropoint = true;
         Dancers[Dancer_i].hardwaredancertype = Dancer_i;
         Dancers[Dancer_i].has_hardwaredancertype = true;
-        DancerConfig.dancers[Dancer_i]->zeropoint=Control_Read_Dancer_Position(Dancer_i,0,0);
+        DancerConfig.dancers[Dancer_i]->zeropoint=Control_Read_Dancer_Position(Dancer_i,0);
         DancerConfig.n_dancers++;
         DancersCfg[Dancer_i].zeropoint = DancerConfig.dancers[Dancer_i]->zeropoint;
     }
-    MCU_E2PromProgram(EEPROM_STORAGE_DANCER_0,DancersCfg[0].zeropoint);
-    MCU_E2PromProgram(EEPROM_STORAGE_DANCER_1,DancersCfg[1].zeropoint);
-    MCU_E2PromProgram(EEPROM_STORAGE_DANCER_2,DancersCfg[2].zeropoint);
-    Report("Store eeprom 0",__FILE__,DancersCfg[0].zeropoint,(int)DancersCfg[1].zeropoint,RpWarning,(int)DancersCfg[2].zeropoint,0);
 
+    status |= MCU_E2PromProgram(EEPROM_STORAGE_DANCER_0,DancersCfg[0].zeropoint);
+    status |= MCU_E2PromProgram(EEPROM_STORAGE_DANCER_1,DancersCfg[1].zeropoint);
+    status |= MCU_E2PromProgram(EEPROM_STORAGE_DANCER_2,DancersCfg[2].zeropoint);
+    Report("~~~~~~Store eeprom 0",__FILE__,DancersCfg[0].zeropoint,(int)DancersCfg[1].zeropoint,RpWarning,(int)DancersCfg[2].zeropoint,0);
+/*
     response_buffer = my_malloc(hardware_configuration__get_packed_size(&DancerConfig));
     if (response_buffer)
     {
@@ -187,43 +194,23 @@ uint32_t StoreDancerConfigMessage()
 
 
     my_free(response_buffer);
-
-    return Fresult;
+*/
+    return status;
 }
 uint32_t LoadDancerConfigMessage()
 {
-    void* buffer = NULL;
-    uint32_t Bytes = 0;
-    FRESULT Fresult = FR_OK;
-
-    HardwareConfiguration *DancerConfig;
-    int Dancer_i;
-    HardwareDancer DancersCfg1[MAX_SYSTEM_DANCERS] = {0};
-    HardwareDancer DancersCfg2[MAX_SYSTEM_DANCERS] = {0};
-
-    memcpy(DancersCfg1,(void *)DANCERS_MAP_IN_FLASH,sizeof(DancersCfg1));
+    uint32_t status = OK;
 
-    Fresult = FileRead(DancerConfigPath, &Bytes, &buffer);
-    if (Fresult == FR_OK)
-    {
-        DancerConfig = hardware_configuration__unpack(NULL, Bytes, buffer);
-        for (Dancer_i = 0; Dancer_i < DancerConfig->n_dancers ; Dancer_i++)
-        {
-            DancersCfg2[Dancer_i].zeropoint = DancerConfig->dancers[Dancer_i]->zeropoint;
-        }
-        hardware_configuration__free_unpacked(DancerConfig,NULL);
-        free (buffer);
-    }
     MCU_E2PromRead(EEPROM_STORAGE_DANCER_0,&DancersCfg[0].zeropoint);
     MCU_E2PromRead(EEPROM_STORAGE_DANCER_1,&DancersCfg[1].zeropoint);
     MCU_E2PromRead(EEPROM_STORAGE_DANCER_2,&DancersCfg[2].zeropoint);
 
 
-    Report("Dancer 0 Store data flash, internal flash, eeprom ",__FILE__,DancersCfg[0].zeropoint,(int)DancersCfg1[0].zeropoint,RpWarning,(int)DancersCfg2[0].zeropoint,0);
-    Report("Dancer 1 Store data flash, internal flash, eeprom ",__FILE__,DancersCfg[1].zeropoint,(int)DancersCfg1[1].zeropoint,RpWarning,(int)DancersCfg2[1].zeropoint,0);
-    Report("Dancer 2 Store data flash, internal flash, eeprom ",__FILE__,DancersCfg[2].zeropoint,(int)DancersCfg1[2].zeropoint,RpWarning,(int)DancersCfg2[2].zeropoint,0);
+    status |= Report("Dancer 0 Store data eeprom ",__FILE__,__LINE__,0,RpWarning,(int)DancersCfg[0].zeropoint,0);
+    status |= Report("Dancer 1 Store data eeprom ",__FILE__,__LINE__,1,RpWarning,(int)DancersCfg[1].zeropoint,0);
+    status |= Report("Dancer 2 Store data eeprom ",__FILE__,__LINE__,2,RpWarning,(int)DancersCfg[2].zeropoint,0);
 
-    return Fresult;
+    return status;
 
 }