Hnah108 refactor (#10787)

Co-authored-by: Drashna Jaelre <drashna@live.com>

keyboards/handwired/hnah108/config.h

@@ -20,12 +20,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID 0xFEED
-#define PRODUCT_ID 0x0000
-#define DEVICE_VER 0x0002
+#define VENDOR_ID    0xFEED
+#define PRODUCT_ID   0x0000
+#define DEVICE_VER   0x0002
 #define MANUFACTURER HnahKB
-#define PRODUCT Hnah108
-#define DESCRIPTION Fullsize PCB keyboard 
+#define PRODUCT      Hnah108
 
 /* key matrix size */
 #define MATRIX_ROWS 10
@@ -41,21 +40,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
  *
  */
-#define MATRIX_ROW_PINS \
-    { F7, F6, F5, F4, F1, C7, B4, B5, B6, C6 }
-#define MATRIX_COL_PINS \
-    { F0, E6, B0, D0, D1, D2, D3, D5, D4, D6, D7 }
+#define MATRIX_ROW_PINS { F7, F6, F5, F4, F1, C7, B4, B5, B6, C6 }
+#define MATRIX_COL_PINS { F0, E6, B0, D0, D1, D2, D3, D5, D4, D6, D7 }
 #define UNUSED_PINS
 
-/* COL2ROW, ROW2COL*/
+/* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-
 #define ENCODERS_PAD_A { B2 }
 #define ENCODERS_PAD_B { B3 }
 
-#define ENCODER_RESOLUTION 4
-
 #define BACKLIGHT_PIN B7
 #define BACKLIGHT_BREATHING
 #define BACKLIGHT_LEVELS 4
@@ -63,28 +57,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_DI_PIN E2
 #define DRIVER_LED_TOTAL 31
 
-//   #define RGBLIGHT_HUE_STEP 8
-//   #define RGBLIGHT_SAT_STEP 8
-//   #define RGBLIGHT_VAL_STEP 8
-//   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
-//   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
-// /*== customize breathing effect ==*/
-//   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
-//   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
-//   /*==== use exp() and sin() ====*/
-//   #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
-//   #define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
-
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
 
@@ -97,9 +69,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_RESYNC_ENABLE
 
 /* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
- * This is userful for the Windows task manager shortcut (ctrl+shift+esc).
+ * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
  */
-// #define GRAVE_ESC_CTRL_OVERRIDE
+//#define GRAVE_ESC_CTRL_OVERRIDE
 
 /*
  * Force NKRO
@@ -122,59 +94,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 //#define FORCE_NKRO
 
-/*
- * Magic Key Options
- *
- * Magic keys are hotkey commands that allow control over firmware functions of
- * the keyboard. They are best used in combination with the HID Listen program,
- * found here: https://www.pjrc.com/teensy/hid_listen.html
- *
- * The options below allow the magic key functionality to be changed. This is
- * useful if your keyboard/keypad is missing keys and you want magic key support.
- *
- */
-
-/* key combination for magic key command */
-/* defined by default; to change, uncomment and set to the combination you want */
-// #define IS_COMMAND() (get_mods() == MOD_MASK_SHIFT)
-
-/* control how magic key switches layers */
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS  true
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS  true
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM false
-
-/* override magic key keymap */
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM
-//#define MAGIC_KEY_HELP           H
-//#define MAGIC_KEY_HELP_ALT       SLASH
-//#define MAGIC_KEY_DEBUG          D
-//#define MAGIC_KEY_DEBUG_MATRIX   X
-//#define MAGIC_KEY_DEBUG_KBD      K
-//#define MAGIC_KEY_DEBUG_MOUSE    M
-//#define MAGIC_KEY_VERSION        V
-//#define MAGIC_KEY_STATUS         S
-//#define MAGIC_KEY_CONSOLE        C
-//#define MAGIC_KEY_LAYER0         0
-//#define MAGIC_KEY_LAYER0_ALT     GRAVE
-//#define MAGIC_KEY_LAYER1         1
-//#define MAGIC_KEY_LAYER2         2
-//#define MAGIC_KEY_LAYER3         3
-//#define MAGIC_KEY_LAYER4         4
-//#define MAGIC_KEY_LAYER5         5
-//#define MAGIC_KEY_LAYER6         6
-//#define MAGIC_KEY_LAYER7         7
-//#define MAGIC_KEY_LAYER8         8
-//#define MAGIC_KEY_LAYER9         9
-//#define MAGIC_KEY_BOOTLOADER     B
-//#define MAGIC_KEY_BOOTLOADER_ALT ESC
-//#define MAGIC_KEY_LOCK           CAPS
-//#define MAGIC_KEY_EEPROM         E
-//#define MAGIC_KEY_EEPROM_CLEAR   BSPACE
-//#define MAGIC_KEY_NKRO           N
-//#define MAGIC_KEY_SLEEP_LED      Z
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
@@ -190,29 +109,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
-
-/*
- * MIDI options
- */
-
-/* Prevent use of disabled MIDI features in the keymap */
-//#define MIDI_ENABLE_STRICT 1
-
-/* enable basic MIDI features:
-   - MIDI notes can be sent when in Music mode is on
-*/
-//#define MIDI_BASIC
-
-/* enable advanced MIDI features:
-   - MIDI notes can be added to the keymap
-   - Octave shift and transpose
-   - Virtual sustain, portamento, and modulation wheel
-   - etc.
-*/
-//#define MIDI_ADVANCED
 
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 1
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
 
+/* Bootmagic Lite key configuration */
+//#define BOOTMAGIC_LITE_ROW 0
+//#define BOOTMAGIC_LITE_COLUMN 0

keyboards/handwired/hnah108/hnah108.c

@@ -13,31 +13,35 @@
  * 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 "hnah108.h"
-
 
+#include "hnah108.h"
 
-led_config_t g_led_config = { {
-  //Key Matrix to LED Index
-  {    18,    17,    16,NO_LED,    15,    14,NO_LED,NO_LED,    13,    12,NO_LED},
-  {NO_LED,NO_LED,NO_LED,NO_LED,NO_LED,NO_LED,NO_LED,NO_LED,NO_LED,NO_LED,NO_LED},
-  {19,    NO_LED,NO_LED,NO_LED,NO_LED,NO_LED,NO_LED,NO_LED,NO_LED,NO_LED,NO_LED},
-  {NO_LED,NO_LED,NO_LED,NO_LED,NO_LED,NO_LED,NO_LED,NO_LED,NO_LED,NO_LED,NO_LED},
-  {20,    NO_LED,NO_LED,NO_LED,NO_LED,24    ,NO_LED,NO_LED,26    ,NO_LED,NO_LED},
-  {    21,    22,    23,    25,    27,NO_LED,    28,    29,NO_LED,     0,     1},    
-  {    11,    10,NO_LED,     9,NO_LED,     8,NO_LED,     7,     6,NO_LED,     5},
-  {NO_LED,NO_LED,NO_LED,NO_LED,NO_LED,NO_LED,NO_LED,NO_LED,NO_LED,NO_LED,     4},
-  {NO_LED,NO_LED,NO_LED,NO_LED,NO_LED,NO_LED,NO_LED,NO_LED,NO_LED,NO_LED,     3},
-  {NO_LED,NO_LED,NO_LED,NO_LED,NO_LED,NO_LED,NO_LED,NO_LED,NO_LED,NO_LED,     2}
-}, {
-  //LED Index to Physical Positon
-  {   0,   0},  { 18,  0},  { 37,  0 }, { 56,   0}, {  74,  0},  { 93,  0}, { 112, 0 }, { 130, 0}, { 149,  0}, { 168,  0}, { 186, 0 },  { 205, 0},
-  {   0,  25} ,                                                                                                                         { 205, 25},
-  {   0,  51} ,                                                                                                                         { 205, 51},
-  {   0,  63} , { 18,  63}, { 37, 63},  { 56,  63}, { 74,  63},  { 93, 63}, { 112, 63}, { 130, 63},{ 149, 63}, { 168, 63}, { 186, 63 }, { 205, 63},
-}, {
-  1,1,1,1,1,1,1,1,1,1,1,1,1,
-  1,1,
-  1,1,
-  1,1,1,1,1,1,1,1,1,1,1,1,1,
-} };
+#ifdef RGB_MATRIX_ENABLE
+led_config_t g_led_config = {
+    {
+        // Key Matrix to LED Index
+        {     18,     17,     16, NO_LED,     15,     14, NO_LED, NO_LED,     13,     12, NO_LED },
+        { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED },
+        {     19, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED },
+        { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED },
+        {     20, NO_LED, NO_LED, NO_LED, NO_LED,     24, NO_LED, NO_LED,     26, NO_LED, NO_LED },
+        {     21,     22,     23,     25,     27, NO_LED,     28,     29, NO_LED,      0,      1 },
+        {     11,     10, NO_LED,      9, NO_LED,      8, NO_LED,      7,      6, NO_LED,      5 },
+        { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED,      4 },
+        { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED,      3 },
+        { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED,      2 }
+    }, {
+        // LED Index to Physical Position
+        {   0,   0 }, {  18,   0 }, {  37,   0 }, {  56,   0 }, {  74,   0 }, {  93,   0 }, { 112,   0 }, { 130,   0 }, { 149,   0 }, { 168,   0 }, { 186,   0 }, { 205,   0 },
+        {   0,  25 },                                                                                                                                             { 205,  25 },
+        {   0,  51 },                                                                                                                                             { 205,  51 },
+        {   0,  63 }, {  18,  63 }, {  37,  63 }, {  56,  63 }, {  74,  63 }, {  93,  63 }, { 112,  63 }, { 130,  63 }, { 149,  63 }, { 168,  63 }, { 186,  63 }, { 205,  63 }
+    }, {
+        // LED Index to Flag
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1,                                  1,
+        1,                                  1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
+    }
+};
+#endif

keyboards/handwired/hnah108/hnah108.h

@@ -13,20 +13,21 @@
  * 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 "quantum.h"
 
+#define XXX KC_NO
 
 #define LAYOUT_all( \
-    k00,      k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k60, k61,     k62, k63, k64,      k65, k66, k67, k68, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k70, k71, k72,     k73, k74, k75,      k76, k77, k78, k69,  \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k80, k81, k82,     k83, k84, k85,      k86, k87, k79, k6A, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k91, k93, k94,                         k96, k97, k88, \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k90,      k92,          k95,           k98, k99, k89, k7A, \
-    k50, k51, k52,                k53,                k54, k55, k56, k57,     k58, k59, k5A,      k9A,      k8A \
-) \
-{ \
+    k00,      k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k60, k61,   k62, k63, k64,   k65, k66, k67, k68, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k70, k71, k72,   k73, k74, k75,   k76, k77, k78, k69, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k80, k81, k82,   k83, k84, k85,   k86, k87, k79, k6A, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k91, k93, k94,                    k96, k97, k88, \
+    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k90,      k92,        k95,        k98, k99, k89, k7A, \
+    k50, k51, k52,                k53,                k54, k55, k56, k57,   k58, k59, k5A,   k9A,      k8A \
+) { \
     { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A }, \
     { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A }, \
     { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A }, \
@@ -36,37 +37,45 @@
     { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6A }, \
     { k70, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7A }, \
     { k80, k81, k82, k83, k84, k85, k86, k87, k88, k89, k8A }, \
-    { k90, k91, k92, k93, k94, k95, k96, k97, k98, k99, k9A }, \
+    { k90, k91, k92, k93, k94, k95, k96, k97, k98, k99, k9A } \
 }
 
 #define LAYOUT_fullsize_iso( \
