Merge branch 'master' into fix-typos

Author: ladislas

.ycm_extra_conf.py

@@ -22,7 +22,8 @@
   ,'c++'
 
   # Avr-libc flags installed with homebrew
-  ,"-isystem/usr/local/Cellar/avr-gcc/7.2.0/avr/include"
+  # ,"-isystem/usr/local/Cellar/avr-gcc/7.2.0/avr/include"
+  ,"-isystem/usr/local/Cellar/avr-gcc/8.3.0/avr/include"
 
   # IDE 1.6.3
   ,'-I/Applications/Arduino.app/Contents/Java/hardware/arduino/avr/cores/arduino'

Arduino-Makefile

@@ -115,17 +115,18 @@ $ git push --set-upstream origin master
 
 To upload the program, we need to reset the Arduino board. This is done using a `python script` stored in `./Arduino-Makefile/bin`
 
-First, if you don't already have Python, you can install it using Homebrew on OS X:
+First, if you don't already have Python 2 & 3, you can install it using Homebrew on OS X:
 
 ```Bash
-$ brew install python
+$ brew install python python@2
 ```
 
 Then install `pySerial`:
 
 ```Bash
-$ pip install pyserial
+$ pip install pyserial & pip2 install pyserial
 ```
+
 ### 4. Copy and edit a `Makefile`
 
 To make sure you're up and running to hack Arduino, we are going to compile some code. We need to have a Makefile for each project we want to compile.

INSTALL.md

@@ -5,35 +5,38 @@
 
 ### PROJECT_DIR
 ### This is the path to where you have created/cloned your project
-PROJECT_DIR       =
-
-### AVR_GCC_VERSION
-### Check if the version is equal or higher than 4.9
-AVR_GCC_VERSION  := $(shell expr `avr-gcc -dumpversion | cut -f1` \>= 4.9)
-
+# PROJECT_DIR       = // set by calling make
+#
 ### ARDMK_DIR
 ### Path to the Arduino-Makefile directory.
 ARDMK_DIR         = $(PROJECT_DIR)/Arduino-Makefile
 
 ### ARDUINO_DIR
-### Path to the Arduino application and resources directory.
-ARDUINO_DIR       =
+
+### Path to the Arduino application and ressources directory.
+# ARDUINO_DIR       = // set by calling make
 
 ### USER_LIB_PATH
 ### Path to where the your project's libraries are stored.
-USER_LIB_PATH     := $(PROJECT_DIR)/lib
+# USER_LIB_PATH     := $(PROJECT_DIR)/lib
+USER_LIB_PATH    :=  $(realpath $(PROJECT_DIR)/lib)
 
 ### BOARD_TAG
 ### It must be set to the board you are currently using. (i.e uno, mega2560, etc.)
-BOARD_TAG         = mega2560
+BOARD_TAG         = mega
+BOARD_SUB         = atmega2560
+
+### MONITOR_PORT
+### The port your board is connected to. Using an '*' tries all the ports and finds the right one.
+MONITOR_PORT      = /dev/tty.usbmodem*
 
 ### MONITOR_BAUDRATE
 ### It must be set to Serial baudrate value you are using.
 MONITOR_BAUDRATE  = 115200
 
 ### AVR_TOOLS_DIR
 ### Path to the AVR tools directory such as avr-gcc, avr-g++, etc.
-AVR_TOOLS_DIR     =
+# AVR_TOOLS_DIR     = // set by calling make
 
 ### AVRDUDE
 ### Path to avrdude directory.
@@ -47,23 +50,14 @@ CXXFLAGS_STD      = -std=gnu++11
 
 ### CPPFLAGS
 ### Flags you might want to set for debugging purpose. Comment to stop.
-CXXFLAGS         = -pedantic -Wall -Wextra
-
-### If avr-gcc -v is higher than 4.9, activate coloring of the output
-ifeq "$(AVR_GCC_VERSION)" "1"
-    CXXFLAGS += -fdiagnostics-color
-endif
-
-### MONITOR_PORT
-### The port your board is connected to. Using an '*' tries all the ports and finds the right one.
-MONITOR_PORT      = /dev/tty.usbmodem*
-
-### don't touch this
-CURRENT_DIR       = $(shell basename $(CURDIR))
+CXXFLAGS         += -pedantic -Wall -Wextra
+LDFLAGS          += -fdiagnostics-color
 
 ### OBJDIR
