summaryrefslogtreecommitdiffstats
path: root/keyboards/crkbd/keymaps
diff options
context:
space:
mode:
authormarksard <38324387+marksard@users.noreply.github.com>2018-09-04 01:34:16 +0200
committerDrashna Jaelre <drashna@live.com>2018-09-04 01:34:16 +0200
commit35efcc9f398a1a2493b482dd1bd7c859f93ef450 (patch)
tree004b44e13067b8793ad9523340ce0539977bf8b9 /keyboards/crkbd/keymaps
parentfa1ee47cf2293d06693b86e8dd188d9fbc9338c4 (diff)
downloadqmk_firmware-35efcc9f398a1a2493b482dd1bd7c859f93ef450.tar.gz
qmk_firmware-35efcc9f398a1a2493b482dd1bd7c859f93ef450.tar.xz
Keyboard: Improvement of crkbd communication functions (based on helix-keyboard) (#3798)
* improvement of crkbd communication functions (based on helix-keyboard) * Removed unnecessary code. * Changed read restriction from #define to #pragma once. * Changed from sizeof to defined size. * moved lib folder to crkbdroot. removed warning of ws2812.d
Diffstat (limited to 'keyboards/crkbd/keymaps')
-rw-r--r--keyboards/crkbd/keymaps/default/keymap.c2
-rw-r--r--keyboards/crkbd/keymaps/default/rules.mk14
-rw-r--r--keyboards/crkbd/keymaps/lib/host_led_state_reader.c15
-rw-r--r--keyboards/crkbd/keymaps/lib/keylogger.c45
-rw-r--r--keyboards/crkbd/keymaps/lib/layer_state_reader.c35
-rw-r--r--keyboards/crkbd/keymaps/lib/logo_reader.c11
-rw-r--r--keyboards/crkbd/keymaps/lib/mode_icon_reader.c15
-rw-r--r--keyboards/crkbd/keymaps/lib/rgb_state_reader.c15
-rw-r--r--keyboards/crkbd/keymaps/lib/timelogger.c16
-rw-r--r--keyboards/crkbd/keymaps/like_jis/keymap.c2
-rw-r--r--keyboards/crkbd/keymaps/like_jis/rules.mk14
11 files changed, 14 insertions, 170 deletions
diff --git a/keyboards/crkbd/keymaps/default/keymap.c b/keyboards/crkbd/keymaps/default/keymap.c
index 87661d345..e92fbdebf 100644
--- a/keyboards/crkbd/keymaps/default/keymap.c
+++ b/keyboards/crkbd/keymaps/default/keymap.c
@@ -5,7 +5,6 @@
#include "split_util.h"
#endif
#ifdef SSD1306OLED
- #include "LUFA/Drivers/Peripheral/TWI.h"
#include "ssd1306.h"
#endif
@@ -130,7 +129,6 @@ void matrix_init_user(void) {
#endif
//SSD1306 OLED init, make sure to add #define SSD1306OLED in config.h
#ifdef SSD1306OLED
- TWI_Init(TWI_BIT_PRESCALE_1, TWI_BITLENGTH_FROM_FREQ(1, 800000));
iota_gfx_init(!has_usb()); // turns on the display
#endif
}
diff --git a/keyboards/crkbd/keymaps/default/rules.mk b/keyboards/crkbd/keymaps/default/rules.mk
index 6570e2f5c..0edf1181f 100644
--- a/keyboards/crkbd/keymaps/default/rules.mk
+++ b/keyboards/crkbd/keymaps/default/rules.mk
@@ -21,10 +21,10 @@ SWAP_HANDS_ENABLE = no # Enable one-hand typing
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
# If you want to change the display of OLED, you need to change here
-SRC += ../lib/rgb_state_reader.c \
- ../lib/layer_state_reader.c \
- ../lib/logo_reader.c \
- ../lib/keylogger.c \
- # ../lib/mode_icon_reader.c \
- # ../lib/host_led_state_reader.c \
- # ../lib/timelogger.c \
+SRC += ./lib/rgb_state_reader.c \
+ ./lib/layer_state_reader.c \
+ ./lib/logo_reader.c \
+ ./lib/keylogger.c \
+ # ./lib/mode_icon_reader.c \
+ # ./lib/host_led_state_reader.c \
+ # ./lib/timelogger.c \
diff --git a/keyboards/crkbd/keymaps/lib/host_led_state_reader.c b/keyboards/crkbd/keymaps/lib/host_led_state_reader.c
deleted file mode 100644
index 41ac55dc2..000000000
--- a/keyboards/crkbd/keymaps/lib/host_led_state_reader.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include <stdio.h>
-#include "crkbd.h"
-
-char host_led_state_str[24];
-
-const char *read_host_led_state(void)
-{
- uint8_t leds = host_keyboard_leds();
- snprintf(host_led_state_str, sizeof(host_led_state_str), "NL:%s CL:%s SL:%s",
- (leds & (1 << USB_LED_NUM_LOCK)) ? "on" : "- ",
- (leds & (1 << USB_LED_CAPS_LOCK)) ? "on" : "- ",
- (leds & (1 << USB_LED_SCROLL_LOCK)) ? "on" : "- ");
-
- return host_led_state_str;
-}
diff --git a/keyboards/crkbd/keymaps/lib/keylogger.c b/keyboards/crkbd/keymaps/lib/keylogger.c
deleted file mode 100644
index 8f2a8ce3c..000000000
--- a/keyboards/crkbd/keymaps/lib/keylogger.c
+++ /dev/null
@@ -1,45 +0,0 @@
-#include <stdio.h>
-#include "crkbd.h"
-
-char keylog_str[24] = {};
-char keylogs_str[21] = {};
-int keylogs_str_idx = 0;
-
-const char code_to_name[60] = {
- ' ', ' ', ' ', ' ', 'a', 'b', 'c', 'd', 'e', 'f',
- 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p',
- 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
- '1', '2', '3', '4', '5', '6', '7', '8', '9', '0',
- 'R', 'E', 'B', 'T', ' ', ' ', ' ', ' ', ' ', ' ',
- ' ', ';', '\'', ' ', ',', '.', '/', ' ', ' ', ' '};
-
-void set_keylog(uint16_t keycode, keyrecord_t *record) {
- char name = ' ';
- if (keycode < 60) {
- name = code_to_name[keycode];
- }
-
- // update keylog
- snprintf(keylog_str, sizeof(keylog_str), "%dx%d, k%2d : %c",
- record->event.key.row, record->event.key.col,
- keycode, name);
-
- // update keylogs
- if (keylogs_str_idx == sizeof(keylogs_str) - 1) {
- keylogs_str_idx = 0;
- for (int i = 0; i < sizeof(keylogs_str) - 1; i++) {
- keylogs_str[i] = ' ';
- }
- }
-
- keylogs_str[keylogs_str_idx] = name;
- keylogs_str_idx++;
-}
-
-const char *read_keylog(void) {
- return keylog_str;
-}
-
-const char *read_keylogs(void) {
- return keylogs_str;
-}
diff --git a/keyboards/crkbd/keymaps/lib/layer_state_reader.c b/keyboards/crkbd/keymaps/lib/layer_state_reader.c
deleted file mode 100644
index eddb71337..000000000
--- a/keyboards/crkbd/keymaps/lib/layer_state_reader.c
+++ /dev/null
@@ -1,35 +0,0 @@
-
-#include QMK_KEYBOARD_H
-#include <stdio.h>
-#include "crkbd.h"
-
-#define L_BASE 0
-#define L_LOWER 8
-#define L_RAISE 16
-#define L_ADJUST 65536
-#define L_ADJUST_TRI 65560
-
-char layer_state_str[24];
-
-const char *read_layer_state(void) {
- switch (layer_state)
- {
- case L_BASE:
- snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Default");
- break;
- case L_RAISE:
- snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Raise");
- break;
- case L_LOWER:
- snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Lower");
- break;
- case L_ADJUST:
- case L_ADJUST_TRI:
- snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Adjust");
- break;
- default:
- snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Undef-%ld", layer_state);
- }
-
- return layer_state_str;
-}
diff --git a/keyboards/crkbd/keymaps/lib/logo_reader.c b/keyboards/crkbd/keymaps/lib/logo_reader.c
deleted file mode 100644
index 1bc1503a6..000000000
--- a/keyboards/crkbd/keymaps/lib/logo_reader.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "crkbd.h"
-
-const char *read_logo(void) {
- static char logo[] = {
- 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94,
- 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3, 0xb4,
- 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3, 0xd4,
- 0};
-
- return logo;
-}
diff --git a/keyboards/crkbd/keymaps/lib/mode_icon_reader.c b/keyboards/crkbd/keymaps/lib/mode_icon_reader.c
deleted file mode 100644
index 04c226506..000000000
--- a/keyboards/crkbd/keymaps/lib/mode_icon_reader.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include <stdio.h>
-#include "crkbd.h"
-
-char mode_icon[24];
-
-const char *read_mode_icon(bool swap) {
- static char logo[][2][3] = {{{0x95, 0x96, 0}, {0xb5, 0xb6, 0}}, {{0x97, 0x98, 0}, {0xb7, 0xb8, 0}}};
- if (swap == false) {
- snprintf(mode_icon, sizeof(mode_icon), "%s\n%s", logo[0][0], logo[0][1]);
- } else {
- snprintf(mode_icon, sizeof(mode_icon), "%s\n%s", logo[1][0], logo[1][1]);
- }
-
- return mode_icon;
-}
diff --git a/keyboards/crkbd/keymaps/lib/rgb_state_reader.c b/keyboards/crkbd/keymaps/lib/rgb_state_reader.c
deleted file mode 100644
index e0efe2e52..000000000
--- a/keyboards/crkbd/keymaps/lib/rgb_state_reader.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifdef RGBLIGHT_ENABLE
-
-#include QMK_KEYBOARD_H
-#include <stdio.h>
-
-extern rgblight_config_t rgblight_config;
-char rbf_info_str[24];
-const char *read_rgb_info(void) {
-
- snprintf(rbf_info_str, sizeof(rbf_info_str), "%s %2d h%3d s%3d v%3d",
- rgblight_config.enable ? "on" : "- ", rgblight_config.mode,
- rgblight_config.hue, rgblight_config.sat, rgblight_config.val);
- return rbf_info_str;
-}
-#endif
diff --git a/keyboards/crkbd/keymaps/lib/timelogger.c b/keyboards/crkbd/keymaps/lib/timelogger.c
deleted file mode 100644
index 69828a3a0..000000000
--- a/keyboards/crkbd/keymaps/lib/timelogger.c
+++ /dev/null
@@ -1,16 +0,0 @@
-#include <stdio.h>
-#include "crkbd.h"
-
-char timelog_str[24] = {};
-int last_time = 0;
-int elapsed_time = 0;
-
-void set_timelog(void) {
- elapsed_time = timer_elapsed(last_time);
- last_time = timer_read();
- snprintf(timelog_str, sizeof(timelog_str), "lt:%5d, et:%5d", last_time, elapsed_time);
-}
-
-const char *read_timelog(void) {
- return timelog_str;
-}
diff --git a/keyboards/crkbd/keymaps/like_jis/keymap.c b/keyboards/crkbd/keymaps/like_jis/keymap.c
index 31b5230b1..90e5b7ec1 100644
--- a/keyboards/crkbd/keymaps/like_jis/keymap.c
+++ b/keyboards/crkbd/keymaps/like_jis/keymap.c
@@ -5,7 +5,6 @@
#include "split_util.h"
#endif
#ifdef SSD1306OLED
- #include "LUFA/Drivers/Peripheral/TWI.h"
#include "ssd1306.h"
#endif
@@ -124,7 +123,6 @@ void matrix_init_user(void) {
#endif
//SSD1306 OLED init, make sure to add #define SSD1306OLED in config.h
#ifdef SSD1306OLED
- TWI_Init(TWI_BIT_PRESCALE_1, TWI_BITLENGTH_FROM_FREQ(1, 800000));
iota_gfx_init(!has_usb()); // turns on the display
#endif
}
diff --git a/keyboards/crkbd/keymaps/like_jis/rules.mk b/keyboards/crkbd/keymaps/like_jis/rules.mk
index 6570e2f5c..0edf1181f 100644
--- a/keyboards/crkbd/keymaps/like_jis/rules.mk
+++ b/keyboards/crkbd/keymaps/like_jis/rules.mk
@@ -21,10 +21,10 @@ SWAP_HANDS_ENABLE = no # Enable one-hand typing
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
# If you want to change the display of OLED, you need to change here
-SRC += ../lib/rgb_state_reader.c \
- ../lib/layer_state_reader.c \
- ../lib/logo_reader.c \
- ../lib/keylogger.c \
- # ../lib/mode_icon_reader.c \
- # ../lib/host_led_state_reader.c \
- # ../lib/timelogger.c \
+SRC += ./lib/rgb_state_reader.c \
+ ./lib/layer_state_reader.c \
+ ./lib/logo_reader.c \
+ ./lib/keylogger.c \
+ # ./lib/mode_icon_reader.c \
+ # ./lib/host_led_state_reader.c \
+ # ./lib/timelogger.c \