Change firmware to v3.1

Remove sekigon stuff
crides · Dec 31, 2020 · e5383f6 · e5383f6
1 parent b72d1b9
commit e5383f6
Show file tree

Hide file tree

Showing 14 changed files with 7 additions and 451 deletions.
diff --git a/qmk/v2/board/custom_board.h b/qmk/v2/board/custom_board.h
diff --git a/qmk/v2/config.h b/qmk/v2/config.h
@@ -1,52 +1,31 @@
 #ifndef CONFIG_H
 #define CONFIG_H
 
-#ifdef __AVR__
 #include "config_common.h"
-#endif
 
 /* USB Device descriptor parameter */
 #define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0x6062
-#define DEVICE_VER      0x0202
+#define PRODUCT_ID      0x6063
+#define DEVICE_VER      0x0301
 #define MANUFACTURER    Crides
-#define PRODUCT         Fissure-v2.2
+#define PRODUCT         Fissure-v3.1
 #define DESCRIPTION     40 key split keyboard
 
-#ifdef __AVR__
 #define USE_I2C
-#endif
-/* #define USE_SERIAL */
-/* #define SOFT_SERIAL_PIN D0 */
 #define EE_HANDS
+#define SPLIT_USB_DETECT
 
 #define RGBLED_NUM 2
-#ifdef __AVR__
 #define RGB_DI_PIN F7
-#else
-#define RGB_DI_PIN 9
-#endif
 #define RGBLED_SPLIT {1, 1}
 #define RGBLIGHT_SPLIT
 
 // Rows are doubled-up
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 5
 
-#ifdef __AVR__
-#define MATRIX_ROW_PINS { E6, D7, C6, D4 }
+#define MATRIX_ROW_PINS { E6, B4, B5, D7 }
 #define MATRIX_COL_PINS { D3, D2, F4, F5, F6 }
-#else
-#define BLE_NUS_MIN_INTERVAL 10 // default 60
-#define BLE_NUS_MAX_INTERVAL 30 // default 75
-#define BLE_HID_MAX_INTERVAL 30 // default 90
-#define BLE_HID_SLAVE_LATENCY 4 // default 4
-
-#define CONFIG_PIN_SCL 11
-#define CONFIG_PIN_SDA 12
-
-#define USE_BATTERY_PIN NRF_SAADC_INPUT_AIN5
-#endif
 
 #define DIODE_DIRECTION COL2ROW
 #define DEBOUNCING_DELAY 5
@@ -59,24 +38,16 @@
 // Steno stuff
 #define CUSTOM_STENO
 
-#define STENO_DEBUG
+/* #define STENO_DEBUG */
 /* #define DEBUG_FLASH */
 /* #define DEBUG_STROKE */
-#define DEBUG_HIST
+/* #define DEBUG_HIST */
 
 #define RAW_USAGE_PAGE  0xFF60
 #define RAW_USAGE_ID    0x61
-#define MATRIX_SCAN_MS 20
 
-#ifdef __AVR__
 #ifdef CUSTOM_STENO
 #undef VIRTSER_ENABLE
 #endif
-#endif
-
-#define THIS_DEVICE_ROWS MATRIX_ROWS
-#define THIS_DEVICE_COLS MATRIX_COLS
-#define IS_LEFT_HAND true
-#define ENABLE_STARTUP_ADV_NOLIST
 
 #endif
diff --git a/qmk/v2/keymaps/default/keymap.c b/qmk/v2/keymaps/default/keymap.c
@@ -3,10 +3,6 @@
 #include "eeconfig.h"
 #include "keymap_steno.h"
 
-#ifndef __AVR__
-#include "app_ble_func.h"
-#endif
-
 // Layers
 #define _BASE   0
 #define _LOWER 1
@@ -36,10 +32,6 @@ void set_hsv(uint8_t a, uint8_t b, uint8_t c) {
 
 void keyboard_pre_init_user(void) {
     set_hsv(HSV_TEAL);
-#ifndef __AVR__
-    set_usb_enabled(true);
-    debug_matrix=true;
-#endif
 }
 
 void suspend_power_down_user() {
@@ -59,20 +51,9 @@ uint32_t layer_state_set_user(uint32_t state) {
     }
     return state;
 }
-#ifdef __AVR__
-#else
-// Aliases
-#define C(kc) LCTL(kc)
-#define S(kc) LSFT(kc)
-#define A(kc) LALT(kc)
-#define G(kc) LGUI(kc)
-
-#endif
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    // If console is enabled, it will print the matrix position and status of each key pressed
 #ifdef CONSOLE_ENABLE
-    /* uprintf("KL: kc: %u, col: %u, row: %u, pressed: %u\n", keycode, record->event.key.col, record->event.key.row, record->event.pressed); */
     // For keylogging
     uprintf("[kl] %u:%u %c\n", record->event.key.row, record->event.key.col, record->event.pressed ? 'p' : 'P');
 #endif 
@@ -93,12 +74,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,      KC_N,     KC_M,     KC_COMM,     KC_DOT,     KC_SLSH,
                   DEL,      TAB,      ESC,      ENT,      SPC,     BKSP),
 
-    /* [_BASE] = KEYMAP( */
-    /*     KC_Q,  KC_W,  KC_F,  KC_P,  KC_B,   KC_J,  KC_L,     KC_U,    KC_Y,  KC_SCLN, */
-    /*     KC_A,  KC_R,  KC_S,  KC_T,  KC_G,   KC_M,  KC_N,     KC_E,    KC_I,     KC_O, */
-    /*     KC_Z,  KC_X,  KC_C,  KC_D,  KC_V,   KC_K,  KC_H,  KC_COMM,  KC_DOT,  KC_SLSH, */
-    /*      DEL,   TAB,   ESC,   ENT,   SPC,  BKSP), */
-
     [_LOWER] = KEYMAP(
         XXXXXXX, G(KC_1),  G(KC_2),  G(KC_3),  G(KC_4),  G(KC_5),   G(KC_6),  G(KC_7),  G(KC_8),  KC_F11,  KC_F12, XXXXXXX,
         XXXXXXX,    KC_1,     KC_2,     KC_3,     KC_4,     KC_5,      KC_6,     KC_7,     KC_8,    KC_9,    KC_0, XXXXXXX,

diff --git a/qmk/v2/ld/nrf52840.ld b/qmk/v2/ld/nrf52840.ld
diff --git a/qmk/v2/master/config.h b/qmk/v2/master/config.h
diff --git a/qmk/v2/master/master.c b/qmk/v2/master/master.c
diff --git a/qmk/v2/master/master.h b/qmk/v2/master/master.h
diff --git a/qmk/v2/master/rules.mk b/qmk/v2/master/rules.mk