diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2018-08-20 17:34:36 +0300 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2018-08-20 17:34:36 +0300 |
| commit | 48800971a024f2bf7e8b6ae673ecbb2235ef18dc (patch) | |
| tree | 0a5e30e30c962c1fc5e77a98fe1787790123b368 /Software/Embedded_SW | |
| parent | f468145c16b5c677201327feeb4f207c21df0b0b (diff) | |
| download | Tango-48800971a024f2bf7e8b6ae673ecbb2235ef18dc.tar.gz Tango-48800971a024f2bf7e8b6ae673ecbb2235ef18dc.zip | |
homing/ jogging only for configured motors. default blower value 3000 millivolt
Diffstat (limited to 'Software/Embedded_SW')
4 files changed, 6 insertions, 5 deletions
diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/DAC/Blower.h b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/DAC/Blower.h index a21889310..44fa4fef7 100644 --- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/DAC/Blower.h +++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/DAC/Blower.h @@ -20,7 +20,7 @@ #define AD5691R_DONT_CARE_DATA_BYTE 0x00 -#define Default_Voltage 4000 //4V +#define Default_Voltage 3000 //4V #define DAC_I2C_BASE 2 diff --git a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.h b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.h index 82d267bd6..3fc0969f8 100644 --- a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.h +++ b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.h @@ -34,6 +34,7 @@ uint32_t MotorAbortJoggingRequestFunc(MessageContainer* requestContainer); uint32_t DispenserAbortJoggingRequestFunc(MessageContainer* requestContainer); uint32_t SetComponentValueRequestRequestFunc(MessageContainer* requestContainer); +uint32_t SetDigitalOutRequestRequestFunc(MessageContainer* requestContainer); diff --git a/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsHoming.c b/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsHoming.c index ad26ad7c2..af8932872 100644 --- a/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsHoming.c +++ b/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsHoming.c @@ -128,7 +128,7 @@ uint32_t MotorHomingRequestFunc(MessageContainer* requestContainer) if (speed == 0) speed = 150; if (MotorId <= NUM_OF_MOTORS) { - if (JobIsActive() == false) + if ((JobIsActive() == false)&&(isMotorConfigured(MotorId) == true)) { if ( Motor_Id_to_LS_Id[MotorId] != MAX_GPI) { @@ -220,7 +220,7 @@ uint32_t DispenserHomingRequestFunc(MessageContainer* requestContainer) //free (container_buffer); if (MotorId <= NUM_OF_MOTORS) { - if (JobIsActive() == false) + if ((JobIsActive() == false)&&(isMotorConfigured(MotorId) == true)) { if ( Motor_Id_to_LS_Id[MotorId] != MAX_GPI) { diff --git a/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsJogging.c b/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsJogging.c index cfb6008b4..32e76cbde 100644 --- a/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsJogging.c +++ b/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsJogging.c @@ -59,7 +59,7 @@ uint32_t MotorJoggingRequestFunc(MessageContainer* requestContainer) if (MotorId <= NUM_OF_MOTORS) { - if (JobIsActive() == false) + if ((JobIsActive() == false)&&(isMotorConfigured(MotorId) == true)) { { switch (request->direction) @@ -145,7 +145,7 @@ uint32_t DispenserJoggingRequestFunc(MessageContainer* requestContainer) if (MotorId <= NUM_OF_MOTORS) { - if (JobIsActive() == false) + if ((JobIsActive() == false)&&(isMotorConfigured(MotorId) == true)) { switch (request->direction) { |