+### Don't touch this!
 ### This is were you put the binaries you just compile using 'make'
-OBJDIR            = $(PROJECT_DIR)/bin/$(BOARD_TAG)/$(CURRENT_DIR)
+CURRENT_DIR       = $(shell basename $(CURDIR))
+OBJDIR            = $(PROJECT_DIR)/build/$(CURRENT_DIR)/$(BOARD_TAG)
 
 ### path to Arduino.mk, inside the ARDMK_DIR, don't touch.
 include $(ARDMK_DIR)/Arduino.mk

LICENSE.md renamed to LICENSE

@@ -5,11 +5,7 @@
 
 ### PROJECT_DIR
 ### This is the path to where you have created/cloned your project
-PROJECT_DIR       = $(shell dirname $(shell dirname $(shell pwd)))
-
-### AVR_GCC_VERSION
-### Check if the version is equal or higher than 4.9
-AVR_GCC_VERSION  := $(shell expr `avr-gcc -dumpversion | cut -f1` \>= 4.9)
+PROJECT_DIR       = $(shell dirname $(shell pwd))
 
 ### ARDMK_DIR
 ### Path to the Arduino-Makefile directory.
@@ -33,6 +29,11 @@ USER_LIB_PATH     :=  $(realpath $(PROJECT_DIR)/lib)
 BOARD_TAG         = mega
 BOARD_SUB         = atmega2560
 
+### MONITOR_PORT
+### The port your board is connected to. Using an '*' tries all the ports and finds the right one. Choose one of the two.
+MONITOR_PORT      = /dev/ttyUSB*
+# MONITOR_PORT      = /dev/ttyACM*
+
 ### MONITOR_BAUDRATE
 ### It must be set to Serial baudrate value you are using.
 MONITOR_BAUDRATE  = 115200
@@ -43,35 +44,28 @@ AVR_TOOLS_DIR     = /usr
 
 ### AVRDUDE
 ### Path to avrdude directory.
-AVRDUDE          = /usr/bin/avrdude
+AVRDUDE           = /usr/bin/avrdude
 
 ### CFLAGS_STD
 CFLAGS_STD        = -std=gnu11
 
 ### CXXFLAGS_STD
-CXXFLAGS_STD      = -std=gnu++11
+### You can choose wich ever you like
+# CXXFLAGS_STD      = -std=gnu++11
+CXXFLAGS_STD      = -std=gnu++17
+
 
 ### CPPFLAGS
 ### Flags you might want to set for debugging purpose. Comment to stop.
-CXXFLAGS          = -pedantic -Wall -Wextra
-
-### If avr-gcc -v is higher than 4.9, activate coloring of the output
-ifeq "$(AVR_GCC_VERSION)" "1"
-    CXXFLAGS += -fdiagnostics-color
-endif
-
-### MONITOR_PORT
-### The port your board is connected to. Using an '*' tries all the ports and finds the right one. Choose one of the two.
-MONITOR_PORT      = /dev/ttyUSB*
-# MONITOR_PORT      = /dev/ttyACM*
-
-### don't touch this
-CURRENT_DIR       = $(shell basename $(CURDIR))
+CXXFLAGS         += -pedantic -Wall -Wextra
+LDFLAGS          += -fdiagnostics-color
 
 ### OBJDIR
+### Don't touch this!
 ### This is were you put the binaries you just compile using 'make'
 CURRENT_DIR       = $(shell basename $(CURDIR))
-OBJDIR            = $(PROJECT_DIR)/bin/$(CURRENT_DIR)/$(BOARD_TAG)
+OBJDIR            = $(PROJECT_DIR)/build/$(CURRENT_DIR)/$(BOARD_TAG)
 
 ### path to Arduino.mk, inside the ARDMK_DIR, don't touch.
 include $(ARDMK_DIR)/Arduino.mk
+

Makefile-CI.mk

@@ -5,11 +5,7 @@
 
 ### PROJECT_DIR
 ### This is the path to where you have created/cloned your project
