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

5 files changed, 14 insertions, 14 deletions

diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
index 2428ef465..62a52bcf3 100644
--- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
+++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
@@ -593,7 +593,7 @@ void setRapidPressureRead(bool value)
     if (GetDiagnosticMode() == Diagnostic_Extreme_Mode)
         RapidPressureRead = true;
 }
-bool Shinko_Read = true;
+bool Shinko_Read = false;
 uint16_t PumpCounter = 0;
 uint16_t realtimetest[101];
 uint32_t MillisecLowLoop(uint32_t tick)
@@ -727,12 +727,12 @@ uint32_t MillisecLowLoop(uint32_t tick)
                 WHS_Shinko_Communication(R_SETUP);
             }
             else
-            if(0)//TBD - need stop condition to write only once (all the steps) , Read_Setup != setup, Read_Setup != 0, Read_Setup != Prev_Read_Setup
+            /*if(0)//TBD - need stop condition to write only once (all the steps) , Read_Setup != setup, Read_Setup != 0, Read_Setup != Prev_Read_Setup
             {
                 // option to wrte + read setup and stop when read = write
                WHS_Shinko_Communication(W_SETUP);
             }
-            else
+            else*/
             {
                 //finish reading the setup before start reading the value
                 WHS_Shinko_Communication(R_Value); // Reading every fourth cycle (Set HW, Request, Set HW, Response)
diff --git a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c
index d27ab05f7..36bcc0c3b 100644
--- a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c
+++ b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c
@@ -129,8 +129,8 @@ double OverallTemperature;
 
 DoubleArray DispenserFreq[MAX_SYSTEM_DISPENSERS];
 DoubleArray DiagnosticsDispenserPressure[MAX_SYSTEM_DISPENSERS];
-DoubleArray DispenserInkLevel[MAX_SYSTEM_DISPENSERS];
-DoubleArray DiagnosticsMidTankInkLevel[MAX_SYSTEM_DISPENSERS];
+//DoubleArray DispenserInkLevel[MAX_SYSTEM_DISPENSERS];
+//DoubleArray DiagnosticsMidTankInkLevel[MAX_SYSTEM_DISPENSERS];
 
 HeaterState **heatersstates;
 HeaterState  HeaterInfo[HEATER_TYPE_MAX_HEATERS];
@@ -426,9 +426,9 @@ void LoadChillerState(HeaterType HeaterType,HeaterState *HeaterState)
     HeaterState->has_heatertype = true;
     HeaterState->heatertype = HeaterType;
     HeaterState->has_setpoint = true;
-    HeaterState->setpoint = ShinkoTempDeg.Read_Setup;
+    HeaterState->setpoint = (float)(ShinkoTempDeg.Read_Setup)/10;
     HeaterState->has_currentvalue = true;
-    HeaterState->currentvalue = ShinkoTempDeg.Read_value;//Shinko_Temperature;//MillisecGetTemperatures(HeaterId2PT100Id[HeaterId])/100;
+    HeaterState->currentvalue = (float)(ShinkoTempDeg.Read_value)/10;
     return;
 }
 
@@ -926,7 +926,7 @@ void DiagnosticOneSecCollection(void)
         }
         else
         {
-            DiagnosticsMonitor.chillertemperature = &ShinkoTempDeg.Read_value;//Shinko_Temperature;
+            DiagnosticsMonitor.chillertemperature = ShinkoTempDeg.Read_value;//Shinko_Temperature;
         }
         DiagnosticsMonitor.n_chillertemperature = 1;
         DiagnosticsMonitor.n_wastelevel = 1;