-    k00,      k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k60, k61,     k62, k63, k64,      k65, k66, k67, k68, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k70, k71, k72,     k73, k74, k75,      k76, k77, k78, k69,  \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k80, k81,          k83, k84, k85,      k86, k87, k79, k6A, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k91, k93, k94,                         k96, k97, k88, \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k90,      k92,          k95,           k98, k99, k89, k7A, \
-    k50, k51, k52,                k53,                k54, k55, k56, k57,     k58, k59, k5A,      k9A,      k8A \
-) LAYOUT_all( \
-    k00,      k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k60, k61,     k62, k63, k64,      k65, k66, k67, k68, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k70, k71, k72,     k73, k74, k75,      k76, k77, k78, k69,  \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k80, k81, KC_NO,   k83, k84, k85,      k86, k87, k79, k6A, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k91, k93, k94,                         k96, k97, k88, \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k90,      k92,          k95,           k98, k99, k89, k7A, \
-    k50, k51, k52,                k53,                k54, k55, k56, k57,     k58, k59, k5A,      k9A,      k8A \
-)
+    k00,      k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k60, k61,   k62, k63, k64,   k65, k66, k67, k68, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k70, k71, k72,   k73, k74, k75,   k76, k77, k78, k69, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k80, k81,        k83, k84, k85,   k86, k87, k79, k6A, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k91, k93, k94,                    k96, k97, k88, \
+    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k90,      k92,        k95,        k98, k99, k89, k7A, \
+    k50, k51, k52,                k53,                k54, k55, k56, k57,   k58, k59, k5A,   k9A,      k8A \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A }, \
+    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A }, \
+    { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A }, \
+    { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6A }, \
+    { k70, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7A }, \
+    { k80, k81, XXX, k83, k84, k85, k86, k87, k88, k89, k8A }, \
+    { k90, k91, k92, k93, k94, k95, k96, k97, k98, k99, k9A } \
+}
 
 #define LAYOUT_fullsize_ansi( \
