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

5 files changed, 38 insertions, 38 deletions

diff --git a/keyboards/pearlboards/pandora/rules.mk b/keyboards/pearlboards/pandora/rules.mk
index 04aacf572b..e0d88f1d85 100644
--- a/keyboards/pearlboards/pandora/rules.mk
+++ b/keyboards/pearlboards/pandora/rules.mk
@@ -10,13 +10,13 @@ BOOTLOADER = atmel-dfu
 BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no        # Console for debug
-COMMAND_ENABLE = no        # Commands for debug and configuration
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
 NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
-DIP_SWITCH_ENABLE = yes
-ENCODER_ENABLE = yes
+DIP_SWITCH_ENABLE = yes     # Enable dip switches
+ENCODER_ENABLE = yes        # Rotary encoder
 
-LTO_ENABLE = yes
+LTO_ENABLE = yes            # Link time optimization
diff --git a/keyboards/pearlboards/zeus/rules.mk b/keyboards/pearlboards/zeus/rules.mk
index b75d687546..556a5e9df9 100644
--- a/keyboards/pearlboards/zeus/rules.mk
+++ b/keyboards/pearlboards/zeus/rules.mk
@@ -16,8 +16,8 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = yes          # Audio output
-ENCODER_ENABLE = yes
-HAPTIC_ENABLE = yes
-HAPTIC_DRIVER = DRV2605L
+ENCODER_ENABLE = yes        # Rotary encoder
+HAPTIC_ENABLE = yes         # Rumble feefback
+HAPTIC_DRIVER = DRV2605L    # Rumble motor
 
-LTO_ENABLE = yes
+LTO_ENABLE = yes            # Link time optimization
diff --git a/keyboards/pearlboards/zeuspad/keymaps/default/keymap.c b/keyboards/pearlboards/zeuspad/keymaps/default/keymap.c
index 3faa703484..71a33c4545 100644
--- a/keyboards/pearlboards/zeuspad/keymaps/default/keymap.c
+++ b/keyboards/pearlboards/zeuspad/keymaps/default/keymap.c
@@ -19,18 +19,18 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_all(
-		KC_ESC,   KC_LCTL,  KC_LALT,  KC_MEDIA_PLAY_PAUSE,
-		KC_NLCK,  KC_PSLS,  KC_PAST,  MO(1),
-		KC_P7,    KC_P8,    KC_P9,    KC_PPLS,
-		KC_P4,    KC_P5,    KC_P6,    KC_PPLS,
-		KC_P1,    KC_P2,    KC_P3,    KC_PENT,
-		KC_P0,    KC_P0,    KC_PDOT,  KC_PENT),
+		LT(1, KC_ESC),  KC_LCTL,  KC_LALT,  KC_MEDIA_PLAY_PAUSE,
+		KC_NLCK,        KC_PSLS,  KC_PAST,  KC_PMNS,
+		KC_P7,          KC_P8,    KC_P9,    KC_PPLS,
+		KC_P4,          KC_P5,    KC_P6,    KC_PPLS,
+		KC_P1,          KC_P2,    KC_P3,    KC_PENT,
+		KC_P0,          KC_P0,    KC_PDOT,  KC_PENT),
 
   [1] = LAYOUT_all(
-		RESET,    KC_LCTL,  KC_LALT,  KC_TRNS,
-		RGB_TOG,  RGB_MOD,  RGB_HUI,  KC_PMNS,
-		KC_P7,    KC_P8,    KC_P9,    KC_PPLS,
-		KC_P4,    KC_P5,    KC_P6,    KC_PPLS,
-		KC_P1,    KC_P2,    KC_P3,    KC_PENT,
-		KC_P0,    KC_P0,    KC_PDOT,  KC_PENT)
+		KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+		RESET,    RGB_TOG,  RGB_MOD,  RGB_HUI,
+    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS)
 };
diff --git a/keyboards/pearlboards/zeuspad/keymaps/via/keymap.c b/keyboards/pearlboards/zeuspad/keymaps/via/keymap.c
index a0c6b0c69f..5c99ae2acc 100644
--- a/keyboards/pearlboards/zeuspad/keymaps/via/keymap.c
+++ b/keyboards/pearlboards/zeuspad/keymaps/via/keymap.c
@@ -19,20 +19,20 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_all(
-		KC_ESC,   RGB_TOG,  RGB_MOD,  KC_MEDIA_PLAY_PAUSE,
-		KC_NLCK,  KC_PSLS,  KC_PAST,  MO(1),
-		KC_P7,    KC_P8,    KC_P9,    KC_PPLS,
-		KC_P4,    KC_P5,    KC_P6,    KC_PPLS,
-		KC_P1,    KC_P2,    KC_P3,    KC_PENT,
-		KC_P0,    KC_P0,    KC_PDOT,  KC_PENT),
+		LT(1, KC_ESC),  RGB_TOG,  RGB_MOD,  KC_MEDIA_PLAY_PAUSE,
+		KC_NLCK,        KC_PSLS,  KC_PAST,  KC_PMNS,
+		KC_P7,          KC_P8,    KC_P9,    KC_PPLS,
+		KC_P4,          KC_P5,    KC_P6,    KC_PPLS,
+		KC_P1,          KC_P2,    KC_P3,    KC_PENT,
+		KC_P0,          KC_P0,    KC_PDOT,  KC_PENT),
 
   [1] = LAYOUT_all(
-		RESET,    KC_LCTL,  KC_LALT,  KC_TRNS,
-		RGB_TOG,  RGB_MOD,  RGB_HUI,  KC_PMNS,
-		KC_P7,    KC_P8,    KC_P9,    KC_PPLS,
-		KC_P4,    KC_P5,    KC_P6,    KC_PPLS,
-		KC_P1,    KC_P2,    KC_P3,    KC_PENT,
-		KC_P0,    KC_P0,    KC_PDOT,  KC_PENT),
+		KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+		RESET,    RGB_TOG,  RGB_MOD,  RGB_HUI,
+    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS),
 
   [2] = LAYOUT_all(
     KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
diff --git a/keyboards/pearlboards/zeuspad/rules.mk b/keyboards/pearlboards/zeuspad/rules.mk
index 0299b99a2f..b76fe206a1 100644
--- a/keyboards/pearlboards/zeuspad/rules.mk
+++ b/keyboards/pearlboards/zeuspad/rules.mk
@@ -16,8 +16,8 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes
-OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
+ENCODER_ENABLE = yes        # Rotary encoder
+OLED_ENABLE = yes           # Enable oled
+OLED_DRIVER = SSD1306       # Oled type
 
-LTO_ENABLE = yes
+LTO_ENABLE = yes            # Link time optimization