loads of stuff. rp2040 stuff at least

sevanteri · Dec 28, 2022 · f75d793 · f75d793
1 parent 258985d
commit f75d793
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 21 deletions.
diff --git a/keyboards/gboards/gergoplex/keymaps/sevanteri/rules.mk b/keyboards/gboards/gergoplex/keymaps/sevanteri/rules.mk
@@ -13,7 +13,7 @@ UNICODE_ENABLE   = no  # Unicode
 TAP_DANCE_ENABLE = yes
 COMBO_ENABLE = yes
 LEADER_ENABLE = no
-POINTING_DEVICE_ENABLE = yes
+POINTING_DEVICE_ENABLE = no
 
 LTO_ENABLE = yes
 

diff --git a/keyboards/input_club/ergodox_infinity/keymaps/sevanteri/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/sevanteri/keymap.c
@@ -132,13 +132,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_GAME] = LAYOUT_ergodox_pretty_wrapper(
 
-    KC_ESC,   KC_6,      KC_1,     KC_2,   KC_3,      KC_4,    KC_5,    /*****/  TG(_GAME),  _______,  _______,  _______,  _______,  _______,  _______,
-    KC_T,     KC_TAB,    KC_Q,     KC_W,   KC_E,      KC_R,    KC_7,    /*****/  S(KC_F1),   _______,  _______,  _______,  _______,  _______,  _______,
+    KC_ESC,   KC_0,      KC_1,     KC_2,   KC_3,      KC_4,    KC_5,    /*****/  TG(_GAME),  _______,  _______,  _______,  _______,  _______,  _______,
+    KC_T,     KC_TAB,    KC_Q,     KC_W,   KC_E,      KC_R,    KC_6,    /*****/  S(KC_F1),   _______,  _______,  _______,  _______,  _______,  _______,
     KC_G,     KC_LCTRL,  KC_A,     KC_S,   KC_D,      KC_F,    /**/     /*****/  /**/        _______,  _______,  _______,  _______,  _______,  _______,
-    KC_B,     KC_LSFT,   KC_Z,     KC_X,   KC_C,      KC_V,    KC_8,    /*****/  KC_BSPC,    _______,  _______,  _______,  _______,  _______,  _______,
-    KC_LALT,  KC_LEFT,   KC_DOWN,  KC_UP,  KC_RIGHT,  /*****/  /*****/  /*****/  /*****/     /*****/   _______,  _______,  _______,  _______,  KC_RGUI,
+    KC_B,     KC_LSFT,   KC_Z,     KC_X,   KC_C,      KC_V,    KC_7,    /*****/  KC_BSPC,    _______,  _______,  _______,  _______,  _______,  _______,
+    KC_LALT,  KC_LEFT,   KC_DOWN,  KC_UP,  KC_RIGHT,  /*****/  /*****/  /*****/  /*****/     /*****/   KC_VOLU,  KC_VOLD,  _______,  _______,  KC_RGUI,
 
-    /**/      /**/     /**/     /**/     /**/     KC_9,     KC_0,          /*****/ _______, _______,
+    /**/      /**/     /**/     /**/     /**/     KC_8,     KC_9,          /*****/ _______, _______,
     /**/      /**/     /**/     /**/     /**/     /**/      SH_OS,         /*****/ _______,
     /**/      /**/     /**/     /**/     KC_SPC,  KC_LSFT,  KC_ENT,        /*****/ _______, KC_ENT, _______
 

diff --git a/keyboards/splitkb/kyria/keymaps/sevanteri/config.h b/keyboards/splitkb/kyria/keymaps/sevanteri/config.h
@@ -16,6 +16,8 @@
 
 #pragma once
 
+#include "config_common.h"
+
 #define EE_HANDS
 
 #ifdef OLED_DRIVER_ENABLE
@@ -40,19 +42,22 @@
   #endif
 #endif
 
-#define F_SCL 240000UL  // SCL frequency
+//#define F_SCL 240000UL  // SCL frequency
 #include "sevanteri_config.h"
 
 // If you are using an Elite C rev3 on the slave side, uncomment the lines below:
-/* #define SPLIT_USB_DETECT */
-/* #define NO_USB_STARTUP_CHECK */
-/* #undef RGBLED_SPLIT */
+#define SPLIT_USB_DETECT
+#define NO_USB_STARTUP_CHECK
+#undef RGBLED_SPLIT
+/* #define SOFT_SERIAL_PIN D0 */
 
 /* #define RGBLIGHT_LIMIT_VAL 200 */
 
 /* #undef RGBLIGHT_LAYERS */
 /* #undef RGBLIGHT_SPLIT_SET_CHANGE_LAYERS */
 /* #define RGBLIGHT_SPLIT_SET_CHANGE_LAYERS */
-#define USER_PRINT
+//#define USER_PRINT
 
 /* #define TAP_CODE_DELAY 35 */
+
+/* #define I2C_DRIVER I2CD2 */
diff --git a/keyboards/splitkb/kyria/keymaps/sevanteri/rules.mk b/keyboards/splitkb/kyria/keymaps/sevanteri/rules.mk
@@ -1,19 +1,17 @@
-OLED_DRIVER_ENABLE = no   # Enables the use of OLED displays
-OLED_ENABLE = no   # Enables the use of OLED displays
+MCU = RP2040
+BOOTLOADER = rp2040
+CONVERT_TO = promicro_rp2040
+
+
+OLED_ENABLE = no
 ENCODER_ENABLE = no       # Enables the use of one or more encoders
 RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
 
+
 ifneq ($(strip $(LEFT_SIDE)), yes)
     PIMORONI_TRACKBALL_ENABLE = yes
+    QUANTUM_LIB_SRC += i2c_master.c
 endif
 
 CONSOLE_ENABLE = no
 COMMAND_ENABLE = no
-
-LTO_ENABLE = yes
-
-VERBOSE 		 = yes
-DEBUG_MATRIX_SCAN_RATE   = no
-DEBUG_BALLER 		 = no
-DEBUG_MATRIX		 = no
-
diff --git a/users/sevanteri/features/pimoroni_trackball.h b/users/sevanteri/features/pimoroni_trackball.h
@@ -2,6 +2,7 @@
 
 #include <quantum.h>
 #include "color.h"
+#include "i2c_master.h"
 
 #ifndef TRACKBALL_ADDRESS
 #    define TRACKBALL_ADDRESS 0x0A

diff --git a/users/sevanteri/sevanteri_config.h b/users/sevanteri/sevanteri_config.h
@@ -53,3 +53,8 @@
 
 #undef LOCKING_SUPPORT_ENABLE
 #undef LOCKING_RESYNC_ENABLE
+
+/* #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET */
+/* #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP25 */
+/* #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U */
+