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 76d349920..8ff095047 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 | |||
| 12 | MIDI_ENABLE = no # MIDI controls | 12 | MIDI_ENABLE = no # MIDI controls |
| 13 | AUDIO_ENABLE = no # Audio output on port C6 | 13 | AUDIO_ENABLE = no # Audio output on port C6 |
| 14 | UNICODE_ENABLE = no # Unicode | 14 | UNICODE_ENABLE = no # Unicode |
| 15 | UNICODEMAP_ENABLE = yes | ||
| 16 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID | 15 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID |
| 17 | RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. | 16 | RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. |
| 18 | PS2_USE_USART = yes | 17 | PS2_USE_USART = yes |
| 19 | API_SYSEX_ENABLE = no | 18 | API_SYSEX_ENABLE = no |
| 20 | 19 | ||
diff --git a/keyboards/converter/ibm_terminal/rules.mk b/keyboards/converter/ibm_terminal/rules.mk index 3fa879246..a48038ccd 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 | |||
| 58 | MIDI_ENABLE = no # MIDI controls | 58 | MIDI_ENABLE = no # MIDI controls |
| 59 | AUDIO_ENABLE = no # Audio output on port C6 | 59 | AUDIO_ENABLE = no # Audio output on port C6 |
| 60 | UNICODE_ENABLE = no # Unicode | 60 | UNICODE_ENABLE = no # Unicode |
| 61 | UNICODEMAP_ENABLE = yes | ||
| 62 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID | 61 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID |
| 63 | RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. | 62 | RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. |
| 64 | PS2_USE_USART = yes | 63 | PS2_USE_USART = yes |
diff --git a/keyboards/converter/palm_usb/rules.mk b/keyboards/converter/palm_usb/rules.mk index 8dfc2ca4d..7374fd955 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 | |||
| 22 | MIDI_ENABLE = no # MIDI controls | 22 | MIDI_ENABLE = no # MIDI controls |
| 23 | AUDIO_ENABLE = no # Audio output on port C6 | 23 | AUDIO_ENABLE = no # Audio output on port C6 |
| 24 | UNICODE_ENABLE = no # Unicode | 24 | UNICODE_ENABLE = no # Unicode |
| 25 | UNICODEMAP_ENABLE = no | ||
| 26 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID | 25 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID |
| 27 | RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. | 26 | RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. |
| 28 | # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE | 27 | # 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 22311c3d4..db6b5c7ee 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 | |||
| 22 | MIDI_ENABLE = no # MIDI controls | 22 | MIDI_ENABLE = no # MIDI controls |
| 23 | AUDIO_ENABLE = no # Audio output on port C6 | 23 | AUDIO_ENABLE = no # Audio output on port C6 |
| 24 | UNICODE_ENABLE = no # Unicode | 24 | UNICODE_ENABLE = no # Unicode |
| 25 | UNICODEMAP_ENABLE = yes | ||
| 26 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID | 25 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID |
| 27 | RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. | 26 | RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. |
| 28 | # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE | 27 | # 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 cee9acb5f..327402761 100644 --- a/quantum/process_keycode/process_unicodemap.c +++ b/quantum/process_keycode/process_unicodemap.c | |||
| @@ -17,9 +17,6 @@ | |||
| 17 | #include "process_unicodemap.h" | 17 | #include "process_unicodemap.h" |
| 18 | #include "process_unicode_common.h" | 18 | #include "process_unicode_common.h" |
| 19 | 19 | ||
| 20 | __attribute__((weak)) | ||
| 21 | const uint32_t PROGMEM unicode_map[] = {}; | ||
| 22 | |||
| 23 | void register_hex32(uint32_t hex) { | 20 | void register_hex32(uint32_t hex) { |
| 24 | bool onzerostart = true; | 21 | bool onzerostart = true; |
| 25 | for(int i = 7; i >= 0; i--) { | 22 | for(int i = 7; i >= 0; i--) { |
diff --git a/quantum/process_keycode/process_unicodemap.h b/quantum/process_keycode/process_unicodemap.h index 5764697f8..fe4f97915 100644 --- a/quantum/process_keycode/process_unicodemap.h +++ b/quantum/process_keycode/process_unicodemap.h | |||
| @@ -19,5 +19,7 @@ | |||
| 19 | #include "quantum.h" | 19 | #include "quantum.h" |
| 20 | #include "process_unicode_common.h" | 20 | #include "process_unicode_common.h" |
| 21 | 21 | ||
| 22 | extern const uint32_t PROGMEM unicode_map[]; | ||
| 23 | |||
| 22 | void unicodemap_input_error(void); | 24 | void unicodemap_input_error(void); |
| 23 | bool process_unicodemap(uint16_t keycode, keyrecord_t *record); | 25 | bool process_unicodemap(uint16_t keycode, keyrecord_t *record); |
