commit 3b8369abaeb47b198422ab194cf3365d68944692
parent ddd56f5d83a971498a4bddd6b66611fd7e332137
Author: Jack Sangdahl <jack@pngu.org>
Date: Fri, 28 Nov 2025 21:26:57 -0700
Remove switcher module, some QP code
Diffstat:
15 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +1,3 @@
[submodule "modules/getreuer"]
path = modules/getreuer
url = https://github.com/getreuer/qmk-modules.git
-[submodule "modules/dave-thompson"]
- path = modules/dave-thompson
- url = https://github.com/dave-thompson/qmk-modules.git
diff --git a/keyboards/endgame/keymaps/jack/keymap.json b/keyboards/endgame/keymaps/jack/keymap.json
@@ -1,5 +0,0 @@
-{
- "modules": [
- "dave-thompson/switcher"
- ]
-}
diff --git a/keyboards/projectcain/relic/keymaps/jack/keymap.json b/keyboards/projectcain/relic/keymaps/jack/keymap.json
@@ -1,5 +0,0 @@
-{
- "modules": [
- "dave-thompson/switcher"
- ]
-}
diff --git a/keyboards/projectcain/vault35/keymaps/jack/keymap.json b/keyboards/projectcain/vault35/keymaps/jack/keymap.json
@@ -1,5 +0,0 @@
-{
- "modules": [
- "dave-thompson/switcher"
- ]
-}
diff --git a/keyboards/pseusplit/rules.mk b/keyboards/pseusplit/rules.mk
@@ -1,2 +1,2 @@
POINTING_DEVICE_DRIVER = azoteq_iqs5xx
-QUANTUM_PAINTER_DRIVERS += st7789_spi
+QUANTUM_PAINTER_DRIVERS = st7789_spi
diff --git a/keyboards/splitkb/kyria/keymaps/jack/keymap.json b/keyboards/splitkb/kyria/keymaps/jack/keymap.json
@@ -1,6 +1,5 @@
{
"modules": [
- "getreuer/palettefx",
- "dave-thompson/switcher"
+ "getreuer/palettefx"
]
}
diff --git a/keyboards/sweep/keymaps/jack/keymap.c b/keyboards/sweep/keymaps/jack/keymap.c
@@ -1,7 +1,6 @@
// Copyright 2025 jack@pngu.org
// SPDX-License-Identifier: GPL-2.0-or-later
#include "jack.h"
-#include "analog.h"
// clang-format off
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
@@ -26,6 +25,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
};
// clang-format on
+#ifdef QUANTUM_PAINTER_ENABLE
+#include "analog.h"
+
static painter_device_t display;
void keyboard_post_init_keymap() {
@@ -87,3 +89,4 @@ void housekeeping_task_keymap(void) {
void suspend_power_down_user(void) { qp_power(display, false); }
void suspend_wakeup_init_user(void) { qp_power(display, true); }
+#endif
diff --git a/keyboards/sweep/keymaps/jack/keymap.json b/keyboards/sweep/keymaps/jack/keymap.json
@@ -1,6 +1,5 @@
{
"modules": [
- "getreuer/palettefx",
- "dave-thompson/switcher"
+ "getreuer/palettefx"
]
}
diff --git a/modules/dave-thompson b/modules/dave-thompson
@@ -1 +0,0 @@
-Subproject commit 30411fa14bc5e74bad65eaecc665091d5d538dfd
diff --git a/users/jack/jack.c b/users/jack/jack.c
@@ -7,6 +7,9 @@ void housekeeping_task_user(void) {
#ifdef RGB_MATRIX_ENABLE
housekeeping_task_rgb_matrix();
#endif
+#ifdef QUANTUM_PAINTER_ENABLE
+ housekeeping_task_qp();
+#endif
housekeeping_task_keymap();
}
diff --git a/users/jack/jack.h b/users/jack/jack.h
@@ -43,8 +43,10 @@ void ply_nxt_prv(tap_dance_state_t *state, void *user_data);
#endif
#ifdef QUANTUM_PAINTER_ENABLE
-void keyboard_post_init_qp(void);
extern painter_font_handle_t qp_font;
+void keyboard_post_init_qp(void);
+void display_timer_reset(void);
+void housekeeping_task_qp(void);
#endif
#ifdef OLED_ENABLE
@@ -111,12 +113,12 @@ void housekeeping_task_keymap(void);
#define ___LOWER1___ KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0
#define ___LOWER2___ HRML(KC_EXLM, KC_AT, KC_HASH, KC_DLR), KC_PERC, KC_CIRC, HRMR(KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN)
#define ___LOWER3___ KC_VOLD, KC_TAB, KC_CAPS, REMOVE, KC_GRV, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_VOLU
-#define ___LOWER4___ _______, _______, SWTCH, PNP
+#define ___LOWER4___ _______, _______, _______, PNP
#define ___RAISE1___ XRGB_TOG, XRGB_NXT, XRGB_HUI, XRGB_SAI, XRGB_VAI, UC_NOMODE, UC_SCRIPT, UC_BLOCKS, UC_REGIONAL, QK_MAKE
#define ___RAISE2___ MS_JIGGLE, XRGB_PRV, XRGB_HUD, XRGB_SAD, XRGB_VAD, UC_WIDE, UC_AUSSIE, UC_ZALGO, UC_SUPER, QK_BOOT
#define ___RAISE3___ KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10
-#define ___RAISE4___ _______, UPDIR, _______, _______
+#define ___RAISE4___ UPDIR, _______, _______, _______
// clang-format on
#define LAYOUT_jack_60_ts(...) LAYOUT_60_ansi_tsangan(__VA_ARGS__)
diff --git a/users/jack/oled.c b/users/jack/oled.c
@@ -10,7 +10,7 @@ void oled_timer_reset(void) { oled_timer = timer_read32(); }
__attribute__((weak)) bool oled_task_keymap(void) { return true; }
bool oled_task_user(void) {
if (is_keyboard_master()) {
- if (timer_elapsed32(oled_timer) > 300000) {
+ if (timer_elapsed32(oled_timer) > 180000) {
oled_off();
return false;
} else
diff --git a/users/jack/painter.c b/users/jack/painter.c
@@ -4,7 +4,14 @@
#include "painter.h"
painter_font_handle_t qp_font;
+uint32_t display_timer = 0;
void keyboard_post_init_qp(void) {
qp_font = qp_load_font_mem(font_JetBrainsMono_11);
}
+
+void display_timer_reset(void) { display_timer = timer_read32(); }
+
+void housekeeping_task_qp(void) {
+ qp_power(display, timer_elapsed32(display_timer) > 180000);
+}
diff --git a/users/jack/painter.h b/users/jack/painter.h
@@ -4,3 +4,5 @@
#include "qp.h"
#include "fonts.qff.h"
+
+extern painter_device_t display;
diff --git a/users/jack/tapping.c b/users/jack/tapping.c
@@ -67,6 +67,10 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
if (!process_record_rgb_matrix(keycode, record))
return false;
#endif
+#ifdef QUANTUM_PAINTER_ENABLE
+ if (record->event.pressed)
+ display_timer_reset();
+#endif
#ifdef OLED_ENABLE
if (record->event.pressed)
oled_timer_reset();
