diff --git a/left/build/kds/.gitignore b/left/build/kds/.gitignore index 17ca2b8..536aa9c 100644 --- a/left/build/kds/.gitignore +++ b/left/build/kds/.gitignore @@ -1,3 +1,4 @@ /debug/ /release/ /v7-release/ +/v6-release/ diff --git a/left/src/bridge_protocol_handler.c b/left/src/bridge_protocol_handler.c index d2aa49e..549733d 100644 --- a/left/src/bridge_protocol_handler.c +++ b/left/src/bridge_protocol_handler.c @@ -3,7 +3,6 @@ #include "main.h" #include "i2c_addresses.h" #include "i2c.h" -#include "iso_jumper.h" void SetError(uint8_t error); void SetGenericError(); @@ -37,8 +36,5 @@ void BridgeProtocolHandler() BridgeTxSize = 0; TEST_LED_SET(BridgeRxBuffer[1]); break; - case BRIDGE_COMMAND_GET_ISO_JUMPER_STATE: - BridgeTxBuffer[0] = IsoJumperState; - break; } } diff --git a/left/src/bridge_protocol_handler.h b/left/src/bridge_protocol_handler.h index c85b3a2..dbee2a3 100644 --- a/left/src/bridge_protocol_handler.h +++ b/left/src/bridge_protocol_handler.h @@ -15,7 +15,6 @@ #define BRIDGE_COMMAND_GET_KEY_STATES 0 #define BRIDGE_COMMAND_SET_LED 1 - #define BRIDGE_COMMAND_GET_ISO_JUMPER_STATE 2 // Variables: diff --git a/left/src/init_peripherials.c b/left/src/init_peripherials.c index 4a490c2..9981a32 100644 --- a/left/src/init_peripherials.c +++ b/left/src/init_peripherials.c @@ -6,7 +6,6 @@ #include "fsl_i2c.h" #include "fsl_clock.h" #include "i2c.h" -#include "iso_jumper.h" void InitI2c() { port_pin_config_t pinConfig = { @@ -42,6 +41,5 @@ void InitPeripherials(void) { InitLedDriver(); InitTestLed(); - InitIsoJumper(); InitI2c(); } diff --git a/left/src/iso_jumper.c b/left/src/iso_jumper.c deleted file mode 100644 index 69b6ce9..0000000 --- a/left/src/iso_jumper.c +++ /dev/null @@ -1,14 +0,0 @@ -#include "iso_jumper.h" -#include "fsl_port.h" - -void InitIsoJumper() { - CLOCK_EnableClock(ISO_JUMPER_INPUT_CLOCK); - PORT_SetPinConfig(ISO_JUMPER_INPUT_PORT, ISO_JUMPER_INPUT_PIN, - &(port_pin_config_t){.pullSelect=kPORT_PullDown, .mux=kPORT_MuxAsGpio}); - GPIO_PinInit(ISO_JUMPER_INPUT_GPIO, ISO_JUMPER_INPUT_PIN, &(gpio_pin_config_t){kGPIO_DigitalInput}); - - CLOCK_EnableClock(ISO_JUMPER_OUTPUT_CLOCK); - PORT_SetPinConfig(ISO_JUMPER_OUTPUT_PORT, ISO_JUMPER_OUTPUT_PIN, - &(port_pin_config_t){.pullSelect=kPORT_PullDisable, .mux=kPORT_MuxAsGpio}); - GPIO_PinInit(ISO_JUMPER_OUTPUT_GPIO, ISO_JUMPER_OUTPUT_PIN, &(gpio_pin_config_t){kGPIO_DigitalOutput, 1}); -} diff --git a/left/src/iso_jumper.h b/left/src/iso_jumper.h deleted file mode 100644 index 1b4eeb2..0000000 --- a/left/src/iso_jumper.h +++ /dev/null @@ -1,30 +0,0 @@ -#ifndef __ISO_JUMPER_H__ -#define __ISO_JUMPER_H__ - -// Includes: - - #include "fsl_gpio.h" - -// Macros: - - #define ISO_JUMPER_INPUT_GPIO GPIOB - #define ISO_JUMPER_INPUT_PORT PORTB - #define ISO_JUMPER_INPUT_CLOCK kCLOCK_PortB - #define ISO_JUMPER_INPUT_PIN 13 - #define ISO_JUMPER_INPUT_IRQ PORTB_IRQn - #define ISO_JUMPER_INPUT_IRQ_HANDLER PORTB_IRQHandler - - #define ISO_JUMPER_OUTPUT_GPIO GPIOA - #define ISO_JUMPER_OUTPUT_PORT PORTA - #define ISO_JUMPER_OUTPUT_CLOCK kCLOCK_PortA - #define ISO_JUMPER_OUTPUT_PIN 6 - #define ISO_JUMPER_OUTPUT_IRQ PORTA_IRQn - #define ISO_JUMPER_OUTPUT_IRQ_HANDLER PORTA_IRQHandler - - #define ISO_JUMPER_IS_ENABLED !GPIO_ReadPinInput(ISO_JUMPER_INPUT_GPIO, ISO_JUMPER_INPUT_PIN) - -// Functions: - - extern void InitIsoJumper(); - -#endif diff --git a/left/src/main.c b/left/src/main.c index 91718e1..c71b00e 100644 --- a/left/src/main.c +++ b/left/src/main.c @@ -9,7 +9,6 @@ #include "i2c.h" #include "init_peripherials.h" #include "bridge_protocol_handler.h" -#include "iso_jumper.h" key_matrix_t keyMatrix = { .colNum = KEYBOARD_MATRIX_COLS_NUM, @@ -84,7 +83,6 @@ int main(void) { InitClock(); InitPeripherials(); - IsoJumperState = ISO_JUMPER_IS_ENABLED; I2C_SlaveGetDefaultConfig(&slaveConfig); slaveConfig.slaveAddress = I2C_ADDRESS_LEFT_KEYBOARD_HALF; diff --git a/right/src/init_peripherials.c b/right/src/init_peripherials.c index 18f8c55..bb995d4 100644 --- a/right/src/init_peripherials.c +++ b/right/src/init_peripherials.c @@ -5,7 +5,6 @@ #include "i2c.h" #include "led_driver.h" #include "merge_sensor.h" -#include "led_jumper.h" void InitI2c() { port_pin_config_t pinConfig = { @@ -47,7 +46,6 @@ void InitI2c() { void InitPeripherials(void) { InitResetButton(); - InitLedJumper(); InitMergeSensor(); InitTestLed(); InitI2c(); diff --git a/right/src/led_jumper.c b/right/src/led_jumper.c deleted file mode 100644 index aab7673..0000000 --- a/right/src/led_jumper.c +++ /dev/null @@ -1,8 +0,0 @@ -#include "led_jumper.h" -#include "fsl_port.h" - -void InitLedJumper() { - CLOCK_EnableClock(LED_JUMPER_CLOCK); - PORT_SetPinConfig(LED_JUMPER_PORT, LED_JUMPER_PIN, - &(port_pin_config_t){.pullSelect=kPORT_PullUp, .mux=kPORT_MuxAsGpio}); -} diff --git a/right/src/led_jumper.h b/right/src/led_jumper.h deleted file mode 100644 index 1fb0ed4..0000000 --- a/right/src/led_jumper.h +++ /dev/null @@ -1,23 +0,0 @@ -#ifndef __LED_JUMPER_H__ -#define __LED_JUMPER_H__ - -// Includes: - - #include "fsl_gpio.h" - -// Macros: - - #define LED_JUMPER_GPIO GPIOC - #define LED_JUMPER_PORT PORTC - #define LED_JUMPER_CLOCK kCLOCK_PortC - #define LED_JUMPER_PIN 4 - #define LED_JUMPER_IRQ PORTC_IRQn - #define LED_JUMPER_IRQ_HANDLER PORTC_IRQHandler - - #define LED_JUMPER_IS_ENABLED !GPIO_ReadPinInput(LED_JUMPER_GPIO, LED_JUMPER_PIN) - -// Functions: - - extern void InitLedJumper(); - -#endif diff --git a/right/src/usb_protocol_handler.c b/right/src/usb_protocol_handler.c index a17dd64..8a17e0e 100644 --- a/right/src/usb_protocol_handler.c +++ b/right/src/usb_protocol_handler.c @@ -4,7 +4,6 @@ #include "i2c_addresses.h" #include "led_driver.h" #include "merge_sensor.h" -#include "led_jumper.h" void SetError(uint8_t error); void SetGenericError(); @@ -17,8 +16,6 @@ void ReadLedDriver(); void WriteEeprom(); void ReadEeprom(); void ReadMergeSensor(); -void ReadLedJumper(); -void ReadIsoJumper(); // Functions for setting error statuses @@ -68,12 +65,6 @@ void UsbProtocolHandler() case USB_COMMAND_READ_MERGE_SENSOR: ReadMergeSensor(); break; - case USB_COMMAND_READ_LED_JUMPER: - ReadLedJumper(); - break; - case USB_COMMAND_READ_ISO_JUMPER: - ReadIsoJumper(); - break; default: break; } @@ -180,19 +171,3 @@ void ReadMergeSensor() { SetResponseByte(MERGE_SENSOR_IS_MERGED); } - -void ReadLedJumper() -{ - SetResponseByte(LED_JUMPER_IS_ENABLED); -} - -void ReadIsoJumper() -{ - uint8_t txBuffer[] = {2}; - I2cWrite(I2C_MAIN_BUS_BASEADDR, I2C_ADDRESS_LEFT_KEYBOARD_HALF, txBuffer, sizeof(txBuffer)); - - uint8_t rxBuffer[1]; - I2cRead(I2C_MAIN_BUS_BASEADDR, I2C_ADDRESS_LEFT_KEYBOARD_HALF, rxBuffer, sizeof(rxBuffer)); - - SetResponseByte(rxBuffer[0]); -} diff --git a/right/src/usb_protocol_handler.h b/right/src/usb_protocol_handler.h index 2ccef06..c835b98 100644 --- a/right/src/usb_protocol_handler.h +++ b/right/src/usb_protocol_handler.h @@ -25,8 +25,6 @@ #define WRITE_EEPROM_RESPONSE_INVALID_PAYLOAD_SIZE 1 #define USB_COMMAND_READ_EEPROM 6 #define USB_COMMAND_READ_MERGE_SENSOR 7 - #define USB_COMMAND_READ_LED_JUMPER 8 - #define USB_COMMAND_READ_ISO_JUMPER 9 // Functions: