diff options
| author | Konstantin Đorđević <vomindoraan@gmail.com> | 2019-02-15 05:55:31 +0100 |
|---|---|---|
| committer | Drashna Jaelre <drashna@live.com> | 2019-02-14 20:55:31 -0800 |
| commit | d7754a19b97d65f878a3eaafe379db025bffd3bf (patch) | |
| tree | 761e50ae73fec207ebf459837e456eba28618838 | |
| parent | 3a3de84e40262a6cb19767740a4620f821625377 (diff) | |
| download | qmk_firmware-d7754a19b97d65f878a3eaafe379db025bffd3bf.tar.gz qmk_firmware-d7754a19b97d65f878a3eaafe379db025bffd3bf.zip | |
Remove problematic unicode_map stub definition in process_unicodemap.c (#5110)
* Remove problematic unicode_map stub definition in process_unicodemap.c
* Add unicode_map declaration to process_unicodemap.h
* Disable UNICODEMAP on converter boards that don't use it
| -rw-r--r-- | keyboards/converter/ibm_terminal/keymaps/default/rules.mk | 3 | ||||
| -rw-r--r-- | keyboards/converter/ibm_terminal/rules.mk | 1 | ||||
| -rw-r--r-- | keyboards/converter/palm_usb/rules.mk | 1 | ||||
| -rw-r--r-- | keyboards/converter/sun_usb/rules.mk | 1 | ||||
| -rw-r--r-- | quantum/process_keycode/process_unicodemap.c | 3 | ||||
| -rw-r--r-- | quantum/process_keycode/process_unicodemap.h | 2 |
6 files changed, 3 insertions, 8 deletions
diff --git a/keyboards/converter/ibm_terminal/keymaps/default/rules.mk b/keyboards/converter/ibm_terminal/keymaps/default/rules.mk index 76d349920f..8ff0950472 100644 --- a/keyboards/converter/ibm_terminal/keymaps/default/rules.mk +++ b/keyboards/converter/ibm_terminal/keymaps/default/rules.mk @@ -12,9 +12,8 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality MIDI_ENABLE = no # MIDI controls AUDIO_ENABLE = no # Audio output on port C6 UNICODE_ENABLE = no # Unicode -UNICODEMAP_ENABLE = yes BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. +RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. PS2_USE_USART = yes API_SYSEX_ENABLE = no diff --git a/keyboards/converter/ibm_terminal/rules.mk b/keyboards/converter/ibm_terminal/rules.mk index 3fa8792464..a48038ccde 100644 --- a/keyboards/converter/ibm_terminal/rules.mk +++ b/keyboards/converter/ibm_terminal/rules.mk @@ -58,7 +58,6 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality MIDI_ENABLE = no # MIDI controls AUDIO_ENABLE = no # Audio output on port C6 UNICODE_ENABLE = no # Unicode -UNICODEMAP_ENABLE = yes BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. PS2_USE_USART = yes diff --git a/keyboards/converter/palm_usb/rules.mk b/keyboards/converter/palm_usb/rules.mk index 8dfc2ca4d7..7374fd955f 100644 --- a/keyboards/converter/palm_usb/rules.mk +++ b/keyboards/converter/palm_usb/rules.mk @@ -22,7 +22,6 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality MIDI_ENABLE = no # MIDI controls AUDIO_ENABLE = no # Audio output on port C6 UNICODE_ENABLE = no # Unicode -UNICODEMAP_ENABLE = no BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE diff --git a/keyboards/converter/sun_usb/rules.mk b/keyboards/converter/sun_usb/rules.mk index 22311c3d4c..db6b5c7ee4 100644 --- a/keyboards/converter/sun_usb/rules.mk +++ b/keyboards/converter/sun_usb/rules.mk @@ -22,7 +22,6 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality MIDI_ENABLE = no # MIDI controls AUDIO_ENABLE = no # Audio output on port C6 UNICODE_ENABLE = no # Unicode -UNICODEMAP_ENABLE = yes BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE diff --git a/quantum/process_keycode/process_unicodemap.c b/quantum/process_keycode/process_unicodemap.c index cee9acb5fc..3274027613 100644 --- a/quantum/process_keycode/process_unicodemap.c +++ b/quantum/process_keycode/process_unicodemap.c @@ -17,9 +17,6 @@ #include "process_unicodemap.h" #include "process_unicode_common.h" -__attribute__((weak)) -const uint32_t PROGMEM unicode_map[] = {}; - void register_hex32(uint32_t hex) { bool onzerostart = true; for(int i = 7; i >= 0; i--) { diff --git a/quantum/process_keycode/process_unicodemap.h b/quantum/process_keycode/process_unicodemap.h index 5764697f84..fe4f979155 100644 --- a/quantum/process_keycode/process_unicodemap.h +++ b/quantum/process_keycode/process_unicodemap.h @@ -19,5 +19,7 @@ #include "quantum.h" #include "process_unicode_common.h" +extern const uint32_t PROGMEM unicode_map[]; + void unicodemap_input_error(void); bool process_unicodemap(uint16_t keycode, keyrecord_t *record); |