-PROJECT_DIR       = $(shell dirname $(shell dirname $(shell pwd)))
-
-### AVR_GCC_VERSION
-### Check if the version is equal or higher than 4.9
-AVR_GCC_VERSION  := $(shell expr `avr-gcc -dumpversion | cut -f1` \>= 4.9)
+PROJECT_DIR       = $(shell dirname $(shell pwd))
 
 ### ARDMK_DIR
 ### Path to the Arduino-Makefile directory.
@@ -19,7 +15,7 @@ ARDMK_DIR         = $(PROJECT_DIR)/Arduino-Makefile
 ### Path to the Arduino application and resources directory.
 ### For Arduino IDE 1.0.x
 # ARDUINO_DIR       = /Applications/Arduino.app/Contents/Resources/Java
-### For Arduino IDE 1.6.x
+### For Arduino IDE 1.6.x ++
 ARDUINO_DIR       = /Applications/Arduino.app/Contents/Java
 
 ### USER_LIB_PATH
@@ -36,6 +32,10 @@ USER_LIB_PATH    :=  $(realpath $(PROJECT_DIR)/lib)
 BOARD_TAG         = mega
 BOARD_SUB         = atmega2560
 
+### MONITOR_PORT
+### The port your board is connected to. Using an '*' tries all the ports and finds the right one.
+MONITOR_PORT      = /dev/tty.usbmodem*
+
 ### MONITOR_BAUDRATE
 ### It must be set to Serial baudrate value you are using.
 MONITOR_BAUDRATE  = 115200
@@ -46,31 +46,27 @@ AVR_TOOLS_DIR     = /usr/local
 
 ### AVRDUDE
 ### Path to avrdude directory.
-AVRDUDE          = /usr/local/bin/avrdude
+AVRDUDE           = /usr/local/bin/avrdude
 
 ### CFLAGS_STD
 CFLAGS_STD        = -std=gnu11
 
 ### CXXFLAGS_STD
-CXXFLAGS_STD      = -std=gnu++11
+### You can choose wich ever you like
+# CXXFLAGS_STD      = -std=gnu++11
+CXXFLAGS_STD      = -std=gnu++17
 
 ### CPPFLAGS
 ### Flags you might want to set for debugging purpose. Comment to stop.
-CXXFLAGS          = -pedantic -Wall -Wextra
-
-### If avr-gcc -v is higher than 4.9, activate coloring of the output
-ifeq "$(AVR_GCC_VERSION)" "1"
-    CXXFLAGS     += -fdiagnostics-color
-endif
-
-### MONITOR_PORT
-### The port your board is connected to. Using an '*' tries all the ports and finds the right one.
-MONITOR_PORT      = /dev/tty.usbmodem*
+CXXFLAGS         += -pedantic -Wall -Wextra
+LDFLAGS          += -fdiagnostics-color
 
 ### OBJDIR
+### Don't touch this!
 ### This is were you put the binaries you just compile using 'make'
 CURRENT_DIR       = $(shell basename $(CURDIR))
-OBJDIR            = $(PROJECT_DIR)/bin/$(CURRENT_DIR)/$(BOARD_TAG)
+OBJDIR            = $(PROJECT_DIR)/build/$(CURRENT_DIR)/$(BOARD_TAG)
 
 ### path to Arduino.mk, inside the ARDMK_DIR, don't touch.
 include $(ARDMK_DIR)/Arduino.mk
+

Makefile-Linux.mk

@@ -4,10 +4,9 @@
 
 ## Important notice
 