-    k00,      k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k60, k61,     k62, k63, k64,      k65, k66, k67, k68,  \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k70, k71, k72,     k73, k74, k75,      k76, k77, k78, k69,  \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k80, k81, k82,     k83, k84, k85,      k86, k87, k79, k6A, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k91,      k94,                         k96, k97, k88, \
-    k40,      k42, k43, k44, k45, k46, k47, k48, k49, k4A, k90,      k92,          k95,           k98, k99, k89, k7A, \
-    k50, k51, k52,                k53,                k54, k55, k56, k57,     k58, k59, k5A,      k9A,      k8A \
-) LAYOUT_all( \
-    k00,      k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k60, k61,     k62, k63, k64,      k65, k66, k67, k68, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k70, k71, k72,     k73, k74, k75,      k76, k77, k78, k69,  \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k80, k81, k82,     k83, k84, k85,      k86, k87, k79, k6A, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k91,KC_NO,k94,                         k96, k97, k88, \
-    k40,KC_NO,k42, k43, k44, k45, k46, k47, k48, k49, k4A, k90,      k92,          k95,           k98, k99, k89, k7A, \
-    k50, k51, k52,                k53,                k54, k55, k56, k57,     k58, k59, k5A,      k9A,      k8A \
-)
+    k00,      k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k60, k61,   k62, k63, k64,   k65, k66, k67, k68, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k70, k71, k72,   k73, k74, k75,   k76, k77, k78, k69, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k80, k81, k82,   k83, k84, k85,   k86, k87, k79, k6A, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k91,      k94,                    k96, k97, k88, \
+    k40,      k42, k43, k44, k45, k46, k47, k48, k49, k4A, k90,      k92,        k95,        k98, k99, k89, k7A, \
+    k50, k51, k52,                k53,                k54, k55, k56, k57,   k58, k59, k5A,   k9A,      k8A \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A }, \
+    { k40, XXX, k42, k43, k44, k45, k46, k47, k48, k49, k4A }, \
+    { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A }, \
+    { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6A }, \
+    { k70, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7A }, \
+    { k80, k81, k82, k83, k84, k85, k86, k87, k88, k89, k8A }, \
+    { k90, k91, k92, XXX, k94, k95, k96, k97, k98, k99, k9A } \
+}

