aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2020-04-02 01:49:45 +1100
committerGitHub <noreply@github.com>2020-04-01 15:49:45 +0100
commit95c5c11d0b909f14696c9c0b2dd30b3bfd406273 (patch)
treed4b8a91d15cc824efd96f7ce63c47222cb665bd3
parentb6a09502c626c3a94a859ab0a61d41a41835d611 (diff)
downloadqmk_firmware-95c5c11d0b909f14696c9c0b2dd30b3bfd406273.tar.gz
qmk_firmware-95c5c11d0b909f14696c9c0b2dd30b3bfd406273.zip
Miscellaneous cleanups (#8639)
* Miscellaneous cleanups * Cast NO_PIN
-rw-r--r--keyboards/coseyfannitutti/romeo/config.h2
-rw-r--r--quantum/config_common.h2
-rw-r--r--quantum/quantum.c4
-rw-r--r--tmk_core/protocol/lufa/lufa.h6
-rwxr-xr-xutil/activate_msys2.sh5
-rwxr-xr-xutil/activate_wsl.sh4
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/>.
50/* COL2ROW, ROW2COL*/ 50/* COL2ROW, ROW2COL*/
51#define DIODE_DIRECTION COL2ROW 51#define DIODE_DIRECTION COL2ROW
52 52
53#define NO_UART 1
54
55/* 53/*
56 * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN. 54 * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
57 */ 55 */
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 @@
21#define ROW2COL 1 21#define ROW2COL 1
22 22
23// useful for direct pin mapping 23// useful for direct pin mapping
24#define NO_PIN (~0) 24#define NO_PIN (pin_t)(~0)
25 25
26#ifdef __AVR__ 26#ifdef __AVR__
27# ifndef __ASSEMBLER__ 27# 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) {
145#ifdef HAPTIC_ENABLE 145#ifdef HAPTIC_ENABLE
146 haptic_shutdown(); 146 haptic_shutdown();
147#endif 147#endif
148// this is also done later in bootloader.c - not sure if it's neccesary here
149#ifdef BOOTLOADER_CATERINA
150 *(uint16_t *)0x0800 = 0x7777; // these two are a-star-specific
151#endif
152 bootloader_jump(); 148 bootloader_jump();
153} 149}
154 150
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;
69# define MIDI_SYSEX_BUFFER (API_SYSEX_MAX_SIZE + API_SYSEX_MAX_SIZE / 7 + (API_SYSEX_MAX_SIZE % 7 ? 1 : 0)) 69# define MIDI_SYSEX_BUFFER (API_SYSEX_MAX_SIZE + API_SYSEX_MAX_SIZE / 7 + (API_SYSEX_MAX_SIZE % 7 ? 1 : 0))
70#endif 70#endif
71 71
72// #if LUFA_VERSION_INTEGER < 0x120730
73// /* old API 120219 */
74// #define ENDPOINT_CONFIG(epnum, eptype, epdir, epsize, epbank) Endpoint_ConfigureEndpoint(epnum, eptype, epdir, epsize, epbank)
75// #else
76/* new API >= 120730 */
77#define ENDPOINT_BANK_SINGLE 1 72#define ENDPOINT_BANK_SINGLE 1
78#define ENDPOINT_BANK_DOUBLE 2 73#define ENDPOINT_BANK_DOUBLE 2
79#define ENDPOINT_CONFIG(epnum, eptype, epdir, epsize, epbank) Endpoint_ConfigureEndpoint((epdir) | (epnum), eptype, epsize, epbank) 74#define ENDPOINT_CONFIG(epnum, eptype, epdir, epsize, epbank) Endpoint_ConfigureEndpoint((epdir) | (epnum), eptype, epsize, epbank)
80// #endif
81 75
82#endif 76#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 {
9 export PATH=$PATH:$util_dir/flip/bin 9 export PATH=$PATH:$util_dir/flip/bin
10 export PATH=$PATH:$util_dir/avr8-gnu-toolchain/bin 10 export PATH=$PATH:$util_dir/avr8-gnu-toolchain/bin
11 export PATH=$PATH:$util_dir/gcc-arm-none-eabi/bin 11 export PATH=$PATH:$util_dir/gcc-arm-none-eabi/bin
12 export PATH=$PATH:/mingw64/bin
13} 12}
14 13
15export_variables 14export_variables
16
17
18
19
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 {
12} 12}
13 13
14export_variables 14export_variables
15
16
17
18