Merge remote-tracking branch 'origin/develop' into xap

keyboards/pabile/p18/keyboard.json

@@ -27,8 +27,7 @@
             {"pin_a": "F6", "pin_b": "F5"}
         ]
     },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
+    "development_board": "promicro",
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/pabile/p20/ver1/keyboard.json

@@ -22,8 +22,7 @@
             {"pin_a": "F7", "pin_b": "B1"}
         ]
     },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
+    "development_board": "promicro",
     "layouts": {
         "LAYOUT_numpad_5x4": {
             "layout": [

keyboards/pabile/p20/ver2/keyboard.json

@@ -15,8 +15,7 @@
         "rows": ["C6", "D7", "E6", "B4", "B5"]
     },
     "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
+    "development_board": "promicro",
     "layouts": {
         "LAYOUT_numpad_5x4": {
             "layout": [

keyboards/pabile/p40/keyboard.json

@@ -20,8 +20,7 @@
         "rows": ["F6", "B3", "B2", "B6"]
     },
     "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
+    "development_board": "promicro",
     "community_layouts": ["ortho_4x10"],
     "layouts": {
         "LAYOUT_ortho_4x10": {

keyboards/pabile/p40_ortho/keyboard.json

@@ -19,8 +19,7 @@
         "rows": ["D1", "D0", "F4", "F5"]
     },
     "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
+    "development_board": "promicro",
     "layouts": {
         "LAYOUT_ortho_4x10": {
             "layout": [

keyboards/pabile/p42/keyboard.json

@@ -20,8 +20,7 @@
         "rows": ["D1", "D0", "D4", "C6"]
     },
     "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
+    "development_board": "promicro",
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/peej/tripel/info.json

@@ -20,6 +20,5 @@
         "rows": ["C6", "D4", "D0", "B4", "E6", "D7", "D1", "D2", "D3"]
     },
     "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "caterina"
+    "development_board": "promicro"
 }

keyboards/peranekofactory/tone/rev1/keyboard.json

@@ -27,8 +27,7 @@
         },
         "tap_keycode_delay": 100
     },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
+    "development_board": "promicro",
     "matrix_pins": {
         "direct": [
             ["D4", "C6", "D7", "E6", "F6", "F7", "B1", "B3"]

keyboards/peranekofactory/tone/rev2/keyboard.json

@@ -27,8 +27,7 @@
         },
         "tap_keycode_delay": 100
     },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
+    "development_board": "promicro",
     "matrix_pins": {
         "direct": [
             ["D4", "C6", "D7", "E6", "F6", "F7", "B1", "B3"]

keyboards/pica40/rev1/keyboard.json

@@ -1,6 +1,5 @@
 {
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
+    "development_board": "promicro",
     "diode_direction": "COL2ROW",
     "matrix_pins": {
         "cols": ["D2", "B5", "B4", "E6", "D7"],

keyboards/pimentoso/paddino02/rev1/keyboard.json

@@ -24,8 +24,7 @@
         "rows": ["D1", "D0", "D4"]
     },
     "diode_direction": "ROW2COL",
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
+    "development_board": "promicro",
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/pimentoso/paddino02/rev2/left/keyboard.json

@@ -24,8 +24,7 @@
         "rows": ["D0", "D4", "D1"]
     },
     "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
+    "development_board": "promicro",
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/pimentoso/paddino02/rev2/right/keyboard.json

@@ -24,8 +24,7 @@
         "rows": ["F4", "F6", "F5"]
     },
     "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
+    "development_board": "promicro",
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/pimentoso/touhoupad/keyboard.json

@@ -35,8 +35,7 @@
         "rows": ["D4"]
     },
     "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
+    "development_board": "promicro",
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/pinky/3/keyboard.json

@@ -17,8 +17,7 @@
             "pin": "D2"
         }
     },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
+    "development_board": "promicro",
     "layout_aliases": {
         "LAYOUT": "LAYOUT_split_3x7_4"
     },

keyboards/pinky/4/keyboard.json

@@ -17,8 +17,7 @@
             "pin": "D2"
         }
     },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