keyboards/handwired/hnah108/keymaps/default/config.h

@@ -1,19 +0,0 @@
-/* Copyright 2019 HnahKB
- *
- * 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/>.
- */
-
-#pragma once
-
-// place overrides here

keyboards/handwired/hnah108/keymaps/default/keymap.c

@@ -13,67 +13,67 @@
  * 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
 
-enum hnah_layers{
-  _QWERTY,
-  _FN
+enum layer_names {
+    _QWERTY,
+    _FN
 };
 
 #define LOWER MO(_FN)
 #define RAISE MO(_QWERTY)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT_all( /* Base */
-    KC_ESC, 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_PSCR, KC_SLCK, KC_PAUS,    KC_MYCM, KC_CALC, KC_MPLY, LOWER,
-    KC_GRV, 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_INS,  KC_HOME, KC_PGUP,    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
-     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_SLSH,    KC_DEL,  KC_END,  KC_PGDN,    KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
-      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_NUHS, KC_ENT,                                 KC_P4,   KC_P5,   KC_P6, 
-     KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_BSLS,   KC_RSFT,              KC_UP,               KC_P1,   KC_P2,    KC_P3,   KC_PENT,
-     KC_LCTL,  KC_LGUI,  KC_LALT,               KC_SPC,             KC_RALT,  KC_APP,  KC_RGUI, KC_RCTL,  KC_LEFT, KC_DOWN, KC_RGHT,        KC_P0,  KC_PDOT 
-  ),
+    [_QWERTY] = LAYOUT_all(
+        KC_ESC,           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_PSCR, KC_SLCK, KC_PAUS,   KC_MYCM, KC_CALC, KC_MPLY, LOWER,
+
+        KC_GRV,  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_INS,  KC_HOME, KC_PGUP,   KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        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_SLSH,   KC_DEL,  KC_END,  KC_PGDN,   KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
+        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_NUHS, KC_ENT,                                 KC_P4,   KC_P5,   KC_P6,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_BSLS,          KC_RSFT,            KC_UP,              KC_P1,   KC_P2,   KC_P3,   KC_PENT,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_APP,  KC_RGUI, KC_RCTL,   KC_LEFT, KC_DOWN, KC_RGHT,   KC_P0,            KC_PDOT
+    ),
+
+    [_FN] = LAYOUT_all(
+        RESET,            BL_STEP, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_HUI, RGB_HUD, RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, _______, _______,   _______, _______, _______,   _______, _______, _______, _______,
 
-  [_FN] = LAYOUT_all( /* Base */
-    RESET,       BL_STEP,RGB_TOG, RGB_MOD, RGB_RMOD,     RGB_HUI, RGB_HUD, RGB_VAI, RGB_VAD,     RGB_SPI, RGB_SPD, _______, _______,    _______, _______, _______,    _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, KC_VOLU,   _______,     _______, _______, _______,    _______, _______, _______, _______,
-     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______,   _______, _______, _______,    _______,   _______,   _______,   _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                                   _______,   _______,   _______, 
-     _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        _______,                KC_BRIU,             _______,   _______,   _______,   _______,
-     _______,    _______,    _______,                      _______,                   _______,    _______,    _______,   _______,       _______, KC_BRID, _______,          _______,        _______ 
-  ),
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, KC_VOLU, _______,   _______, _______, _______,   _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,   _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                                _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,            KC_BRIU,            _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______,   _______, KC_BRID, _______,   _______,          _______
+    )
 };
 
 void encoder_update_user(uint8_t index, bool clockwise) {
-  if (index == 0) {
-    if (IS_LAYER_ON(_FN)) { 
-    if (clockwise) {
-            tap_code(KC_BRIU);
-    } else {
-            tap_code(KC_BRID);
+    if (index == 0) {
+        if (IS_LAYER_ON(_FN)) {
+            if (clockwise) {
+                tap_code(KC_BRIU);
+            } else {
+                tap_code(KC_BRID);
+            }
+        } else {
+            if (clockwise) {
+                tap_code(KC_VOLU);
+            } else {
+                tap_code(KC_VOLD);
+            }
+        }
     }
-  } else {
-    if (clockwise) {
-            tap_code(KC_VOLU);
+}
+
+void rgb_matrix_indicators_user(void) {
+    led_t led_state = get_host_led_state();
 
+    if (led_state.caps_lock) {
+        rgb_matrix_set_color(30, 0x00, 0xFF, 0x00);
+    } else if (led_state.num_lock) {
+        rgb_matrix_set_color(30, 0xFF, 0x00, 0x00);
+    } else if (led_state.scroll_lock) {
+        rgb_matrix_set_color(30, 0x00, 0x00, 0xFF);
     } else {
-            tap_code(KC_VOLD);
-      }
+        rgb_matrix_set_color(30, 0x00, 0x00, 0x00);
     }
-  }
 }
-
-void rgb_matrix_indicators_user(void)
-{
-        if IS_HOST_LED_ON(USB_LED_CAPS_LOCK)
-        {
-            rgb_matrix_set_color(30, 0x00, 0xFF, 0x00);
-        } else if IS_HOST_LED_ON(USB_LED_NUM_LOCK)
-        {
-            rgb_matrix_set_color(30, 0xFF, 0x00, 0x00);
-        } else if IS_HOST_LED_ON(USB_LED_SCROLL_LOCK)
-        {
-            rgb_matrix_set_color(30, 0x00, 0x00, 0xFF);
-        } else {
-            rgb_matrix_set_color(30, 0x00, 0x00, 0x00);
-        }
-}

keyboards/handwired/hnah108/keymaps/default/readme.md

@@ -1 +1 @@
-# The default keymap for hnah108
+# The default keymap for hnah108

keyboards/handwired/hnah108/readme.md

@@ -1,14 +1,18 @@
 # hnah108
 
-![hnah108](https://i.imgur.com/rV0lM8M.jpg)  
+![hnah108](https://i.imgur.com/rV0lM8Ml.jpg)
 
-A Full size keyboard pcb with rotary encoder. Used ws2811 IC as a indicator LED driver 
+A full size keyboard pcb with rotary encoder. Uses WS2811 IC as an indicator LED driver.
 
-Keyboard Maintainer: [HnahKB](https://github.com/vuhopkep)  
-Hardware Supported: Hnah108 v1  
+* Keyboard Maintainer: [HnahKB](https://github.com/vuhopkep)
+* Hardware Supported: Hnah108 v1
 
 Make example for this keyboard (after setting up your build environment):
 
     make handwired/hnah108:default
 
+Flashing example for this keyboard:
+
+    make handwired/hnah108:default:flash
+
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).

keyboards/handwired/hnah108/rules.mk

@@ -2,33 +2,23 @@
 MCU = atmega32u4
 
 # Bootloader selection
-#   Teensy       halfkay
-#   Pro Micro    caterina
-#   Atmel DFU    atmel-dfu
-#   LUFA DFU     lufa-dfu
-#   QMK DFU      qmk-dfu
-#   ATmega32A    bootloadHID
-#   ATmega328P   USBasp
 BOOTLOADER = atmel-dfu
 
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = lite      # Virtual DIP switch configuration(+1000)
-MOUSEKEY_ENABLE = no       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no        # Console for debug(+400)
-COMMAND_ENABLE = no        # Commands for debug and configuration
+BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
 NKRO_ENABLE = no            # USB Nkey Rollover
-BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
+BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-MIDI_ENABLE = no            # MIDI support (+2400 to 4200, depending on config)
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-AUDIO_ENABLE = no           # Audio output on port C6
-FAUXCLICKY_ENABLE = no      # Use buzzer to emulate clicky switches
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 RGB_MATRIX_ENABLE = WS2812