updating keyboards for latest qmk

youknowfred · Nov 28, 2022 · 5c9a77c · 5c9a77c
1 parent acd1840
commit 5c9a77c
Show file tree

Hide file tree

Showing 18 changed files with 66 additions and 69 deletions.
diff --git a/keyboards/jasonhazel/bad_wings/config.h b/keyboards/jasonhazel/bad_wings/config.h
@@ -2,12 +2,6 @@
 
 #include "config_common.h"
 
-#define DEVICE_VER  0x0001
-#define VENDOR_ID   0x4A48 // JH
-#define PRODUCT_ID  0x4257 // BW
-
-#define MANUFACTURER    jasonhazel
-#define PRODUCT         Bad Wings
 
 #define MATRIX_COLS 8
 #define MATRIX_ROWS  5

diff --git a/keyboards/jasonhazel/bad_wings/info.json b/keyboards/jasonhazel/bad_wings/info.json
@@ -0,0 +1,9 @@
+{
+  "keyboard_name": "Bad Wings",
+  "manufacturer": "jasonhazel",
+  "usb": {
+    "vid": "0x4A48",
+    "pid": "0x4257",
+    "device_version": "0.0.1"
+  }
+}
diff --git a/keyboards/jasonhazel/bad_wings/keymaps/default/keymap.c b/keyboards/jasonhazel/bad_wings/keymaps/default/keymap.c
@@ -93,7 +93,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
   [_SYMBOL] = LAYOUT(
     KC_EXLM,    KC_AT,      KC_HASH,    KC_DLR,     KC_PERC,          KC_CIRC,     KC_AMPR,   KC_ASTR,    KC_PIPE,    KC_NO,      \
-    KC_GRV,     KC_TILD,      KC_UNDS,    KC_EQL,     KC_NO,            KC_SBKT,     KC_CBKT,   KC_PARN,    KC_LTGT,  KC_BSLASH,  \
+    KC_GRV,     KC_TILD,      KC_UNDS,    KC_EQL,     KC_NO,            KC_SBKT,     KC_CBKT,   KC_PARN,    KC_LTGT,  KC_BACKSLASH,  \
     KC_NO,      KC_NO,      KC_PLUS,    KC_MINS,    KC_NO,            KC_NO,       KC_NO,     KC_COLN,    KC_DOT,     KC_SCLN,    \
                              KC_LCTL,    KC_OSYM,    KC_OSFT,          KC_SPC,     KC_ONUM,    KC_ENT
   ),

diff --git a/keyboards/jasonhazel/crepe/config.h b/keyboards/jasonhazel/crepe/config.h
@@ -2,12 +2,6 @@
 
 #include "config_common.h"
 
-#define DEVICE_VER		0x0001
-#define VENDOR_ID		  0x4A48 // JH
-#define PRODUCT_ID		0x4350 // cp
-
-#define MANUFACTURER    jasonhazel
-#define PRODUCT         CREPE
 
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 5

diff --git a/keyboards/jasonhazel/crepe/info.json b/keyboards/jasonhazel/crepe/info.json
@@ -0,0 +1,9 @@
+{
+  "keyboard_name": "CREPE",
+  "manufacturer": "jasonhazel",
+  "usb": {
+    "vid": "0x4A48",
+    "pid": "0x4350",
+    "device_version": "0.0.1"
+  }
+}
diff --git a/keyboards/jasonhazel/crepe/keymaps/default/keymap.c b/keyboards/jasonhazel/crepe/keymaps/default/keymap.c
@@ -93,7 +93,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
   [_SYMBOL] = LAYOUT(
     KC_EXLM,    KC_AT,      KC_HASH,    KC_DLR,     KC_PERC,          KC_CIRC,    KC_AMPR,   KC_ASTR,    KC_PIPE,    KC_NO,      \
-    KC_GRV,     KC_TILD,    KC_UNDS,    KC_EQL,     KC_NO,            KC_SBKT,    KC_CBKT,   KC_PARN,    KC_LTGT,    KC_BSLASH,  \
+    KC_GRV,     KC_TILD,    KC_UNDS,    KC_EQL,     KC_NO,            KC_SBKT,    KC_CBKT,   KC_PARN,    KC_LTGT,    KC_BACKSLASH,  \
     KC_NO,      KC_NO,      KC_PLUS,    KC_MINS,    KC_NO,            KC_NO,      KC_NO,     KC_COLN,    KC_DOT,     KC_SCLN,    \
     KC_TAB,     KC_LALT,    KC_LCTL,    KC_OSYM,    KC_OSFT,          KC_SPC,     KC_ONUM,    KC_ENT,     KC_LCTL,    KC_LALT
   ),

