Index: firmware/App/Controllers/DialOutUF.c =================================================================== diff -u -r96bff7c1a8c755eb28a89e131a737dc1c4a7d9fc -r2bb447181c2519690441d81f83563d17e0882ef2 --- firmware/App/Controllers/DialOutUF.c (.../DialOutUF.c) (revision 96bff7c1a8c755eb28a89e131a737dc1c4a7d9fc) +++ firmware/App/Controllers/DialOutUF.c (.../DialOutUF.c) (revision 2bb447181c2519690441d81f83563d17e0882ef2) @@ -18,8 +18,9 @@ #include #endif -#include "can.h" #include "etpwm.h" +#include "gio.h" +#include "spi.h" #include "Common.h" #include "FPGA.h" @@ -91,13 +92,13 @@ } DIAL_OUT_FLOW_SELF_TEST_STATE_T; // CAN3 port pin assignments for pump stop and direction outputs -#define STOP_CAN3_PORT_MASK 0x00000002 // (Tx - re-purposed as output GPIO for dialOut pump stop signal) -#define DIR_CAN3_PORT_MASK 0x00000002 // (Rx - re-purposed as output GPIO for dialOut pump direction signal) +#define STOP_SPI4_PORT_MASK 0x00000200 // (CLK - re-purposed as output GPIO) +#define DIR_DO_PUMP_GIO_PORT_PIN 6U // dialOut pump stop and direction macros -#define SET_DOP_DIR() {canREG3->RIOC |= DIR_CAN3_PORT_MASK;} -#define SET_DOP_STOP() {canREG3->TIOC |= STOP_CAN3_PORT_MASK;} -#define CLR_DOP_DIR() {canREG3->RIOC &= ~DIR_CAN3_PORT_MASK;} -#define CLR_DOP_STOP() {canREG3->TIOC &= ~STOP_CAN3_PORT_MASK;} +#define SET_DOP_DIR() gioSetBit( gioPORTA, DIR_DO_PUMP_GIO_PORT_PIN, PIN_SIGNAL_HIGH ) +#define SET_DOP_STOP() {spiREG4->PC3 |= STOP_SPI4_PORT_MASK;} +#define CLR_DOP_DIR() gioSetBit( gioPORTA, DIR_DO_PUMP_GIO_PORT_PIN, PIN_SIGNAL_LOW ) +#define CLR_DOP_STOP() {spiREG4->PC3 &= ~STOP_SPI4_PORT_MASK;} // ********** private data **********