Fixes/clean-up for PR to main qmk repo (Massdrop#9)

* Clean-up for merge to main QMK repo * Update info.json/readme.md * More fixes, clean-up * Spacing for readme.md
rmblau · Aug 18, 2019 · 5f6d9dc · 5f6d9dc
1 parent 5e6878b
commit 5f6d9dc
Show file tree

Hide file tree

Showing 22 changed files with 56 additions and 341 deletions.
diff --git a/keyboards/georgi/keymaps/template/keymap.c b/keyboards/georgi/keymaps/template/keymap.c
diff --git a/keyboards/georgi/keymaps/template/readme.md b/keyboards/georgi/keymaps/template/readme.md
diff --git a/keyboards/georgi/keymaps/template/rules.mk b/keyboards/georgi/keymaps/template/rules.mk
diff --git a/keyboards/kbdfans/kbd4x/info.json b/keyboards/kbdfans/kbd4x/info.json
@@ -2,7 +2,7 @@
     "keyboard_name": "kbd4x",
     "url": "",
     "maintainer": "qmk",
-    "width": 14,
+    "width": 12,
     "height": 4,
     "layouts": {
         "LAYOUT_planck_mit": {

diff --git a/keyboards/keebio/iris/info.json b/keyboards/keebio/iris/info.json
@@ -2,8 +2,8 @@
     "keyboard_name": "Iris",
     "url": "https://keeb.io",
     "maintainer": "Keebio",
-    "width": 14.5,
-    "height": 5,
+    "width": 15,
+    "height": 5.75,
     "layouts": {
         "LAYOUT": {
             "layout": [

diff --git a/keyboards/massdrop/alt/info.json b/keyboards/massdrop/alt/info.json
@@ -1,6 +1,6 @@
 {
     "keyboard_name": "ALT",
-    "url": "https://www.massdrop.com/buy/massdrop-alt-mechanical-keyboard",
+    "url": "https://drop.com/buy/massdrop-alt-mechanical-keyboard",
     "maintainer": "Massdrop",
     "width": 16,
     "height": 5,

diff --git a/keyboards/massdrop/alt/keymaps/default/keymap.c b/keyboards/massdrop/alt/keymaps/default/keymap.c
@@ -119,7 +119,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             return true; //Process all other keycodes normally
     }
 }
-
-led_instruction_t led_instructions[] = {
-    { .end = 1 }
-};
diff --git a/keyboards/massdrop/alt/keymaps/mac/keymap.c b/keyboards/massdrop/alt/keymaps/mac/keymap.c
@@ -119,7 +119,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             return true; //Process all other keycodes normally
     }
 }
-
-led_instruction_t led_instructions[] = {
-    { .end = 1 }
-};
diff --git a/keyboards/massdrop/alt/keymaps/reywood/keymap.c b/keyboards/massdrop/alt/keymaps/reywood/keymap.c
@@ -114,20 +114,17 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       return false;
     case L_T_ONF:
       if (record->event.pressed) {
-        led_enabled = !led_enabled;
-        I2C3733_Control_Set(led_enabled);
+        I2C3733_Control_Set(!I2C3733_Control_Get());
       }
       return false;
     case L_ON:
       if (record->event.pressed) {
-        led_enabled = 1;
-        I2C3733_Control_Set(led_enabled);
+        I2C3733_Control_Set(1);
       }
       return false;
     case L_OFF:
       if (record->event.pressed) {
-        led_enabled = 0;
-        I2C3733_Control_Set(led_enabled);
+        I2C3733_Control_Set(0);
       }
       return false;
     case L_T_BR:

diff --git a/keyboards/massdrop/alt/readme.md b/keyboards/massdrop/alt/readme.md
@@ -1,20 +1,20 @@
 # ALT
 
-![ALT](https://massdrop-s3.imgix.net/product-images/alt-keyboard/FP/WNxwR19gTua3nxiiQWP3_AI7B3311%20copy%20page.jpg?auto=format&fm=jpg&fit=max&w=700&h=467&dpr=1&q=80)
+![ALT](https://massdrop-s3.imgix.net/product-images/massdrop-alt-mechanical-keyboard/FP/wRxrw2oVQfu6KCnN4OOC_WNxwR19gTua3nxiiQWP3_AI7B3311%20copy%20page.png?auto=format&fm=png&fit=fill&w=700&h=467)
 
 The Massdrop ALT is a 65% mechanical keyboard featuring dual USB-C connectors, an integrated Hi-Speed USB 2.0 hub, and fully customizable RGB backlighting and underlighting.
 
-Keyboard Maintainer: [Massdrop](https://github.com/massdrop)  
+Keyboard Maintainer: [Drop / Massdrop](https://github.com/Massdrop/qmk_firmware)  
 Hardware Supported: Massdrop, Inc. ALT PCBs utilizing Microchip's ATSAMD51J18A MCU and USB2422 2-Port USB 2.0 Hi-Speed Hub Controller, and ISSI's IS31FL3733 LED Drivers.  
-Hardware Availability: [Massdrop ALT Mechanical Keyboard](https://www.massdrop.com/buy/massdrop-alt-mechanical-keyboard)
+Hardware Availability: [Massdrop ALT Mechanical Keyboard](https://drop.com/buy/massdrop-alt-mechanical-keyboard)
 
 Make example for this keyboard (after setting up your build environment):
 
     make massdrop/alt:default
 
 For information on flashing this keyboard, visit the following links:
 
-[Massdrop Loader Releases](https://github.com/Massdrop/mdloader/releases/tag/0.0.1)  
+[Massdrop Loader Releases](https://github.com/Massdrop/mdloader/releases/tag/1.0.3)  
 [Massdrop Loader Repository and Instructions](https://github.com/Massdrop/mdloader)
 
 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).
diff --git a/keyboards/massdrop/ctrl/info.json b/keyboards/massdrop/ctrl/info.json
@@ -1,6 +1,6 @@
 {
     "keyboard_name": "CTRL",
-    "url": "https://www.massdrop.com/buy/massdrop-ctrl-mechanical-keyboard",
+    "url": "https://drop.com/buy/massdrop-ctrl-mechanical-keyboard",
     "maintainer": "Massdrop",
     "width": 18.5,
     "height": 6.5,

diff --git a/keyboards/massdrop/ctrl/keymaps/default/keymap.c b/keyboards/massdrop/ctrl/keymaps/default/keymap.c
@@ -122,15 +122,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             return true; //Process all other keycodes normally
     }
 }
-
-led_instruction_t led_instructions[] = {
-    // { .flags = LED_FLAG_MATCH_ID | LED_FLAG_USE_RGB, .id0 = 10, .id1 = 9, .r = 255, .g = 0, .b = 0 },
-    // { .flags = LED_FLAG_MATCH_ID | LED_FLAG_USE_PATTERN, .id0 = 4, .id1 = 0, .pattern_id = 8 },
-    // { .flags = LED_FLAG_MATCH_ID | LED_FLAG_USE_RGB, .id0 = 8, .id1 = 0, .r = 0, .g = 255, .b = 0 },
-    // { .flags = LED_FLAG_MATCH_ID | LED_FLAG_USE_PATTERN, .id = 16, .id1 = 0, .pattern_id = 9 },
-    // { .flags = LED_FLAG_MATCH_ID | LED_FLAG_USE_RGB, .id0 = 32, .id1 = 0, .r = 0, .g = 0, .b = 255 },
-    // { .flags = LED_FLAG_MATCH_ID | LED_FLAG_USE_ROTATE_PATTERN, .id0 = 64, .id1 = 0},
-    // { .flags = LED_FLAG_MATCH_ID | LED_FLAG_MATCH_LAYER | LED_FLAG_USE_ROTATE_PATTERN, .id0 = 262144, .id1 = 0, .layer = 0 },
-    // { .flags = LED_FLAG_MATCH_ID | LED_FLAG_MATCH_LAYER | LED_FLAG_USE_ROTATE_PATTERN, .id = 16777216, .id1 = 0, .layer = 1 },
-    { .end = 1 }
-};
diff --git a/keyboards/massdrop/ctrl/keymaps/mac/keymap.c b/keyboards/massdrop/ctrl/keymaps/mac/keymap.c
@@ -122,7 +122,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             return true; //Process all other keycodes normally
     }
 }
-
-led_instruction_t led_instructions[] = {
-    { .end = 1 }
-};
diff --git a/keyboards/massdrop/ctrl/keymaps/matthewrobo/keymap.c b/keyboards/massdrop/ctrl/keymaps/matthewrobo/keymap.c
@@ -7,8 +7,7 @@ enum ctrl_layers {
 };
 
 enum ctrl_keycodes {
-	U_T_AUTO = SAFE_RANGE, //USB Extra Port Toggle Auto Detect / Always Active
-	U_T_AGCR,              //USB Toggle Automatic GCR control
+	U_T_AGCR = SAFE_RANGE, //USB Toggle Automatic GCR control
 	DBG_TOG,               //DEBUG Toggle On / Off
 	DBG_MTRX,              //DEBUG Toggle Matrix Prints
 	DBG_KBD,               //DEBUG Toggle Keyboard Prints
@@ -236,12 +235,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t* record)
 	static uint32_t key_timer;
 
 	switch (keycode) {
-	case U_T_AUTO:
-		if (record->event.pressed && MODS_SHIFT && MODS_CTRL) {
-			TOGGLE_FLAG_AND_PRINT(usb_extra_manual, "USB extra port manual mode");
-		}
-
-		return false;
 
 	case U_T_AGCR:
 		if (record->event.pressed && MODS_SHIFT && MODS_CTRL) {