diff options
| author | Ryan <fauxpark@gmail.com> | 2020-04-02 01:49:45 +1100 |
|---|---|---|
| committer | Florian Didron <fdidron@users.noreply.github.com> | 2020-06-12 17:00:27 +0900 |
| commit | ee1860315df5c0f0a9eb3a44b9df460a9a12836f (patch) | |
| tree | acc94d30f98148e1150a56d2a2441dd02145705d | |
| parent | 09aa3b15f4069578c4d4a43c12598caea7b7e366 (diff) | |
Miscellaneous cleanups (#8639)
* Miscellaneous cleanups
* Cast NO_PIN
| -rw-r--r-- | quantum/config_common.h | 2 | ||||
| -rw-r--r-- | quantum/quantum.c | 4 | ||||
| -rw-r--r-- | tmk_core/protocol/lufa/lufa.h | 6 | ||||
| -rwxr-xr-x | util/activate_msys2.sh | 5 | ||||
| -rwxr-xr-x | util/activate_wsl.sh | 4 |
5 files changed, 1 insertions, 20 deletions
diff --git a/quantum/config_common.h b/quantum/config_common.h index 5df48e20b4..b3abdee774 100644 --- a/quantum/config_common.h +++ b/quantum/config_common.h @@ -22,7 +22,7 @@ #define CUSTOM_MATRIX 2 /* Disables built-in matrix scanning code */ // useful for direct pin mapping -#define NO_PIN (~0) +#define NO_PIN (pin_t)(~0) #ifdef __AVR__ # ifndef __ASSEMBLER__ diff --git a/quantum/quantum.c b/quantum/quantum.c index 354fa480bb..c67eb9b6cb 100644 --- a/quantum/quantum.c +++ b/quantum/quantum.c @@ -142,10 +142,6 @@ void reset_keyboard(void) { #ifdef HAPTIC_ENABLE haptic_shutdown(); #endif -// this is also done later in bootloader.c - not sure if it's neccesary here -#ifdef BOOTLOADER_CATERINA - *(uint16_t *)0x0800 = 0x7777; // these two are a-star-specific -#endif bootloader_jump(); } diff --git a/tmk_core/protocol/lufa/lufa.h b/tmk_core/protocol/lufa/lufa.h index 1b88060f14..82a5f8e05f 100644 --- a/tmk_core/protocol/lufa/lufa.h +++ b/tmk_core/protocol/lufa/lufa.h @@ -69,14 +69,8 @@ extern host_driver_t lufa_driver; # define MIDI_SYSEX_BUFFER (API_SYSEX_MAX_SIZE + API_SYSEX_MAX_SIZE / 7 + (API_SYSEX_MAX_SIZE % 7 ? 1 : 0)) #endif -// #if LUFA_VERSION_INTEGER < 0x120730 -// /* old API 120219 */ -// #define ENDPOINT_CONFIG(epnum, eptype, epdir, epsize, epbank) Endpoint_ConfigureEndpoint(epnum, eptype, epdir, epsize, epbank) -// #else -/* new API >= 120730 */ #define ENDPOINT_BANK_SINGLE 1 #define ENDPOINT_BANK_DOUBLE 2 #define ENDPOINT_CONFIG(epnum, eptype, epdir, epsize, epbank) Endpoint_ConfigureEndpoint((epdir) | (epnum), eptype, epsize, epbank) -// #endif #endif diff --git a/util/activate_msys2.sh b/util/activate_msys2.sh index 85d645e6d0..07888ffe12 100755 --- a/util/activate_msys2.sh +++ b/util/activate_msys2.sh @@ -9,11 +9,6 @@ function export_variables { export PATH=$PATH:$util_dir/flip/bin export PATH=$PATH:$util_dir/avr8-gnu-toolchain/bin export PATH=$PATH:$util_dir/gcc-arm-none-eabi/bin - export PATH=$PATH:/mingw64/bin } export_variables - - - - diff --git a/util/activate_wsl.sh b/util/activate_wsl.sh index cd88d2b655..78bbf9ccbf 100755 --- a/util/activate_wsl.sh +++ b/util/activate_wsl.sh @@ -12,7 +12,3 @@ function export_variables { } export_variables - - - - |