Make the CLI Ψ capital (#6637 )

Decrement EECONFIG magic number
This will manually wipe the EEPROM. This is a hacky solution for when new ranges are added or moved around. A better (more complicated) solution would be to zero out everything, not just known ranges. But for now, this is a hacky solution that will work.
2026-07-08 09:54:28 -04:00 · 2019-08-30 10:23:36 -07:00 · 2019-08-27 20:32:36 -07:00 · 2019-08-27 16:22:20 -07:00 · 2019-08-27 14:20:25 -07:00 · 2019-08-26 11:08:18 -07:00
7 changed files with 111 additions and 30 deletions
@@ -47,7 +47,7 @@ else:

 # Setup the CLI
 import milc
-milc.EMOJI_LOGLEVELS['INFO'] = '{fg_blue}ψ{style_reset_all}'
+milc.EMOJI_LOGLEVELS['INFO'] = '{fg_blue}Ψ{style_reset_all}'

 # If we were invoked as `qmk <cmd>` massage sys.argv into `qmk-<cmd>`.
 # This means we can't accept arguments to the qmk script itself.
@@ -36,15 +36,7 @@ F_USB = $(F_CPU)
 # Interrupt driven control endpoint task(+60)
 OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT

-
-# Boot Section Size in *bytes*
-#   Teensy halfKay   512
-#   Teensy++ halfKay 1024
-#   Atmel DFU loader 4096
-#   LUFA bootloader  4096
-#   USBaspLoader     2048
-OPT_DEFS += -DBOOTLOADER_SIZE=4096
-
+BOOTLOADER=atmel-dfu

 # Build Options
 #   change yes to no to disable
@@ -0,0 +1,80 @@
+{
+    "keyboard_name": "Maartenwut Wonderland",
+    "url": "",
+    "maintainer": "Maartenwut",
+    "width": 18.25,
+    "height": 5,
+    "layouts": {
+        "LAYOUT": {
+            "key_count": 66,
+            "layout": [
+                {"label":"k10", "x":0, "y":0},
+                {"label":"k00", "x":1.25, "y":0},
+                {"label":"k01", "x":2.25, "y":0},
+                {"label":"k02", "x":3.25, "y":0},
+                {"label":"k03", "x":4.25, "y":0},
+                {"label":"k04", "x":5.25, "y":0},
+                {"label":"k05", "x":6.25, "y":0},
+                {"label":"k06", "x":7.25, "y":0},
+                {"label":"k07", "x":10.25, "y":0},
+                {"label":"k08", "x":11.25, "y":0},
+                {"label":"k09", "x":12.25, "y":0},
+                {"label":"k0a", "x":13.25, "y":0},
+                {"label":"k0b", "x":14.25, "y":0},
+                {"label":"k0c", "x":15.25, "y":0},
+                {"label":"k0d", "x":16.25, "y":0},
+                {"label":"k0e", "x":17.25, "y":0},
+                {"label":"k20", "x":0, "y":1},
+                {"label":"k11", "x":1.25, "y":1, "w":1.5},
+                {"label":"k12", "x":2.75, "y":1},
+                {"label":"k13", "x":3.75, "y":1},
+                {"label":"k14", "x":4.75, "y":1},
+                {"label":"k15", "x":5.75, "y":1},
+                {"label":"k16", "x":6.75, "y":1},
+                {"label":"k17", "x":9.75, "y":1},
+                {"label":"k18", "x":10.75, "y":1},
+                {"label":"k19", "x":11.75, "y":1},
+                {"label":"k1a", "x":12.75, "y":1},
+                {"label":"k1b", "x":13.75, "y":1},
+                {"label":"k1c", "x":14.75, "y":1},
+                {"label":"k1d", "x":15.75, "y":1},
+                {"label":"k1e", "x":16.75, "y":1, "w":1.5},
+                {"label":"k30", "x":0, "y":2},
+                {"label":"k21", "x":1.25, "y":2, "w":1.75},
+                {"label":"k22", "x":3, "y":2},
+                {"label":"k23", "x":4, "y":2},
+                {"label":"k24", "x":5, "y":2},
+                {"label":"k25", "x":6, "y":2},
+                {"label":"k26", "x":7, "y":2},
+                {"label":"k27", "x":10, "y":2},
+                {"label":"k28", "x":11, "y":2},
+                {"label":"k29", "x":12, "y":2},
+                {"label":"k2a", "x":13, "y":2},
+                {"label":"k2b", "x":14, "y":2},
+                {"label":"k2c", "x":15, "y":2},
+                {"label":"k2e", "x":16, "y":2, "w":2.25},
+                {"label":"k31", "x":1.25, "y":3, "w":2.25},
+                {"label":"k32", "x":3.5, "y":3},
+                {"label":"k33", "x":4.5, "y":3},
+                {"label":"k34", "x":5.5, "y":3},
+                {"label":"k35", "x":6.5, "y":3},
+                {"label":"k36", "x":7.5, "y":3},
+                {"label":"k37", "x":9.5, "y":3},
+                {"label":"k38", "x":10.5, "y":3},
+                {"label":"k39", "x":11.5, "y":3},
+                {"label":"k3a", "x":12.5, "y":3},
+                {"label":"k3b", "x":13.5, "y":3},
+                {"label":"k3c", "x":14.5, "y":3},
+                {"label":"k3d", "x":15.5, "y":3, "w":1.75},
+                {"label":"k3e", "x":17.25, "y":3},
+                {"label":"k41", "x":1.25, "y":4, "w":1.5},
+                {"label":"k43", "x":4.25, "y":4, "w":1.5},
+                {"label":"k45", "x":5.75, "y":4, "w":2},
+                {"label":"k46", "x":7.75, "y":4, "w":1.25},
+                {"label":"k48", "x":9.5, "y":4, "w":2.75},
+                {"label":"k4a", "x":12.25, "y":4, "w":1.5},
+                {"label":"k4e", "x":16.75, "y":4, "w":1.5}
+            ]
+        }
+    }
+}
@@ -0,0 +1,14 @@
+Wonderland USB-c and USB-mini
+======
+
+Only the USB-mini part is compatible with the original Alice case. The USB-c version was created for the Lubrigante, a case designed by Zambumon and a GB run by homerowco.
+
+Keyboard Maintainer: [Maartenwut](https://github.com/Maartenwut)<br>
+Hardware Supported: Wonderland-C and Wonderland-Mini<br>
+Hardware Availability: https://maartenwut.com/product/wonderland-mini-usb-only/<br>
+
+Make example for this keyboard (after setting up your build environment):
+
+    make maartenwut/wonderland:default
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
@@ -1,7 +1,5 @@
 #include QMK_KEYBOARD_H

-extern keymap_config_t keymap_config;
-
 // Each layer gets a name for readability, which is then used in the keymap matrix below.
 // The underscores don't mean anything - you can have a layer called STUFF or any other name.
 // Layer names don't all need to be of the same length, obviously, and you can also skip them
@@ -19,11 +17,10 @@ enum custom_keycodes {
 };

 // Shortcut to make keymap more readable
-#define KC_BKSL KC_BSLASH
 #define SYM_L   MO(_SYMB)

 #define KC_ALAS LALT_T(KC_PAST)
-#define KC_CTPL LCTL_T(KC_PSLS)
+#define KC_CTPL LCTL_T(KC_BSLS)

 #define KC_NAGR LT(_NAV, KC_GRV)
 #define KC_NAMI LT(_NAV, KC_MINS)
@@ -41,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
     KC_ESC  ,KC_A    ,KC_S    ,KC_D    ,KC_F    ,KC_G    ,KC_LBRC ,                          KC_RBRC ,KC_H    ,KC_J    ,KC_K    ,KC_L    ,KC_SCLN ,KC_QUOT ,
  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_LSFT ,KC_Z    ,KC_X    ,KC_C    ,KC_V    ,KC_B    ,KC_ADPU ,KC_PGDN ,        KC_HOME ,KC_ADEN ,KC_N    ,KC_M    ,KC_COMM ,KC_DOT  ,KC_BKSL ,KC_RSFT ,
+     KC_LSFT ,KC_Z    ,KC_X    ,KC_C    ,KC_V    ,KC_B    ,KC_ADPU ,KC_PGDN ,        KC_HOME ,KC_ADEN ,KC_N    ,KC_M    ,KC_COMM ,KC_DOT  ,KC_SLSH ,KC_RSFT ,
  //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
     KC_LGUI ,KC_PPLS ,KC_PMNS ,KC_ALAS ,     KC_CTPL ,    KC_BSPC ,KC_DEL  ,        KC_ENT  ,KC_SPC  ,    KC_RALT ,     KC_LEFT ,KC_DOWN ,KC_UP   ,KC_RGHT 
  //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
@@ -51,13 +48,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
     _______ ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,                                            KC_F6   ,KC_F7   ,KC_F8   ,KC_F9   ,KC_F10  ,XXXXXXX ,
  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,KC_EXLM ,KC_AT   ,KC_LCBR ,KC_RCBR ,KC_PIPE ,_______ ,                          _______ ,XXXXXXX ,KC_KP_7 ,KC_KP_8 ,KC_KP_9 ,XXXXXXX ,XXXXXXX ,
+     _______ ,KC_EXLM ,KC_AT   ,KC_LCBR ,KC_RCBR ,KC_PIPE ,_______ ,                          _______ ,KC_PSLS ,KC_P7 ,KC_P8 ,KC_P9 ,KC_PMNS ,XXXXXXX ,
  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,KC_HASH ,KC_DLR  ,KC_LBRC ,KC_RBRC ,KC_GRV  ,_______ ,                          _______ ,XXXXXXX ,KC_KP_4 ,KC_KP_5 ,KC_KP_6 ,XXXXXXX ,XXXXXXX ,
+     _______ ,KC_HASH ,KC_DLR  ,KC_LBRC ,KC_RBRC ,KC_GRV  ,_______ ,                          _______ ,KC_PAST ,KC_P4 ,KC_P5 ,KC_P6 ,KC_PPLS ,XXXXXXX ,
  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,KC_PERC ,KC_CIRC ,KC_LPRN ,KC_RPRN ,KC_TILD ,_______ ,_______ ,        _______ ,_______ ,XXXXXXX ,KC_KP_1 ,KC_KP_2 ,KC_KP_3 ,XXXXXXX ,XXXXXXX ,
+     _______ ,KC_PERC ,KC_CIRC ,KC_LPRN ,KC_RPRN ,KC_TILD ,_______ ,_______ ,        _______ ,_______ ,XXXXXXX ,KC_P1 ,KC_P2 ,KC_P3 ,KC_PENT ,XXXXXXX ,
  //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
-     _______ ,_______ ,_______ ,_______ ,     _______ ,    _______ ,_______ ,        _______ ,_______ ,    KC_KP_0 ,     KC_KP_0 ,KC_PDOT ,XXXXXXX ,XXXXXXX 
+     _______ ,_______ ,_______ ,_______ ,     _______ ,    _______ ,_______ ,        _______ ,_______ ,    KC_P0 ,     KC_P0 ,KC_PDOT ,KC_PENT ,XXXXXXX 
  //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
  ),

@@ -88,5 +85,4 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,     XXXXXXX ,    XXXXXXX ,XXXXXXX ,        XXXXXXX ,XXXXXXX ,    XXXXXXX ,     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX 
  //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
  )
