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

keyboards/mechlovin/olly/orion/orion.c

@@ -16,13 +16,18 @@
 
 #include "orion.h"
 
-void led_init_ports(void) {
+void board_init(void) {
+   //JTAG-DP Disabled and SW-DP Enabled    
+   AFIO->MAPR = (AFIO->MAPR & ~AFIO_MAPR_SWJ_CFG_Msk) | AFIO_MAPR_SWJ_CFG_DISABLE;
+}
+
+void keyboard_pre_init_kb(void) {
   setPinOutput(B5);
   setPinOutput(B6);
   setPinOutput(B7);
   setPinOutput(B8);
   setPinOutput(B9);
-
+  keyboard_pre_init_user();
 }
 
 layer_state_t layer_state_set_kb(layer_state_t state) {