minor fixes inlcuding adding explicit flash mode to make file, and fi…

…x incorrect ifdef
OpenSprinkler · May 16, 2018 · fd7cdad · fd7cdad
1 parent 8ab85c7
commit fd7cdad
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 39 deletions.
diff --git a/examples/mainArduino/mainArduino.ino b/examples/mainArduino/mainArduino.ino
@@ -1,6 +1,6 @@
 #include <Wire.h>
 
-#ifndef(ESP8266)
+#ifndef ESP8266
 #include <SdFat.h>
 #endif
 

diff --git a/mainArduino.ino b/mainArduino.ino
diff --git a/make.lin30 b/make.lin30
@@ -25,14 +25,15 @@ LIBS ?= $(ESP_LIBS)/Wire \
 	.
 
 # Esp8266 Arduino git location
-ESP_ROOT ?= $(HOME)/esp8266_2.2.0/
+ESP_ROOT ?= $(HOME)/esp8266_2.2/
 # Output directory
 BUILD_ROOT ?= /tmp/$(MAIN_NAME)
 
 UPLOAD_SPEED ?= 230400
 UPLOAD_VERB ?= -v
 UPLOAD_RESET ?= ck
 
+FLASH_MODE ?= dio
 FLASH_DEF ?= 4M1M
 
 # Include possible project makefile. This can be used to override the defaults below