Merge pull request #582 from tve/master

compilation issues for esp8266 target

Author: gfwilliams

Makefile

@@ -1273,7 +1273,7 @@ libs/network/esp8266/network_esp8266.c
 
 # The tool used for building the firmware and flashing
 ESPTOOL_CK ?= esptool-ck
-ESPTOOL    ?= esptool
+ESPTOOL    ?= $(ESP8266_SDK_ROOT)/esptool/esptool.py
 
 # Extra include directories specific to the ESP8266
 INCLUDE += -I$(ESP8266_SDK_ROOT)/include \
@@ -1422,10 +1422,10 @@ ifndef COMPORT
 	$(error, "In order to flash, we need to have the COMPORT variable defined")
 endif
 # Handle ESP8266 flashing
-	@echo Disass: $(OBJDUMP) -d -l -x $(PROJ_NAME).elf
+	@echo Disassembly: $(OBJDUMP) -d -l -x $(PROJ_NAME).elf
 	-$(Q)$(ESPTOOL_CK) -eo $(PROJ_NAME).elf -bo ESP8266_0x00000.bin -bs .text -bs .data -bs .rodata -bs .iram0.text -bc -ec
 	-$(Q)$(ESPTOOL_CK) -eo $(PROJ_NAME).elf -es .irom0.text ESP8266_0x10000.bin -ec
-	-$(Q)$(ESPTOOL) --port $(COMPORT) --baud 115200 write_flash  --flash_freq 40m --flash_mode qio --flash_size 4m 0x00000 ESP8266_0x00000.bin 0x10000 ESP8266_0x10000.bin
+	-$(Q)$(ESPTOOL) --port $(COMPORT) --baud 115200 write_flash --flash_freq 40m --flash_mode qio --flash_size 4m 0x00000 ESP8266_0x00000.bin 0x10000 ESP8266_0x10000.bin
 # End of handle ESP8266 flashing
 else
 	echo ST-LINK flash

README_Building.md

@@ -55,6 +55,28 @@ To program the nRF52 Development Kit with Espruino:
 
 -- Note that limited functionality is implemented on the nRF52. Feel free to help! Currently working on NFC touch to pair so you can tap the device with your smartphone to connect without opening the app and then scanning. Also thinking of ways to edit scripts (typing long programs on smartphone is tedious).
 
+### for esp8266
+
+In order to compile for the esp8266 on Linux several pre-requisites have to be installed:
+- the esp-open-sdk from https://github.com/pfalcon/esp-open-sdk, use make STANDALONE=n
+- the Espressif SDK (version 1.4.0 as of this writing) from http://bbs.espressif.com/viewforum.php?f=46
+- Esptool-ck from https://github.com/tommie/esptool-ck
+
+Note: esptool-ck should be eliminated and replaced with esptool (.py), this will happen naturally
+when an OTA update is developed.
+
+To run make you need to pass a number of environment variables to make, the easiest is to place
+the following lines into a script, adapt it to your needs and then run it.
+```
+#! /bin/bash
+export ESP8266_BOARD=1
+export ESP8266_SDK_ROOT=/esp8266/esp_iot_sdk_v1.4.0
+export PATH=$PATH:/esp8266/esp-open-sdk/xtensa-lx106-elf/bin/
+export ESPTOOL_CK=/esp8266/esptool-ck/esptool
+export COMPORT=/dev/ttyUSB0
+make $*
+```
+
 ### for Linux
 
 Simple: Just run `make`

libs/network/network.c

@@ -20,6 +20,9 @@
 #if defined(USE_WIZNET)
   #include "network_wiznet.h"
 #endif
+#if defined(USE_ESP8266_BOARD)
+  #include "network_esp8266.h"
+#endif
 #if defined(LINUX)
   #include "network_linux.h"
 #endif
@@ -167,6 +170,9 @@ bool networkGetFromVar(JsNetwork *net) {
 #if defined(USE_WIZNET)
   case JSNETWORKTYPE_W5500 : netSetCallbacks_wiznet(net); break;
 #endif
+#if defined(USE_ESP8266_BOARD)
+  case JSNETWORKTYPE_ESP8266_BOARD : netSetCallbacks_esp8266_board(net); break;
+#endif
 #if defined(LINUX)
   case JSNETWORKTYPE_SOCKET : netSetCallbacks_linux(net); break;
 #endif

libs/network/network.h

@@ -36,6 +36,7 @@ typedef enum {
   JSNETWORKTYPE_CC3000,  ///< TI CC3000 support
   JSNETWORKTYPE_W5500,  ///< WIZnet W5500 support
   JSNETWORKTYPE_JS,  ///< JavaScript network type
+  JSNETWORKTYPE_ESP8266_BOARD, ///< Espressif ESP8266 board support
 } JsNetworkType;
 
 typedef struct {