+    "development_board": "promicro",
     "layout_aliases": {
         "LAYOUT": "LAYOUT_split_4x7_4"
     },

keyboards/plum47/keyboard.json

@@ -2,7 +2,7 @@
     "manufacturer": "Masayuki Takagi",
     "keyboard_name": "plum47",
     "maintainer": "awh-tokyo",
-    "bootloader": "caterina",
+    "development_board": "promicro",
     "diode_direction": "COL2ROW",
     "features": {
         "bootmagic": true,
@@ -14,7 +14,6 @@
         "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "B5", "B4", "E6", "D7"],
         "rows": ["D1", "D0", "D4", "C6"]
     },
-    "processor": "atmega32u4",
     "url": "ihttps://github.com/takagi/plum47_buildguide",
     "usb": {
         "device_version": "1.0.0",

keyboards/psuieee/pluto12/keyboard.json

@@ -31,8 +31,7 @@
             {"pin_a": "B6", "pin_b": "B2"}
         ]
     },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
+    "development_board": "promicro",
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/pteron36/keyboard.json

@@ -54,8 +54,7 @@
     "ws2812": {
         "pin": "B6"
     },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
+    "development_board": "promicro",
     "community_layouts": ["split_3x5_3"],
     "layouts": {
         "LAYOUT_split_3x5_3": {

keyboards/rainkeebs/rainkeeb/keyboard.json

@@ -32,8 +32,7 @@
             {"pin_a": "B2", "pin_b": "B6"}
         ]
     },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
+    "development_board": "promicro",
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/rart/rart4x4/keyboard.json

@@ -54,8 +54,7 @@
             {"pin_a": "D7", "pin_b": "E6"}
         ]
     },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
+    "development_board": "promicro",
     "community_layouts": ["ortho_4x4"],
     "layouts": {
         "LAYOUT_ortho_4x4": {

keyboards/rart/rart67m/keyboard.json

@@ -26,8 +26,7 @@
         "rows": ["D3", "D2", "D4", "F6", "B3", "B4", "B2", "B5"]
     },
     "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
+    "development_board": "promicro",
     "layout_aliases": {
         "LAYOUT_all": "LAYOUT"
     },

keyboards/rart/rartlite/keyboard.json

@@ -29,8 +29,7 @@
         "num_lock": "F6",
         "on_state": 0
     },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
+    "development_board": "promicro",
     "layouts": {
         "LAYOUT_right_numpad": {
             "layout": [

keyboards/rart/rartpad/keyboard.json

@@ -57,8 +57,7 @@
       "twinkle": true
     }
   },
-  "processor": "atmega32u4",
-  "bootloader": "caterina",
+  "development_board": "promicro",
   "community_layouts": ["ortho_5x4", "numpad_5x4"],
   "layouts": {
       "LAYOUT_ortho_5x4": {

keyboards/rate/pistachio_mp/keyboard.json

@@ -39,8 +39,7 @@
             {"pin_a": "F4", "pin_b": "F5"}
         ]
     },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
+    "development_board": "promicro",
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/recompile_keys/choco60/rev1/keyboard.json

@@ -19,6 +19,5 @@
             "pin": "D3"
         }
     },
-    "processor": "atmega32u4",
-    "bootloader": "caterina"
+    "development_board": "promicro"
 }

keyboards/recompile_keys/cocoa40/keyboard.json

@@ -28,8 +28,7 @@
             "pin": "D2"
         }
     },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
+    "development_board": "promicro",
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/recompile_keys/nomu30/rev1/keyboard.json

@@ -10,6 +10,5 @@
         "rows": ["D1", "D0", "D4"]
     },
     "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "caterina"
+    "development_board": "promicro"
 }

keyboards/rect44/keyboard.json

@@ -37,8 +37,7 @@
         "rows": ["D3", "D2", "F5", "F4"]
     },
     "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