-
 };
@@ -1,7 +1,5 @@
 #include QMK_KEYBOARD_H

-extern keymap_config_t keymap_config;
-
 // Each layer gets a name for readability, which is then used in the keymap matrix below.
 // The underscores don't mean anything - you can have a layer called STUFF or any other name.
 // Layer names don't all need to be of the same length, obviously, and you can also skip them
@@ -19,11 +17,10 @@ enum custom_keycodes {
 };

 // Shortcut to make keymap more readable
-#define KC_BKSL KC_BSLASH
 #define SYM_L   MO(_SYMB)

 #define KC_ALAS LALT_T(KC_PAST)
-#define KC_CTPL LCTL_T(KC_PSLS)
+#define KC_CTPL LCTL_T(KC_BSLS)

 #define KC_NAGR LT(_NAV, KC_GRV)
 #define KC_NAMI LT(_NAV, KC_MINS)
@@ -41,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
     KC_ESC  ,KC_A    ,KC_S    ,KC_D    ,KC_F    ,KC_G    ,KC_LBRC ,                          KC_RBRC ,KC_H    ,KC_J    ,KC_K    ,KC_L    ,KC_SCLN ,KC_QUOT ,
  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_LSFT ,KC_Z    ,KC_X    ,KC_C    ,KC_V    ,KC_B    ,KC_ADPU ,KC_PGDN ,        KC_HOME ,KC_ADEN ,KC_N    ,KC_M    ,KC_COMM ,KC_DOT  ,KC_BKSL ,KC_RSFT ,
