diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-11-28 18:11:09 +0200 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-11-28 18:11:09 +0200 |
| commit | c86a3bd32bf6d561fecf662b53b49749d2989b88 (patch) | |
| tree | ed73b260b9ee941364354d2b08d6fb343f0b8980 /Software/Embedded_SW/Embedded/Modules | |
| parent | 539aecd793ee0ce55833eef98c3049dd0bf8127d (diff) | |
| parent | 411e49392baf97f94435c02b9755cb8f2fc431bb (diff) | |
| download | Tango-c86a3bd32bf6d561fecf662b53b49749d2989b88.tar.gz Tango-c86a3bd32bf6d561fecf662b53b49749d2989b88.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules')
4 files changed, 8 insertions, 5 deletions
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]; 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; |