[Keyboard] Hadron keymap and config updates (#5632)
* update hadron keymaps, code cleanup * keymap update * refactor custom matrix to use quantum matrix defines * fix wrong pin for matrix
This commit is contained in:
ishtob
Drashna Jaelre
parent
93b7fccad6
commit
0a6beab224
11 changed files with 90 additions and 275 deletions
|
|
@ -48,7 +48,7 @@
|
||||||
* @details Frequency of the system timer that drives the system ticks. This
|
* @details Frequency of the system timer that drives the system ticks. This
|
||||||
* setting also defines the system tick time unit.
|
* setting also defines the system tick time unit.
|
||||||
*/
|
*/
|
||||||
#define CH_CFG_ST_FREQUENCY 100000
|
#define CH_CFG_ST_FREQUENCY 1000
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Time delta constant for the tick-less mode.
|
* @brief Time delta constant for the tick-less mode.
|
||||||
|
|
@ -58,7 +58,7 @@
|
||||||
* The value one is not valid, timeouts are rounded up to
|
* The value one is not valid, timeouts are rounded up to
|
||||||
* this value.
|
* this value.
|
||||||
*/
|
*/
|
||||||
#define CH_CFG_ST_TIMEDELTA 2
|
#define CH_CFG_ST_TIMEDELTA 0
|
||||||
|
|
||||||
/** @} */
|
/** @} */
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -27,6 +27,28 @@
|
||||||
#define MATRIX_ROWS 5
|
#define MATRIX_ROWS 5
|
||||||
#define MATRIX_COLS 15
|
#define MATRIX_COLS 15
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Keyboard Matrix Assignments
|
||||||
|
*
|
||||||
|
* Change this to how you wired your keyboard
|
||||||
|
* COLS: AVR pins used for columns, left to right
|
||||||
|
* ROWS: AVR pins used for rows, top to bottom
|
||||||
|
* DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
|
||||||
|
* ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
#undef MATRIX_ROW_PINS
|
||||||
|
#undef MATRIX_COL_PINS
|
||||||
|
|
||||||
|
#define MATRIX_ROW_PINS { C15, C14, A10, A9, A8 }
|
||||||
|
#define MATRIX_COL_PINS { B8, B2, B10, A0, A1, A2, B0, A3, B1, A6, A7, B12, C13, B11, B9 }
|
||||||
|
#define UNUSED_PINS
|
||||||
|
|
||||||
|
#define NUMBER_OF_ENCODERS 1
|
||||||
|
#define ENCODERS_PAD_A { B13 }
|
||||||
|
#define ENCODERS_PAD_B { B14 }
|
||||||
|
|
||||||
|
|
||||||
//Audio
|
//Audio
|
||||||
#undef AUDIO_VOICES
|
#undef AUDIO_VOICES
|
||||||
#undef C6_AUDIO
|
#undef C6_AUDIO
|
||||||
|
|
@ -55,16 +77,6 @@
|
||||||
#define micro_oled_rotate_180
|
#define micro_oled_rotate_180
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
/*
|
|
||||||
* Keyboard Matrix Assignments
|
|
||||||
*
|
|
||||||
* Change this to how you wired your keyboard
|
|
||||||
* COLS: AVR pins used for columns, left to right
|
|
||||||
* ROWS: AVR pins used for rows, top to bottom
|
|
||||||
* DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
|
|
||||||
* ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
|
/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
|
||||||
#define DEBOUNCE 6
|
#define DEBOUNCE 6
|
||||||
|
|
@ -185,13 +197,13 @@
|
||||||
#define ZC_DET_TIME 0
|
#define ZC_DET_TIME 0
|
||||||
#define AUTO_CAL_TIME 3
|
#define AUTO_CAL_TIME 3
|
||||||
|
|
||||||
//#define RGBLIGHT_ANIMATIONS
|
#define RGBLIGHT_ANIMATIONS
|
||||||
|
|
||||||
//#define RGBLED_NUM 10
|
#define RGBLED_NUM 10
|
||||||
//#define RGB_DI_PIN B5
|
#define RGB_DI_PIN B5
|
||||||
//#define DRIVER_LED_TOTAL RGBLED_NUM
|
#define DRIVER_LED_TOTAL RGBLED_NUM
|
||||||
|
|
||||||
//#define RGB_MATRIX_KEYPRESSES
|
// #define RGB_MATRIX_KEYPRESSES
|
||||||
|
|
||||||
#define SOLENOID_PIN A14
|
#define SOLENOID_PIN A14
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -111,7 +111,7 @@
|
||||||
* @brief Enables the PWM subsystem.
|
* @brief Enables the PWM subsystem.
|
||||||
*/
|
*/
|
||||||
#if !defined(HAL_USE_PWM) || defined(__DOXYGEN__)
|
#if !defined(HAL_USE_PWM) || defined(__DOXYGEN__)
|
||||||
#define HAL_USE_PWM FALSE
|
#define HAL_USE_PWM TRUE
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
|
|
@ -175,19 +175,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||||
|
|
||||||
/* Adjust (Lower + Raise)
|
/* Adjust (Lower + Raise)
|
||||||
* ,------+------+------+------+------+------------------------------------------------.
|
* ,------+------+------+------+------+------------------------------------------------.
|
||||||
* | Esc | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - |
|
* | Reset|HPT TG|HPT FB|HPT M+|HPT M-|HPT RS| | | | | |EEP RS|
|
||||||
* |------+------+------+------+------+------+------+------+------+------+------+------+--------------------.
|
* |------+------+------+------+------+------+------+------+------+------+------+------+--------------------.
|
||||||
* | Reset|RGB TG|RGB ST|RGBH -|RGBH +|RGBS -|RGBS +|RGBV -|RGBV +| | | | | | Del |
|
* | |RGB TG|RGB ST|RGBH -|RGBH +|RGBS -|RGBS +|RGBV -|RGBV +| | | | | | Del |
|
||||||
* |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
|
* |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
|
||||||
* | | | |Aud on|Audoff|AGnorm| | | |AGswap|Qwerty|Colemk| | | |
|
* | | | |Aud on|Audoff|AGnorm| | | |AGswap|Qwerty|Colemk| | | |
|
||||||
* |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
|
* |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
|
||||||
* | |Voice-|Voice+|Mus on|Musoff| | | | | | | | BL + |BL ST |BL TG |
|
* | |Voice-|Voice+|Mus on|Musoff| | | | | | |BL - | BL + |BL ST |BL TG |
|
||||||
* |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
|
* |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
|
||||||
* | | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | |CK RS |CK - |CK + |CK TG |
|
||||||
* `--------------------------------------------------------------------------------------------------------'
|
* `--------------------------------------------------------------------------------------------------------'
|
||||||
*/
|
*/
|
||||||
[_ADJUST] = LAYOUT(
|
[_ADJUST] = LAYOUT(
|
||||||
RESET, HPT_TOG, HPT_FBK, HPT_MODI, HPT_MODD, HPT_RST , _______, _______, _______, _______, _______, _______, \
|
RESET, HPT_TOG, HPT_FBK, HPT_MODI, HPT_MODD, HPT_RST , _______, _______, _______, _______, _______, EEP_RST, \
|
||||||
_______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, KC_DEL, \
|
_______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, KC_DEL, \
|
||||||
_______, _______, _______, AU_ON, AU_OFF, AG_NORM, _______, _______, _______, AG_SWAP, QWERTY, COLEMAK, _______, _______, _______, \
|
_______, _______, _______, AU_ON, AU_OFF, AG_NORM, _______, _______, _______, AG_SWAP, QWERTY, COLEMAK, _______, _______, _______, \
|
||||||
_______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, BL_DEC, BL_INC, BL_STEP, BL_TOGG, \
|
_______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, BL_DEC, BL_INC, BL_STEP, BL_TOGG, \
|
||||||
|
|
|
||||||
|
|
@ -153,19 +153,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||||
|
|
||||||
/* Adjust (Lower + Raise)
|
/* Adjust (Lower + Raise)
|
||||||
* ,------+------+------+------+------+------------------------------------------------.
|
* ,------+------+------+------+------+------------------------------------------------.
|
||||||
* | Esc | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - |
|
* | Reset|HPT TG|HPT FB|HPT M+|HPT M-|HPT RS| | | | | |EEP RS|
|
||||||
* |------+------+------+------+------+------+------+------+------+------+------+------+--------------------.
|
* |------+------+------+------+------+------+------+------+------+------+------+------+--------------------.
|
||||||
* | Reset|RGB TG|RGB ST|RGBH -|RGBH +|RGBS -|RGBS +|RGBV -|RGBV +| | | | | | Del |
|
* | |RGB TG|RGB ST|RGBH -|RGBH +|RGBS -|RGBS +|RGBV -|RGBV +| | | | | | Del |
|
||||||
* |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
|
* |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
|
||||||
* | | | |Aud on|Audoff|AGnorm| | | |AGswap|Qwerty|Colemk| | | |
|
* | | | |Aud on|Audoff|AGnorm| | | |AGswap|Qwerty|Colemk| | | |
|
||||||
* |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
|
* |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
|
||||||
* | |Voice-|Voice+|Mus on|Musoff| | | | | | | | BL + |BL ST |BL TG |
|
* | |Voice-|Voice+|Mus on|Musoff| | | | | | |BL - | BL + |BL ST |BL TG |
|
||||||
* |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
|
* |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
|
||||||
* | | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | |CK RS |CK - |CK + |CK TG |
|
||||||
* `--------------------------------------------------------------------------------------------------------'
|
* `--------------------------------------------------------------------------------------------------------'
|
||||||
*/
|
*/
|
||||||
[_ADJUST] = LAYOUT_wrapper(
|
[_ADJUST] = LAYOUT_wrapper(
|
||||||
_______, HPT_TOG, HPT_FBK, HPT_MODI, HPT_MODD, HPT_RST, _______, _______, _______, _______, _______, _______, \
|
_______, HPT_TOG, HPT_FBK, HPT_MODI, HPT_MODD, HPT_RST, _______, _______, _______, _______, _______, EEP_RST, \
|
||||||
RESET, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, KC_DEL, \
|
RESET, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, KC_DEL, \
|
||||||
_______, MAGIC_TOGGLE_NKRO, _______, AU_ON, AU_OFF, AG_NORM, _______, _______, _______, AG_SWAP, QWERTY, COLEMAK, _______, _______, _______, \
|
_______, MAGIC_TOGGLE_NKRO, _______, AU_ON, AU_OFF, AG_NORM, _______, _______, _______, AG_SWAP, QWERTY, COLEMAK, _______, _______, _______, \
|
||||||
_______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, BL_DEC, BL_INC, BL_STEP, BL_TOGG, \
|
_______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, BL_DEC, BL_INC, BL_STEP, BL_TOGG, \
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,8 @@ When adding your keymap to this list, keep it organised alphabetically (select l
|
||||||
|
|
||||||
* **folder_name** description
|
* **folder_name** description
|
||||||
|
|
||||||
# List of Planck keymaps
|
# List of Hadron keymaps
|
||||||
|
|
||||||
* **default** default Planck layout
|
* **default** default Hadron layout
|
||||||
* **cbbrowne** cbbrowne's Planck layout
|
* **ishtob** ishtob's Hadron layout
|
||||||
|
* **sebaslayout** sebaslayout's Hadron layout
|
||||||
|
|
@ -1,195 +0,0 @@
|
||||||
#include <string.h>
|
|
||||||
#include "hal.h"
|
|
||||||
#include "timer.h"
|
|
||||||
#include "wait.h"
|
|
||||||
#include "printf.h"
|
|
||||||
#include "backlight.h"
|
|
||||||
#include "matrix.h"
|
|
||||||
#include "action.h"
|
|
||||||
#include "keycode.h"
|
|
||||||
|
|
||||||
/* matrix state(1:on, 0:off) */
|
|
||||||
static matrix_row_t matrix[MATRIX_ROWS];
|
|
||||||
static matrix_row_t matrix_debouncing[MATRIX_COLS];
|
|
||||||
static bool debouncing = false;
|
|
||||||
static uint16_t debouncing_time = 0;
|
|
||||||
|
|
||||||
static uint8_t encoder_state = 0;
|
|
||||||
static int8_t encoder_value = 0;
|
|
||||||
static int8_t encoder_LUT[] = { 0, -1, 1, 0, 1, 0, 0, -1, -1, 0, 0, 1, 0, 1, -1, 0 };
|
|
||||||
|
|
||||||
__attribute__ ((weak))
|
|
||||||
void matrix_init_user(void) {}
|
|
||||||
|
|
||||||
__attribute__ ((weak))
|
|
||||||
void matrix_scan_user(void) {}
|
|
||||||
|
|
||||||
__attribute__ ((weak))
|
|
||||||
void matrix_init_kb(void) {
|
|
||||||
matrix_init_user();
|
|
||||||
}
|
|
||||||
|
|
||||||
__attribute__ ((weak))
|
|
||||||
void matrix_scan_kb(void) {
|
|
||||||
matrix_scan_user();
|
|
||||||
}
|
|
||||||
|
|
||||||
void matrix_init(void) {
|
|
||||||
printf("matrix init\n");
|
|
||||||
//debug_matrix = true;
|
|
||||||
|
|
||||||
// encoder setup
|
|
||||||
palSetPadMode(GPIOB, 13, PAL_MODE_INPUT_PULLUP);
|
|
||||||
palSetPadMode(GPIOB, 14, PAL_MODE_INPUT_PULLUP);
|
|
||||||
|
|
||||||
encoder_state = (palReadPad(GPIOB, 13) << 0) | (palReadPad(GPIOB, 14) << 1);
|
|
||||||
|
|
||||||
// actual matrix setup
|
|
||||||
palSetPadMode(GPIOB, 8, PAL_MODE_OUTPUT_PUSHPULL);
|
|
||||||
palSetPadMode(GPIOB, 2, PAL_MODE_OUTPUT_PUSHPULL);
|
|
||||||
palSetPadMode(GPIOB, 10, PAL_MODE_OUTPUT_PUSHPULL);
|
|
||||||
palSetPadMode(GPIOA, 0, PAL_MODE_OUTPUT_PUSHPULL);
|
|
||||||
palSetPadMode(GPIOA, 1, PAL_MODE_OUTPUT_PUSHPULL);
|
|
||||||
palSetPadMode(GPIOA, 2, PAL_MODE_OUTPUT_PUSHPULL);
|
|
||||||
palSetPadMode(GPIOB, 0, PAL_MODE_OUTPUT_PUSHPULL);
|
|
||||||
palSetPadMode(GPIOA, 3, PAL_MODE_OUTPUT_PUSHPULL);
|
|
||||||
palSetPadMode(GPIOB, 1, PAL_MODE_OUTPUT_PUSHPULL);
|
|
||||||
palSetPadMode(GPIOA, 6, PAL_MODE_OUTPUT_PUSHPULL);
|
|
||||||
palSetPadMode(GPIOA, 7, PAL_MODE_OUTPUT_PUSHPULL);
|
|
||||||
palSetPadMode(GPIOB, 12, PAL_MODE_OUTPUT_PUSHPULL);
|
|
||||||
palSetPadMode(GPIOC, 13, PAL_MODE_OUTPUT_PUSHPULL);
|
|
||||||
palSetPadMode(GPIOB, 11, PAL_MODE_OUTPUT_PUSHPULL);
|
|
||||||
palSetPadMode(GPIOB, 9, PAL_MODE_OUTPUT_PUSHPULL);
|
|
||||||
|
|
||||||
palSetPadMode(GPIOC, 15, PAL_MODE_INPUT_PULLDOWN);
|
|
||||||
palSetPadMode(GPIOC, 14, PAL_MODE_INPUT_PULLDOWN);
|
|
||||||
palSetPadMode(GPIOA, 10, PAL_MODE_INPUT_PULLDOWN);
|
|
||||||
palSetPadMode(GPIOA, 9, PAL_MODE_INPUT_PULLDOWN);
|
|
||||||
palSetPadMode(GPIOA, 8, PAL_MODE_INPUT_PULLDOWN);
|
|
||||||
|
|
||||||
|
|
||||||
memset(matrix, 0, MATRIX_ROWS * sizeof(matrix_row_t));
|
|
||||||
memset(matrix_debouncing, 0, MATRIX_COLS * sizeof(matrix_row_t));
|
|
||||||
|
|
||||||
|
|
||||||
matrix_init_quantum();
|
|
||||||
}
|
|
||||||
|
|
||||||
__attribute__ ((weak))
|
|
||||||
void encoder_update(bool clockwise) { }
|
|
||||||
|
|
||||||
#ifndef ENCODER_RESOLUTION
|
|
||||||
#define ENCODER_RESOLUTION 4
|
|
||||||
#endif
|
|
||||||
|
|
||||||
uint8_t matrix_scan(void) {
|
|
||||||
// encoder on B13 and B14
|
|
||||||
encoder_state <<= 2;
|
|
||||||
encoder_state |= (palReadPad(GPIOB, 13) << 0) | (palReadPad(GPIOB, 14) << 1);
|
|
||||||
encoder_value += encoder_LUT[encoder_state & 0xF];
|
|
||||||
if (encoder_value >= ENCODER_RESOLUTION) {
|
|
||||||
encoder_update(0);
|
|
||||||
}
|
|
||||||
if (encoder_value <= -ENCODER_RESOLUTION) { // direction is arbitrary here, but this clockwise
|
|
||||||
encoder_update(1);
|
|
||||||
}
|
|
||||||
encoder_value %= ENCODER_RESOLUTION;
|
|
||||||
|
|
||||||
// actual matrix
|
|
||||||
for (int col = 0; col < MATRIX_COLS; col++) {
|
|
||||||
matrix_row_t data = 0;
|
|
||||||
|
|
||||||
// strobe col { PB8, PB2, PB10, PA0, PA1, PA2, PB0, PA3, PB1, PA6, PA7, PB1, PA6, PA7, PB12, PC3, PB11, }
|
|
||||||
switch (col) {
|
|
||||||
case 0: palSetPad(GPIOB, 8); break;
|
|
||||||
case 1: palSetPad(GPIOB, 2); break;
|
|
||||||
case 2: palSetPad(GPIOB, 10); break;
|
|
||||||
case 3: palSetPad(GPIOA, 0); break;
|
|
||||||
case 4: palSetPad(GPIOA, 1); break;
|
|
||||||
case 5: palSetPad(GPIOA, 2); break;
|
|
||||||
case 6: palSetPad(GPIOB, 0); break;
|
|
||||||
case 7: palSetPad(GPIOA, 3); break;
|
|
||||||
case 8: palSetPad(GPIOB, 1); break;
|
|
||||||
case 9: palSetPad(GPIOA, 6); break;
|
|
||||||
case 10: palSetPad(GPIOA, 7); break;
|
|
||||||
case 11: palSetPad(GPIOB, 12); break;
|
|
||||||
case 12: palSetPad(GPIOC, 13); break;
|
|
||||||
case 13: palSetPad(GPIOB, 11); break;
|
|
||||||
case 14: palSetPad(GPIOB, 9); break;
|
|
||||||
}
|
|
||||||
|
|
||||||
// need wait to settle pin state
|
|
||||||
wait_us(20);
|
|
||||||
|
|
||||||
// read row data { PC15, PC14, PA10, PA9, PA8 }
|
|
||||||
data = (
|
|
||||||
(palReadPad(GPIOC, 15) << 0 ) |
|
|
||||||
(palReadPad(GPIOC, 14) << 1 ) |
|
|
||||||
(palReadPad(GPIOA, 10) << 2 ) |
|
|
||||||
(palReadPad(GPIOA, 9) << 3 ) |
|
|
||||||
(palReadPad(GPIOA, 8) << 4 )
|
|
||||||
);
|
|
||||||
|
|
||||||
// unstrobe col { PB8, PB2, PB10, PA0, PA1, PA2, PB0, PA3, PB1, PA6, PA7, PB1, PA6, PA7, PB12, PC3, PB11, }
|
|
||||||
switch (col) {
|
|
||||||
case 0: palClearPad(GPIOB, 8); break;
|
|
||||||
case 1: palClearPad(GPIOB, 2); break;
|
|
||||||
case 2: palClearPad(GPIOB, 10); break;
|
|
||||||
case 3: palClearPad(GPIOA, 0); break;
|
|
||||||
case 4: palClearPad(GPIOA, 1); break;
|
|
||||||
case 5: palClearPad(GPIOA, 2); break;
|
|
||||||
case 6: palClearPad(GPIOB, 0); break;
|
|
||||||
case 7: palClearPad(GPIOA, 3); break;
|
|
||||||
case 8: palClearPad(GPIOB, 1); break;
|
|
||||||
case 9: palClearPad(GPIOA, 6); break;
|
|
||||||
case 10: palClearPad(GPIOA, 7); break;
|
|
||||||
case 11: palClearPad(GPIOB, 12); break;
|
|
||||||
case 12: palClearPad(GPIOC, 13); break;
|
|
||||||
case 13: palClearPad(GPIOB, 11); break;
|
|
||||||
case 14: palClearPad(GPIOB, 9); break;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (matrix_debouncing[col] != data) {
|
|
||||||
matrix_debouncing[col] = data;
|
|
||||||
debouncing = true;
|
|
||||||
debouncing_time = timer_read();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (debouncing && timer_elapsed(debouncing_time) > DEBOUNCE) {
|
|
||||||
for (int row = 0; row < MATRIX_ROWS; row++) {
|
|
||||||
matrix[row] = 0;
|
|
||||||
for (int col = 0; col < MATRIX_COLS; col++) {
|
|
||||||
matrix[row] |= ((matrix_debouncing[col] & (1 << row) ? 1 : 0) << col);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
debouncing = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
matrix_scan_quantum();
|
|
||||||
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool matrix_is_on(uint8_t row, uint8_t col) {
|
|
||||||
return (matrix[row] & (1<<col));
|
|
||||||
}
|
|
||||||
|
|
||||||
matrix_row_t matrix_get_row(uint8_t row) {
|
|
||||||
return matrix[row];
|
|
||||||
}
|
|
||||||
|
|
||||||
void matrix_print(void) {
|
|
||||||
printf("\nr/c 01234567\n");
|
|
||||||
for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
|
|
||||||
printf("%X0: ", row);
|
|
||||||
matrix_row_t data = matrix_get_row(row);
|
|
||||||
for (int col = 0; col < MATRIX_COLS; col++) {
|
|
||||||
if (data & (1<<col))
|
|
||||||
printf("1");
|
|
||||||
else
|
|
||||||
printf("0");
|
|
||||||
}
|
|
||||||
printf("\n");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -225,7 +225,7 @@
|
||||||
* ST driver system settings.
|
* ST driver system settings.
|
||||||
*/
|
*/
|
||||||
#define STM32_ST_IRQ_PRIORITY 8
|
#define STM32_ST_IRQ_PRIORITY 8
|
||||||
#define STM32_ST_USE_TIMER 2
|
#define STM32_ST_USE_TIMER 3
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* UART driver system settings.
|
* UART driver system settings.
|
||||||
|
|
|
||||||
|
|
@ -1,57 +1,25 @@
|
||||||
# project specific files
|
# projecct specific files
|
||||||
SRC = matrix.c
|
|
||||||
|
|
||||||
## chip/board settings
|
|
||||||
# - the next two should match the directories in
|
|
||||||
# <chibios>/os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES)
|
|
||||||
MCU_FAMILY = STM32
|
|
||||||
MCU_SERIES = STM32F3xx
|
|
||||||
|
|
||||||
# Linker script to use
|
|
||||||
# - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/
|
|
||||||
# or <this_dir>/ld/
|
|
||||||
MCU_LDSCRIPT = STM32F303xC
|
|
||||||
|
|
||||||
# Startup code to use
|
|
||||||
# - it should exist in <chibios>/os/common/startup/ARMCMx/compilers/GCC/mk/
|
|
||||||
MCU_STARTUP = stm32f3xx
|
|
||||||
|
|
||||||
# Board: it should exist either in <chibios>/os/hal/boards/
|
|
||||||
# or <this_dir>/boards
|
|
||||||
BOARD = GENERIC_STM32_F303XC
|
|
||||||
|
|
||||||
# Cortex version
|
# Cortex version
|
||||||
MCU = cortex-m4
|
MCU = STM32F303
|
||||||
|
|
||||||
# ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7
|
|
||||||
ARMV = 7
|
|
||||||
|
|
||||||
USE_FPU = yes
|
|
||||||
|
|
||||||
# Vector table for application
|
|
||||||
# 0x00000000-0x00001000 area is occupied by bootlaoder.*/
|
|
||||||
# The CORTEX_VTOR... is needed only for MCHCK/Infinity KB
|
|
||||||
# OPT_DEFS = -DCORTEX_VTOR_INIT=0x08005000
|
|
||||||
OPT_DEFS =
|
|
||||||
|
|
||||||
# Options to pass to dfu-util when flashing
|
|
||||||
DFU_ARGS = -d 0483:df11 -a 0 -s 0x08000000:leave
|
|
||||||
|
|
||||||
# Build Options
|
# Build Options
|
||||||
# comment out to disable the options.
|
# comment out to disable the options.
|
||||||
#
|
#
|
||||||
BACKLIGHT_ENABLE = no
|
BACKLIGHT_ENABLE = no
|
||||||
BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration
|
BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration
|
||||||
## (Note that for BOOTMAGIC on Teensy LC you have to use a custom .ld script.)
|
## (Note that for BOOTMAGIC on Teensy LC you have to use a custom .ld script.)
|
||||||
MOUSEKEY_ENABLE = yes # Mouse keys
|
MOUSEKEY_ENABLE = yes # Mouse keys
|
||||||
EXTRAKEY_ENABLE = yes # Audio control and System control
|
EXTRAKEY_ENABLE = yes # Audio control and System control
|
||||||
CONSOLE_ENABLE = no # Console for debug
|
CONSOLE_ENABLE = no # Console for debug
|
||||||
COMMAND_ENABLE = no # Commands for debug and configuration
|
COMMAND_ENABLE = yes # Commands for debug and configuration
|
||||||
#SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend
|
#SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend
|
||||||
NKRO_ENABLE = yes # USB Nkey Rollover
|
NKRO_ENABLE = yes # USB Nkey Rollover
|
||||||
CUSTOM_MATRIX = yes # Custom matrix file
|
CUSTOM_MATRIX = no # Custom matrix file
|
||||||
AUDIO_ENABLE = yes
|
AUDIO_ENABLE = yes
|
||||||
RGBLIGHT_ENABLE = no
|
RGBLIGHT_ENABLE = no
|
||||||
|
RGB_MATRIX_ENABLE = no #WS2812 once arm_rgb is implemented
|
||||||
HAPTIC_ENABLE += DRV2605L
|
HAPTIC_ENABLE += DRV2605L
|
||||||
QWIIC_ENABLE += MICRO_OLED
|
QWIIC_ENABLE += MICRO_OLED
|
||||||
|
ENCODER_ENABLER = yes
|
||||||
# SERIAL_LINK_ENABLE = yes
|
# SERIAL_LINK_ENABLE = yes
|
||||||
|
|
|
||||||
|
|
@ -16,9 +16,36 @@
|
||||||
#include "ver3.h"
|
#include "ver3.h"
|
||||||
#include "qwiic.h"
|
#include "qwiic.h"
|
||||||
#include "action_layer.h"
|
#include "action_layer.h"
|
||||||
#include "matrix.h"
|
|
||||||
#include "haptic.h"
|
#include "haptic.h"
|
||||||
|
|
||||||
|
#ifdef RGB_MATRIX_ENABLE
|
||||||
|
#include "rgblight.h"
|
||||||
|
|
||||||
|
const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
|
||||||
|
/*{row | col << 4}
|
||||||
|
| {x=0..224, y=0..64}
|
||||||
|
| | modifier
|
||||||
|
| | | */
|
||||||
|
{{1|(13<<4)}, {195, 3}, 0},
|
||||||
|
{{4|(13<<4)}, {195, 16}, 0},
|
||||||
|
{{4|(10<<4)}, {150, 16}, 0},
|
||||||
|
{{4|(7<<4)}, {105, 16}, 0},
|
||||||
|
{{4|(4<<4)}, {60, 16}, 0},
|
||||||
|
{{4|(1<<4)}, {15, 16}, 0},
|
||||||
|
{{1|(1<<4)}, {15, 3}, 0},
|
||||||
|
{{1|(4<<4)}, {60, 3}, 0},
|
||||||
|
{{1|(7<<4)}, {105, 3}, 0},
|
||||||
|
{{1|(10<<4)}, {150, 3}, 0}
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
|
uint8_t *o_fb;
|
||||||
|
|
||||||
|
uint16_t counterst = 0;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#ifdef QWIIC_MICRO_OLED_ENABLE
|
#ifdef QWIIC_MICRO_OLED_ENABLE
|
||||||
|
|
||||||
/* screen off after this many milliseconds */
|
/* screen off after this many milliseconds */
|
||||||
|
|
@ -41,7 +68,7 @@ void draw_ui(void) {
|
||||||
send_command(DISPLAYON);
|
send_command(DISPLAYON);
|
||||||
|
|
||||||
/* Layer indicator is 41 x 10 pixels */
|
/* Layer indicator is 41 x 10 pixels */
|
||||||
#define LAYER_INDICATOR_X 0
|
#define LAYER_INDICATOR_X 5
|
||||||
#define LAYER_INDICATOR_Y 0
|
#define LAYER_INDICATOR_Y 0
|
||||||
|
|
||||||
draw_string(LAYER_INDICATOR_X + 1, LAYER_INDICATOR_Y + 2, "LAYER", PIXEL_ON, NORM, 0);
|
draw_string(LAYER_INDICATOR_X + 1, LAYER_INDICATOR_Y + 2, "LAYER", PIXEL_ON, NORM, 0);
|
||||||
|
|
@ -49,7 +76,7 @@ void draw_ui(void) {
|
||||||
draw_char(LAYER_INDICATOR_X + 34, LAYER_INDICATOR_Y + 2, layer + 0x30, PIXEL_ON, XOR, 0);
|
draw_char(LAYER_INDICATOR_X + 34, LAYER_INDICATOR_Y + 2, layer + 0x30, PIXEL_ON, XOR, 0);
|
||||||
|
|
||||||
/* Matrix display is 19 x 9 pixels */
|
/* Matrix display is 19 x 9 pixels */
|
||||||
#define MATRIX_DISPLAY_X 0
|
#define MATRIX_DISPLAY_X 5
|
||||||
#define MATRIX_DISPLAY_Y 18
|
#define MATRIX_DISPLAY_Y 18
|
||||||
|
|
||||||
for (uint8_t x = 0; x < MATRIX_ROWS; x++) {
|
for (uint8_t x = 0; x < MATRIX_ROWS; x++) {
|
||||||
|
|
@ -184,5 +211,10 @@ if (queue_for_send) {
|
||||||
send_command(DISPLAYOFF); /* 0xAE */
|
send_command(DISPLAYOFF); /* 0xAE */
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
if (counterst == 0) {
|
||||||
|
//testPatternFB(o_fb);
|
||||||
|
}
|
||||||
|
counterst = (counterst + 1) % 1024;
|
||||||
|
//rgblight_task();
|
||||||
matrix_scan_user();
|
matrix_scan_user();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
/* Copyright 2018 Jack Humbert <jack.humb@gmail.com>
|
/* Copyright 2018 ishtob
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
|
@ -13,9 +13,6 @@
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
#ifndef VER3_H
|
#pragma once
|
||||||
#define VER3_H
|
|
||||||
|
|
||||||
#include "hadron.h"
|
#include "hadron.h"
|
||||||
|
|
||||||
#endif
|
|
||||||
Loading…
Reference in a new issue