aboutsummaryrefslogtreecommitdiff
path: root/keyboards/wilba_tech
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/wilba_tech')
-rw-r--r--keyboards/wilba_tech/rama_works_m10_b/keyboard.json2
-rw-r--r--keyboards/wilba_tech/rama_works_m50_ax/keyboard.json2
-rw-r--r--keyboards/wilba_tech/wt60_g/keyboard.json2
-rw-r--r--keyboards/wilba_tech/wt60_g2/keyboard.json2
-rw-r--r--keyboards/wilba_tech/wt60_h1/keyboard.json2
-rw-r--r--keyboards/wilba_tech/wt60_h2/keyboard.json2
-rw-r--r--keyboards/wilba_tech/wt60_h3/keyboard.json2
-rw-r--r--keyboards/wilba_tech/wt60_xt/keyboard.json2
-rw-r--r--keyboards/wilba_tech/wt65_d/keyboard.json2
-rw-r--r--keyboards/wilba_tech/wt65_f/keyboard.json2
-rw-r--r--keyboards/wilba_tech/wt65_fx/keyboard.json2
-rw-r--r--keyboards/wilba_tech/wt65_g/keyboard.json2
-rw-r--r--keyboards/wilba_tech/wt65_g2/keyboard.json2
-rw-r--r--keyboards/wilba_tech/wt65_h1/keyboard.json2
-rw-r--r--keyboards/wilba_tech/wt65_xt/keyboard.json2
-rw-r--r--keyboards/wilba_tech/wt65_xtx/keyboard.json2
-rw-r--r--keyboards/wilba_tech/wt70_jb/keyboard.json2
-rw-r--r--keyboards/wilba_tech/wt80_g/keyboard.json2
-rw-r--r--keyboards/wilba_tech/wt_main.c59
-rw-r--r--keyboards/wilba_tech/wt_mono_backlight.c2
-rw-r--r--keyboards/wilba_tech/wt_rgb_backlight.c2
21 files changed, 11 insertions, 88 deletions
diff --git a/keyboards/wilba_tech/rama_works_m10_b/keyboard.json b/keyboards/wilba_tech/rama_works_m10_b/keyboard.json
index 157baa1c5a..43df7942cb 100644
--- a/keyboards/wilba_tech/rama_works_m10_b/keyboard.json
+++ b/keyboards/wilba_tech/rama_works_m10_b/keyboard.json
@@ -10,8 +10,6 @@
},
"features": {
"bootmagic": true,
- "command": false,
- "console": false,
"extrakey": true,
"mousekey": false,
"nkro": true
diff --git a/keyboards/wilba_tech/rama_works_m50_ax/keyboard.json b/keyboards/wilba_tech/rama_works_m50_ax/keyboard.json
index c44032f97c..9018086906 100644
--- a/keyboards/wilba_tech/rama_works_m50_ax/keyboard.json
+++ b/keyboards/wilba_tech/rama_works_m50_ax/keyboard.json
@@ -10,8 +10,6 @@
},
"features": {
"bootmagic": true,
- "command": false,
- "console": false,
"extrakey": true,
"mousekey": false,
"nkro": true
diff --git a/keyboards/wilba_tech/wt60_g/keyboard.json b/keyboards/wilba_tech/wt60_g/keyboard.json
index 526a6a9d72..1838cb4809 100644
--- a/keyboards/wilba_tech/wt60_g/keyboard.json
+++ b/keyboards/wilba_tech/wt60_g/keyboard.json
@@ -10,8 +10,6 @@
},
"features": {
"bootmagic": true,
- "command": false,
- "console": false,
"extrakey": true,
"mousekey": false,
"nkro": true
diff --git a/keyboards/wilba_tech/wt60_g2/keyboard.json b/keyboards/wilba_tech/wt60_g2/keyboard.json
index 5f62d9d52b..a8a8b186a8 100644
--- a/keyboards/wilba_tech/wt60_g2/keyboard.json
+++ b/keyboards/wilba_tech/wt60_g2/keyboard.json
@@ -10,8 +10,6 @@
},
"features": {
"bootmagic": true,
- "command": false,
- "console": false,
"extrakey": true,
"mousekey": false,
"nkro": true
diff --git a/keyboards/wilba_tech/wt60_h1/keyboard.json b/keyboards/wilba_tech/wt60_h1/keyboard.json
index 2832cf3cd7..bd8d687a57 100644
--- a/keyboards/wilba_tech/wt60_h1/keyboard.json
+++ b/keyboards/wilba_tech/wt60_h1/keyboard.json
@@ -10,8 +10,6 @@
},
"features": {
"bootmagic": true,
- "command": false,
- "console": false,
"extrakey": true,
"mousekey": false,
"nkro": true
diff --git a/keyboards/wilba_tech/wt60_h2/keyboard.json b/keyboards/wilba_tech/wt60_h2/keyboard.json
index f48e03940c..76c1385fcd 100644
--- a/keyboards/wilba_tech/wt60_h2/keyboard.json
+++ b/keyboards/wilba_tech/wt60_h2/keyboard.json
@@ -10,8 +10,6 @@
},
"features": {
"bootmagic": true,
- "command": false,
- "console": false,
"extrakey": true,
"mousekey": false,
"nkro": true
diff --git a/keyboards/wilba_tech/wt60_h3/keyboard.json b/keyboards/wilba_tech/wt60_h3/keyboard.json
index 9078fa9242..cf75517fb1 100644
--- a/keyboards/wilba_tech/wt60_h3/keyboard.json
+++ b/keyboards/wilba_tech/wt60_h3/keyboard.json
@@ -10,8 +10,6 @@
},
"features": {
"bootmagic": true,
- "command": false,
- "console": false,
"extrakey": true,
"mousekey": false,
"nkro": true
diff --git a/keyboards/wilba_tech/wt60_xt/keyboard.json b/keyboards/wilba_tech/wt60_xt/keyboard.json
index ba8e8000db..55229a2400 100644
--- a/keyboards/wilba_tech/wt60_xt/keyboard.json
+++ b/keyboards/wilba_tech/wt60_xt/keyboard.json
@@ -11,8 +11,6 @@
"features": {
"audio": true,
"bootmagic": true,
- "command": false,
- "console": false,
"extrakey": true,
"mousekey": false,
"nkro": true
diff --git a/keyboards/wilba_tech/wt65_d/keyboard.json b/keyboards/wilba_tech/wt65_d/keyboard.json
index 3754b3788b..e4e22b1eea 100644
--- a/keyboards/wilba_tech/wt65_d/keyboard.json
+++ b/keyboards/wilba_tech/wt65_d/keyboard.json
@@ -10,8 +10,6 @@
},
"features": {
"bootmagic": true,
- "command": false,
- "console": false,
"extrakey": true,
"mousekey": false,
"nkro": true
diff --git a/keyboards/wilba_tech/wt65_f/keyboard.json b/keyboards/wilba_tech/wt65_f/keyboard.json
index fb79856578..b97e180fde 100644
--- a/keyboards/wilba_tech/wt65_f/keyboard.json
+++ b/keyboards/wilba_tech/wt65_f/keyboard.json
@@ -10,8 +10,6 @@
},
"features": {
"bootmagic": true,
- "command": false,
- "console": false,
"extrakey": true,
"mousekey": false,
"nkro": true
diff --git a/keyboards/wilba_tech/wt65_fx/keyboard.json b/keyboards/wilba_tech/wt65_fx/keyboard.json
index f53332b6af..a914a804e1 100644
--- a/keyboards/wilba_tech/wt65_fx/keyboard.json
+++ b/keyboards/wilba_tech/wt65_fx/keyboard.json
@@ -10,8 +10,6 @@
},
"features": {
"bootmagic": true,
- "command": false,
- "console": false,
"extrakey": true,
"mousekey": false,
"nkro": true
diff --git a/keyboards/wilba_tech/wt65_g/keyboard.json b/keyboards/wilba_tech/wt65_g/keyboard.json
index e097477074..fee51985f2 100644
--- a/keyboards/wilba_tech/wt65_g/keyboard.json
+++ b/keyboards/wilba_tech/wt65_g/keyboard.json
@@ -10,8 +10,6 @@
},
"features": {
"bootmagic": true,
- "command": false,
- "console": false,
"extrakey": true,
"mousekey": false,
"nkro": true
diff --git a/keyboards/wilba_tech/wt65_g2/keyboard.json b/keyboards/wilba_tech/wt65_g2/keyboard.json
index 8a7862dcbe..7c5610a3b4 100644
--- a/keyboards/wilba_tech/wt65_g2/keyboard.json
+++ b/keyboards/wilba_tech/wt65_g2/keyboard.json
@@ -10,8 +10,6 @@
},
"features": {
"bootmagic": true,
- "command": false,
- "console": false,
"extrakey": true,
"mousekey": false,
"nkro": true
diff --git a/keyboards/wilba_tech/wt65_h1/keyboard.json b/keyboards/wilba_tech/wt65_h1/keyboard.json
index d56321ce5f..f43f4bb8d6 100644
--- a/keyboards/wilba_tech/wt65_h1/keyboard.json
+++ b/keyboards/wilba_tech/wt65_h1/keyboard.json
@@ -10,8 +10,6 @@
},
"features": {
"bootmagic": true,
- "command": false,
- "console": false,
"extrakey": true,
"mousekey": false,
"nkro": true
diff --git a/keyboards/wilba_tech/wt65_xt/keyboard.json b/keyboards/wilba_tech/wt65_xt/keyboard.json
index 5331856269..bc5785c3f1 100644
--- a/keyboards/wilba_tech/wt65_xt/keyboard.json
+++ b/keyboards/wilba_tech/wt65_xt/keyboard.json
@@ -10,8 +10,6 @@
},
"features": {
"bootmagic": true,
- "command": false,
- "console": false,
"extrakey": true,
"mousekey": false,
"nkro": true
diff --git a/keyboards/wilba_tech/wt65_xtx/keyboard.json b/keyboards/wilba_tech/wt65_xtx/keyboard.json
index 7d60043b91..63660aa750 100644
--- a/keyboards/wilba_tech/wt65_xtx/keyboard.json
+++ b/keyboards/wilba_tech/wt65_xtx/keyboard.json
@@ -10,8 +10,6 @@
},
"features": {
"bootmagic": true,
- "command": false,
- "console": false,
"extrakey": true,
"mousekey": false,
"nkro": true
diff --git a/keyboards/wilba_tech/wt70_jb/keyboard.json b/keyboards/wilba_tech/wt70_jb/keyboard.json
index f922810600..8204b1850b 100644
--- a/keyboards/wilba_tech/wt70_jb/keyboard.json
+++ b/keyboards/wilba_tech/wt70_jb/keyboard.json
@@ -33,8 +33,6 @@
},
"features": {
"bootmagic": true,
- "command": false,
- "console": false,
"extrakey": true,
"mousekey": false,
"nkro": true,
diff --git a/keyboards/wilba_tech/wt80_g/keyboard.json b/keyboards/wilba_tech/wt80_g/keyboard.json
index cc148a9fa0..27526e4e1f 100644
--- a/keyboards/wilba_tech/wt80_g/keyboard.json
+++ b/keyboards/wilba_tech/wt80_g/keyboard.json
@@ -10,8 +10,6 @@
},
"features": {
"bootmagic": true,
- "command": false,
- "console": false,
"extrakey": true,
"mousekey": false,
"nkro": true
diff --git a/keyboards/wilba_tech/wt_main.c b/keyboards/wilba_tech/wt_main.c
index 92c43c794d..7e56d98356 100644
--- a/keyboards/wilba_tech/wt_main.c
+++ b/keyboards/wilba_tech/wt_main.c
@@ -33,7 +33,7 @@
// Called from via_init() if VIA_ENABLE
// Called from matrix_init_kb() if not VIA_ENABLE
-void via_init_kb(void)
+void wt_main_init(void)
{
// This checks both an EEPROM reset (from bootmagic lite, keycodes)
// and also firmware build date (from via_eeprom_is_valid())
@@ -64,11 +64,9 @@ void via_init_kb(void)
void matrix_init_kb(void)
{
// If VIA is disabled, we still need to load backlight settings.
- // Call via_init_kb() the same way as via_init(), with setting
- // EEPROM valid afterwards.
+ // Call via_init_kb() the same way as via_init_kb() does.
#ifndef VIA_ENABLE
- via_init_kb();
- via_eeprom_set_valid(true);
+ wt_main_init();
#endif // VIA_ENABLE
matrix_init_user();
@@ -109,6 +107,10 @@ void suspend_wakeup_init_kb(void)
// Moving this to the bottom of this source file is a workaround
// for an intermittent compiler error for Atmel compiler.
#ifdef VIA_ENABLE
+void via_init_kb(void) {
+ wt_main_init();
+}
+
void via_custom_value_command_kb(uint8_t *data, uint8_t length) {
uint8_t *command_id = &(data[0]);
uint8_t *channel_id = &(data[1]);
@@ -159,50 +161,3 @@ void via_set_device_indication(uint8_t value)
}
#endif // VIA_ENABLE
-
-//
-// In the case of VIA being disabled, we still need to check if
-// keyboard level EEPROM memory is valid before loading.
-// Thus these are copies of the same functions in VIA, since
-// the backlight settings reuse VIA's EEPROM magic/version,
-// and the ones in via.c won't be compiled in.
-//
-// Yes, this is sub-optimal, and is only here for completeness
-// (i.e. catering to the 1% of people that want wilba.tech LED bling
-// AND want persistent settings BUT DON'T want to use dynamic keymaps/VIA).
-//
-#ifndef VIA_ENABLE
-
-bool via_eeprom_is_valid(void)
-{
- char *p = QMK_BUILDDATE; // e.g. "2019-11-05-11:29:54"
- uint8_t magic0 = ( ( p[2] & 0x0F ) << 4 ) | ( p[3] & 0x0F );
- uint8_t magic1 = ( ( p[5] & 0x0F ) << 4 ) | ( p[6] & 0x0F );
- uint8_t magic2 = ( ( p[8] & 0x0F ) << 4 ) | ( p[9] & 0x0F );
-
- return (eeprom_read_byte( (void*)VIA_EEPROM_MAGIC_ADDR+0 ) == magic0 &&
- eeprom_read_byte( (void*)VIA_EEPROM_MAGIC_ADDR+1 ) == magic1 &&
- eeprom_read_byte( (void*)VIA_EEPROM_MAGIC_ADDR+2 ) == magic2 );
-}
-
-void via_eeprom_set_valid(bool valid)
-{
- char *p = QMK_BUILDDATE; // e.g. "2019-11-05-11:29:54"
- uint8_t magic0 = ( ( p[2] & 0x0F ) << 4 ) | ( p[3] & 0x0F );
- uint8_t magic1 = ( ( p[5] & 0x0F ) << 4 ) | ( p[6] & 0x0F );
- uint8_t magic2 = ( ( p[8] & 0x0F ) << 4 ) | ( p[9] & 0x0F );
-
- eeprom_update_byte( (void*)VIA_EEPROM_MAGIC_ADDR+0, valid ? magic0 : 0xFF);
- eeprom_update_byte( (void*)VIA_EEPROM_MAGIC_ADDR+1, valid ? magic1 : 0xFF);
- eeprom_update_byte( (void*)VIA_EEPROM_MAGIC_ADDR+2, valid ? magic2 : 0xFF);
-}
-
-void via_eeprom_reset(void)
-{
- // Set the VIA specific EEPROM state as invalid.
- via_eeprom_set_valid(false);
- // Set the TMK/QMK EEPROM state as invalid.
- eeconfig_disable();
-}
-
-#endif // VIA_ENABLE
diff --git a/keyboards/wilba_tech/wt_mono_backlight.c b/keyboards/wilba_tech/wt_mono_backlight.c
index 01fefc8ecc..8359aab135 100644
--- a/keyboards/wilba_tech/wt_mono_backlight.c
+++ b/keyboards/wilba_tech/wt_mono_backlight.c
@@ -25,6 +25,8 @@
#include "progmem.h"
#include "eeprom.h"
+#include "nvm_eeprom_eeconfig_internal.h" // expose EEPROM addresses, no appetite to move legacy/deprecated code to nvm
+#include "nvm_eeprom_via_internal.h" // expose EEPROM addresses, no appetite to move legacy/deprecated code to nvm
#include "via.h" // uses EEPROM address, lighting value IDs
#define MONO_BACKLIGHT_CONFIG_EEPROM_ADDR (VIA_EEPROM_CUSTOM_CONFIG_ADDR)
diff --git a/keyboards/wilba_tech/wt_rgb_backlight.c b/keyboards/wilba_tech/wt_rgb_backlight.c
index e52d002060..744bcb262d 100644
--- a/keyboards/wilba_tech/wt_rgb_backlight.c
+++ b/keyboards/wilba_tech/wt_rgb_backlight.c
@@ -66,6 +66,8 @@
#include "quantum/color.h"
#include "eeprom.h"
+#include "nvm_eeprom_eeconfig_internal.h" // expose EEPROM addresses, no appetite to move legacy/deprecated code to nvm
+#include "nvm_eeprom_via_internal.h" // expose EEPROM addresses, no appetite to move legacy/deprecated code to nvm
#include "via.h" // uses EEPROM address, lighting value IDs
#define RGB_BACKLIGHT_CONFIG_EEPROM_ADDR (VIA_EEPROM_CUSTOM_CONFIG_ADDR)