g1smo
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Miscellaneous cleanups (#8639) 

* Miscellaneous cleanups

* Cast NO_PIN
master
Ryan 2020-04-02 01:49:45 +11:00 committed by GitHub
parent b6a09502c6
commit 95c5c11d0b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
keyboards/coseyfannitutti/romeo/config.h
View File

@ -50,8 +50,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* COL2ROW, ROW2COL*/ /* COL2ROW, ROW2COL*/
#define DIODE_DIRECTION COL2ROW #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. * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
*/ */

2
quantum/config_common.h
View File

@ -21,7 +21,7 @@
#define ROW2COL 1 #define ROW2COL 1
// useful for direct pin mapping // useful for direct pin mapping
#define NO_PIN (~0) #define NO_PIN (pin_t)(~0)
#ifdef __AVR__ #ifdef __AVR__
# ifndef __ASSEMBLER__ # ifndef __ASSEMBLER__

4
quantum/quantum.c
View File

@ -144,10 +144,6 @@ void reset_keyboard(void) {
#endif #endif
#ifdef HAPTIC_ENABLE #ifdef HAPTIC_ENABLE
haptic_shutdown(); 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 #endif
bootloader_jump(); bootloader_jump();
} }

6
tmk_core/protocol/lufa/lufa.h
View File

@ -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)) # define MIDI_SYSEX_BUFFER (API_SYSEX_MAX_SIZE + API_SYSEX_MAX_SIZE / 7 + (API_SYSEX_MAX_SIZE % 7 ? 1 : 0))
#endif #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_SINGLE 1
#define ENDPOINT_BANK_DOUBLE 2 #define ENDPOINT_BANK_DOUBLE 2
#define ENDPOINT_CONFIG(epnum, eptype, epdir, epsize, epbank) Endpoint_ConfigureEndpoint((epdir) | (epnum), eptype, epsize, epbank) #define ENDPOINT_CONFIG(epnum, eptype, epdir, epsize, epbank) Endpoint_ConfigureEndpoint((epdir) | (epnum), eptype, epsize, epbank)
// #endif
#endif #endif

5
util/activate_msys2.sh
View File

@ -9,11 +9,6 @@ function export_variables {
export PATH=$PATH:$util_dir/flip/bin export PATH=$PATH:$util_dir/flip/bin
export PATH=$PATH:$util_dir/avr8-gnu-toolchain/bin export PATH=$PATH:$util_dir/avr8-gnu-toolchain/bin
export PATH=$PATH:$util_dir/gcc-arm-none-eabi/bin export PATH=$PATH:$util_dir/gcc-arm-none-eabi/bin
export PATH=$PATH:/mingw64/bin
} }
export_variables export_variables

4
util/activate_wsl.sh
View File

@ -12,7 +12,3 @@ function export_variables {
} }
export_variables export_variables