diff options
| author | Álvaro A. Volpato <alvaro.volpato@usp.br> | 2021-12-07 11:48:12 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-07 14:48:12 +0000 |
| commit | 28e92536d46298229593c12406b503bf3bcbbede (patch) | |
| tree | 26dafb81884df75d67794f5368b273113596582d | |
| parent | 554cc86aebd9011efd30d708ed2a717aaf8f93f1 (diff) | |
| download | qmk_firmware-28e92536d46298229593c12406b503bf3bcbbede.tar.gz qmk_firmware-28e92536d46298229593c12406b503bf3bcbbede.zip | |
Iron180 LED fix (#15411)
| -rw-r--r-- | keyboards/iron180/config.h | 27 | ||||
| -rw-r--r-- | keyboards/iron180/halconf.h | 10 | ||||
| -rw-r--r-- | keyboards/iron180/iron180.h | 2 | ||||
| -rwxr-xr-x | keyboards/iron180/keymaps/default/keymap.c | 2 | ||||
| -rwxr-xr-x | keyboards/iron180/keymaps/via/keymap.c | 2 | ||||
| -rw-r--r-- | keyboards/iron180/mcuconf.h | 10 | ||||
| -rw-r--r-- | keyboards/iron180/readme.md | 25 | ||||
| -rw-r--r-- | keyboards/iron180/rules.mk | 3 |
8 files changed, 31 insertions, 50 deletions
diff --git a/keyboards/iron180/config.h b/keyboards/iron180/config.h index b7b6cb652..bb71496b5 100644 --- a/keyboards/iron180/config.h +++ b/keyboards/iron180/config.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | Copyright 2015 Álvaro "Gondolindrim" Volpato <gondolindrim@acheronproject.com> | 2 | Copyright 2021 Álvaro "Gondolindrim" Volpato <gondolindrim@acheronproject.com> |
| 3 | 3 | ||
| 4 | This program is free software: you can redistribute it and/or modify | 4 | This program is free software: you can redistribute it and/or modify |
| 5 | it under the terms of the GNU General Public License as published by | 5 | it under the terms of the GNU General Public License as published by |
| @@ -36,12 +36,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 36 | #define BACKLIGHT_PWM_DRIVER PWMD3 | 36 | #define BACKLIGHT_PWM_DRIVER PWMD3 |
| 37 | #define BACKLIGHT_PWM_CHANNEL 1 | 37 | #define BACKLIGHT_PWM_CHANNEL 1 |
| 38 | #define BACKLIGHT_PAL_MODE 1 | 38 | #define BACKLIGHT_PAL_MODE 1 |
| 39 | #define BACKLIGHT_LEVELS 6 | 39 | #define BACKLIGHT_LEVELS 20 |
| 40 | #define BACKLIGHT_BREATHING | 40 | #define BACKLIGHT_BREATHING |
| 41 | #define BREATHING_PERIOD 6 | 41 | #define BREATHING_PERIOD 5 |
| 42 | |||
| 43 | /* define if matrix has ghost */ | ||
| 44 | //#define MATRIX_HAS_GHOST | ||
| 45 | 42 | ||
| 46 | /* Set 0 if debouncing isn't needed */ | 43 | /* Set 0 if debouncing isn't needed */ |
| 47 | #define DEBOUNCE 5 | 44 | #define DEBOUNCE 5 |
| @@ -50,21 +47,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 50 | #define LOCKING_SUPPORT_ENABLE | 47 | #define LOCKING_SUPPORT_ENABLE |
| 51 | /* Locking resynchronize hack */ | 48 | /* Locking resynchronize hack */ |
| 52 | #define LOCKING_RESYNC_ENABLE | 49 | #define LOCKING_RESYNC_ENABLE |
| 53 | |||
| 54 | /* | ||
| 55 | * Feature disable options | ||
| 56 | * These options are also useful to firmware size reduction. | ||
| 57 | */ | ||
| 58 | |||
| 59 | /* disable debug print */ | ||
| 60 | //#define NO_DEBUG | ||
| 61 | |||
| 62 | /* disable print */ | ||
| 63 | //#define NO_PRINT | ||
| 64 | |||
| 65 | /* disable action features */ | ||
| 66 | //#define NO_ACTION_LAYER | ||
| 67 | //#define NO_ACTION_TAPPING | ||
| 68 | //#define NO_ACTION_ONESHOT | ||
| 69 | //#define NO_ACTION_MACRO | ||
| 70 | //#define NO_ACTION_FUNCTION | ||
diff --git a/keyboards/iron180/halconf.h b/keyboards/iron180/halconf.h index 2d0841426..dbc739b13 100644 --- a/keyboards/iron180/halconf.h +++ b/keyboards/iron180/halconf.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* Copyright 2020 QMK | 1 | /* Copyright 2021 QMK |
| 2 | * | 2 | * |
| 3 | * This program is free software: you can redistribute it and/or modify | 3 | * This program is free software: you can redistribute it and/or modify |
| 4 | * it under the terms of the GNU General Public License as published by | 4 | * it under the terms of the GNU General Public License as published by |
| @@ -14,14 +14,8 @@ | |||
| 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | /* | ||
| 18 | * This file was auto-generated by: | ||
| 19 | * `qmk chibios-confmigrate -i keyboards/iron180/halconf.h -r platforms/chibios/common/configs/halconf.h` | ||
| 20 | */ | ||
| 21 | |||
| 22 | #pragma once | 17 | #pragma once |
| 23 | 18 | ||
| 24 | #define HAL_USE_PWM YES | 19 | #define HAL_USE_PWM TRUE |
| 25 | 20 | ||
| 26 | #include_next <halconf.h> | 21 | #include_next <halconf.h> |
| 27 | |||
diff --git a/keyboards/iron180/iron180.h b/keyboards/iron180/iron180.h index 032d8afb5..3027ed11a 100644 --- a/keyboards/iron180/iron180.h +++ b/keyboards/iron180/iron180.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | Copyright 2015 Álvaro "Gondolindrim" Volpato <gondolindrim@acheronproject.com> | 2 | Copyright 2021 Álvaro "Gondolindrim" Volpato <gondolindrim@acheronproject.com> |
| 3 | 3 | ||
| 4 | This program is free software: you can redistribute it and/or modify | 4 | This program is free software: you can redistribute it and/or modify |
| 5 | it under the terms of the GNU General Public License as published by | 5 | it under the terms of the GNU General Public License as published by |
diff --git a/keyboards/iron180/keymaps/default/keymap.c b/keyboards/iron180/keymaps/default/keymap.c index d78f60e11..46b107222 100755 --- a/keyboards/iron180/keymaps/default/keymap.c +++ b/keyboards/iron180/keymaps/default/keymap.c | |||
| @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 27 | KC_LCTL, KC_LWIN, KC_LALT, KC_SPC , KC_RALT, KC_RWIN, MO(1) , KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT | 27 | KC_LCTL, KC_LWIN, KC_LALT, KC_SPC , KC_RALT, KC_RWIN, MO(1) , KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT |
| 28 | ), | 28 | ), |
| 29 | [1] = LAYOUT_all( | 29 | [1] = LAYOUT_all( |
| 30 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 30 | RESET , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 31 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 31 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 32 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 32 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 33 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 33 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
diff --git a/keyboards/iron180/keymaps/via/keymap.c b/keyboards/iron180/keymaps/via/keymap.c index d78f60e11..46b107222 100755 --- a/keyboards/iron180/keymaps/via/keymap.c +++ b/keyboards/iron180/keymaps/via/keymap.c | |||
| @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 27 | KC_LCTL, KC_LWIN, KC_LALT, KC_SPC , KC_RALT, KC_RWIN, MO(1) , KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT | 27 | KC_LCTL, KC_LWIN, KC_LALT, KC_SPC , KC_RALT, KC_RWIN, MO(1) , KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT |
| 28 | ), | 28 | ), |
| 29 | [1] = LAYOUT_all( | 29 | [1] = LAYOUT_all( |
| 30 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 30 | RESET , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 31 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 31 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 32 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 32 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 33 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 33 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
diff --git a/keyboards/iron180/mcuconf.h b/keyboards/iron180/mcuconf.h index 620b983c7..a81f81220 100644 --- a/keyboards/iron180/mcuconf.h +++ b/keyboards/iron180/mcuconf.h | |||
| @@ -14,17 +14,9 @@ | |||
| 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | /* | ||
| 18 | * This file was auto-generated by: | ||
| 19 | * `qmk chibios-confmigrate -i keyboards/iron180/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h` | ||
| 20 | */ | ||
| 21 | |||
| 22 | #pragma once | 17 | #pragma once |
| 23 | 18 | ||
| 24 | #include_next <mcuconf.h> | 19 | #include_next <mcuconf.h> |
| 25 | 20 | ||
| 26 | #undef STM32_I2C_USE_DMA | ||
| 27 | #define STM32_I2C_USE_DMA FALSE | ||
| 28 | |||
| 29 | #undef STM32_PWM_USE_TIM3 | 21 | #undef STM32_PWM_USE_TIM3 |
| 30 | #define STM32_PWM_USE_TIM3 YES | 22 | #define STM32_PWM_USE_TIM3 TRUE |
diff --git a/keyboards/iron180/readme.md b/keyboards/iron180/readme.md index 5f340c425..1dbffae1d 100644 --- a/keyboards/iron180/readme.md +++ b/keyboards/iron180/readme.md | |||
| @@ -1,4 +1,6 @@ | |||
| 1 | # Iron180 QMK folder | 1 | # Iron180 QMK firmware folder |
| 2 | |||
| 3 |  | ||
| 2 | 4 | ||
| 3 | ## Introduction | 5 | ## Introduction |
| 4 | 6 | ||
| @@ -6,13 +8,26 @@ This is the QMK Firmware repository for the Iron180 PCB, a keyboard designed by | |||
| 6 | 8 | ||
| 7 | The Iron180 PCB is a F13 TKL PCB with ALPS switches support. It also supports in-switch single-color LEDs and a multi-layout design for default or 7U bottom row, ISO layout, split backspace and right shift. | 9 | The Iron180 PCB is a F13 TKL PCB with ALPS switches support. It also supports in-switch single-color LEDs and a multi-layout design for default or 7U bottom row, ISO layout, split backspace and right shift. |
| 8 | 10 | ||
| 9 | As of November 2020, the only way to obtain an Iron180 was through the [Group Buy](https://geekhack.org/index.php?topic=109513) which is already over and all spots were filled. | 11 | As of november 2021, the Group Buy of Iron180 is already over and extras were not sold yet. See the [GB page](https://geekhack.org/index.php?topic=109513) for more information. |
| 12 | |||
| 13 | ## How to flash | ||
| 14 | |||
| 15 | ### Enter bootloader | ||
| 16 | |||
| 17 | The DFU state in the bootloader can be accessed in 3 ways: | ||
| 10 | 18 | ||
| 11 | ## How to compile | 19 | * **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard with the key pressed; |
| 20 | * **Physical reset button**: press the button on the front of the PCB, next to caps lock, for at least five seconds; | ||
| 21 | * **Keycode in layout**: Press the key mapped to `RESET` if it is available (ESCAPE key in layer 1 of the default layout); | ||
| 12 | 22 | ||
| 13 | After setting up your build environment, you can compile the Iron180 default keymap by using: | 23 | ## Compile firmware and flash |
| 24 | |||
| 25 | To build the default layout for this keyboard (after setting up your build environment), use: | ||
| 14 | 26 | ||
| 15 | make iron180:default | 27 | make iron180:default |
| 16 | 28 | ||
| 17 | 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). | 29 | Then, after accessing the DFU state, use a tool like `dfu-util` or the QMK Toolbox to download that firmware into your PCB. To directly compile-and-flash the PCB after it is put into a DFU state, use |
| 18 | 30 | ||
| 31 | make iron180:default:flash | ||
| 32 | |||
| 33 | 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). | ||
diff --git a/keyboards/iron180/rules.mk b/keyboards/iron180/rules.mk index bb9e5edc3..83576bbed 100644 --- a/keyboards/iron180/rules.mk +++ b/keyboards/iron180/rules.mk | |||
| @@ -14,7 +14,8 @@ CONSOLE_ENABLE = yes # Console for debug | |||
| 14 | COMMAND_ENABLE = yes # Commands for debug and configuration | 14 | COMMAND_ENABLE = yes # Commands for debug and configuration |
| 15 | # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work | 15 | # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work |
| 16 | NKRO_ENABLE = yes # USB Nkey Rollover | 16 | NKRO_ENABLE = yes # USB Nkey Rollover |
| 17 | BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality | 17 | BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality |
| 18 | BACKLIGHT_DRIVER = pwm | ||
| 18 | RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow | 19 | RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow |
| 19 | AUDIO_ENABLE = no # Audio output | 20 | AUDIO_ENABLE = no # Audio output |
| 20 | ENCODER_ENABLE = no | 21 | ENCODER_ENABLE = no |
