From c95669fee0ae81693079c7c35330ae5174d471b9 Mon Sep 17 00:00:00 2001 From: Shlomo Hecht Date: Tue, 3 Mar 2020 14:05:37 +0200 Subject: Version 1.4.6.15 head (magnet) improved, rockers bypass, --- Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Software/Embedded_SW/Embedded/Modules/Control') diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c index da4f04f3b..99036a073 100644 --- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c +++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c @@ -706,7 +706,7 @@ uint32_t MillisecLowLoop(uint32_t tick) if (Onesecond_Tick) { char Lenstr[160]; - static int Counter = 0; + //static int Counter = 0; MachineUpdateResponseFunc(); //KeepAliveOneSecondCall(); -- cgit v1.3.1 From 08776fb8dbe74edb50fb79a55c1613165385e5d7 Mon Sep 17 00:00:00 2001 From: Avi Levkovich Date: Tue, 3 Mar 2020 14:50:33 +0200 Subject: removw warninigs --- Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Software/Embedded_SW/Embedded/Modules/Control') diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c index da4f04f3b..b1efcba9a 100644 --- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c +++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c @@ -59,6 +59,8 @@ #include #include #include +#include "Modules/Heaters/Heaters_ex.h" +#include Task_Handle Millisecond_Task_Handle; /******************** Definitions ********************************************/ -- cgit v1.3.1 From 99f7f5459baabb7651ab4a111e677e6aab167686 Mon Sep 17 00:00:00 2001 From: Shlomo Hecht Date: Wed, 4 Mar 2020 12:29:48 +0200 Subject: compilation warnings removed --- Software/Embedded_SW/Embedded/Communication/CommunicationTask.c | 2 +- .../Embedded_SW/Embedded/Drivers/I2C_Communication/ADC_MUX/ADC_MUX.c | 2 +- Software/Embedded_SW/Embedded/Drivers/I2C_Communication/I2C_Task.c | 3 +-- .../I2C_Communication/WHS_Card/D_Max5805_ADC_Blower/WHS_Blower.c | 4 ++-- Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c | 2 +- Software/Embedded_SW/Embedded/Modules/General/process.h | 1 + Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_ex.h | 1 + Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c | 3 ++- .../Embedded_SW/Embedded/StateMachines/Initialization/InitSequence.c | 1 + .../Embedded/StateMachines/Initialization/PowerOffSequence.h | 1 + 10 files changed, 12 insertions(+), 8 deletions(-) (limited to 'Software/Embedded_SW/Embedded/Modules/Control') diff --git a/Software/Embedded_SW/Embedded/Communication/CommunicationTask.c b/Software/Embedded_SW/Embedded/Communication/CommunicationTask.c index 5369878f8..f1264b3d5 100644 --- a/Software/Embedded_SW/Embedded/Communication/CommunicationTask.c +++ b/Software/Embedded_SW/Embedded/Communication/CommunicationTask.c @@ -126,7 +126,7 @@ void freeArray(uint32_t buffer) uint32_t CommunicationTaskInit(void) { USBCDCD_init(); - Init_U0(); + //Init_U0(); return OK; } diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/ADC_MUX/ADC_MUX.c b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/ADC_MUX/ADC_MUX.c index 283249dd1..457a8b895 100644 --- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/ADC_MUX/ADC_MUX.c +++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/ADC_MUX/ADC_MUX.c @@ -426,7 +426,7 @@ bool Get_Heater_Current_Reading_State(HEATERS_CURRENT Heater_ID) //0-8 if((Head_Type > HEAD_TYPE_SYLKO_WITHOUT_CARD)&&(Heater_ID>=HEATER_DRYER_CURRENT_3)) return false; if (Heater_ID>=NUM_OF_CURRENT_HEATERS) - return; + return false; return Heaters_Current_Read_Enable[Heater_ID]; } 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 b81674d68..a4debd4b9 100644 --- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/I2C_Task.c +++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/I2C_Task.c @@ -81,7 +81,6 @@ typedef struct I2C_ReadingMessage{ void Trigger_Heater_Current_Read(void) { I2C_ReadingMessageStruc I2C_ReadingMessage; - uint8_t Heater_i=0; I2C_ReadingMessage.messageId = Heater_Current_Reading; I2C_ReadingMessage.parameter = NUM_OF_CURRENT_HEATERS; @@ -152,7 +151,7 @@ void Trigger_Head_Fan_Control(uint32_t Fan_ID, uint16_t PWM) //uint8_t Midtank_i; if ((Fan_ID>=MAX_HEAD_FAN)||(PWM>0xFF)) - return ERROR; + return; I2C_ReadingMessage.messageId = HeadFanControl; I2C_ReadingMessage.parameter = Fan_ID; 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 eaad047e1..1a0021694 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 @@ -196,8 +196,8 @@ bool WHS_init_Blower() double WHS_Blower_Avarege(WHS_Flow_Meter ORF_id) { - uint16_t orifice_hex_value = 0; - uint16_t V0_value = 0; + //uint16_t orifice_hex_value = 0; + //uint16_t V0_value = 0; double Q_temp = 0 ; double average_Q = 0.0; diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c index 1f69387a6..0e95f4053 100644 --- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c +++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c @@ -707,7 +707,7 @@ uint32_t MillisecLowLoop(uint32_t tick) } if (Onesecond_Tick) { - char Lenstr[160]; + //char Lenstr[160]; //static int Counter = 0; MachineUpdateResponseFunc(); //KeepAliveOneSecondCall(); diff --git a/Software/Embedded_SW/Embedded/Modules/General/process.h b/Software/Embedded_SW/Embedded/Modules/General/process.h index 97d28f1ef..a546ffdbe 100644 --- a/Software/Embedded_SW/Embedded/Modules/General/process.h +++ b/Software/Embedded_SW/Embedded/Modules/General/process.h @@ -26,6 +26,7 @@ extern ProcessParameters ProcessParametersKeep; extern void ProcessRequestFunc(MessageContainer* requestContainer); extern uint32_t HandleProcessParameters(ProcessParameters* ProcessParams,bool saveData); +uint32_t LoadProcessParamsFromFile(void); uint32_t ProcessParamsInit(void); diff --git a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_ex.h b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_ex.h index f29dd186b..aeec7d696 100644 --- a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_ex.h +++ b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_ex.h @@ -37,5 +37,6 @@ void Heaters_SetOperationLimits(int acheatersloweroperationlimit,int acheatersu uint32_t DrierHeaterVoltageSetup(void); uint32_t HeatersEnd(void); +void HeatersControlStart(void); void HeatersControlStop(void); uint32_t Heaters_Init(void); diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c index bc6662aac..229b86cac 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c +++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c @@ -458,7 +458,8 @@ uint32_t ThreadControlCBFunction(uint32_t IfIndex, uint32_t ReadValue) //extern int MotorSamplePointer[MAX_THREAD_MOTORS_NUM]; //read value is the dancer angle - int i,index=MAX_THREAD_MOTORS_NUM,len; + int i,index=MAX_THREAD_MOTORS_NUM; + //int len; int DancerId; int32_t TranslatedReadValue, avreageSampleValue = 0;//,avreageMotorSampleValue = 0; //double tempcalcspeed = 0; diff --git a/Software/Embedded_SW/Embedded/StateMachines/Initialization/InitSequence.c b/Software/Embedded_SW/Embedded/StateMachines/Initialization/InitSequence.c index 6b75c410d..08136c846 100644 --- a/Software/Embedded_SW/Embedded/StateMachines/Initialization/InitSequence.c +++ b/Software/Embedded_SW/Embedded/StateMachines/Initialization/InitSequence.c @@ -33,6 +33,7 @@ #include "drivers/Valves/Valve.h" #include "drivers/Flash_ram/MCU_E2Prom.h" #include +#include #include "heaters/heaters_ex.h" diff --git a/Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerOffSequence.h b/Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerOffSequence.h index cf743c1a6..5f347c5ba 100644 --- a/Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerOffSequence.h +++ b/Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerOffSequence.h @@ -34,6 +34,7 @@ uint32_t PowerOffCancel(void);//POWER_OFF_CANCELLED void PowerOffSetTemperatureThreshold (int32_t temperature); //celsius temperature bool PowerOffInProcessGetState(void); +uint32_t PowerOffHeatersOff(void); uint32_t PowerDownUpdateFunc(MessageContainer* requestContainer); uint32_t AbortPowerDownFunc(MessageContainer* requestContainer); -- cgit v1.3.1