From: Peter Henn Date: Wed, 29 Dec 2021 11:30:23 +0000 (+0000) Subject: Move Pro-Micro LEDs into own Board-Definition PROMICRO X-Git-Tag: DFU-Bootloader-ProMicro~7 X-Git-Url: http://git.linex4red.de/pub/lufa.git/commitdiff_plain/f027c1c44d017539a6fae903bc65331d134833e4 Move Pro-Micro LEDs into own Board-Definition PROMICRO - Create Board.h and LEDs.h in Drivers/AVR8/PROMICRO directory - Update DFU/makefile - remove commented LEDs.h include in BootloaderDFU.h - reenable LED-calls and remove added LED handling in BootloaderDFU.c --- diff --git a/Bootloaders/DFU/BootloaderDFU.c b/Bootloaders/DFU/BootloaderDFU.c index 3e2f330c7..eb6c06984 100644 --- a/Bootloaders/DFU/BootloaderDFU.c +++ b/Bootloaders/DFU/BootloaderDFU.c @@ -174,7 +174,7 @@ int main(void) SetupHardware(); /* Turn on first LED on the board to indicate that the bootloader has started */ - //LEDs_SetAllLEDs(LEDS_LED1); + LEDs_SetAllLEDs(LEDS_LED1); /* Enable global interrupts so that the USB stack can function */ GlobalInterruptEnable(); @@ -237,11 +237,7 @@ static void SetupHardware(void) /* Initialize the USB and other board hardware drivers */ USB_Init(); - //LEDs_Init(); - DDRB = 1; - PORTB = _BV(PB5); - DDRD = 0b00100000; - PORTD = 0; + LEDs_Init(); /* Bootloader active LED toggle timer initialization */ TIMSK1 = (1 << TOIE1); @@ -253,11 +249,7 @@ static void ResetHardware(void) { /* Shut down the USB and other board hardware drivers */ USB_Disable(); - //LEDs_Disable(); - DDRB = 0; - PORTB = 0; - DDRD = 0; - PORTD = 0; + LEDs_Disable(); /* Disable Bootloader active LED toggle timer */ TIMSK1 = 0; @@ -271,10 +263,7 @@ static void ResetHardware(void) /** ISR to periodically toggle the LEDs on the board to indicate that the bootloader is active. */ ISR(TIMER1_OVF_vect, ISR_BLOCK) { - //LEDs_ToggleLEDs(LEDS_LED1 | LEDS_LED2); - PORTB &= ~_BV(PB0); - _delay_ms(5); - PORTB |= _BV(PB0); + LEDs_ToggleLEDs(LEDS_LED1 | LEDS_LED2); } /** Event handler for the USB_ControlRequest event. This is used to catch and process control requests sent to @@ -293,10 +282,7 @@ void EVENT_USB_Device_ControlRequest(void) stayinbootloader = true; /* Activity - toggle indicator LEDs */ - //LEDs_ToggleLEDs(LEDS_LED1 | LEDS_LED2); - PORTB &= ~_BV(PB0); - _delay_ms(5); - PORTB |= _BV(PB0); + LEDs_ToggleLEDs(LEDS_LED1 | LEDS_LED2); /* Get the size of the command and data from the wLength value */ SentCommand.DataSize = USB_ControlRequest.wLength; diff --git a/Bootloaders/DFU/BootloaderDFU.h b/Bootloaders/DFU/BootloaderDFU.h index 3f7ae2ab0..549ceed06 100644 --- a/Bootloaders/DFU/BootloaderDFU.h +++ b/Bootloaders/DFU/BootloaderDFU.h @@ -52,7 +52,7 @@ #include "Config/AppConfig.h" #include - //#include + #include #include /* Preprocessor Checks: */ diff --git a/Bootloaders/DFU/makefile b/Bootloaders/DFU/makefile index 166d4b652..b777acd02 100644 --- a/Bootloaders/DFU/makefile +++ b/Bootloaders/DFU/makefile @@ -13,7 +13,7 @@ MCU = atmega32u4 ARCH = AVR8 -BOARD = USER +BOARD = PROMICRO F_CPU = 8000000 F_USB = $(F_CPU) OPTIMIZATION = s diff --git a/LUFA/Drivers/Board/AVR8/PROMICRO/Board.h b/LUFA/Drivers/Board/AVR8/PROMICRO/Board.h new file mode 100644 index 000000000..fe863c9cb --- /dev/null +++ b/LUFA/Drivers/Board/AVR8/PROMICRO/Board.h @@ -0,0 +1,78 @@ +/* + LUFA Library + Copyright (C) Dean Camera, 2021. + + dean [at] fourwalledcubicle [dot] com + www.lufa-lib.org +*/ + +/* + Copyright 2021 Dean Camera (dean [at] fourwalledcubicle [dot] com) + + Permission to use, copy, modify, distribute, and sell this + software and its documentation for any purpose is hereby granted + without fee, provided that the above copyright notice appear in + all copies and that both that the copyright notice and this + permission notice and warranty disclaimer appear in supporting + documentation, and that the name of the author not be used in + advertising or publicity pertaining to distribution of the + software without specific, written prior permission. + + The author disclaims all warranties with regard to this + software, including all implied warranties of merchantability + and fitness. In no event shall the author be liable for any + special, indirect or consequential damages or any damages + whatsoever resulting from loss of use, data or profits, whether + in an action of contract, negligence or other tortious action, + arising out of or in connection with the use or performance of + this software. +*/ + +/** \file + * \brief Board specific information header for the Arduino Micro board. + * \copydetails Group_BoardInfo_MICRO + * + * \note This file should not be included directly. It is automatically included as needed by the Board driver + * dispatch header located in LUFA/Drivers/Board/Board.h. + */ + +/** \ingroup Group_BoardInfo + * \defgroup Group_BoardInfo_MICRO PROMICRO + * \brief Board specific information header for the Sparfun Pro Micro board. + * + * Board specific information header for the Arduino Micro board (https://www.sparkfun.com/products/12640). + * + * @{ + */ + +#ifndef __BOARD_PROMICRO_H__ +#define __BOARD_PROMICRO_H__ + + /* Includes: */ + #include "../../../../Common/Common.h" + #include "../../LEDs.h" + + /* Enable C linkage for C++ Compilers: */ + #if defined(__cplusplus) + extern "C" { + #endif + + /* Preprocessor Checks: */ + #if !defined(__INCLUDE_FROM_BOARD_H) + #error Do not include this file directly. Include LUFA/Drivers/Board/Board.h instead. + #endif + + /* Public Interface - May be used in end-application: */ + /* Macros: */ + /** Indicates the board has hardware LEDs mounted. */ + #define BOARD_HAS_LEDS + + /* Disable C linkage for C++ Compilers: */ + #if defined(__cplusplus) + } + #endif + +#endif + +/** @} */ + diff --git a/LUFA/Drivers/Board/AVR8/PROMICRO/LEDs.h b/LUFA/Drivers/Board/AVR8/PROMICRO/LEDs.h new file mode 100644 index 000000000..06eac90f9 --- /dev/null +++ b/LUFA/Drivers/Board/AVR8/PROMICRO/LEDs.h @@ -0,0 +1,164 @@ +/* + LUFA Library + Copyright (C) Dean Camera, 2021. + + dean [at] fourwalledcubicle [dot] com + www.lufa-lib.org +*/ + +/* + Copyright 2021 Dean Camera (dean [at] fourwalledcubicle [dot] com) + + Permission to use, copy, modify, distribute, and sell this + software and its documentation for any purpose is hereby granted + without fee, provided that the above copyright notice appear in + all copies and that both that the copyright notice and this + permission notice and warranty disclaimer appear in supporting + documentation, and that the name of the author not be used in + advertising or publicity pertaining to distribution of the + software without specific, written prior permission. + + The author disclaims all warranties with regard to this + software, including all implied warranties of merchantability + and fitness. In no event shall the author be liable for any + special, indirect or consequential damages or any damages + whatsoever resulting from loss of use, data or profits, whether + in an action of contract, negligence or other tortious action, + arising out of or in connection with the use or performance of + this software. +*/ + +/** \file + * \brief Board specific LED driver header for the Arduino Micro board. + * \copydetails Group_LEDs_MICRO + * + * \note This file should not be included directly. It is automatically included as needed by the LEDs driver + * dispatch header located in LUFA/Drivers/Board/LEDs.h. + */ + +/** \ingroup Group_LEDs + * \defgroup Group_LEDs_MICRO PROMICRO + * \brief Board specific LED driver header for the Sparfun Pro Micro board. + * + * Board specific LED driver header for the Arduino Micro board (https://www.sparkfun.com/products/12640). + * + * + * + * + * + *
NameColorInfoActive LevelPort Pin
LEDS_LED1YellowRXHighPORTB.0
LEDS_LED2GreenTXHighPORTD.5
+ * + * @{ + */ + +#ifndef __LEDS_MICRO_H__ +#define __LEDS_MICRO_H__ + + /* Includes: */ + #include "../../../../Common/Common.h" + + /* Enable C linkage for C++ Compilers: */ + #if defined(__cplusplus) + extern "C" { + #endif + + /* Preprocessor Checks: */ + #if !defined(__INCLUDE_FROM_LEDS_H) + #error Do not include this file directly. Include LUFA/Drivers/Board/LEDS.h instead. + #endif + + /* Private Interface - For use in library only: */ + #if !defined(__DOXYGEN__) + /* Macros: */ + #define LEDS_PORTB_LEDS (LEDS_LED1) + #define LEDS_PORTD_LEDS (LEDS_LED2) + #endif + + /* Public Interface - May be used in end-application: */ + /* Macros: */ + /** LED mask for the first LED on the board. */ + #define LEDS_LED1 (1 << 0) + + /** LED mask for the second LED on the board. */ + #define LEDS_LED2 (1 << 5) + + /** LED mask for all the LEDs on the board. */ + #define LEDS_ALL_LEDS (LEDS_LED1 | LEDS_LED2) + + /** LED mask for none of the board LEDs. */ + #define LEDS_NO_LEDS 0 + + /* Inline Functions: */ + #if !defined(__DOXYGEN__) + static inline void LEDs_Init(void) + { + DDRB |= LEDS_PORTB_LEDS; + PORTB &= ~LEDS_PORTB_LEDS; + DDRD |= LEDS_PORTD_LEDS; + PORTD &= ~LEDS_PORTD_LEDS; + } + + static inline void LEDs_Disable(void) + { + DDRB &= ~LEDS_PORTB_LEDS; + PORTB &= ~LEDS_PORTB_LEDS; + DDRD &= ~LEDS_PORTD_LEDS; + PORTD &= ~LEDS_PORTD_LEDS; + } + + static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask) + { + PORTB |= (LEDMask & LEDS_PORTB_LEDS); + PORTD |= (LEDMask & LEDS_PORTD_LEDS); + } + + static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask) + { + PORTB &= ~(LEDMask & LEDS_PORTB_LEDS); + PORTD &= ~(LEDMask & LEDS_PORTD_LEDS); + } + + static inline void LEDs_SetAllLEDs(const uint8_t LEDMask) + { + PORTB = ((PORTB & ~LEDS_PORTB_LEDS) | (LEDMask & LEDS_PORTB_LEDS)); + PORTD = ((PORTD & ~LEDS_PORTD_LEDS) | (LEDMask & LEDS_PORTD_LEDS)); + } + + static inline void LEDs_ChangeLEDs(const uint8_t LEDMask, + const uint8_t ActiveMask) + { + PORTB = ((PORTB & ~(LEDMask & LEDS_PORTB_LEDS)) | (ActiveMask & LEDS_PORTB_LEDS)); + PORTD = ((PORTD & ~(LEDMask & LEDS_PORTD_LEDS)) | (ActiveMask & LEDS_PORTD_LEDS)); + } + +#if 0 + static inline void LEDs_ToggleLEDs(const uint8_t LEDMask) + { + PORTB ^= (LEDMask & LEDS_PORTB_LEDS); + PORTD ^= (LEDMask & LEDS_PORTD_LEDS); + } +#else + static inline void LEDs_ToggleLEDs(const uint8_t LEDMask) + { + PORTB &= ~(LEDMask & LEDS_PORTB_LEDS); + Delay_MS(5); + PORTB |= (LEDMask & LEDS_PORTB_LEDS); + } +#endif + + static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT; + static inline uint8_t LEDs_GetLEDs(void) + { + return ((PORTB & LEDS_PORTB_LEDS) | (PORTD & LEDS_PORTD_LEDS)); + } + #endif + + /* Disable C linkage for C++ Compilers: */ + #if defined(__cplusplus) + } + #endif + +#endif + +/** @} */ + diff --git a/LUFA/Drivers/Board/Board.h b/LUFA/Drivers/Board/Board.h index 457bfbf0d..9f1639074 100644 --- a/LUFA/Drivers/Board/Board.h +++ b/LUFA/Drivers/Board/Board.h @@ -157,6 +157,8 @@ #include "AVR8/YUN/Board.h" #elif (BOARD == BOARD_MICRO) #include "AVR8/MICRO/Board.h" + #elif (BOARD == BOARD_PROMICRO) + #include "AVR8/PROMICRO/Board.h" #elif (BOARD == BOARD_POLOLUMICRO) #include "AVR8/POLOLUMICRO/Board.h" #elif (BOARD == BOARD_XPLAINED_MINI) diff --git a/LUFA/Drivers/Board/LEDs.h b/LUFA/Drivers/Board/LEDs.h index db34e68da..fb35026c6 100644 --- a/LUFA/Drivers/Board/LEDs.h +++ b/LUFA/Drivers/Board/LEDs.h @@ -207,6 +207,8 @@ #include "AVR8/YUN/LEDs.h" #elif (BOARD == BOARD_MICRO) #include "AVR8/MICRO/LEDs.h" + #elif (BOARD == BOARD_PROMICRO) + #include "AVR8/PROMICRO/LEDs.h" #elif (BOARD == BOARD_POLOLUMICRO) #include "AVR8/POLOLUMICRO/LEDs.h" #elif (BOARD == BOARD_XPLAINED_MINI)