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

keyboards/cannonkeys/lib/satisfaction75/satisfaction_core.c

@@ -50,7 +50,7 @@ void board_init(void) {
   SYSCFG->CFGR1 &= ~(SYSCFG_CFGR1_SPI2_DMA_RMP);
 }
 
-void keyboard_post_init_kb(){
+void keyboard_post_init_kb(void) {
       /*
         This is a workaround to some really weird behavior
         Without this code, the OLED will turn on, but not when you initially plug the keyboard in. 
@@ -63,6 +63,8 @@ void keyboard_post_init_kb(){
         oled_init(OLED_ROTATION_0);
     }
     #endif
+
+    keyboard_post_init_user();
 }
 
 #ifdef VIA_ENABLE

keyboards/cannonkeys/lib/satisfaction75/satisfaction_core.h

@@ -33,7 +33,7 @@ enum encoder_modes {
 };
 
 enum custom_encoder_behavior {
-    ENC_CUSTOM_CW = 0,
+    ENC_CUSTOM_CW,
     ENC_CUSTOM_CCW,
     ENC_CUSTOM_PRESS
 };
@@ -77,12 +77,6 @@ extern int8_t month_config;
 extern int8_t day_config;
 extern uint8_t previous_encoder_mode;
 
-// Backlighting
-#ifdef BACKLIGHT_ENABLE
-extern backlight_config_t kb_backlight_config;
-extern bool kb_backlight_breathing;
-#endif
-
 void pre_encoder_mode_change(void);
 void post_encoder_mode_change(void);
 void change_encoder_mode(bool negative);

keyboards/cannonkeys/satisfaction75/halconf.h

@@ -14,7 +14,5 @@
 
 #define HAL_USE_RTC TRUE
 
-#define HAL_USE_SPI TRUE
-
 #include_next <halconf.h>
 

keyboards/cannonkeys/satisfaction75/info.json

@@ -4,7 +4,6 @@
     "maintainer": "awkannan",
     "backlight": {
         "breathing": true,
-        "breathing_period": 6,
         "levels": 24,
         "pin": "A6"
     },

keyboards/cannonkeys/satisfaction75/mcuconf.h

@@ -21,7 +21,3 @@
 
 #undef STM32_PWM_USE_TIM3
 #define STM32_PWM_USE_TIM3 TRUE
-
-#undef STM32_SPI_USE_SPI2
-#define STM32_SPI_USE_SPI2 TRUE
-

keyboards/cannonkeys/satisfaction75/rev1/keymaps/boy_314/config.h

@@ -1,3 +0,0 @@
-#pragma once 
-
-#define ENCODER_RESOLUTION 2

keyboards/cannonkeys/satisfaction75/rev1/keymaps/boy_314/keymap.c

@@ -1,37 +0,0 @@
-/*
-Copyright 2019 Boy_314
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include QMK_KEYBOARD_H
-
-const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT_2x2(
-    KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,
-    KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_NO,   ENC_PRESS,
-    KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,  KC_HOME,
-    KC_LCTL,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_ENTER, KC_END,
-    KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,            KC_UP,    KC_DEL,
-    KC_LCTL,  KC_LALT,                                KC_SPC,                                 KC_LGUI,            MO(1),    KC_LEFT,  KC_DOWN,  KC_RGHT
-  ),
-  [1] = LAYOUT_2x2(
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    NK_TOGG, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______, _______, _______, OLED_TOGG,
-    _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP, _______, _______, QK_BOOT, CLOCK_SET,
-    KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_DEL,  KC_END,  KC_PGDN, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_VOLU, _______,
-    _______, _______,                            _______,                            _______,          _______, KC_MPRV, KC_VOLD, KC_MNXT
-  )
-};

keyboards/cannonkeys/satisfaction75/rev1/keymaps/boy_314/readme.md

@@ -1,3 +0,0 @@
-# Boy_314's Satisfaction75 Layout
-
-This is Boy_314's Satisfaction75 Layout. It can be used on VIA. It features a QWERTY layout on the base, along with missing TKL keys on layer 1. Right side 3 keys from top down are: Home, End, Delete. The encoder resolution has been reduced from the default of 4 down to 2 so that it no longer needs to click twice, but now only once, before triggering an action.

keyboards/cannonkeys/satisfaction75/rev1/keymaps/boy_314/rules.mk

@@ -1,3 +0,0 @@
-# rules.mk overrides to enable VIA
-
-VIA_ENABLE = yes

keyboards/cannonkeys/satisfaction75/rev1/keymaps/jae/keymap.c

@@ -1,37 +0,0 @@
-/*
-Copyright 2012,2013 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include QMK_KEYBOARD_H
-
-const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT_all(
-    KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,
-    KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_DEL, ENC_PRESS,
-    KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,  KC_PGUP,
-    KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS,  KC_ENTER, KC_PGDN,
-    KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,  KC_UP,    MO(1),
-    KC_LCTL,  KC_LGUI,  KC_LALT,  KC_SPC,             KC_SPC,             KC_SPC,             KC_RALT,  MO(1),    KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT
-  ),
-  [1] = LAYOUT_all(
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, _______, OLED_TOGG,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, CLOCK_SET,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______,          _______,          _______,          _______, _______, _______, _______, _______, _______
-  )
-};

keyboards/cannonkeys/satisfaction75_hs/halconf.h

@@ -12,7 +12,5 @@
 
 #define HAL_USE_RTC TRUE
 
-#define HAL_USE_SPI TRUE
-
 #include_next <halconf.h>
 

keyboards/cannonkeys/satisfaction75_hs/mcuconf.h

@@ -18,7 +18,3 @@
 
 #undef STM32_I2C_USE_I2C1
 #define STM32_I2C_USE_I2C1 TRUE
-
-#undef STM32_SPI_USE_SPI2
-#define STM32_SPI_USE_SPI2 TRUE
-