diff --git a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_Cleaning.c b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_Cleaning.c
index 2e3d61f0c..0e28134c4 100644
--- a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_Cleaning.c
+++ b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_Cleaning.c
@@ -160,7 +160,7 @@ uint32_t IDS_Cleaning_Stop_Cleaning_Solution (callback_fptr callback)
     }
     if(Head_Type == HEAD_TYPE_ARC)
     {
-        MotorMovetoLimitSwitch(MotorId,1-MotorsCfg[MotorId].directionthreadwize, 50,  Motor_Id_to_LS_IdDown[MotorId], cleaningMotorCBFunction,30000);
+        MotorMovetoLimitSwitch(MotorId,1-MotorsCfg[MotorId].directionthreadwize, 30,  Motor_Id_to_LS_IdDown[MotorId], cleaningMotorCBFunction,30000);
     }
 
     ReportWithPackageFilter(IDSFilter,"IDS_Cleaning_Motor_Homing", __FILE__, __LINE__, 1, RpWarning,   CleaningStageCounter, 0);
diff --git a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c
index e6d45daa9..cd3feb624 100644
--- a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c
+++ b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c
@@ -65,7 +65,7 @@ uint32_t IDS_Valve_PresegmentReady(uint32_t deviceID, uint32_t ReadValue);
 uint32_t IDSBrushStopRestartCallback(uint32_t IfIndex, uint32_t readValue);
 //bool IDS_isDispenserUsedNextSegment(void *JobDetails,int DispenserId, int SegmentId);
 /******************** GLOBAL PARAMETERS  ********************************************/
-DispenserControlConfig_t DispenserControlConfig[MAX_SYSTEM_DISPENSERS];
+//DispenserControlConfig_t DispenserControlConfig[MAX_SYSTEM_DISPENSERS];
 uint32_t    ControlIdtoDispenserId [MAX_SYSTEM_DISPENSERS] = {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF};
 int OriginalDispenserSpd_2PPS[MAX_SYSTEM_DISPENSERS] = {0,0,0,0,0,0,0,0};
 bool         DispenserPreSegmentReady[MAX_SYSTEM_DISPENSERS] = {true,true,true,true,true,true,true,true};
@@ -182,7 +182,7 @@ uint32_t IDS_DispenserPidRequestMessage(HardwarePidControl* request)
     return OK;
 }
 uint32_t DispenserPidControlId[MAX_SYSTEM_DISPENSERS] = {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF};
-uint32_t IDS_Pid_Testing_Func(uint32_t DispenserId, uint32_t ReadValue)
+/*uint32_t IDS_Pid_Testing_Func(uint32_t DispenserId, uint32_t ReadValue)
 {
     float calculated_speed;
     DispenserControlConfig[DispenserId].m_mesuredParam = MillisecGetPressures(DispenserId);
@@ -205,7 +205,7 @@ void IDS_Stop_Pid_Testing(int DispenserId)
     RemoveControlCallback(DispenserPidControlId[DispenserId], IDS_Pid_Testing_Func );
     DispenserPidControlId[DispenserId] = 0xFF;
     ReportWithPackageFilter(IDSFilter,"IDS_Stop_Pid_Testing ",__FILE__,__LINE__,DispenserId,RpWarning,(int)DispenserPidControlId[DispenserId],0);
-}
+}*/
 /*
  * IDS Printing support
  * Prepare: build pressure in all participating dispensers
diff --git a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c
index 706aa5bce..fb8e97898 100644
--- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c
+++ b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c
@@ -969,7 +969,7 @@ void Stub_ProgressRequest(MessageContainer* requestContainer)
         response.progress = (double)OK;
         response.has_progress = true;
     }
-    else
+    /*else
     if(request->amount == 0xE1)  //fast refresh for pressure
     {
         LOG_ERROR(request->delay,"Starting Dispenser PID");
@@ -984,7 +984,7 @@ void Stub_ProgressRequest(MessageContainer* requestContainer)
         IDS_Stop_Pid_Testing(request->delay);
         response.progress = (double)OK;
         response.has_progress = true;
-    }
+    }*/
     else
     if(request->amount == 0xE3)  //fast refresh for pressure
     {