diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2019-01-17 13:33:29 +0200 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2019-01-17 13:33:29 +0200 |
| commit | 04567ae62958dc731d8eae71dc57d1316b4e8563 (patch) | |
| tree | f2da2e285e240601a6d4de993cecd901f0073fab /Software/Embedded_SW/Embedded | |
| parent | 071dc67e905d23347ac6b5cc4573972d91dd0ea3 (diff) | |
| parent | 994456523c7adf2f77dd7f74c639262b59d56ec4 (diff) | |
| download | Tango-04567ae62958dc731d8eae71dc57d1316b4e8563.tar.gz Tango-04567ae62958dc731d8eae71dc57d1316b4e8563.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango
Diffstat (limited to 'Software/Embedded_SW/Embedded')
4 files changed, 52 insertions, 1 deletions
diff --git a/Software/Embedded_SW/Embedded/DataDef.h b/Software/Embedded_SW/Embedded/DataDef.h index bfe65aa23..436230a3d 100644 --- a/Software/Embedded_SW/Embedded/DataDef.h +++ b/Software/Embedded_SW/Embedded/DataDef.h @@ -121,6 +121,10 @@ enum #define CurrentMotDriver 0x08 #define VoltageMotDriver 0x00 +#define CurrentCombinedMotDriver 0x0108 // 01 Combined Driver, 08 Current +#define VoltageCombinedMotDriver 0x0100 // 01 Combined Driver, 00 Voltage +#define CombinrdMotDriver 0x0300 // 03 Combined Driver + Combined Modes , 00 Voltage mode enabled +#define CombinrdMotDriver 0x0308 // 03 Combined Driver + Combined Modes , 08 Current mode enabled //#define MagneticLImitSwitch 0x01 diff --git a/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_GPIO/FPGA_GPIO.h b/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_GPIO/FPGA_GPIO.h index b1a148791..87107efb1 100644 --- a/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_GPIO/FPGA_GPIO.h +++ b/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_GPIO/FPGA_GPIO.h @@ -226,4 +226,5 @@ typedef enum void Pumps_Control(PUMPS_ENUM Pump_Id, bool Direction); + #endif /* DRIVERS_FPGA_FPGA_GPIO_FPGA_GPIO_H_ */ diff --git a/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_Rename.h b/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_Rename.h new file mode 100644 index 000000000..bb7022948 --- /dev/null +++ b/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_Rename.h @@ -0,0 +1,45 @@ +//New BP usage +#include "FPGA_GPIO.h" + +#define DISP_SAFETY_STOP_IND_1 GPI_LS_DISPENSER_SPARE_1 +#define DISP_SAFETY_STOP_IND_2 GPI_LS_DISPENSER_SPARE_2 +#define DISP_SAFETY_STOP_IND_3 GPI_LS_DISPENSER_SPARE_3 +#define DISP_SAFETY_STOP_IND_4 GPI_LS_DISPENSER_SPARE_4 +#define DISP_SAFETY_STOP_IND_5 GPI_LS_DISPENSER_SPARE_5 +#define DISP_SAFETY_STOP_IND_6 GPI_LS_DISPENSER_SPARE_6 +#define DISP_SAFETY_STOP_IND_7 GPI_LS_DISPENSER_SPARE_7 +#define DISP_SAFETY_STOP_IND_8 GPI_LS_DISPENSER_SPARE_8 +//#define DISP_SAFETY_STOP_INPUT GPO_SPARE1_1 +//#define CART1_LAMP GPO_SPARE1_2 +//#define CART2_LAMP GPO_SPARE2_1 +//#define CART3_LAMP GPO_SPARE2_2 +//#define ?? LSPARE_ROTENC_CLK_p +//#define ?? LSPARE_ROTENC_DATA_p +//#define ?? LSPARE_ROTENC_CLK_n +//#define ?? LSPARE_ROTENC_DATA_n +//#define DRYER_FAN_SPEED_PWM aaaaaaaa +//#define aaaaaaaa +#define DRYER_FAN_ON F1_GPO_EXTWINDER_1 +#define DRYER_FAN_DIRECT F1_GPO_EXTWINDER_2 +#define DRYER_FAN_TORQUE_PWM F1_GPO_EXTWINDER_3 +#define DRYER_FAN_TACHO GPI_LS_DRYER_SPARE2 +//#define EPB_S1 aaaaaaaa +//#define ANALOG_DYEINGH_TEMP6_1 aaaaaaaa +//#define ANALOG_DYEINGH_TEMP6_3 aaaaaaaa +//#define ANALOG_DYEINGH_TEMP6_4 aaaaaaaa +//#define aaaaaaaa +#define DR_DOOR_SW_NO GPI_LS_RLOADRAM_UP +#define WASTE_FLOW_SW_NO F2_GPI_AIRFLOW_FLAP +#define FILTER_PRES_SW_NO F3_GPI_SW_FILTER_PRES +#define WASTE_OVERFULL_NO F2_GPI_CHILLER_STAT1 +//#define CHILLER_RS485_p aaaaaaaa +//#define CHILLER_RS485_n aaaaaaaa +//#define WHS_TEMP_RS485_p aaaaaaaa +//#define WHS_TEMP_RS485_n aaaaaaaa +//#define CART1_INT aaaaaaaa +//#define CART2_INT aaaaaaaa +//#define CART3_INT aaaaaaaa +//#define CART1_RST aaaaaaaa +//#define CART2_RST aaaaaaaa +//#define CART3_RST aaaaaaaa +#define GPO_DH_MAGNET GPO_TFEED_BREAK_1 diff --git a/Software/Embedded_SW/Embedded/Drivers/Motors/Motor.h b/Software/Embedded_SW/Embedded/Drivers/Motors/Motor.h index e204e91dc..34c41d159 100644 --- a/Software/Embedded_SW/Embedded/Drivers/Motors/Motor.h +++ b/Software/Embedded_SW/Embedded/Drivers/Motors/Motor.h @@ -93,7 +93,8 @@ typedef struct uint32_t Position; uint32_t Status; uint8_t MicroSteps; - uint32_t ADC; //read the motor driver type + uint32_t ADC; //read the Adc in order to know the motor driver type L6470/ L6472 / powerSTEP01 + uint32_t DriverType; //current or voltage mode bool Busy; }MotorDriverResponseStruct; |