Clean up source, add editorconfig, improve makefile errors

.editorconfig

@@ -0,0 +1,17 @@
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+
+[*.{md,markdown}]
+indent_style = tab
+indent_size = 2
+
+[Makefile]
+indent_style = tab
+indent_size = 2
+
+[*.c]
+indent_style = space
+indent_size = 4

ergodox-infinity/Makefile

@@ -1,6 +1,17 @@
-ifndef QMK_DIR
+# Check that given variables are set and all have non-empty values,
-	$(error QMK_DIR is not defined)
+# die with an error otherwise.
-endif
+#
+# Params:
+#   1. Variable name(s) to test.
+#   2. (optional) Error message to print.
+check_defined = \
+    $(strip $(foreach 1,$1, \
+        $(call __check_defined,$1,$(strip $(value 2)))))
+__check_defined = \
+    $(if $(value $1),, \
+      $(error Undefined $1$(if $2, ($2))))
+
+$(call check_defined, QMK_DIR)
 
 KEYMAP_NAME = "lytedev"
 ERGODOX_DIR = "${QMK_DIR}/keyboards/ergodox"

ergodox-infinity/keymap.c

@@ -17,7 +17,7 @@ enum custom_keycodes {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-/* Layer 0: Basic
+    /* Layer 0: Basic
      *
      * ,--------------------------------------------------.           ,--------------------------------------------------.
      * |   `    |   1  |   2  |   3  |   4  |   5  |  F11 |           | F12  |   6  |   7  |   8  |   9  |   0  |  Back  |
@@ -39,8 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      *                                 `--------------------'       `--------------------'
      */
 
-[BASE] = KEYMAP(
+    [BASE] = KEYMAP(
-
         // Left Hand
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5, KC_F11,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T, KC_LBRC,
@@ -66,8 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_PSCR, KC_ENT,  KC_SPC
     ),
 
-
+    /* Layer 1: Symbols1
-/* Layer 1: Symbols1
      *
      * ,--------------------------------------------------.           ,--------------------------------------------------.
      * |   ~    |   !  |   @  |   #  |   $  |   %  |  F11 |           | F12  |   ^  |   &  |   *  |   (  |   )  |  Back  |
@@ -89,8 +87,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      *                                 `--------------------'       `--------------------'
      */
 
-[SYM1] = KEYMAP(
+    [SYM1] = KEYMAP(
-
         // Left Hand
         KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_F11,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_LCBR,
@@ -116,7 +113,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         RESET,  KC_ENT,  KC_SPC
     ),
 
-/* Layer 2: Symbols2
+    /* Layer 2: Symbols2
      *
      * ,--------------------------------------------------.           ,--------------------------------------------------.
      * |   `    |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |           |  F7  |  F8  |  F9  | F10  | F11  | F12  |  Back  |
@@ -138,8 +135,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      *                                 `--------------------'       `--------------------'
      */
 
-[SYM2] = KEYMAP(
+    [SYM2] = KEYMAP(
-
         // Left Hand
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,
         KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_LCBR,

ergodox-infinity/readme.md

@@ -25,7 +25,7 @@ This contains my `qmk_firmware`-compatible Infinity Ergodox keymap.
 
 **Note**: You may need to run the `make dfu-left` and `make dfu-right` commands
 as root. In this case, use `sudo -E make dfu-{left,right}` so that you preserve
-the `QMK_DIR` environment variable.
+the `QMK_DIR` environment variable you set previously.
 
 **Tip**: If you don't have an extra keyboard to send the `make dfu` command,
 just prepend `sleep 10 &&` to it to give yourself 10 seconds to hit the flash