-> I'm not using this project as much as I used to and might be slow at answering issues or PR's.
-> I am slowly moving out of Arduino-Makefile in favor of [PlatformIO](http://docs.platformio.org/en/latest/).
-> I've ported their basic toolchain so you can still use the latest avr-gcc toolchain and stuff.
-> Take a look here and let me know what you think: [osx-cross/platform-osxcrossavr](https://github.com/osx-cross/platform-osxcrossavr)
+> ~~I'm not using this project as much as I used to and might be slow at answering issues or PR's.
+> I am slowly moving out of Arduino-Makefile in favor of PlatformIO
+> I've ported their basic toolchain so you can still use the latest avr-gcc toolchain and stuff.~~
 
 <!-- START doctoc generated TOC please keep comment here to allow auto update -->
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
@@ -39,7 +38,7 @@ Ever wanted to start a new [Arduino](http://arduino.cc/) project and...
     -   tests in `test`
     -   binaries in `bin`
     -   etc.
--   **use** a newer version of `avr-gcc` such as `7.2` or `6.4`?
+-   **use** a newer version of `avr-gcc` such as `8.3.0`?
 -   **use** an awesome [`Makefile`](https://github.com/sudar/Arduino-Makefile) to compile and upload your code from the `cli`?
 
 If you answered **yes** to one of the above, this [Bare Arduino Project](https://github.com/ladislas/bare-arduino-project) is just what you're looking for! :)
@@ -50,8 +49,8 @@ Based on what we've learned on our [Moti project](http://github.com/weareleka/mo
 
 -   move away from the Arduino IDE and use your favorite text editor such as Vim or SublimeText
 -   get up and running in less time
--   use `avr-gcc 7.2` to compile your code
--   use `C++14` for your standard coding
+-   use `avr-gcc 8.3.0` to compile your code
+-   use `C++17` for your standard coding
 -   use `make` to compile, `make upload` to upload, thanks to [Sudar](https://github.com/sudar/)'s incredible project [Arduino-Makefile](https://github.com/sudar/Arduino-Makefile)
 -   use our [Travis-CI](https://travis-ci.org) continuous integration configuration and adapt it to suit your needs
 

Makefile-OSX.mk

@@ -7,7 +7,7 @@ SRC="$CWD/src"
 TEST="$CWD/test"
 ARDMK="$CWD/Arduino-Makefile"
 
-AVR_GCC="/usr/local/share/avr-gcc"
-ARDUINO="/usr/local/share/arduino"
+AVR_GCC="/usr/share/avr-gcc"
+ARDUINO="/usr/share/arduino"
 
 source "$SCRIPTS_DIR/install.sh"

README.md

@@ -2,26 +2,23 @@
 
 echo "Installing dependencies needed to build the sources and tests..."
 
-ARDUINO_BASENAME="arduino-1.0.6"
-ARDUINO_FILE="$ARDUINO_BASENAME-linux64.tgz"
-ARDUINO_URL="http://arduino.cc/download.php?f=/$ARDUINO_FILE"
-
-AVR_GCC_BASENAME="arduino-1.5.8"
-AVR_GCC_FILE="$AVR_GCC_BASENAME-linux64.tgz"
-AVR_GCC_URL="http://arduino.cc/download.php?f=/$AVR_GCC_FILE"
-
-echo "Installing Arduino 1.0.6..."
+ARDUINO_BASENAME="arduino-1.8.9"
+ARDUINO_FILE="$ARDUINO_BASENAME-linux64.tar.xz"
+ARDUINO_URL="https://downloads.arduino.cc/$ARDUINO_FILE"
 
+echo "Downloading $ARDUINO_BASENAME from $ARDUINO_URL"
 wget "$ARDUINO_URL" -O "$ARDUINO_FILE"
-tar -xzf "$ARDUINO_FILE"
-sudo mv "$ARDUINO_BASENAME/" "$ARDUINO"
 
-echo "Installing avr-gcc from Arduino 1.5.8..."
+echo "Unzipping $ARDUINO_BASENAME"
+tar xf "$ARDUINO_FILE"
 
-wget "$AVR_GCC_URL" -O "$AVR_GCC_FILE"
-tar -xzf "$AVR_GCC_FILE"
-sudo mv "$AVR_GCC_BASENAME/hardware/tools/avr" "$AVR_GCC"
+echo "Installing avr-gcc to $AVR_GCC"
+sudo mv "$ARDUINO_BASENAME/hardware/tools/avr" "$AVR_GCC"
+
+echo "Install Arduino to $ARDUINO"
+sudo mv "$ARDUINO_BASENAME/" "$ARDUINO"
 
 echo "Installation of dependencies is complete, we are now going to run some tests..."
 
 source "$SCRIPTS_DIR/runtests.sh"
+

script/bootstrap.sh

@@ -1,6 +1,7 @@
 #include <Arduino.h>
 #include <Wire.h>
 #include "BarLib.h"
+#include "FooLib.h"
 
 BarClass BarObject;