diff options
| author | Wilba <Jason.S.Williams@gmail.com> | 2019-10-12 15:37:03 +1100 |
|---|---|---|
| committer | Drashna Jaelre <drashna@live.com> | 2019-10-11 21:37:03 -0700 |
| commit | e47ab6a5752e16bd3b4288153798c12af1bee3d5 (patch) | |
| tree | 47fd56bfb7be699cc6b1ca84c3c22b8804000f5c /keyboards/wilba_tech/wt60_a | |
| parent | 22aa2ce6b2f3bda51aca84d8f707c17f0301ff3b (diff) | |
| download | qmk_firmware-e47ab6a5752e16bd3b4288153798c12af1bee3d5.tar.gz qmk_firmware-e47ab6a5752e16bd3b4288153798c12af1bee3d5.zip | |
[Keyboard] wilba.tech PCB refactoring (#6982)
* Cleanup
* Refactor VIA rules.mk
* WT mono backlight refactor, VIA support
* Added WT75-C
* Fixed compile error
* Cleanup rules.mk
* Review changes
* Review changes
Diffstat (limited to 'keyboards/wilba_tech/wt60_a')
| -rw-r--r-- | keyboards/wilba_tech/wt60_a/config.h | 35 | ||||
| -rw-r--r-- | keyboards/wilba_tech/wt60_a/keymaps/via/rules.mk | 69 | ||||
| -rw-r--r-- | keyboards/wilba_tech/wt60_a/rules.mk | 1 |
3 files changed, 29 insertions, 76 deletions
diff --git a/keyboards/wilba_tech/wt60_a/config.h b/keyboards/wilba_tech/wt60_a/config.h index 3ac8ea6fc..6e1e0e81c 100644 --- a/keyboards/wilba_tech/wt60_a/config.h +++ b/keyboards/wilba_tech/wt60_a/config.h | |||
| @@ -179,14 +179,33 @@ | |||
| 179 | /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */ | 179 | /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */ |
| 180 | //#define MIDI_TONE_KEYCODE_OCTAVES 1 | 180 | //#define MIDI_TONE_KEYCODE_OCTAVES 1 |
| 181 | 181 | ||
| 182 | #define WT_MONO_BACKLIGHT | 182 | // enable the mono backlight |
| 183 | #define MONO_BACKLIGHT_ENABLED 1 | ||
| 184 | |||
| 185 | // enable the RGB indicator for WT75-A | ||
| 186 | #define MONO_BACKLIGHT_WT75_A | ||
| 187 | |||
| 188 | // disable backlight when USB suspended (PC sleep/hibernate/shutdown) | ||
| 189 | #define MONO_BACKLIGHT_DISABLE_WHEN_USB_SUSPENDED 0 | ||
| 190 | |||
| 191 | // disable backlight after timeout in minutes, 0 = no timeout | ||
| 192 | #define MONO_BACKLIGHT_DISABLE_AFTER_TIMEOUT 0 | ||
| 193 | |||
| 194 | // the default brightness | ||
| 195 | #define MONO_BACKLIGHT_BRIGHTNESS 255 | ||
| 196 | |||
| 197 | // the default effect | ||
| 198 | #define MONO_BACKLIGHT_EFFECT 1 | ||
| 199 | |||
| 200 | // the default effect speed (0-3) | ||
| 201 | #define MONO_BACKLIGHT_EFFECT_SPEED 0 | ||
| 183 | 202 | ||
| 184 | #define DYNAMIC_KEYMAP_LAYER_COUNT 4 | 203 | #define DYNAMIC_KEYMAP_LAYER_COUNT 4 |
| 185 | 204 | ||
| 186 | // EEPROM usage | 205 | // EEPROM usage |
| 187 | 206 | ||
| 188 | // TODO: refactor with new user EEPROM code (coming soon) | 207 | // TODO: refactor with new user EEPROM code (coming soon) |
| 189 | #define EEPROM_MAGIC 0x451F | 208 | #define EEPROM_MAGIC 0x4520 |
| 190 | #define EEPROM_MAGIC_ADDR 34 | 209 | #define EEPROM_MAGIC_ADDR 34 |
| 191 | // Bump this every time we change what we store | 210 | // Bump this every time we change what we store |
| 192 | // This will automatically reset the EEPROM with defaults | 211 | // This will automatically reset the EEPROM with defaults |
| @@ -194,9 +213,11 @@ | |||
| 194 | #define EEPROM_VERSION 0x08 | 213 | #define EEPROM_VERSION 0x08 |
| 195 | #define EEPROM_VERSION_ADDR 36 | 214 | #define EEPROM_VERSION_ADDR 36 |
| 196 | 215 | ||
| 197 | // Dynamic keymap starts after EEPROM version | 216 | // Backlight config starts after EEPROM version |
| 198 | #define DYNAMIC_KEYMAP_EEPROM_ADDR 37 | 217 | #define MONO_BACKLIGHT_CONFIG_EEPROM_ADDR 37 |
| 199 | // Dynamic macro starts after dynamic keymaps (37+(4*5*14*2)) = (37+560) | 218 | // Dynamic keymap starts after backlight config (37+7) |
| 200 | #define DYNAMIC_KEYMAP_MACRO_EEPROM_ADDR 597 | 219 | #define DYNAMIC_KEYMAP_EEPROM_ADDR 44 |
| 201 | #define DYNAMIC_KEYMAP_MACRO_EEPROM_SIZE 427 | 220 | // Dynamic macro starts after dynamic keymaps (44+(4*5*14*2)) = (44+560) |
| 221 | #define DYNAMIC_KEYMAP_MACRO_EEPROM_ADDR 604 | ||
| 222 | #define DYNAMIC_KEYMAP_MACRO_EEPROM_SIZE 420 | ||
| 202 | #define DYNAMIC_KEYMAP_MACRO_COUNT 16 | 223 | #define DYNAMIC_KEYMAP_MACRO_COUNT 16 |
diff --git a/keyboards/wilba_tech/wt60_a/keymaps/via/rules.mk b/keyboards/wilba_tech/wt60_a/keymaps/via/rules.mk index 76a07d7a4..8834bf0c8 100644 --- a/keyboards/wilba_tech/wt60_a/keymaps/via/rules.mk +++ b/keyboards/wilba_tech/wt60_a/keymaps/via/rules.mk | |||
| @@ -1,71 +1,2 @@ | |||
| 1 | # project specific files | ||
| 2 | SRC = drivers/issi/is31fl3736.c \ | ||
| 3 | drivers/avr/i2c_master.c \ | ||
| 4 | keyboards/wilba_tech/wt_mono_backlight.c \ | ||
| 5 | keyboards/wilba_tech/wt_main.c | ||
| 6 | |||
| 7 | # MCU name | ||
| 8 | MCU = atmega32u4 | ||
| 9 | |||
| 10 | # Processor frequency. | ||
| 11 | # This will define a symbol, F_CPU, in all source code files equal to the | ||
| 12 | # processor frequency in Hz. You can then use this symbol in your source code to | ||
| 13 | # calculate timings. Do NOT tack on a 'UL' at the end, this will be done | ||
| 14 | # automatically to create a 32-bit value in your source code. | ||
| 15 | # | ||
| 16 | # This will be an integer division of F_USB below, as it is sourced by | ||
| 17 | # F_USB after it has run through any CPU prescalers. Note that this value | ||
| 18 | # does not *change* the processor frequency - it should merely be updated to | ||
| 19 | # reflect the processor speed set externally so that the code can use accurate | ||
| 20 | # software delays. | ||
| 21 | F_CPU = 16000000 | ||
| 22 | |||
| 23 | |||
| 24 | # | ||
| 25 | # LUFA specific | ||
| 26 | # | ||
| 27 | # Target architecture (see library "Board Types" documentation). | ||
| 28 | ARCH = AVR8 | ||
| 29 | |||
| 30 | # Input clock frequency. | ||
| 31 | # This will define a symbol, F_USB, in all source code files equal to the | ||
| 32 | # input clock frequency (before any prescaling is performed) in Hz. This value may | ||
| 33 | # differ from F_CPU if prescaling is used on the latter, and is required as the | ||
| 34 | # raw input clock is fed directly to the PLL sections of the AVR for high speed | ||
| 35 | # clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL' | ||
| 36 | # at the end, this will be done automatically to create a 32-bit value in your | ||
| 37 | # source code. | ||
| 38 | # | ||
| 39 | # If no clock division is performed on the input clock inside the AVR (via the | ||
| 40 | # CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. | ||
| 41 | F_USB = $(F_CPU) | ||
| 42 | |||
| 43 | # Interrupt driven control endpoint task(+60) | ||
| 44 | OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT | ||
| 45 | |||
| 46 | |||
| 47 | # Boot Section | ||
| 48 | BOOTLOADER = atmel-dfu | ||
| 49 | |||
| 50 | |||
| 51 | # Build Options | ||
| 52 | # change yes to no to disable | ||
| 53 | # | ||
| 54 | BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) | ||
| 55 | MOUSEKEY_ENABLE = no # Mouse keys(+4700) | ||
| 56 | EXTRAKEY_ENABLE = yes # Audio control and System control(+450) | ||
| 57 | CONSOLE_ENABLE = no # Console for debug(+400) | ||
| 58 | COMMAND_ENABLE = no # Commands for debug and configuration | ||
| 59 | # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE | ||
| 60 | SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend | ||
| 61 | # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work | ||
| 62 | NKRO_ENABLE = yes # USB Nkey Rollover | ||
| 63 | BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality on B7 by default | ||
| 64 | MIDI_ENABLE = no # MIDI support (+2400 to 4200, depending on config) | ||
| 65 | UNICODE_ENABLE = no # Unicode | ||
| 66 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID | ||
| 67 | AUDIO_ENABLE = no # Audio output on port C6 | ||
| 68 | FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches | ||
| 69 | |||
| 70 | RAW_ENABLE = yes | 1 | RAW_ENABLE = yes |
| 71 | DYNAMIC_KEYMAP_ENABLE = yes \ No newline at end of file | 2 | DYNAMIC_KEYMAP_ENABLE = yes \ No newline at end of file |
diff --git a/keyboards/wilba_tech/wt60_a/rules.mk b/keyboards/wilba_tech/wt60_a/rules.mk index e41f2186b..4f702fab4 100644 --- a/keyboards/wilba_tech/wt60_a/rules.mk +++ b/keyboards/wilba_tech/wt60_a/rules.mk | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | # project specific files | 1 | # project specific files |
| 2 | SRC = drivers/issi/is31fl3736.c \ | 2 | SRC = drivers/issi/is31fl3736.c \ |
| 3 | drivers/avr/i2c_master.c \ | 3 | drivers/avr/i2c_master.c \ |
| 4 | quantum/color.c \ | ||
| 4 | keyboards/wilba_tech/wt_mono_backlight.c \ | 5 | keyboards/wilba_tech/wt_mono_backlight.c \ |
| 5 | keyboards/wilba_tech/wt_main.c | 6 | keyboards/wilba_tech/wt_main.c |
| 6 | 7 | ||
