Skip to content

Arduino 1.8.2 #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Arduino 1.8.2 #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
67a3ec9
Add a gitignore
peternewman Jan 26, 2019
8438861
Make it compile with Arduino 1.8.2, resulting hex currently untested
peternewman Jan 26, 2019
9d42256
Merge branch 'master' into arduino-1.8.2
peternewman Jan 26, 2019
6406ddf
Update last tested version
peternewman Jan 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
*.o
applet/
16 changes: 10 additions & 6 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,12 @@ SOURCES = RDMHandlers.cpp RDMSender.cpp UsbProReceiver.cpp \
UsbProSender.cpp WidgetSettings.cpp

VERSION=1.0
ARDUINO = $(INSTALL_DIR)/hardware/arduino/cores/arduino
VARIANTS = $(INSTALL_DIR)/hardware/arduino/variants/standard
# For earlier versions of Arduino, you may need to drop the /avr from the end
# of this path
ARDUINO_BASE = $(INSTALL_DIR)/hardware/arduino/avr
ARDUINO = $(ARDUINO_BASE)/cores/arduino
ARDUINO_CORE_LIB = $(ARDUINO_BASE)/libraries
VARIANTS = $(ARDUINO_BASE)/variants/standard
ARDUINO_LIB = $(INSTALL_DIR)/libraries
AVR_TOOLS_PATH = $(INSTALL_DIR)/hardware/tools/avr/bin
AVRDUDE_PATH = $(INSTALL_DIR)/hardware/tools/avr/bin
Expand All @@ -75,8 +79,9 @@ $(ARDUINO)/Tone.cpp \
$(ARDUINO)/WMath.cpp \
$(ARDUINO)/Print.cpp \
$(ARDUINO)/HardwareSerial.cpp \
$(ARDUINO)/HardwareSerial0.cpp \
$(ARDUINO)/CDC.cpp \
$(ARDUINO)/HID.cpp \
$(ARDUINO_CORE_LIB)/HID/src/HID.cpp \
$(ARDUINO)/IPAddress.cpp \
$(ARDUINO)/new.cpp \
$(ARDUINO)/Stream.cpp \
Expand All @@ -85,7 +90,6 @@ $(ARDUINO)/WMath.cpp \
$(ARDUINO)/WString.cpp \
$(ARDUINO)/main.cpp \
$(SOURCES) \
$(ARDUINO_LIB)/EEPROM/EEPROM.cpp \

CXX_APP = main.cpp
MODULES = $(C_MODULES) $(CXX_MODULES)
Expand All @@ -109,8 +113,8 @@ CDEFS = -DF_CPU=$(F_CPU)L -DARDUINO=$(VERSION)
CXXDEFS = -DF_CPU=$(F_CPU)L -DARDUINO=$(VERSION)

# Place -I options here
CINCS = -I$(ARDUINO) -I$(VARIANTS) -I$(ARDUINO_LIB)
CXXINCS = -I$(ARDUINO) -I$(VARIANTS) -I$(ARDUINO_LIB)
CINCS = -I$(ARDUINO) -I$(VARIANTS) -I$(ARDUINO_CORE_LIB) -I$(ARDUINO_LIB)
CXXINCS = -I$(ARDUINO) -I$(VARIANTS) -I$(ARDUINO_CORE_LIB) -I$(ARDUINO_LIB)

# Compiler flag to set the C Standard level.
# c89 - "ANSI" C
Expand Down
2 changes: 1 addition & 1 deletion README
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

To build this software you need the Arduino build environment from
http://arduino.cc/en/Main/Software. The last tested version was 0022.
http://arduino.cc/en/Main/Software. The last tested version was 1.8.2.

Edit the INSTALL_DIR variable in the Makefile to point at the Arduino
installation directory. The software can then be built by running
Expand Down
2 changes: 1 addition & 1 deletion WidgetSettings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
* dmx personality (1)
*/

#include "EEPROM/EEPROM.h"
#include "EEPROM/src/EEPROM.h"
#include "WidgetSettings.h"


Expand Down