summaryrefslogtreecommitdiff
path: root/keyboards/setta21
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/setta21')
-rw-r--r--keyboards/setta21/keymaps/salicylic/config.h3
-rw-r--r--keyboards/setta21/keymaps/salicylic/keymap.c28
-rw-r--r--keyboards/setta21/keymaps/salicylic/rules.mk3
-rw-r--r--keyboards/setta21/rules.mk7
4 files changed, 20 insertions, 21 deletions
diff --git a/keyboards/setta21/keymaps/salicylic/config.h b/keyboards/setta21/keymaps/salicylic/config.h
index 44b34aa2fd..06e23ba7a3 100644
--- a/keyboards/setta21/keymaps/salicylic/config.h
+++ b/keyboards/setta21/keymaps/salicylic/config.h
@@ -27,7 +27,7 @@
# define RGB_MATRIX_KEYPRESSES // reacts to keypresses
// # define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
// # define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
-# define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended
+# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
// # define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
// # define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
// # define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
@@ -37,4 +37,3 @@
# define RGB_MATRIX_VAL_STEP 5
# define RGB_MATRIX_SPD_STEP 10
#endif
-
diff --git a/keyboards/setta21/keymaps/salicylic/keymap.c b/keyboards/setta21/keymaps/salicylic/keymap.c
index d1db2ff9a2..568afd1339 100644
--- a/keyboards/setta21/keymaps/salicylic/keymap.c
+++ b/keyboards/setta21/keymaps/salicylic/keymap.c
@@ -9,7 +9,7 @@ extern rgblight_config_t rgblight_config;
extern uint8_t is_master;
-#ifdef OLED_DRIVER_ENABLE
+#ifdef OLED_ENABLE
static uint32_t oled_timer = 0;
#endif
@@ -40,11 +40,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//|--------+--------+--------+--------|
KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
//|--------+--------+--------+--------|
- KC_P7, KC_P8, KC_P9,
+ KC_P7, KC_P8, KC_P9,
//|--------+--------+--------+--------|
KC_P4, KC_P5, KC_P6, KC_PPLS,
//|--------+--------+--------+--------|
- KC_P1, KC_P2, KC_P3,
+ KC_P1, KC_P2, KC_P3,
//|--------+--------+--------+--------|
LT(_ARROW, KC_P0),LT(_MACRO, KC_PDOT),KC_PENT
//`-----------------------------------'
@@ -56,13 +56,13 @@ LT(_ARROW, KC_P0),LT(_MACRO, KC_PDOT),KC_PENT
//|--------+--------+--------+--------|
XXXXXXX, _______, _______, _______,
//|--------+--------+--------+--------|
- XXXXXXX, KC_UP, XXXXXXX,
+ XXXXXXX, KC_UP, XXXXXXX,
//|--------+--------+--------+--------|
KC_LEFT, KC_DOWN,KC_RIGHT, _______,
//|--------+--------+--------+--------|
- XXXXXXX, KC_DOWN, XXXXXXX,
+ XXXXXXX, KC_DOWN, XXXXXXX,
//|--------+--------+--------+--------|
- MO(_ARROW), MO(_MACRO), _______
+ MO(_ARROW), MO(_MACRO), _______
//`-----------------------------------'
),
@@ -72,13 +72,13 @@ LT(_ARROW, KC_P0),LT(_MACRO, KC_PDOT),KC_PENT
//|--------+--------+--------+--------|
SEND_MIN,SEND_MAX,SEND_CIF,SEND_AVE,
//|--------+--------+--------+--------|
- KC_F7, KC_F8, KC_F9,
+ KC_F7, KC_F8, KC_F9,
//|--------+--------+--------+--------|
KC_F4, KC_F5, KC_F6,SEND_SUM,
//|--------+--------+--------+--------|
- KC_F11, KC_F12, KC_F3,
+ KC_F11, KC_F12, KC_F3,
//|--------+--------+--------+--------|
- _______, _______, JP_RPRN
+ _______, _______, JP_RPRN
//`-----------------------------------'
),
@@ -88,13 +88,13 @@ LT(_ARROW, KC_P0),LT(_MACRO, KC_PDOT),KC_PENT
//|--------+--------+--------+--------|
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
//|--------+--------+--------+--------|
- RGB_SAD, RGB_SAI, XXXXXXX,
+ RGB_SAD, RGB_SAI, XXXXXXX,
//|--------+--------+--------+--------|
RGB_HUD, RGB_HUI, XXXXXXX, RGB_TOG,
//|--------+--------+--------+--------|
- RGB_VAD, RGB_VAI, XXXXXXX,
+ RGB_VAD, RGB_VAI, XXXXXXX,
//|--------+--------+--------+--------|
- _______, _______, RGB_MOD
+ _______, _______, RGB_MOD
//`-----------------------------------'
)
};
@@ -109,7 +109,7 @@ int RGB_current_mode;
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
bool result = false;
if (record->event.pressed) {
- #ifdef OLED_DRIVER_ENABLE
+ #ifdef OLED_ENABLE
oled_timer = timer_read32();
#endif
}
@@ -163,7 +163,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
return result;
}
-#ifdef OLED_DRIVER_ENABLE
+#ifdef OLED_ENABLE
oled_rotation_t oled_init_user(oled_rotation_t rotation) { return OLED_ROTATION_0; }
diff --git a/keyboards/setta21/keymaps/salicylic/rules.mk b/keyboards/setta21/keymaps/salicylic/rules.mk
index 2d19192969..69864a3166 100644
--- a/keyboards/setta21/keymaps/salicylic/rules.mk
+++ b/keyboards/setta21/keymaps/salicylic/rules.mk
@@ -1,3 +1,4 @@
RGBLIGHT_ENABLE = no
RGB_MATRIX_ENABLE = yes
-OLED_DRIVER_ENABLE = yes
+OLED_ENABLE = yes
+OLED_DRIVER = SSD1306
diff --git a/keyboards/setta21/rules.mk b/keyboards/setta21/rules.mk
index b99696bc26..6085e5cf1c 100644
--- a/keyboards/setta21/rules.mk
+++ b/keyboards/setta21/rules.mk
@@ -14,20 +14,19 @@ BOOTLOADER = caterina
# Build Options
# change yes to no to disable
#
-BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # Mouse keys
EXTRAKEY_ENABLE = no # Audio control and System control
CONSOLE_ENABLE = no # Console for debug
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 = no # Enable keyboard backlight functionality
-MIDI_ENABLE = no # MIDI controls
AUDIO_ENABLE = no # Audio output on port C6
UNICODE_ENABLE = no # Unicode
BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight.
+RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight.
TAP_DANCE_ENABLE = no
-OLED_DRIVER_ENABLE = no
+OLED_ENABLE = no
USE_I2C = 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