drashna/qmk_firmware
1
0
Fork 0
Code Activity Actions

[Keyboard] Hadron keymap and config updates (#5632)

Browse source 
* 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 2019-04-16 17:49:24 -04:00 • committed by Drashna Jaelre
parent 93b7fccad6
commit 0a6beab224
11 changed files with 90 additions and 275 deletions
Download patch file Download diff file Expand all files Collapse all files

38
keyboards/hadron/ver3/ver3.c
View file

@ -16,9 +16,36 @@
#include "ver3.h"
#include "qwiic.h"
#include "action_layer.h"
#include "matrix.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
/* screen off after this many milliseconds */
@ -41,7 +68,7 @@ void draw_ui(void) {
send_command(DISPLAYON);
/* Layer indicator is 41 x 10 pixels */
#define LAYER_INDICATOR_X 0
#define LAYER_INDICATOR_X 5
#define LAYER_INDICATOR_Y 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);
/* Matrix display is 19 x 9 pixels */
#define MATRIX_DISPLAY_X 0
#define MATRIX_DISPLAY_X 5
#define MATRIX_DISPLAY_Y 18
for (uint8_t x = 0; x < MATRIX_ROWS; x++) {
@ -184,5 +211,10 @@ if (queue_for_send) {
send_command(DISPLAYOFF); /* 0xAE */
}
#endif
if (counterst == 0) {
//testPatternFB(o_fb);
}
counterst = (counterst + 1) % 1024;
//rgblight_task();
matrix_scan_user();
}