Update keyboards/subatomic/config.h

Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com>

keyboards/subatomic/config.h

@@ -1,16 +1,14 @@
+
 /*
 Copyright 2012 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/>.
 */
@@ -24,24 +22,27 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define VENDOR_ID       0xFEED
 #define PRODUCT_ID      0x6063
 #define DEVICE_VER      0x0001
-#define MANUFACTURER    Ortholinear Keyboards
-#define PRODUCT         The Subatomic Keyboard
+#define MANUFACTURER    OLKB
+#define PRODUCT         Subatomic
 #define DESCRIPTION     A compact ortholinear keyboard
 
 /* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 14
+#define MATRIX_ROWS 10
+#define MATRIX_COLS 8
 
 /* Planck PCB default pin-out */
-#define MATRIX_ROW_PINS { D2, D5, B5, B6, D3 }
-#define MATRIX_COL_PINS { F1, F0, B0, C7, F4, F5, F6, F7, D4, D6, B4, D7, C6, C5 }
+#define MATRIX_ROW_PINS { A10, A9, A8, B15, C13, C14, C15, A2, A3, A6 }
+#define MATRIX_COL_PINS { B11, B10, B2, B1, A7, B0, B9, B8 }
 #define UNUSED_PINS
 
+#define ENCODERS_PAD_A { B12 }
+#define ENCODERS_PAD_B { B13 }
+
+#define ENCODERS_PAD_C { C13, C14, C15, A2, A3, A6, A10, A9, A8, B15 }
+
 // #define AUDIO_VOICES
 // #define C6_AUDIO
 
-#define BACKLIGHT_PIN B7
-
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
@@ -59,6 +60,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
+/* key combination for command */
+#define IS_COMMAND() ( \
+    keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \
+)
+
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.

keyboards/subatomic/keymaps/default/config.h

@@ -1,26 +0,0 @@
-#pragma once
-
-// place overrides here
-
-/*
- * MIDI options
- */
-
-/* Prevent use of disabled MIDI features in the keymap */
-//#define MIDI_ENABLE_STRICT 1
-
-/* enable basic MIDI features:
-   - MIDI notes can be sent when in Music mode is on
-*/
-#define MIDI_BASIC
-
-/* enable advanced MIDI features:
-   - MIDI notes can be added to the keymap
-   - Octave shift and transpose
-   - Virtual sustain, portamento, and modulation wheel
-   - etc.
-*/
-//#define MIDI_ADVANCED
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2

keyboards/subatomic/rules.mk

@@ -1,33 +1,21 @@
 # MCU name
-MCU = at90usb1286
-
-# Bootloader selection
-#   Teensy       halfkay
-#   Pro Micro    caterina
-#   Atmel DFU    atmel-dfu
-#   LUFA DFU     lufa-dfu
-#   QMK DFU      qmk-dfu
-#   ATmega32A    bootloadHID
-#   ATmega328P   USBasp
-BOOTLOADER = atmel-dfu
+MCU = STM32F303
 
 # Build Options
 #   change to "no" to disable the options, or define them in the Makefile in 
 #   the appropriate keymap folder that will get included automatically
 #
-BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration(+1000)
-MOUSEKEY_ENABLE = no       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = no            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-MIDI_ENABLE = yes            # MIDI controls
-AUDIO_ENABLE = yes           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
-API_SYSEX_ENABLE = no
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
+BACKLIGHT_ENABLE = no
+BOOTMAGIC_ENABLE = yes  # Virtual DIP switch configuration
+## (Note that for BOOTMAGIC on Teensy LC you have to use a custom .ld script.)
+MOUSEKEY_ENABLE = yes # Mouse keys
+EXTRAKEY_ENABLE = yes # Audio control and System control
+CONSOLE_ENABLE = yes  # Console for debug
+COMMAND_ENABLE = yes    # Commands for debug and configuration
+#SLEEP_LED_ENABLE = yes  # Breathing sleep LED during USB suspend
+NKRO_ENABLE = yes     # USB Nkey Rollover
+#CUSTOM_MATRIX = yes # Custom matrix file
+AUDIO_ENABLE = yes
+RGBLIGHT_ENABLE = no
+# SERIAL_LINK_ENABLE = yes
+ENCODER_ENABLE = yes

