summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2021-09-12 19:16:48 +0200
committerChristian Pointner <equinox@spreadspace.org>2021-09-12 19:16:48 +0200
commit703b09b73787d6248d3815b9eb9160efa8ebfe00 (patch)
tree7dea392d14c1ebca386f7f2010fec0385ebab110
parentupdated copyright header and some whitespace fixes (diff)
add support for sparkfun ProMicro
-rw-r--r--defines.mk9
-rw-r--r--lib/led.c6
-rw-r--r--lib/util.c6
-rw-r--r--usb-led/Makefile2
4 files changed, 16 insertions, 7 deletions
diff --git a/defines.mk b/defines.mk
index 3238e1b..56fe4bf 100644
--- a/defines.mk
+++ b/defines.mk
@@ -171,6 +171,15 @@ ifeq ($(BOARD_TYPE),elecrow32u4lora)
LUFA_BOARD = NONE
ARDUINO_PINS = leonardo
endif
+ifeq ($(BOARD_TYPE),sparkfunProMicro)
+ MCU := atmega32u4
+ ARCH = AVR8
+ F_CPU := 16000000
+ F_USB = $(F_CPU)
+ PROG := DFU
+ LUFA_BOARD = NONE
+ ARDUINO_PINS = leonardo
+endif
ifeq ($(BOARD_TYPE),arduinoProMicro)
MCU := atmega32u4
ARCH = AVR8
diff --git a/lib/led.c b/lib/led.c
index 5398f5b..88ff0bc 100644
--- a/lib/led.c
+++ b/lib/led.c
@@ -25,7 +25,7 @@
#include "led.h"
-#if defined(__BOARD_minimus__) || defined(__BOARD_minimus32__) || defined(__BOARD_arduinoProMicro__) || defined(__BOARD_elecrow32u4lora__)
+#if defined(__BOARD_minimus__) || defined(__BOARD_minimus32__) || defined(__BOARD_arduinoProMicro__) || defined(__BOARD_sparkfunProMicro__) || defined(__BOARD_elecrow32u4lora__)
#define NUM_LEDS 2
#elif defined(__BOARD_teensy1__) || defined(__BOARD_teensy1pp__) || defined(__BOARD_teensy2__) || defined(__BOARD_teensy2pp__) || \
defined(__BOARD_arduinoNano__) || defined(__BOARD_arduinoNG__) || defined(__BOARD_arduino2009v2__) || defined(__BOARD_arduino2009__) || \
@@ -39,7 +39,7 @@
#endif
#if defined(__BOARD_teensy1__) || defined(__BOARD_teensy1pp__) || defined(__BOARD_minimus__) || defined(__BOARD_minimus32__) || \
- defined(__BOARD_rhmixxx__) || defined(__BOARD_arduinoProMicro__) || defined(__BOARD_elecrow32u4lora__)
+ defined(__BOARD_rhmixxx__) || defined(__BOARD_arduinoProMicro__) || defined(__BOARD_sparkfunProMicro__) || defined(__BOARD_elecrow32u4lora__)
#define LED_DIR 0
#else
#define LED_DIR 1
@@ -68,7 +68,7 @@
#define LED_PINNUM 7
#endif
-#if defined(__BOARD_arduinoProMicro__) || defined(__BOARD_elecrow32u4lora__)
+#if defined(__BOARD_arduinoProMicro__) || defined(__BOARD_sparkfunProMicro__) || defined(__BOARD_elecrow32u4lora__)
#define LED_PORT PORTD
#define LED_DDR DDRD
#define LED_PINNUM 5
diff --git a/lib/util.c b/lib/util.c
index f0622ce..c3a6776 100644
--- a/lib/util.c
+++ b/lib/util.c
@@ -64,7 +64,7 @@ void jtag_disable(void)
#define BOOTLOADER_VEC 0x3800
#elif defined(__BOARD_hhd70dongle__) || defined(__BOARD_rda1846dongle__) || defined(__BOARD_culV3__)
#define BOOTLOADER_VEC 0x3800
-#elif defined(__BOARD_slowpandongle1__) || defined(__BOARD_slowpandongle2__) || defined(__BOARD_teenstep__)
+#elif defined(__BOARD_slowpandongle1__) || defined(__BOARD_slowpandongle2__) || defined(__BOARD_teenstep__) || defined(__BOARD_sparkfunProMicro__)
#define BOOTLOADER_VEC 0x3800
#elif defined(__BOARD_rhmixxx__)
#define BOOTLOADER_VEC 0xF000
@@ -80,7 +80,7 @@ void reset2bootloader(void)
#if defined(__BOARD_teensy1__) || defined(__BOARD_teensy1pp__) || defined(__BOARD_teensy2__) || defined(__BOARD_teensy2pp__) || \
defined(__BOARD_hhd70dongle__) || defined(__BOARD_rda1846dongle__) || defined(__BOARD_culV3__) || \
defined(__BOARD_slowpandongle1__) || defined(__BOARD_slowpandongle2__) || defined(__BOARD_teenstep__) || \
- defined(__BOARD_rhmixxx__) || defined(__BOARD_minimus__) || defined(__BOARD_minimus32__)
+ defined(__BOARD_rhmixxx__) || defined(__BOARD_minimus__) || defined(__BOARD_minimus32__) || defined(__BOARD_sparkfunProMicro__)
cli();
// disable watchdog, if enabled
// disable all peripherals
@@ -119,7 +119,7 @@ void reset2bootloader(void)
DDRB = 0; DDRC = 0; DDRD = 0;
PORTB = 0; PORTC = 0; PORTD = 0;
#elif defined(__BOARD_hhd70dongle2__) || defined(__BOARD_hhd70dongle__) || defined(__BOARD_rda1846dongle__) || defined(__BOARD_culV3__) || \
- defined(__BOARD_slowpandongle2__) || defined(__BOARD_teenstep__)
+ defined(__BOARD_slowpandongle2__) || defined(__BOARD_teenstep__) || defined(__BOARD_sparkfunProMicro__)
EIMSK = 0; PCICR = 0; SPCR = 0; ACSR = 0; EECR = 0; ADCSRA = 0;
TIMSK0 = 0; TIMSK1 = 0; TIMSK3 = 0; TIMSK4 = 0; UCSR1B = 0; TWCR = 0;
DDRB = 0; DDRC = 0; DDRD = 0; DDRE = 0; DDRF = 0; TWCR = 0;
diff --git a/usb-led/Makefile b/usb-led/Makefile
index e86d421..c1814da 100644
--- a/usb-led/Makefile
+++ b/usb-led/Makefile
@@ -21,7 +21,7 @@
##
NAME := usb-led
-BOARD_TYPE := elecrow32u4lora
+BOARD_TYPE := sparkfunProMicro
OBJ := $(NAME).o
LIBS := util led lufa-descriptor-usbserial usbio
EXTERNAL_LIBS := lufa