eqmk
/
qmk_firmware
forked from mfulz_github/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix typos in the HID class bootloader makefile.

This commit is contained in:
Dean Camera 2011-02-11 20:00:48 +00:00
parent 782614dbb5
commit 3d232953d9
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Bootloaders/HID/HostLoaderApp/Makefile
View File

@ -14,7 +14,7 @@ else ifeq ($(OS), WINDOWS)
CC = i586-mingw32msvc-gcc CC = i586-mingw32msvc-gcc
CFLAGS ?= -O2 -Wall CFLAGS ?= -O2 -Wall
hid_bootloader_cli.exe: hid_bootloader_cli.c hid_bootloader_cli.exe: hid_bootloader_cli.c
$(CC) $(CFLAGS) -s -DUSE_WIN32 -o thid_bootloader_cli.exe hid_bootloader_cli.c -lhid -lsetupapi $(CC) $(CFLAGS) -s -DUSE_WIN32 -o hid_bootloader_cli.exe hid_bootloader_cli.c -lhid -lsetupapi
else ifeq ($(OS), MACOSX) else ifeq ($(OS), MACOSX)
@ -29,11 +29,11 @@ else ifeq ($(OS), BSD) # works on NetBSD and OpenBSD
CC ?= gcct CC ?= gcct
CFLAGS ?= -O2 -Wall CFLAGS ?= -O2 -Wall
hid_bootloader_cli: hid_bootloader_cli.c hid_bootloader_cli: hid_bootloader_cli.c
$(CC) $(CFLAGS) -s -DUSE_UHID -o teensy_loader_cli hid_bootloader_cli.c $(CC) $(CFLAGS) -s -DUSE_UHID -o hid_bootloader_cli hid_bootloader_cli.c
endif endif
clean: clean:
rm -f thid_bootloader_cli hid_bootloader_cli.exe rm -f hid_bootloader_cli hid_bootloader_cli.exe

1
LUFA/ManPages/FutureChanges.txt
View File

@ -19,6 +19,7 @@
* -# Re-add interrupt Pipe/Endpoint support * -# Re-add interrupt Pipe/Endpoint support
* -# Investigate dynamically created device descriptors * -# Investigate dynamically created device descriptors
* -# Re-add in software PDI/TPI support into the AVRISP-MKII project * -# Re-add in software PDI/TPI support into the AVRISP-MKII project
* -# Add makefile includes to reduce boilerplate in user makefiles
* - Documentation/Support * - Documentation/Support
* -# Add detailed overviews of how each demo works * -# Add detailed overviews of how each demo works
* -# Add board overviews * -# Add board overviews

10
Projects/LEDNotifier/LEDNotifier.c
View File

@ -72,6 +72,11 @@ static volatile uint8_t SoftPWM_Channel2_Duty;
/** Duty cycle for the third software PWM channel */ /** Duty cycle for the third software PWM channel */
static volatile uint8_t SoftPWM_Channel3_Duty; static volatile uint8_t SoftPWM_Channel3_Duty;
/** Standard file stream for the CDC interface when set up, so that the virtual CDC COM port can be
* used like any regular character stream in the C APIs
*/
static FILE USBSerialStream;
/** Interrupt handler for managing the software PWM channels for the LEDs */ /** Interrupt handler for managing the software PWM channels for the LEDs */
ISR(TIMER0_COMPA_vect, ISR_BLOCK) ISR(TIMER0_COMPA_vect, ISR_BLOCK)
@ -93,11 +98,6 @@ ISR(TIMER0_COMPA_vect, ISR_BLOCK)
LEDs_SetAllLEDs(LEDMask); LEDs_SetAllLEDs(LEDMask);
} }
/** Standard file stream for the CDC interface when set up, so that the virtual CDC COM port can be
* used like any regular character stream in the C APIs
*/
static FILE USBSerialStream;
/** Main program entry point. This routine contains the overall program flow, including initial /** Main program entry point. This routine contains the overall program flow, including initial
* setup of all components and the main program loop. * setup of all components and the main program loop.
*/ */