+    "development_board": "promicro",
     "layouts": {
         "LAYOUT_all": {
             "layout": [

keyboards/redox_media/keyboard.json

@@ -36,8 +36,7 @@
             "pin": "D0"
         }
     },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
+    "development_board": "promicro",
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/reviung/reviung34/keyboard.json

@@ -26,8 +26,7 @@
         "rows": ["F4", "F5", "F6", "F7"]
     },
     "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
+    "development_board": "promicro",
     "community_layouts": [
         "split_3x5_2"
     ],

keyboards/reviung/reviung39/keyboard.json

@@ -49,8 +49,7 @@
         "rows": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"]
     },
     "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
+    "development_board": "promicro",
     "layout_aliases": {
         "LAYOUT_reviung39": "LAYOUT"
     },

keyboards/reviung/reviung41/keyboard.json

@@ -49,8 +49,7 @@
         "rows": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"]
     },
     "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
+    "development_board": "promicro",
     "layout_aliases": {
         "LAYOUT_reviung41": "LAYOUT"
     },

keyboards/reviung/reviung5/keyboard.json

@@ -53,8 +53,7 @@
             {"pin_a": "D0", "pin_b": "D1"}
         ]
     },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
+    "development_board": "promicro",
     "layout_aliases": {
         "LAYOUT_reviung5": "LAYOUT"
     },

keyboards/reviung/reviung53/keyboard.json

@@ -47,8 +47,7 @@
         "rows": ["D0", "D4", "C6", "D7", "E6", "B4", "B5"]
     },
     "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
+    "development_board": "promicro",
     "layout_aliases": {
         "LAYOUT_reviung53": "LAYOUT"
     },

keyboards/rgbkb/zen/rev1/keyboard.json

@@ -38,8 +38,7 @@
   "ws2812": {
     "pin": "D1"
   },
-  "processor": "atmega32u4",
-  "bootloader": "caterina",
+  "development_board": "promicro",
   "layouts": {
     "LAYOUT": {
       "layout": [

keyboards/rgbkb/zen/rev2/keyboard.json

@@ -56,8 +56,7 @@
     "ws2812": {
       "pin": "B6"
     },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
+    "development_board": "promicro",
     "layouts": {
       "LAYOUT": {
         "layout": [

keyboards/rpiguy9907/southpaw66/keyboard.json

@@ -35,8 +35,7 @@
     "tapping": {
         "term": 400
     },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
+    "development_board": "promicro",
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/rura66/rev1/keyboard.json

@@ -55,8 +55,7 @@
     "ws2812": {
         "pin": "D3"
     },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
+    "development_board": "promicro",
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/ryanbaekr/rb1/keyboard.json

@@ -7,8 +7,7 @@
         "pid": "0x0001",
         "device_version": "0.0.3"
     },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
+    "development_board": "promicro",
     "features": {
         "bootmagic": true,
         "extrakey": true,

quantum/quantum.c

@@ -461,8 +461,8 @@ bool process_record_quantum(keyrecord_t *record) {
                 } else {
                     print("DEBUG: disabled.\n");
                 }
-#endif
                 return false;
+#endif
             case QK_CLEAR_EEPROM:
 #ifdef NO_RESET
                 eeconfig_init();
@@ -479,13 +479,13 @@ bool process_record_quantum(keyrecord_t *record) {
 #ifndef NO_ACTION_ONESHOT
             case QK_ONE_SHOT_TOGGLE:
                 oneshot_toggle();
-                break;
+                return false;
             case QK_ONE_SHOT_ON:
                 oneshot_enable();
-                break;
+                return false;
             case QK_ONE_SHOT_OFF:
                 oneshot_disable();
-                break;
+                return false;
 #endif
 #ifdef ENABLE_COMPILE_KEYCODE
             case QK_MAKE: // Compiles the firmware, and adds the flash command based on keyboard bootloader
@@ -512,6 +512,7 @@ bool process_record_quantum(keyrecord_t *record) {
                 if (temp_mod & MOD_MASK_SHIFT && temp_mod & MOD_MASK_CTRL) {
                     reset_keyboard();
                 }
+                return false;
             }
 #endif
         }