+     KC_LSFT ,KC_Z    ,KC_X    ,KC_C    ,KC_V    ,KC_B    ,KC_ADPU ,KC_PGDN ,        KC_HOME ,KC_ADEN ,KC_N    ,KC_M    ,KC_COMM ,KC_DOT  ,KC_SLSH ,KC_RSFT ,
  //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
     KC_LGUI ,KC_PPLS ,KC_PMNS ,KC_ALAS ,     KC_CTPL ,    KC_BSPC ,KC_DEL  ,        KC_ENT  ,KC_SPC  ,    KC_RALT ,     KC_LEFT ,KC_DOWN ,KC_UP   ,KC_RGHT
  //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
@@ -51,13 +48,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
     _______ ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,                                            KC_F6   ,KC_F7   ,KC_F8   ,KC_F9   ,KC_F10  ,XXXXXXX ,
  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,KC_EXLM ,KC_AT   ,KC_LCBR ,KC_RCBR ,KC_PIPE ,_______ ,                          _______ ,XXXXXXX ,KC_KP_7 ,KC_KP_8 ,KC_KP_9 ,XXXXXXX ,XXXXXXX ,
+     _______ ,KC_EXLM ,KC_AT   ,KC_LCBR ,KC_RCBR ,KC_PIPE ,_______ ,                          _______ ,KC_PSLS ,KC_P7 	,KC_P8 	 ,KC_P9   ,KC_PMNS ,XXXXXXX ,
  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,KC_HASH ,KC_DLR  ,KC_LBRC ,KC_RBRC ,KC_GRV  ,_______ ,                          _______ ,XXXXXXX ,KC_KP_4 ,KC_KP_5 ,KC_KP_6 ,XXXXXXX ,XXXXXXX ,
