diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2020-02-06 13:51:20 +0200 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2020-02-06 13:51:20 +0200 |
| commit | 5bf44be1121abf9dd36c948c19ca0650f5571c3e (patch) | |
| tree | f43950bfe7f660efb7fc2dd6afa904037af46e33 /Software/Embedded_SW/Embedded/Modules | |
| parent | b3589be05166fdd15692a9a835262d6e04e56bd2 (diff) | |
| download | Tango-5bf44be1121abf9dd36c948c19ca0650f5571c3e.tar.gz Tango-5bf44be1121abf9dd36c948c19ca0650f5571c3e.zip | |
fix job bug and I2C_Task for LP machines
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules')
3 files changed, 5 insertions, 5 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/control.c b/Software/Embedded_SW/Embedded/Modules/Control/control.c index 02a216ba6..bb3149b43 100644 --- a/Software/Embedded_SW/Embedded/Modules/Control/control.c +++ b/Software/Embedded_SW/Embedded/Modules/Control/control.c @@ -66,7 +66,7 @@ //#define CONTROL_DEBUG -#define DURATION_LIMIT 5 +#define DURATION_LIMIT 6 /******************** Definitions ********************************************/ #define MAX_TANGO_CONTROL_DEVICES 100 /******************** STRUCTURES AND ENUMs ********************************************/ @@ -632,7 +632,7 @@ uint32_t ControlLowLoop(uint32_t tick) dev = ControlLowDevice_i; } } - Report(ControlArray[dev].Name,__FILE__,__LINE__,dev,RpWarning,max,0); + //Report(ControlArray[dev].Name,__FILE__,__LINE__,dev,RpWarning,max,0); } #endif //ROM_IntMasterEnable(); diff --git a/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsHoming.c b/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsHoming.c index 674135180..be8e84f3e 100644 --- a/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsHoming.c +++ b/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsHoming.c @@ -216,7 +216,7 @@ uint32_t DispenserHomingRequestFunc(MessageContainer* requestContainer) responseContainer = createContainer(MESSAGE_TYPE__DispenserHomingResponse, requestContainer->token, false, &response, &dispenser_homing_response__pack, &dispenser_homing_response__get_packed_size); responseContainer.has_continuous = true; -responseContainer.continuous = true; + responseContainer.continuous = true; uint8_t* container_buffer = my_malloc(message_container__get_packed_size(&responseContainer)); size_t container_size = message_container__pack(&responseContainer, container_buffer); my_free(responseContainer.data.data); diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_init.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_init.c index fb3b78752..e53adabb7 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_init.c +++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_init.c @@ -73,14 +73,14 @@ uint32_t MotorsConfigMessage(HardwareConfiguration * HWrequest) MotorsCfg[Motor_i].pulseperround = request->pulseperround; MotorsCfg[Motor_i].pulleyradius = request->pulleyradius; MotorsCfg[Motor_i].configword = request->configword; - if(MotorDriverResponse[Motor_i].DriverType == CombinrdMotDriver) + /*if(MotorDriverResponse[Motor_i].DriverType == CombinrdMotDriver) { MotorsCfg[Motor_i].directionthreadwize = request->directionthreadwize ^ 1;//PowerSTEP01 } else { MotorsCfg[Motor_i].directionthreadwize = request->directionthreadwize;//L6470 + L6472 - } + }*/ MotorsCfg[Motor_i].kvalhold = request->kvalhold; MotorsCfg[Motor_i].kvalrun = request->kvalrun; MotorsCfg[Motor_i].kvalacc = request->kvalacc; |