Merge remote-tracking branch 'origin/2.1.6'

OpenSprinkler · Sep 15, 2015 · 95f8689 · 95f8689
2 parents 4162c68 + 560db55
commit 95f8689
Show file tree

Hide file tree

Showing 17 changed files with 2,149 additions and 1,228 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@ logs/**
 nvm.dat
 OpenSprinkler
 wtopts.txt
+stns.dat
diff --git a/Arduino.mk b/Arduino.mk
@@ -951,7 +951,7 @@ endif
 # Using += instead of =, so that CPPFLAGS can be set per sketch level
 CPPFLAGS      += -$(MCU_FLAG_NAME)=$(MCU) -DF_CPU=$(F_CPU) -DARDUINO=$(ARDUINO_VERSION) $(ARDUINO_ARCH_FLAG) -D__PROG_TYPES_COMPAT__ \
         -I. -I$(ARDUINO_CORE_PATH) -I$(ARDUINO_VAR_PATH)/$(VARIANT) \
-        $(SYS_INCLUDES) $(PLATFORM_INCLUDES) $(USER_INCLUDES) -Wall -ffunction-sections \
+        $(SYS_INCLUDES) $(PLATFORM_INCLUDES) $(USER_INCLUDES) -ffunction-sections \
         -fdata-sections
 
 ifdef DEBUG