diff --git a/keyboards/jasonhazel/dust/config.h b/keyboards/jasonhazel/dust/config.h
@@ -2,12 +2,12 @@
 
 #include "config_common.h"
 
-#define DEVICE_VER  0x0001
-#define VENDOR_ID   0x4A48 // JH
-#define PRODUCT_ID  0x6474 // dt
+// #define DEVICE_VER  0x0001
+// #define VENDOR_ID   0x4A48 // JH
+// #define PRODUCT_ID  0x6474 // dt
 
-#define MANUFACTURER    jasonhazel
-#define PRODUCT         dust
+// #define MANUFACTURER    jasonhazel
+// #define PRODUCT         dust
 
 #define MATRIX_COLS   5
 #define MATRIX_ROWS   8

diff --git a/keyboards/jasonhazel/dust/info.json b/keyboards/jasonhazel/dust/info.json
@@ -0,0 +1,9 @@
+{
+  "keyboard_name": "dust",
+  "manufacturer": "jasonhazel",
+  "usb": {
+    "vid": "0x4A48",
+    "pid": "0x6474",
+    "device_version": "0.0.1"
+  }
+}
diff --git a/keyboards/jasonhazel/dust/keymaps/default/keymap.c b/keyboards/jasonhazel/dust/keymaps/default/keymap.c
@@ -93,7 +93,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
   [_SYMBOL] = LAYOUT(
     KC_EXLM,    KC_AT,      KC_HASH,    KC_DLR,     KC_PERC,          KC_CIRC,     KC_AMPR,   KC_ASTR,    KC_PIPE,    KC_NO,      \
-    KC_GRV,     KC_TILD,    KC_UNDS,    KC_EQL,     KC_NO,            KC_SBKT,     KC_CBKT,   KC_PARN,    KC_LTGT,    KC_BSLASH,  \
+    KC_GRV,     KC_TILD,    KC_UNDS,    KC_EQL,     KC_NO,            KC_SBKT,     KC_CBKT,   KC_PARN,    KC_LTGT,    KC_BACKSLASH,  \
     KC_NO,      KC_NO,      KC_PLUS,    KC_MINS,    KC_NO,            KC_NO,       KC_NO,     KC_COLN,    KC_DOT,     KC_SCLN,    \
                                         KC_OSYM,    KC_OSFT,          KC_SPC,     KC_ONUM
   ),

diff --git a/keyboards/jasonhazel/glitch/config.h b/keyboards/jasonhazel/glitch/config.h
@@ -2,13 +2,6 @@
 
 #include "config_common.h"
 
-#define DEVICE_VER		0x0001
-#define VENDOR_ID		  0x4A48 // JH
-#define PRODUCT_ID		0x474C // GL
-
-#define MANUFACTURER    jasonhazel
-#define PRODUCT         Glitch
-
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 5
 
@@ -18,8 +11,6 @@
 #define MATRIX_ROW_PINS_RIGHT { D7, E6, B4, B5 }
 #define MATRIX_COL_PINS_RIGHT { B2, B3, B1, F7, F6 }
 
-#define UNUSED_PINS
-
 #define DIODE_DIRECTION COL2ROW
 
 #define DEBOUNCE 5

diff --git a/keyboards/jasonhazel/glitch/info.json b/keyboards/jasonhazel/glitch/info.json
@@ -0,0 +1,9 @@
+{
+  "keyboard_name": "CREPE",
+  "manufacturer": "jasonhazel",
+  "usb": {
+    "vid": "0x4A48",
+    "pid": "0x474C",
+    "device_version": "0.0.1"
+  }
+}
diff --git a/keyboards/jasonhazel/glitch/keymaps/default/keymap.c b/keyboards/jasonhazel/glitch/keymaps/default/keymap.c
@@ -93,7 +93,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
   [_SYMBOL] = LAYOUT(
     KC_EXLM,    KC_AT,      KC_HASH,    KC_DLR,     KC_PERC,          KC_CIRC,     KC_AMPR,   KC_ASTR,    KC_NO,      KC_PIPE,    \
-    KC_GRV,     KC_NO,      KC_UNDS,    KC_EQL,     KC_NO,            KC_SBKT,     KC_CBKT,   KC_PARN,    KC_LTGT,    KC_BSLASH,  \
+    KC_GRV,     KC_NO,      KC_UNDS,    KC_EQL,     KC_NO,            KC_SBKT,     KC_CBKT,   KC_PARN,    KC_LTGT,    KC_BACKSLASH,  \
     KC_NO,      KC_NO,      KC_PLUS,    KC_MINS,    KC_NO,            KC_NO,       KC_NO,     KC_COLN,    KC_DOT,     KC_SCLN,    \
                 KC_LALT,     KC_LCTL,    KC_OSYM,    KC_OSFT,          KC_SPC,     KC_ONUM,    KC_ENT,     KC_ENT
   ),

