diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2019-12-08 14:51:46 +0200 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2019-12-08 14:51:46 +0200 |
| commit | aeabb681d16451e191a1620d4eebf40549771491 (patch) | |
| tree | 33183bb64916935d68e2399028b9e9c0952e098f /Software/Embedded_SW/Embedded/Modules/General | |
| parent | 3cd59dd3b04168ad91cb1fe51231e9b3ddd74705 (diff) | |
| download | Tango-aeabb681d16451e191a1620d4eebf40549771491.tar.gz Tango-aeabb681d16451e191a1620d4eebf40549771491.zip | |
Support for new head in ProtoBif and embedded (initial)
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/General')
3 files changed, 9 insertions, 2 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c index 46abd923f..b89702668 100644 --- a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c +++ b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c @@ -420,7 +420,7 @@ uint32_t HWConfiguration(UploadHardwareConfigurationRequest* UploadRequest) for (PID_i = 0; PID_i < request->n_pidcontrols ; PID_i++) { - if (request->pidcontrols[PID_i]->hardwarepidcontroltype <= HARDWARE_PID_CONTROL_TYPE__MixerHeater) + if (isHeater(request->pidcontrols[PID_i]->hardwarepidcontroltype)) status += HeaterConfigRequestMessage(request->pidcontrols[PID_i]); else if ((request->pidcontrols[PID_i]->hardwarepidcontroltype >= HARDWARE_PID_CONTROL_TYPE__MotorDryer)&& (request->pidcontrols[PID_i]->hardwarepidcontroltype < HARDWARE_PID_CONTROL_TYPE__Dispenser1)) diff --git a/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c b/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c index e1a516e95..157841365 100644 --- a/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c +++ b/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c @@ -24,7 +24,7 @@ #include "drivers/Motors/Motor.h" #include "Modules/General/MachineStatus.h" - +#include "Modules/Control/MillisecTask.h" #include "modules/ids/ids_ex.h" MachineState StoredMachineStatus = MACHINE_STATE__Ready; diff --git a/Software/Embedded_SW/Embedded/Modules/General/buttons.c b/Software/Embedded_SW/Embedded/Modules/General/buttons.c index bbb8cb880..22af2b07e 100644 --- a/Software/Embedded_SW/Embedded/Modules/General/buttons.c +++ b/Software/Embedded_SW/Embedded/Modules/General/buttons.c @@ -297,6 +297,13 @@ uint32_t ButtonJogCBFunction(uint32_t IfIndex, uint32_t ReadValue) { ReportWithPackageFilter(GeneralFilter,"------------ joggingMachine: sttJOGGING action->LONGPB-----------------", __FILE__,__LINE__,0, RpMessage, 0, 0); jog.state = sttJOGGING; jog.state = sttLONG_JOGGING; + if (JobIsActive() == false) // added because sometimes the jog stops because of another reason and the button s stucked blinking + { + jog.color = colorON; + Pannel_Leds(THREAD_JOGGING, MODE_ON); + jog.state = sttENABLE; + } + } break; case sttLONG_JOGGING: |