R keyboards/clueboard/66_hotswap/keymaps/66_ansi/keymap.c => keyboards/clueboard/66_hotswap/gen1/keymaps/66_ansi/keymap.c +16 -0
@@ 1,3 1,19 @@
+/* Copyright 2017 Zach White <skullydazed@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
#include QMK_KEYBOARD_H
// Each layer gets a name for readability, which is then used in the keymap matrix below.
R keyboards/clueboard/66_hotswap/keymaps/66_ansi/readme.md => keyboards/clueboard/66_hotswap/gen1/keymaps/66_ansi/readme.md +0 -0
R keyboards/clueboard/66_hotswap/keymaps/default/keymap.c => keyboards/clueboard/66_hotswap/gen1/keymaps/default/keymap.c +16 -0
@@ 1,3 1,19 @@
+/* Copyright 2017 Zach White <skullydazed@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
#include QMK_KEYBOARD_H
// Each layer gets a name for readability, which is then used in the keymap matrix below.
R keyboards/clueboard/66_hotswap/keymaps/default/readme.md => keyboards/clueboard/66_hotswap/gen1/keymaps/default/readme.md +0 -0
R keyboards/clueboard/66_hotswap/keymaps/json/keymap.json => keyboards/clueboard/66_hotswap/gen1/keymaps/json/keymap.json +0 -0
A keyboards/clueboard/66_hotswap/prototype/keymaps/66_ansi/keymap.c => keyboards/clueboard/66_hotswap/prototype/keymaps/66_ansi/keymap.c +52 -0
@@ 0,0 1,52 @@
+/* Copyright 2017 Zach White <skullydazed@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+#define _BL 0
+#define _FL 1
+#define _CL 2
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ /* Keymap _BL: Base Layer (Default Layer)
+ */
+[_BL] = LAYOUT_66_ansi(
+ KC_GESC,KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,KC_EQL, KC_BSPC, KC_PGUP, \
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC,KC_RBRC,KC_BSLS, KC_PGDN, \
+ KC_CAPS,KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN,KC_QUOT, KC_ENT, \
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH, KC_RSFT, KC_UP, \
+ KC_LCTL,KC_LGUI,KC_LALT, KC_SPC, KC_RALT,MO(_FL),KC_RCTL,KC_LEFT,KC_DOWN,KC_RGHT),
+
+ /* Keymap _FL: Function Layer
+ */
+[_FL] = LAYOUT_66_ansi(
+ KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_VOLU, \
+ _______,_______,_______,_______,_______,_______,_______,_______,_______,KC_MPRV,KC_MPLY,KC_MNXT,_______,KC_MUTE, KC_VOLD, \
+ _______,_______,MO(_CL),_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, \
+ _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, KC_PGUP, \
+ _______,_______,_______, _______, _______,MO(_FL),_______,KC_HOME,KC_PGDN,KC_END),
+
+ /* Keymap _CL: Control layer
+ */
+[_CL] = LAYOUT_66_ansi(
+ BL_STEP,RGB_M_P,RGB_M_B,RGB_M_R,RGB_M_SW,RGB_M_SN,RGB_M_K,RGB_M_X,RGB_M_G,_______,_______,_______,_______, RGB_TOG, RGB_VAI, \
+ _______,_______,_______,_______,RESET, _______,_______,_______,_______,_______,_______,_______,_______,_______, RGB_VAD, \
+ _______,_______,MO(_CL),_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, \
+ _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, RGB_SAI, \
+ _______,_______,_______, RGB_MOD, _______,MO(_FL),_______,RGB_HUD,RGB_SAD,RGB_HUI),
+};
A keyboards/clueboard/66_hotswap/prototype/keymaps/66_ansi/readme.md => keyboards/clueboard/66_hotswap/prototype/keymaps/66_ansi/readme.md +11 -0
@@ 0,0 1,11 @@
+
+
+# Basic Clueboard 66% Hotswap Layout
+
+This is the default layout that comes flashed on every Clueboard. For the most
+part it's a straightforward and easy to follow layout. The only unusual key is
+the key in the upper left, which sends Escape normally, but Grave when any of
+the Ctrl, Alt, or GUI modifiers are held down.
+
+This uses `LAYOUT_66_ansi`, which is compatable with the `66_ansi` community
+layout.
A keyboards/clueboard/66_hotswap/prototype/keymaps/default/keymap.c => keyboards/clueboard/66_hotswap/prototype/keymaps/default/keymap.c +139 -0
@@ 0,0 1,139 @@
+/* Copyright 2017 Zach White <skullydazed@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+#define _BL 0
+#define _FL 1
+#define _CL 2
+
+enum custom_keycodes {
+ S_BSKTC = SAFE_RANGE,
+ S_ODEJY,
+ S_RCKBY,
+ S_DOEDR,
+ S_SCALE,
+ S_ONEUP,
+ S_COIN,
+ S_SONIC,
+ S_ZELDA
+};
+
+#ifdef AUDIO_ENABLE
+ float song_basketcase[][2] = SONG(BASKET_CASE);
+ float song_ode_to_joy[][2] = SONG(ODE_TO_JOY);
+ float song_rock_a_bye_baby[][2] = SONG(ROCK_A_BYE_BABY);
+ float song_doe_a_deer[][2] = SONG(DOE_A_DEER);
+ float song_scale[][2] = SONG(MUSIC_SCALE_SOUND);
+ float song_coin[][2] = SONG(COIN_SOUND);
+ float song_one_up[][2] = SONG(ONE_UP_SOUND);
+ float song_sonic_ring[][2] = SONG(SONIC_RING);
+ float song_zelda_puzzle[][2] = SONG(ZELDA_PUZZLE);
+#endif
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ /* Keymap _BL: Base Layer (Default Layer)
+ */
+[_BL] = LAYOUT(
+ KC_GESC,KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,KC_EQL, KC_BSPC, KC_PGUP, \
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC,KC_RBRC,KC_BSLS, KC_PGDN, \
+ KC_CAPS,KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN,KC_QUOT, KC_ENT, \
+ KC_LSFT, KC_NUHS,KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH, KC_NUBS,KC_RSFT, KC_UP, \
+ KC_LCTL,KC_LGUI,KC_LALT, KC_SPC, KC_SPC, KC_RGUI,KC_RALT,MO(_FL),KC_RCTL,KC_LEFT,KC_DOWN,KC_RGHT),
+
+ /* Keymap _FL: Function Layer
+ */
+[_FL] = LAYOUT(
+ KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_VOLU, \
+ _______,_______,_______,_______,_______,_______,_______,_______,_______,KC_MPRV,KC_MPLY,KC_MNXT,_______,KC_MUTE, KC_VOLD, \
+ _______,_______,MO(_CL),_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, \
+ _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______, KC_PGUP, \
+ _______,_______,_______, _______,_______, _______,_______,MO(_FL),_______,KC_HOME,KC_PGDN,KC_END),
+
+ /* Keymap _CL: Control layer
+ */
+[_CL] = LAYOUT(
+ BL_STEP,S_ONEUP,S_SCALE,RGB_M_R,RGB_M_SW,RGB_M_SN,RGB_M_K,RGB_M_X,RGB_M_G,_______,_______,_______,_______, BL_TOGG, BL_INC, \
+ _______,_______,_______,_______,RESET, _______,_______,_______,_______,_______,_______,_______,_______,_______, BL_DEC, \
+ _______,_______,MO(_CL),_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, \
+ _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, RGB_SAI, \
+ _______,_______,_______, BL_BRTG,BL_BRTG, _______,_______,MO(_FL),_______,RGB_HUD,RGB_SAD,RGB_HUI),
+};
+
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+ switch (keycode) {
+ #ifdef AUDIO_ENABLE
+ case S_BSKTC:
+ if (record->event.pressed) {
+ stop_all_notes();
+ PLAY_SONG(song_basketcase);
+ }
+ return false;
+ case S_ODEJY:
+ if (record->event.pressed) {
+ stop_all_notes();
+ PLAY_SONG(song_ode_to_joy);
+ }
+ return false;
+ case S_RCKBY:
+ if (record->event.pressed) {
+ stop_all_notes();
+ PLAY_SONG(song_rock_a_bye_baby);
+ }
+ return false;
+ case S_DOEDR:
+ if (record->event.pressed) {
+ stop_all_notes();
+ PLAY_SONG(song_doe_a_deer);
+ }
+ return false;
+ case S_SCALE:
+ if (record->event.pressed) {
+ stop_all_notes();
+ PLAY_SONG(song_scale);
+ }
+ return false;
+ case S_ONEUP:
+ if (record->event.pressed) {
+ stop_all_notes();
+ PLAY_SONG(song_one_up);
+ }
+ return false;
+ case S_COIN:
+ if (record->event.pressed) {
+ stop_all_notes();
+ PLAY_SONG(song_coin);
+ }
+ return false;
+ case S_SONIC:
+ if (record->event.pressed) {
+ stop_all_notes();
+ PLAY_SONG(song_sonic_ring);
+ }
+ return false;
+ case S_ZELDA:
+ if (record->event.pressed) {
+ stop_all_notes();
+ PLAY_SONG(song_zelda_puzzle);
+ }
+ return false;
+ #endif
+ }
+ return true;
+}
A keyboards/clueboard/66_hotswap/prototype/keymaps/default/readme.md => keyboards/clueboard/66_hotswap/prototype/keymaps/default/readme.md +8 -0
@@ 0,0 1,8 @@
+
+
+# Default Clueboard 66% Hotswap Layout
+
+This is the default layout that comes flashed on every Clueboard. For the most
+part it's a straightforward and easy to follow layout. The only unusual key is
+the key in the upper left, which sends Escape normally, but Grave when any of
+the Ctrl, Alt, or GUI modifiers are held down.
M quantum/audio/luts.h => quantum/audio/luts.h +2 -8
@@ 16,14 16,8 @@
#pragma once
-#if defined(__AVR__)
-# include <avr/io.h>
-# include <avr/interrupt.h>
-# include <avr/pgmspace.h>
-#else
-# include <ch.h>
-# include <hal.h>
-#endif
+#include <float.h>
+#include <stdint.h>
#define VIBRATO_LUT_LENGTH 20
M quantum/audio/voices.h => quantum/audio/voices.h +0 -3
@@ 18,9 18,6 @@
#include <stdint.h>
#include <stdbool.h>
-#if defined(__AVR__)
-# include <avr/io.h>
-#endif
#include "wait.h"
#include "luts.h"
M quantum/keymap_common.c => quantum/keymap_common.c +0 -4
@@ 19,10 19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "report.h"
#include "keycode.h"
#include "action_layer.h"
-#if defined(__AVR__)
-# include <util/delay.h>
-# include <stdio.h>
-#endif
#include "action.h"
#include "action_macro.h"
#include "debug.h"
M quantum/quantum.h => quantum/quantum.h +1 -10
@@ 15,16 15,7 @@
*/
#pragma once
-#if defined(__AVR__)
-# include <avr/pgmspace.h>
-# include <avr/io.h>
-# include <avr/interrupt.h>
-#endif
-#if defined(PROTOCOL_CHIBIOS)
-# include <hal.h>
-# include "chibios_config.h"
-#endif
-
+#include "platform.h"
#include "wait.h"
#include "matrix.h"
#include "keymap.h"
M quantum/rgblight/rgblight.c => quantum/rgblight/rgblight.c +3 -11
@@ 16,17 16,6 @@
#include <math.h>
#include <string.h>
#include <stdlib.h>
-#ifdef __AVR__
-# include <avr/eeprom.h>
-# include <avr/interrupt.h>
-#endif
-#ifdef EEPROM_ENABLE
-# include "eeprom.h"
-#endif
-#ifdef STM32_EEPROM_ENABLE
-# include <hal.h>
-# include "eeprom_stm32.h"
-#endif
#include "wait.h"
#include "progmem.h"
#include "sync_timer.h"
@@ 35,6 24,9 @@
#include "debug.h"
#include "led_tables.h"
#include <lib/lib8tion/lib8tion.h>
+#ifdef EEPROM_ENABLE
+# include "eeprom.h"
+#endif
#ifdef VELOCIKEY_ENABLE
# include "velocikey.h"
#endif
M quantum/rgblight/rgblight.h => quantum/rgblight/rgblight.h +1 -4
@@ 169,15 169,12 @@ enum RGBLIGHT_EFFECT_MODE {
#include <stdint.h>
#include <stdbool.h>
+#include "progmem.h"
#include "eeconfig.h"
#include "ws2812.h"
#include "color.h"
#include "rgblight_list.h"
-#if defined(__AVR__)
-# include <avr/pgmspace.h>
-#endif
-
#ifdef RGBLIGHT_LAYERS
typedef struct {
uint8_t index; // The first LED to light
A tmk_core/common/arm_atsam/platform.h => tmk_core/common/arm_atsam/platform.h +18 -0
@@ 0,0 1,18 @@
+/* Copyright 2021 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+// here just to please the build
A tmk_core/common/avr/platform.h => tmk_core/common/avr/platform.h +20 -0
@@ 0,0 1,20 @@
+/* Copyright 2021 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include <avr/pgmspace.h>
+#include <avr/io.h>
+#include <avr/interrupt.h>
A tmk_core/common/chibios/platform.h => tmk_core/common/chibios/platform.h +19 -0
@@ 0,0 1,19 @@
+/* Copyright 2021 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include <hal.h>
+#include "chibios_config.h"
M tmk_core/common/print.h => tmk_core/common/print.h +1 -1
@@ 47,7 47,7 @@ void print_set_sendchar(sendchar_func_t func);
# define uprintln(s) printf(s "\r\n")
# define uprintf printf
-# endif /* __AVR__ / PROTOCOL_CHIBIOS / PROTOCOL_ARM_ATSAM */
+# endif /* __has_include_next("_print.h") */
#else /* NO_PRINT */
# undef xprintf
// Remove print defines
M tmk_core/common/timer.h => tmk_core/common/timer.h +0 -1
@@ 23,7 23,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#endif
#include <stdint.h>
-#include <stdbool.h>
#define TIMER_DIFF(a, b, max) ((max == UINT8_MAX) ? ((uint8_t)((a) - (b))) : ((max == UINT16_MAX) ? ((uint16_t)((a) - (b))) : ((max == UINT32_MAX) ? ((uint32_t)((a) - (b))) : ((a) >= (b) ? (a) - (b) : (max) + 1 - (b) + (a)))))
#define TIMER_DIFF_8(a, b) TIMER_DIFF(a, b, UINT8_MAX)