summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2020-06-08 15:49:18 +1000
committerGitHub <noreply@github.com>2020-06-07 22:49:18 -0700
commit407d6a2b6779aa7ef4f87b53521aef3c3854f824 (patch)
tree1356662030acaa56347ce4b56fab3fd127d8f9fa
parentd7523c1260d3154a16d223060a24e32d18ebb1a2 (diff)
[Keyboard] Fix error_log complaint about handwired/onekey layout macro (#9263)
-rw-r--r--keyboards/handwired/onekey/keymaps/adc/keymap.c6
-rw-r--r--keyboards/handwired/onekey/keymaps/backlight/keymap.c45
-rw-r--r--keyboards/handwired/onekey/keymaps/default/keymap.c2
-rw-r--r--keyboards/handwired/onekey/keymaps/default_json/keymap.json14
-rw-r--r--keyboards/handwired/onekey/keymaps/eep_rst/keymap.c2
-rw-r--r--keyboards/handwired/onekey/keymaps/i2c_scanner/keymap.c2
-rw-r--r--keyboards/handwired/onekey/keymaps/reset/keymap.c2
-rw-r--r--keyboards/handwired/onekey/keymaps/rgb/keymap.c8
-rw-r--r--keyboards/handwired/onekey/onekey.h6
-rw-r--r--layouts/community/ortho_1x1/test/keymap.c7
10 files changed, 44 insertions, 50 deletions
diff --git a/keyboards/handwired/onekey/keymaps/adc/keymap.c b/keyboards/handwired/onekey/keymaps/adc/keymap.c
index 6626894fac..00238b8e6c 100644
--- a/keyboards/handwired/onekey/keymaps/adc/keymap.c
+++ b/keyboards/handwired/onekey/keymaps/adc/keymap.c
@@ -7,7 +7,7 @@ enum custom_keycodes {
};
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- LAYOUT(ADC_SAMPLE) //
+ LAYOUT_ortho_1x1(ADC_SAMPLE)
};
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
@@ -16,7 +16,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
if (record->event.pressed) {
int16_t val = analogReadPin(ADC_PIN);
- char buffer [50];
+ char buffer[50];
sprintf(buffer, "ADC:%u\n", val);
#ifdef CONSOLE_ENABLE
printf(buffer);
@@ -30,5 +30,5 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
};
// adc_mux pinToMux(pin_t pin) {
-// return TO_MUX( ADC_CHANNEL_IN1, 0 );
+// return TO_MUX(ADC_CHANNEL_IN1, 0);
// };
diff --git a/keyboards/handwired/onekey/keymaps/backlight/keymap.c b/keyboards/handwired/onekey/keymaps/backlight/keymap.c
index 1f4be16a62..1fbbc632da 100644
--- a/keyboards/handwired/onekey/keymaps/backlight/keymap.c
+++ b/keyboards/handwired/onekey/keymaps/backlight/keymap.c
@@ -2,39 +2,38 @@
//Tap Dance Declarations
enum {
- TD_BL = 0
+ TD_BL = 0
};
-void dance_cln_finished (qk_tap_dance_state_t *state, void *user_data) {
- // noop
+void dance_cln_finished(qk_tap_dance_state_t *state, void *user_data) {
+ // noop
}
-void dance_cln_reset (qk_tap_dance_state_t *state, void *user_data) {
- switch (state->count) {
- case 1:
- // single tap - step through backlight
- backlight_step();
- break;
+void dance_cln_reset(qk_tap_dance_state_t *state, void *user_data) {
+ switch (state->count) {
+ case 1:
+ // single tap - step through backlight
+ backlight_step();
+ break;
#ifdef BACKLIGHT_BREATHING
- case 2:
- // double tap - toggle breathing
- breathing_toggle();
- break;
- case 3:
- //tripple tap - do some pulse stuff
- breathing_pulse();
- break;
+ case 2:
+ // double tap - toggle breathing
+ breathing_toggle();
+ break;
+ case 3:
+ // triple tap - do some pulse stuff
+ breathing_pulse();
+ break;
#endif
- default:
- // more - nothing
- break;
- }
+ default:
+ break;
+ }
}
qk_tap_dance_action_t tap_dance_actions[] = {
- [TD_BL] = ACTION_TAP_DANCE_FN_ADVANCED (NULL, dance_cln_finished, dance_cln_reset)
+ [TD_BL] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, dance_cln_finished, dance_cln_reset)
};
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- LAYOUT( TD(TD_BL) )
+ LAYOUT_ortho_1x1(TD(TD_BL))
};
diff --git a/keyboards/handwired/onekey/keymaps/default/keymap.c b/keyboards/handwired/onekey/keymaps/default/keymap.c
index dd64f9fa55..a5782f7a13 100644
--- a/keyboards/handwired/onekey/keymaps/default/keymap.c
+++ b/keyboards/handwired/onekey/keymaps/default/keymap.c
@@ -1,5 +1,5 @@
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- LAYOUT( KC_A )
+ LAYOUT_ortho_1x1(KC_A)
};
diff --git a/keyboards/handwired/onekey/keymaps/default_json/keymap.json b/keyboards/handwired/onekey/keymaps/default_json/keymap.json
index cf30f37b79..ce4c4b474d 100644
--- a/keyboards/handwired/onekey/keymaps/default_json/keymap.json
+++ b/keyboards/handwired/onekey/keymaps/default_json/keymap.json
@@ -1,9 +1,9 @@
{
- "keyboard":"handwired/onekey/pytest",
- "keymap":"default_json",
- "layout":"LAYOUT",
- "layers":[["KC_A"]],
- "author":"qmk",
- "notes":"This file is a keymap.json file for handwired/onekey/pytest",
- "version":1
+ "keyboard": "handwired/onekey/pytest",
+ "keymap": "default_json",
+ "layout": "LAYOUT_ortho_1x1",
+ "layers": [["KC_A"]],
+ "author": "qmk",
+ "notes": "This file is a keymap.json file for handwired/onekey/pytest",
+ "version": 1
}
diff --git a/keyboards/handwired/onekey/keymaps/eep_rst/keymap.c b/keyboards/handwired/onekey/keymaps/eep_rst/keymap.c
index adb8e4cd2f..3f7a6b8502 100644
--- a/keyboards/handwired/onekey/keymaps/eep_rst/keymap.c
+++ b/keyboards/handwired/onekey/keymaps/eep_rst/keymap.c
@@ -1,5 +1,5 @@
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- LAYOUT( EEP_RST )
+ LAYOUT_ortho_1x1(EEP_RST)
};
diff --git a/keyboards/handwired/onekey/keymaps/i2c_scanner/keymap.c b/keyboards/handwired/onekey/keymaps/i2c_scanner/keymap.c
index 262bd588f2..ea8443709d 100644
--- a/keyboards/handwired/onekey/keymaps/i2c_scanner/keymap.c
+++ b/keyboards/handwired/onekey/keymaps/i2c_scanner/keymap.c
@@ -21,7 +21,7 @@ i2c_status_t i2c_start_bodge(uint8_t address, uint16_t timeout) {
#endif
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- LAYOUT(KC_A) //
+ LAYOUT_ortho_1x1(KC_A)
};
void do_scan(void) {
diff --git a/keyboards/handwired/onekey/keymaps/reset/keymap.c b/keyboards/handwired/onekey/keymaps/reset/keymap.c
index 6a68fda818..ec1b33e64f 100644
--- a/keyboards/handwired/onekey/keymaps/reset/keymap.c
+++ b/keyboards/handwired/onekey/keymaps/reset/keymap.c
@@ -1,5 +1,5 @@
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- LAYOUT( RESET )
+ LAYOUT_ortho_1x1(RESET)
};
diff --git a/keyboards/handwired/onekey/keymaps/rgb/keymap.c b/keyboards/handwired/onekey/keymaps/rgb/keymap.c
index a96c6f3863..c3e77f1ec1 100644
--- a/keyboards/handwired/onekey/keymaps/rgb/keymap.c
+++ b/keyboards/handwired/onekey/keymaps/rgb/keymap.c
@@ -1,11 +1,11 @@
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- LAYOUT( RGB_MOD )
+ LAYOUT_ortho_1x1(RGB_MOD)
};
void keyboard_post_init_user(void) {
- rgblight_enable_noeeprom();
- rgblight_sethsv_noeeprom_cyan();
- rgblight_mode_noeeprom(RGBLIGHT_MODE_RAINBOW_SWIRL);
+ rgblight_enable_noeeprom();
+ rgblight_sethsv_noeeprom_cyan();
+ rgblight_mode_noeeprom(RGBLIGHT_MODE_RAINBOW_SWIRL);
}
diff --git a/keyboards/handwired/onekey/onekey.h b/keyboards/handwired/onekey/onekey.h
index 2924ff3ff8..72cab45be5 100644
--- a/keyboards/handwired/onekey/onekey.h
+++ b/keyboards/handwired/onekey/onekey.h
@@ -18,8 +18,8 @@
#include "quantum.h"
-#define LAYOUT( \
+#define LAYOUT_ortho_1x1( \
k00 \
- ) { \
- { k00 } \
+) { \
+ { k00 } \
}
diff --git a/layouts/community/ortho_1x1/test/keymap.c b/layouts/community/ortho_1x1/test/keymap.c
index 6a186669b0..8821823d99 100644
--- a/layouts/community/ortho_1x1/test/keymap.c
+++ b/layouts/community/ortho_1x1/test/keymap.c
@@ -2,11 +2,6 @@
/* This keyboard/layout is used to test community layout discovery/compilation. */
-#define _DEFAULT 0
-
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-[_DEFAULT] = LAYOUT (
- KC_B
-),
+ LAYOUT_ortho_1x1(KC_B)
};