diff --git a/keyboards/jasonhazel/lisa/config.h b/keyboards/jasonhazel/lisa/config.h
@@ -2,13 +2,6 @@
 
 #include "config_common.h"
 
-#define DEVICE_VER              0x0001
-#define VENDOR_ID               0x4A48
-#define PRODUCT_ID              0x4C50
-
-#define MANUFACTURER            jasonhazel
-#define PRODUCT                 Lisa
-
 #define MATRIX_ROWS             5
 #define MATRIX_COLS             4
 

diff --git a/keyboards/jasonhazel/lisa/info.json b/keyboards/jasonhazel/lisa/info.json
@@ -0,0 +1,9 @@
+{
+  "keyboard_name": "Lisa",
+  "manufacturer": "jasonhazel",
+  "usb": {
+    "vid": "0x4A48",
+    "pid": "0x4C50",
+    "device_version": "0.0.1"
+  }
+}
diff --git a/keyboards/jasonhazel/lisa/keymaps/default/keymap.c b/keyboards/jasonhazel/lisa/keymaps/default/keymap.c
@@ -5,27 +5,6 @@ enum lisa_layers {
   LAYER_LENGTH
 };
 
-enum lisa_combos {
-  COMBO_LENGTH
-};
-
-enum lisa_tapdances {
-  TAPDANCE_LENGTH
-};
-
-uint16_t COMBO_LEN = COMBO_LENGTH;
-combo_t key_combos[] = {
-  NULL
-};
-
-qk_tap_dance_action_t tap_dance_actions[] = {
-  NULL
-};
-
-const key_override_t **key_overrides = (const key_override_t *[]) {
-  NULL
-};
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_NUMPAD] = LAYOUT(
     KC_ESC,   KC_BSPC,  KC_BSLS,  KC_ASTR,

diff --git a/keyboards/jasonhazel/lisa/keymaps/default/rules.mk b/keyboards/jasonhazel/lisa/keymaps/default/rules.mk
@@ -2,6 +2,6 @@ CAPS_WORD_ENABLE 			= no
 GRAVE_ESC_ENABLE 			= no
 SPACE_CADET_ENABLE 		= no
 
-KEY_OVERRIDE_ENABLE		= yes
-COMBO_ENABLE 					= yes
-TAP_DANCE_ENABLE 			= yes
+KEY_OVERRIDE_ENABLE		= no
+COMBO_ENABLE 					= no
+TAP_DANCE_ENABLE 			= no
diff --git a/keyboards/jasonhazel/satpad/config.h b/keyboards/jasonhazel/satpad/config.h
@@ -2,19 +2,11 @@
 
 #include "config_common.h"
 
-#define DEVICE_VER		0x0001
-#define VENDOR_ID		  0x4A48 // JH
-#define PRODUCT_ID		0x7370 // sp
-
-#define MANUFACTURER    jasonhazel
-#define PRODUCT         SatPad
-
 #define MATRIX_ROWS 7
 #define MATRIX_COLS 6
 
 #define MATRIX_ROW_PINS { B3, B2, B6, D3, D2, D4, E6 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, D7 }
-#define UNUSED_PINS
 
 #define DIODE_DIRECTION COL2ROW
 

diff --git a/keyboards/jasonhazel/satpad/info.json b/keyboards/jasonhazel/satpad/info.json
@@ -0,0 +1,9 @@
+{
+  "keyboard_name": "SatPad",
+  "manufacturer": "jasonhazel",
+  "usb": {
+    "vid": "0x4A48",
+    "pid": "0x7370",
+    "device_version": "0.0.1"
+  }
+}