From d6f852d799ed84a395f1c9869c3438556d4396e4 Mon Sep 17 00:00:00 2001 From: Avi Levkovich Date: Wed, 28 Nov 2018 16:33:37 +0200 Subject: Add Stub for MidTank Pressure Sensor --- .../Embedded/Modules/Stubs_Handler/Stub_MidTankPressureSensor.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Software/Embedded_SW/Embedded/Modules') diff --git a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_MidTankPressureSensor.c b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_MidTankPressureSensor.c index c183af7aa..1f00da9dd 100644 --- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_MidTankPressureSensor.c +++ b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_MidTankPressureSensor.c @@ -39,9 +39,9 @@ void Stub_MidTankPressureSensorRequest(MessageContainer* requestContainer) response.midtankid = request->midtankid; response.has_midtankid = true; - Read_MidTank_Pressure_Sensor(request->midtankid); + Read_MidTank_Pressure_Sensor((MidTank_t)request->midtankid); - response.pressure = Get_MidTank_Pressure_Sensor(request->midtankid); + response.pressure = Get_MidTank_Pressure_Sensor((MidTank_t)request->midtankid); response.has_pressure = true; -- cgit v1.3.1 From 16c1f0641e8971895cc9690991c4b3662e8b5988 Mon Sep 17 00:00:00 2001 From: Shlomo Hecht Date: Wed, 28 Nov 2018 17:33:17 +0200 Subject: fix PID in heaters. waste tank valve in intersegment (bug #323) --- Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c | 2 +- Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c | 2 +- Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_init.c | 5 +++-- Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c | 2 ++ 4 files changed, 7 insertions(+), 4 deletions(-) (limited to 'Software/Embedded_SW/Embedded/Modules') diff --git a/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c b/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c index 3d23f9e48..3a6a6f924 100644 --- a/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c +++ b/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c @@ -51,7 +51,7 @@ ErrorCode getErrorCode(FRESULT Fresult) switch (Fresult) { case FR_OK: - retrun ERROR_CODE_NONE; + return ERROR_CODE__NONE; default: return ERROR_CODE__FILE_LENGTH_OUT_OF_RANGE; } diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c index bee00c049..68bd680a8 100644 --- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c +++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c @@ -523,7 +523,7 @@ uint32_t MillisecLoop(uint32_t tick) } //ROM_IntMasterEnable(); - //loop_Run_Read_Speed(); - just for testing + return OK; } /****************************************************************************** diff --git a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_init.c b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_init.c index d1febd3db..169ae463e 100644 --- a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_init.c +++ b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_init.c @@ -284,10 +284,11 @@ uint32_t HeaterRecalculateHeaterParams(uint32_t deviceId, uint32_t new_outputpro } // all numbers are rounded down. better to have carefully calculated numbers - HeaterControl[deviceId].outputproportionalpowerlimit = new_outputproportionalpowerlimit; + if (new_outputproportionalpowerlimit > HeaterControl[deviceId].outputproportionalpowerlimit) + new_outputproportionalpowerlimit = HeaterControl[deviceId].outputproportionalpowerlimit; //mark the time slices for heaters operation as empty / Heater1000 / Heater 200 - DCTimeSliceAllocation[deviceId] = (HeaterControl[deviceId].outputproportionalpowerlimit/*/100*/ * NumberOFSlicesInUse) / 100; + DCTimeSliceAllocation[deviceId] = (new_outputproportionalpowerlimit/*/100*/ * NumberOFSlicesInUse) / 100; diff --git a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c index f9c4c1bc3..2af2f63c0 100644 --- a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c +++ b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c @@ -379,6 +379,8 @@ uint32_t IDSPreSegmentState(void *JobDetails, int SegmentId) int Dispenser_i; TimerMotors_t HW_Motor_Id; + Valve_Set(VALVE_MIXCHIP_WASTECH, Mixer_Waste); + for (Dispenser_i = 0;Dispenser_i < MAX_SYSTEM_DISPENSERS;Dispenser_i++) { HW_Motor_Id = DispenserIdToMotorId[Dispenser_i]; -- cgit v1.3.1