Nulo/qmk_firmware
1
0
Fork 0
Code Releases Activity

[Keyboard] Fix error_log complaint about handwired/onekey layout macro (#9263)

Browse source
This commit is contained in:
Ryan 2020-06-08 15:49:18 +10:00 committed by GitHub
parent d7523c1260
commit 407d6a2b67
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 44 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
keyboards/handwired/onekey/keymaps/adc/keymap.c
View file

@ -7,7 +7,7 @@ enum custom_keycodes {
}; };
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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) { 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) { if (record->event.pressed) {
int16_t val = analogReadPin(ADC_PIN); int16_t val = analogReadPin(ADC_PIN);
char buffer [50]; char buffer[50];
sprintf(buffer, "ADC:%u\n", val); sprintf(buffer, "ADC:%u\n", val);
#ifdef CONSOLE_ENABLE #ifdef CONSOLE_ENABLE
printf(buffer); printf(buffer);
@ -30,5 +30,5 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
}; };
// adc_mux pinToMux(pin_t pin) { // adc_mux pinToMux(pin_t pin) {
// return TO_MUX( ADC_CHANNEL_IN1, 0 ); // return TO_MUX(ADC_CHANNEL_IN1, 0);
// }; // };

45
keyboards/handwired/onekey/keymaps/backlight/keymap.c
View file

@ -2,39 +2,38 @@
//Tap Dance Declarations //Tap Dance Declarations
enum { enum {
TD_BL = 0 TD_BL = 0
}; };
void dance_cln_finished (qk_tap_dance_state_t *state, void *user_data) { void dance_cln_finished(qk_tap_dance_state_t *state, void *user_data) {
// noop // noop
} }
void dance_cln_reset (qk_tap_dance_state_t *state, void *user_data) { void dance_cln_reset(qk_tap_dance_state_t *state, void *user_data) {
switch (state->count) { switch (state->count) {
case 1: case 1:
// single tap - step through backlight // single tap - step through backlight
backlight_step(); backlight_step();
break; break;
#ifdef BACKLIGHT_BREATHING #ifdef BACKLIGHT_BREATHING
case 2: case 2:
// double tap - toggle breathing // double tap - toggle breathing
breathing_toggle(); breathing_toggle();
break; break;
case 3: case 3:
//tripple tap - do some pulse stuff // triple tap - do some pulse stuff
breathing_pulse(); breathing_pulse();
break; break;
#endif #endif
default: default:
// more - nothing break;
break; }
}
} }
qk_tap_dance_action_t tap_dance_actions[] = { 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] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
LAYOUT( TD(TD_BL) ) LAYOUT_ortho_1x1(TD(TD_BL))
}; };

2
keyboards/handwired/onekey/keymaps/default/keymap.c
View file

@ -1,5 +1,5 @@
#include QMK_KEYBOARD_H #include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
LAYOUT( KC_A ) LAYOUT_ortho_1x1(KC_A)
}; };

14
keyboards/handwired/onekey/keymaps/default_json/keymap.json
View file

@ -1,9 +1,9 @@
{ {
"keyboard":"handwired/onekey/pytest", "keyboard": "handwired/onekey/pytest",
"keymap":"default_json", "keymap": "default_json",
"layout":"LAYOUT", "layout": "LAYOUT_ortho_1x1",
"layers":[["KC_A"]], "layers": [["KC_A"]],
"author":"qmk", "author": "qmk",
"notes":"This file is a keymap.json file for handwired/onekey/pytest", "notes": "This file is a keymap.json file for handwired/onekey/pytest",
"version":1 "version": 1
} }

2
keyboards/handwired/onekey/keymaps/eep_rst/keymap.c
View file

@ -1,5 +1,5 @@
#include QMK_KEYBOARD_H #include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
LAYOUT( EEP_RST ) LAYOUT_ortho_1x1(EEP_RST)
}; };

2
keyboards/handwired/onekey/keymaps/i2c_scanner/keymap.c
View file

@ -21,7 +21,7 @@ i2c_status_t i2c_start_bodge(uint8_t address, uint16_t timeout) {
#endif #endif
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
LAYOUT(KC_A) // LAYOUT_ortho_1x1(KC_A)
}; };
void do_scan(void) { void do_scan(void) {

2
keyboards/handwired/onekey/keymaps/reset/keymap.c
View file

@ -1,5 +1,5 @@
#include QMK_KEYBOARD_H #include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
LAYOUT( RESET ) LAYOUT_ortho_1x1(RESET)
}; };

8
keyboards/handwired/onekey/keymaps/rgb/keymap.c
View file

@ -1,11 +1,11 @@
#include QMK_KEYBOARD_H #include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
LAYOUT( RGB_MOD ) LAYOUT_ortho_1x1(RGB_MOD)
}; };
void keyboard_post_init_user(void) { void keyboard_post_init_user(void) {
rgblight_enable_noeeprom(); rgblight_enable_noeeprom();
rgblight_sethsv_noeeprom_cyan(); rgblight_sethsv_noeeprom_cyan();
rgblight_mode_noeeprom(RGBLIGHT_MODE_RAINBOW_SWIRL); rgblight_mode_noeeprom(RGBLIGHT_MODE_RAINBOW_SWIRL);
} }

6
keyboards/handwired/onekey/onekey.h
View file

@ -18,8 +18,8 @@
#include "quantum.h" #include "quantum.h"
#define LAYOUT( \ #define LAYOUT_ortho_1x1( \
k00 \ k00 \
) { \ ) { \
{ k00 } \ { k00 } \
} }

7
layouts/community/ortho_1x1/test/keymap.c
View file

@ -2,11 +2,6 @@
/* This keyboard/layout is used to test community layout discovery/compilation. */ /* This keyboard/layout is used to test community layout discovery/compilation. */
#define _DEFAULT 0
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
LAYOUT_ortho_1x1(KC_B)
[_DEFAULT] = LAYOUT (
KC_B
),
}; };