diff --git a/right/include/board/board.h b/right/include/board/board.h index 69e32d1..7ba7187 100644 --- a/right/include/board/board.h +++ b/right/include/board/board.h @@ -96,15 +96,9 @@ /* Board led color mapping */ #define LOGIC_LED_ON 0U #define LOGIC_LED_OFF 1U -#define BOARD_LED_RED_GPIO GPIOA -#define BOARD_LED_RED_GPIO_PORT PORTA -#define BOARD_LED_RED_GPIO_PIN 1U -#define BOARD_LED_GREEN_GPIO GPIOA -#define BOARD_LED_GREEN_GPIO_PORT PORTA -#define BOARD_LED_GREEN_GPIO_PIN 2U -#define BOARD_LED_BLUE_GPIO GPIOD -#define BOARD_LED_BLUE_GPIO_PORT PORTD -#define BOARD_LED_BLUE_GPIO_PIN 5U +#define BOARD_LED_RED_GPIO GPIOD +#define BOARD_LED_RED_GPIO_PORT PORTD +#define BOARD_LED_RED_GPIO_PIN 7U #define LED_RED_INIT(output) \ GPIO_PinInit(BOARD_LED_RED_GPIO, BOARD_LED_RED_GPIO_PIN, \ @@ -116,26 +110,6 @@ #define LED_RED_TOGGLE() \ GPIO_TogglePinsOutput(BOARD_LED_RED_GPIO, 1U << BOARD_LED_RED_GPIO_PIN) /*!< Toggle on target LED_RED */ -#define LED_GREEN_INIT(output) \ - GPIO_PinInit(BOARD_LED_GREEN_GPIO, BOARD_LED_GREEN_GPIO_PIN, \ - &(gpio_pin_config_t){kGPIO_DigitalOutput, (output)}) /*!< Enable target LED_GREEN */ -#define LED_GREEN_ON() \ - GPIO_ClearPinsOutput(BOARD_LED_GREEN_GPIO, 1U << BOARD_LED_GREEN_GPIO_PIN) /*!< Turn on target LED_GREEN */ -#define LED_GREEN_OFF() \ - GPIO_SetPinsOutput(BOARD_LED_GREEN_GPIO, 1U << BOARD_LED_GREEN_GPIO_PIN) /*!< Turn off target LED_GREEN */ -#define LED_GREEN_TOGGLE() \ - GPIO_TogglePinsOutput(BOARD_LED_GREEN_GPIO, 1U << BOARD_LED_GREEN_GPIO_PIN) /*!< Toggle on target LED_GREEN */ - -#define LED_BLUE_INIT(output) \ - GPIO_PinInit(BOARD_LED_BLUE_GPIO, BOARD_LED_BLUE_GPIO_PIN, \ - &(gpio_pin_config_t){kGPIO_DigitalOutput, (output)}) /*!< Enable target LED_BLUE */ -#define LED_BLUE_ON() \ - GPIO_ClearPinsOutput(BOARD_LED_BLUE_GPIO, 1U << BOARD_LED_BLUE_GPIO_PIN) /*!< Turn on target LED_BLUE */ -#define LED_BLUE_OFF() \ - GPIO_SetPinsOutput(BOARD_LED_BLUE_GPIO, 1U << BOARD_LED_BLUE_GPIO_PIN) /*!< Turn off target LED_BLUE */ -#define LED_BLUE_TOGGLE() \ - GPIO_TogglePinsOutput(BOARD_LED_BLUE_GPIO, 1U << BOARD_LED_BLUE_GPIO_PIN) /*!< Toggle on target LED_BLUE */ - /* @brief FreeRTOS tickless timer configuration. */ #define vPortLptmrIsr LPTMR0_IRQHandler /*!< Timer IRQ handler. */ #define TICKLESS_LPTMR_BASE_PTR LPTMR0 /*!< Tickless timer base address. */ diff --git a/right/include/board/pin_mux.c b/right/include/board/pin_mux.c index bb00488..ca52103 100644 --- a/right/include/board/pin_mux.c +++ b/right/include/board/pin_mux.c @@ -56,21 +56,15 @@ void BOARD_InitPins(void) // Initialize LEDs. PORT_SetPinMux(BOARD_LED_RED_GPIO_PORT, BOARD_LED_RED_GPIO_PIN, kPORT_MuxAsGpio); - PORT_SetPinMux(BOARD_LED_GREEN_GPIO_PORT, BOARD_LED_GREEN_GPIO_PIN, kPORT_MuxAsGpio); - PORT_SetPinMux(BOARD_LED_BLUE_GPIO_PORT, BOARD_LED_BLUE_GPIO_PIN, kPORT_MuxAsGpio); gpio_pin_config_t led_config = { .pinDirection = kGPIO_DigitalOutput, .outputLogic = 0, }; - GPIO_PinInit(BOARD_LED_RED_GPIO, BOARD_LED_RED_GPIO_PIN, &led_config); - GPIO_PinInit(BOARD_LED_GREEN_GPIO, BOARD_LED_GREEN_GPIO_PIN, &led_config); - GPIO_PinInit(BOARD_LED_BLUE_GPIO, BOARD_LED_BLUE_GPIO_PIN, &led_config); + LED_RED_INIT(LOGIC_LED_ON); GPIO_SetPinsOutput(BOARD_LED_RED_GPIO, 1 << BOARD_LED_RED_GPIO_PIN); - GPIO_SetPinsOutput(BOARD_LED_GREEN_GPIO, 1 << BOARD_LED_GREEN_GPIO_PIN); - GPIO_SetPinsOutput(BOARD_LED_BLUE_GPIO, 1 << BOARD_LED_BLUE_GPIO_PIN); // Initialize I2C. diff --git a/right/usb_descriptor_device.h b/right/usb_descriptor_device.h index 597d0ab..2bf833f 100644 --- a/right/usb_descriptor_device.h +++ b/right/usb_descriptor_device.h @@ -3,8 +3,8 @@ // Macros: - #define USB_DEVICE_VENDOR_ID 0x16D0 - #define USB_DEVICE_PRODUCT_ID 0x007E // TODO: Change this to 05EA for 6KRO and 05EB for NKRO + #define USB_DEVICE_VENDOR_ID 0x16D3 // TODO: Change this to 15D0 for the final prototype. + #define USB_DEVICE_PRODUCT_ID 0x05EA #define USB_DEVICE_RELEASE_NUMBER 0x0101 #define USB_DEVICE_SPECIFICATION_VERSION 0x0200 diff --git a/right/usb_interface_generic_hid.c b/right/usb_interface_generic_hid.c index 5fa5e05..a48bff8 100644 --- a/right/usb_interface_generic_hid.c +++ b/right/usb_interface_generic_hid.c @@ -55,26 +55,23 @@ static usb_status_t UsbReceiveData() usb_status_t UsbGenericHidCallback(class_handle_t handle, uint32_t event, void *param) { usb_status_t error = kStatus_USB_Error; + uint8_t command; switch (event) { case kUSB_DeviceHidEventSendResponse: break; case kUSB_DeviceHidEventRecvResponse: - GPIO_SetPinsOutput(BOARD_LED_RED_GPIO, 1 << BOARD_LED_RED_GPIO_PIN); - GPIO_SetPinsOutput(BOARD_LED_GREEN_GPIO, 1 << BOARD_LED_GREEN_GPIO_PIN); - GPIO_SetPinsOutput(BOARD_LED_BLUE_GPIO, 1 << BOARD_LED_BLUE_GPIO_PIN); - uint8_t command = GenericHidBuffer[GenericHidBufferIndex][0]; + command = GenericHidBuffer[GenericHidBufferIndex][0]; switch (command) { - case 'r': - GPIO_ClearPinsOutput(BOARD_LED_RED_GPIO, 1 << BOARD_LED_RED_GPIO_PIN); + case '0': + LED_RED_ON(); break; - case 'g': - GPIO_ClearPinsOutput(BOARD_LED_GREEN_GPIO, 1 << BOARD_LED_GREEN_GPIO_PIN); + case '1': + LED_RED_OFF(); break; - case 'b': - GPIO_ClearPinsOutput(BOARD_LED_BLUE_GPIO, 1 << BOARD_LED_BLUE_GPIO_PIN); + default: break; }