uhk/firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove UHK_PCB_MAJOR_VERSION macro conditionals and default to v7.

Browse Source
This commit is contained in:
László Monda
2017-05-23 01:10:41 +02:00
parent 207da96fd3
commit 1b4d27cfa6
4 changed files with 0 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
left/src/bridge_protocol_handler.c
View File

@@ -43,9 +43,7 @@ void BridgeProtocolHandler()
case BridgeCommand_SetLedPwmBrightness: case BridgeCommand_SetLedPwmBrightness:
BridgeTxSize = 0; BridgeTxSize = 0;
uint8_t brightnessPercent = BridgeRxBuffer[1]; uint8_t brightnessPercent = BridgeRxBuffer[1];
#if UHK_PCB_MAJOR_VERSION >= 7
LedPwm_SetBrightness(brightnessPercent); LedPwm_SetBrightness(brightnessPercent);
#endif
break; break;
case BridgeCommand_SetDisableKeyMatrixScanState: case BridgeCommand_SetDisableKeyMatrixScanState:
BridgeTxSize = 0; BridgeTxSize = 0;

4
left/src/led_pwm.c
View File

@@ -2,7 +2,6 @@
#include "fsl_port.h" #include "fsl_port.h"
void LedPwm_Init() { void LedPwm_Init() {
#if UHK_PCB_MAJOR_VERSION >= 7
CLOCK_EnableClock(LED_PWM_CLOCK); CLOCK_EnableClock(LED_PWM_CLOCK);
PORT_SetPinMux(LED_PWM_PORT, LED_PWM_PIN, kPORT_MuxAlt2); PORT_SetPinMux(LED_PWM_PORT, LED_PWM_PIN, kPORT_MuxAlt2);
@@ -21,13 +20,10 @@ void LedPwm_Init() {
kTPM_EdgeAlignedPwm, TPM_PWM_FREQUENCY, TPM_SOURCE_CLOCK); kTPM_EdgeAlignedPwm, TPM_PWM_FREQUENCY, TPM_SOURCE_CLOCK);
TPM_StartTimer(LED_PWM_TPM_BASEADDR, kTPM_SystemClock); TPM_StartTimer(LED_PWM_TPM_BASEADDR, kTPM_SystemClock);
#endif
} }
void LedPwm_SetBrightness(uint8_t brightnessPercent) void LedPwm_SetBrightness(uint8_t brightnessPercent)
{ {
#if UHK_PCB_MAJOR_VERSION >= 7
TPM_UpdatePwmDutycycle(LED_PWM_TPM_BASEADDR, LED_PWM_TPM_CHANNEL, TPM_UpdatePwmDutycycle(LED_PWM_TPM_BASEADDR, LED_PWM_TPM_CHANNEL,
kTPM_EdgeAlignedPwm, 100 - brightnessPercent); kTPM_EdgeAlignedPwm, 100 - brightnessPercent);
#endif
} }

19
left/src/main.c
View File

@@ -5,7 +5,6 @@
key_matrix_t keyMatrix = { key_matrix_t keyMatrix = {
.colNum = KEYBOARD_MATRIX_COLS_NUM, .colNum = KEYBOARD_MATRIX_COLS_NUM,
.rowNum = KEYBOARD_MATRIX_ROWS_NUM, .rowNum = KEYBOARD_MATRIX_ROWS_NUM,
#if UHK_PCB_MAJOR_VERSION >= 7
.cols = (key_matrix_pin_t[]){ .cols = (key_matrix_pin_t[]){
{PORTB, GPIOB, kCLOCK_PortB, 11}, {PORTB, GPIOB, kCLOCK_PortB, 11},
{PORTA, GPIOA, kCLOCK_PortA, 6}, {PORTA, GPIOA, kCLOCK_PortA, 6},
@@ -22,24 +21,6 @@ key_matrix_t keyMatrix = {
{PORTA, GPIOA, kCLOCK_PortA, 7}, {PORTA, GPIOA, kCLOCK_PortA, 7},
{PORTA, GPIOA, kCLOCK_PortA, 4} {PORTA, GPIOA, kCLOCK_PortA, 4}
} }
#else
.cols = (key_matrix_pin_t[]){
{PORTB, GPIOB, kCLOCK_PortB, 11},
{PORTA, GPIOA, kCLOCK_PortA, 6},
{PORTA, GPIOA, kCLOCK_PortA, 8},
{PORTB, GPIOB, kCLOCK_PortB, 0},
{PORTB, GPIOB, kCLOCK_PortB, 6},
{PORTA, GPIOA, kCLOCK_PortA, 3},
{PORTB, GPIOB, kCLOCK_PortB, 5}
},
.rows = (key_matrix_pin_t[]){
{PORTB, GPIOB, kCLOCK_PortB, 7},
{PORTB, GPIOB, kCLOCK_PortB, 10},
{PORTA, GPIOA, kCLOCK_PortA, 5},
{PORTA, GPIOA, kCLOCK_PortA, 7},
{PORTA, GPIOA, kCLOCK_PortA, 4}
}
#endif
}; };
volatile bool DisableKeyMatrixScanState; volatile bool DisableKeyMatrixScanState;

11
left/src/test_led.h
View File

@@ -10,22 +10,11 @@
#define LOGIC_LED_ON 0U #define LOGIC_LED_ON 0U
#define LOGIC_LED_OFF 1U #define LOGIC_LED_OFF 1U
#if UHK_PCB_MAJOR_VERSION >= 7
#define TEST_LED_GPIO GPIOB #define TEST_LED_GPIO GPIOB
#define TEST_LED_PORT PORTB #define TEST_LED_PORT PORTB
#define TEST_LED_CLOCK kCLOCK_PortB #define TEST_LED_CLOCK kCLOCK_PortB
#define TEST_LED_PIN 13 #define TEST_LED_PIN 13
#else
#define TEST_LED_GPIO GPIOA
#define TEST_LED_PORT PORTA
#define TEST_LED_CLOCK kCLOCK_PortA
#define TEST_LED_PIN 12
#endif
#define TEST_LED_ON() GPIO_SetPinsOutput(TEST_LED_GPIO, 1U << TEST_LED_PIN) #define TEST_LED_ON() GPIO_SetPinsOutput(TEST_LED_GPIO, 1U << TEST_LED_PIN)
#define TEST_LED_OFF() GPIO_ClearPinsOutput(TEST_LED_GPIO, 1U << TEST_LED_PIN) #define TEST_LED_OFF() GPIO_ClearPinsOutput(TEST_LED_GPIO, 1U << TEST_LED_PIN)
#define TEST_LED_SET(state) GPIO_WritePinOutput(TEST_LED_GPIO, TEST_LED_PIN, (state)) #define TEST_LED_SET(state) GPIO_WritePinOutput(TEST_LED_GPIO, TEST_LED_PIN, (state))