aboutsummaryrefslogtreecommitdiffstats
path: root/keyboards/treadstone48/common
diff options
context:
space:
mode:
authormarksard <38324387+marksard@users.noreply.github.com>2020-01-14 03:06:40 +0900
committerDrashna Jaelre <drashna@live.com>2020-01-13 10:06:40 -0800
commit240e1ef6fd4b3356f3d21a50b0a0ad6c0673b1dd (patch)
tree2bb6492f22a39e389a8e5fe2bdb56e2de6558d55 /keyboards/treadstone48/common
parent1b8cb95f2e56acf09bb66e779b800ae14aa074e5 (diff)
downloadfirmware-240e1ef6fd4b3356f3d21a50b0a0ad6c0673b1dd.tar.gz
firmware-240e1ef6fd4b3356f3d21a50b0a0ad6c0673b1dd.tar.bz2
firmware-240e1ef6fd4b3356f3d21a50b0a0ad6c0673b1dd.zip
[Keyboard] Rebuild treadstone48 rev1 firmware (#7856)
* Keyboard: add treeadstone48 * rename layout defines * Use of pragma once * move common include code * fixed info.json * change keymap layout from kc to normal * fix alpha revision keymap * fixed info.json * remove USE_Link_Time_Optimization * I re-created treastone48 keyboard firmware from ./util/new_keyboard.sh After that I use common OLED_DRIVER, RGB_LIGHT and SPLIT_KEYBOARD options. And then check all keymap. * Modified by PR review
Diffstat (limited to 'keyboards/treadstone48/common')
-rw-r--r--keyboards/treadstone48/common/oled_helper.c25
-rw-r--r--keyboards/treadstone48/common/oled_helper.h28
2 files changed, 27 insertions, 26 deletions
diff --git a/keyboards/treadstone48/common/oled_helper.c b/keyboards/treadstone48/common/oled_helper.c
index 500d3c0dc..18d8681a4 100644
--- a/keyboards/treadstone48/common/oled_helper.c
+++ b/keyboards/treadstone48/common/oled_helper.c
@@ -1,8 +1,9 @@
-#ifdef SSD1306OLED
+#ifdef OLED_DRIVER_ENABLE
#include QMK_KEYBOARD_H
-#include "ssd1306.h"
+#include <stdio.h>
+#include <string.h>
-void render_logo(struct CharacterMatrix *matrix) {
+void render_logo(void) {
const char logo_buf[]={
0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x91,0x92,0x93,0x94,
@@ -10,10 +11,10 @@ void render_logo(struct CharacterMatrix *matrix) {
0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,0xd0,0xd1,0xd2,0xd3,0xd4,
0};
- matrix_write(matrix, logo_buf);
+ oled_write(logo_buf, false);
}
-static char keylog_buf[24] = "Key state ready.";
+static char keylog_buf[24] = "Key state ready.\n";
const char code_to_name[60] = {
' ', ' ', ' ', ' ', 'a', 'b', 'c', 'd', 'e', 'f',
'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p',
@@ -27,14 +28,14 @@ void update_key_status(uint16_t keycode, keyrecord_t *record) {
if (!record->event.pressed) return;
char name = (keycode < 60) ? code_to_name[keycode] : ' ';
- snprintf(keylog_buf, sizeof(keylog_buf) - 1, "Key:%dx%d %2x %c",
+ snprintf(keylog_buf, sizeof(keylog_buf) - 1, "Key:%dx%d %2x %c\n",
record->event.key.row, record->event.key.col,
(uint16_t)keycode, name);
}
-void render_key_status(struct CharacterMatrix *matrix) {
+void render_key_status(void) {
- matrix_write(matrix, keylog_buf);
+ oled_write(keylog_buf, false);
}
static char lock_buf[24] = "Lock state ready.\n";
@@ -48,9 +49,9 @@ void update_lock_status(void) {
num_lock, caps_lock, scrl_lock);
}
-void render_lock_status(struct CharacterMatrix *matrix) {
+void render_lock_status(void) {
- matrix_write(matrix, lock_buf);
+ oled_write(lock_buf, false);
}
#ifdef RGBLIGHT_ENABLE
@@ -75,9 +76,9 @@ void update_led_status(void) {
}
}
-void render_led_status(struct CharacterMatrix *matrix) {
+void render_led_status(void) {
- matrix_write(matrix, led_buf);
+ oled_write(led_buf, false);
}
#endif
#endif
diff --git a/keyboards/treadstone48/common/oled_helper.h b/keyboards/treadstone48/common/oled_helper.h
index 44628a526..69ab70560 100644
--- a/keyboards/treadstone48/common/oled_helper.h
+++ b/keyboards/treadstone48/common/oled_helper.h
@@ -1,35 +1,35 @@
-#ifdef SSD1306OLED
+#ifdef OLED_DRIVER_ENABLE
-void render_logo(struct CharacterMatrix *matrix);
+void render_logo(void);
void update_key_status(uint16_t keycode, keyrecord_t *record);
-void render_key_status(struct CharacterMatrix *matrix);
+void render_key_status(void);
void update_lock_status(void);
-void render_lock_status(struct CharacterMatrix *matrix);
+void render_lock_status(void);
-#define RENDER_LOGO(a) render_logo(a)
+#define RENDER_LOGO() render_logo()
#define UPDATE_KEY_STATUS(a, b) update_key_status(a, b)
-#define RENDER_KEY_STATUS(a) render_key_status(a)
+#define RENDER_KEY_STATUS() render_key_status()
#define UPDATE_LOCK_STATUS() update_lock_status()
-#define RENDER_LOCK_STATUS(a) render_lock_status(a)
+#define RENDER_LOCK_STATUS() render_lock_status()
#ifdef RGBLIGHT_ENABLE
void update_led_status(void);
- void render_led_status(struct CharacterMatrix *matrix);
+ void render_led_status(void);
#define UPDATE_LED_STATUS() update_led_status()
- #define RENDER_LED_STATUS(a) render_led_status(a)
+ #define RENDER_LED_STATUS() render_led_status()
#else
#define UPDATE_LED_STATUS()
- #define RENDER_LED_STATUS(a)
+ #define RENDER_LED_STATUS()
#endif
#else
-#define RENDER_LOGO(a)
+#define RENDER_LOGO()
#define UPDATE_KEY_STATUS(a, b)
-#define RENDER_KEY_STATUS(a)
+#define RENDER_KEY_STATUS()
#define UPDATE_LOCK_STATUS()
-#define RENDER_LOCK_STATUS(a)
+#define RENDER_LOCK_STATUS()
#define UPDATE_LED_STATUS()
-#define RENDER_LED_STATUS(a)
+#define RENDER_LED_STATUS()
#endif