+     _______ ,KC_HASH ,KC_DLR  ,KC_LBRC ,KC_RBRC ,KC_GRV  ,_______ ,                          _______ ,KC_PAST ,KC_P4 	,KC_P5   ,KC_P6   ,KC_PPLS ,XXXXXXX ,
  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,KC_PERC ,KC_CIRC ,KC_LPRN ,KC_RPRN ,KC_TILD ,_______ ,_______ ,        _______ ,_______ ,XXXXXXX ,KC_KP_1 ,KC_KP_2 ,KC_KP_3 ,XXXXXXX ,XXXXXXX ,
+     _______ ,KC_PERC ,KC_CIRC ,KC_LPRN ,KC_RPRN ,KC_TILD ,_______ ,_______ ,        _______ ,_______ ,XXXXXXX ,KC_P1 	,KC_P2   ,KC_P3   ,KC_PENT ,XXXXXXX ,
  //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
-     _______ ,_______ ,_______ ,_______ ,     _______ ,    _______ ,_______ ,        _______ ,_______ ,    KC_KP_0 ,     KC_KP_0 ,KC_PDOT ,XXXXXXX ,XXXXXXX
+     _______ ,_______ ,_______ ,_______ ,     _______ ,    _______ ,_______ ,        _______ ,_______ ,    KC_P0   ,     KC_P0   ,KC_PDOT ,KC_PENT ,XXXXXXX 
  //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
  ),

@@ -22,7 +22,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <stdbool.h>


-#define EECONFIG_MAGIC_NUMBER                       (uint16_t)0xFEED
+#ifndef EECONFIG_MAGIC_NUMBER
+#     define EECONFIG_MAGIC_NUMBER                       (uint16_t)0xFEEC
+#endif
 #define EECONFIG_MAGIC_NUMBER_OFF                   (uint16_t)0xFFFF

 /* EEPROM parameter address */
Author	SHA1	Message	Date
fauxpark	c27aa60c50	Make the CLI Ψ capital (#6637 )	2019-08-30 10:23:36 -07:00
Drashna Jaelre	931e9bdbe4	Decrement EECONFIG magic number This will manually wipe the EEPROM. This is a hacky solution for when new ranges are added or moved around. A better (more complicated) solution would be to zero out everything, not just known ranges. But for now, this is a hacky solution that will work.	2019-08-27 20:32:36 -07:00
Yan-Fa Li	5ef7367e6c	Wonderland: README (#6613 ) * Wonderland README breaks * Wonderland info.json * Update keyboards/maartenwut/wonderland/readme.md Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>	2019-08-27 16:22:20 -07:00
Jorde Vorstenbosch	5c6c556933	[Keymap] default keymap fix for questionmark (redox, redox_w) (#6574 ) * default keymap fix for questionmark Added /? to the default position for a qwerty keyboard. Moved \|\ to the left ctrl with the same behaviour as before. * Small PR adjustments and Keypad optimization * Update keymap.c * Update keymap.c	2019-08-27 14:20:25 -07:00
Yan-Fa Li	d2ce12d15d	pegasushoof Specify the bootloader to use :flash (#6614 ) A support for newer :flash command to pegasus hoof	2019-08-26 11:08:18 -07:00