diff options
| author | Ryan <fauxpark@gmail.com> | 2020-04-02 01:49:45 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-01 15:49:45 +0100 |
| commit | 95c5c11d0b909f14696c9c0b2dd30b3bfd406273 (patch) | |
| tree | d4b8a91d15cc824efd96f7ce63c47222cb665bd3 | |
| parent | b6a09502c626c3a94a859ab0a61d41a41835d611 (diff) | |
| download | firmware-95c5c11d0b909f14696c9c0b2dd30b3bfd406273.tar.gz firmware-95c5c11d0b909f14696c9c0b2dd30b3bfd406273.tar.bz2 firmware-95c5c11d0b909f14696c9c0b2dd30b3bfd406273.zip | |
Miscellaneous cleanups (#8639)
* Miscellaneous cleanups
* Cast NO_PIN
| -rw-r--r-- | keyboards/coseyfannitutti/romeo/config.h | 2 | ||||
| -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 |
6 files changed, 1 insertions, 22 deletions
diff --git a/keyboards/coseyfannitutti/romeo/config.h b/keyboards/coseyfannitutti/romeo/config.h index aa54ce250..322ae6802 100644 --- a/keyboards/coseyfannitutti/romeo/config.h +++ b/keyboards/coseyfannitutti/romeo/config.h @@ -50,8 +50,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define NO_UART 1 - /* * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN. */ diff --git a/quantum/config_common.h b/quantum/config_common.h index f981f3f8c..4cfd74b0f 100644 --- a/quantum/config_common.h +++ b/quantum/config_common.h @@ -21,7 +21,7 @@ #define ROW2COL 1 // 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 c857e5f7a..03b5704eb 100644 --- a/quantum/quantum.c +++ b/quantum/quantum.c @@ -145,10 +145,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 1b88060f1..82a5f8e05 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 85d645e6d..07888ffe1 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 cd88d2b65..78bbf9ccb 100755 --- a/util/activate_wsl.sh +++ b/util/activate_wsl.sh @@ -12,7 +12,3 @@ function export_variables { } export_variables - - - - |