keyboards/subatomic/subatomic.h

@@ -25,11 +25,16 @@
     k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
     k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d  \
   ) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d }  \
+    { k00, k01, k02, k03, k04, k05, KC_NO, KC_NO }, \
+    { k10, k11, k12, k13, k14, k15, KC_NO, KC_NO }, \
+    { k20, k21, k22, k23, k24, k25, KC_NO, KC_NO }, \
+    { k30, k31, k32, k33, k34, k35, KC_NO, KC_NO }, \
+    { k06, k07, k08, k09, k0a, k0b, k0c,   k0d }, \
+    { k16, k17, k18, k19, k1a, k1b, k1c,   k1d }, \
+    { k26, k27, k28, k29, k2a, k2b, k2c,   k2d }, \
+    { k36, k37, k38, k39, k3a, k3b, k3c,   k3d }, \
+    { k40, k41, k42, k49, k4a, k4b, k4c,   k4d }, \
+    { k46, k47, k48, k43, k44, k45, KC_NO, KC_NO }, \
 }
 
 
@@ -53,11 +58,16 @@
     k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
     k40, k41, k42, k43, k44, k45,    k46,   k48, k49, k4a, k4b, k4c, k4d  \
   ) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d }, \
-    { k40, k41, k42, k43, k44, k45, k46, XXX, k48, k49, k4a, k4b, k4c, k4d }  \
+    { k00, k01, k02, k03, k04, k05, KC_NO, KC_NO }, \
+    { k10, k11, k12, k13, k14, k15, KC_NO, KC_NO }, \
+    { k20, k21, k22, k23, k24, k25, KC_NO, KC_NO }, \
+    { k30, k31, k32, k33, k34, k35, KC_NO, KC_NO }, \
+    { k06, k07, k08, k09, k0a, k0b, k0c,   k0d }, \
+    { k16, k17, k18, k19, k1a, k1b, k1c,   k1d }, \
+    { k26, k27, k28, k29, k2a, k2b, k2c,   k2d }, \
+    { k36, k37, k38, k39, k3a, k3b, k3c,   k3d }, \
+    { k40, k41, k42, k49, k4a, k4b, k4c,   k4d }, \
+    { k46, KC_NO, k48, k43, k44, k45, KC_NO, KC_NO }, \
 }
 
 
@@ -81,9 +91,14 @@
     k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
     k40, k41, k42, k43, k44,   k45,      k47,    k49, k4a, k4b, k4c, k4d  \
   ) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d }, \
-    { k40, k41, k42, k43, k44, k45, XXX, k47, XXX, k49, k4a, k4b, k4c, k4d }  \
+    { k00, k01, k02, k03, k04, k05, KC_NO, KC_NO }, \
+    { k10, k11, k12, k13, k14, k15, KC_NO, KC_NO }, \
+    { k20, k21, k22, k23, k24, k25, KC_NO, KC_NO }, \
+    { k30, k31, k32, k33, k34, k35, KC_NO, KC_NO }, \
+    { k06, k07, k08, k09, k0a, k0b, k0c,   k0d }, \
+    { k16, k17, k18, k19, k1a, k1b, k1c,   k1d }, \
+    { k26, k27, k28, k29, k2a, k2b, k2c,   k2d }, \
+    { k36, k37, k38, k39, k3a, k3b, k3c,   k3d }, \
+    { k40, k41, k42, k49, k4a, k4b, k4c,   k4d }, \
+    { KC_NO, k47, KC_NO, k43, k44, k45, KC_NO, KC_NO }, \
 }