Merge branch 'master' into me-no-dev

me-no-dev · me-no-dev · commit 7d843cbf5202 · 2016-12-12T02:12:28.000+02:00
diff --git a/README.md b/README.md
@@ -1,7 +1,13 @@
-Arduino core for ESP32 WiFi chip
-===========================================
+# Arduino core for ESP32 WiFi chip
 
-### Development Status
+- [Development Status](#development-status)
+- Installing options:
+  + [Using Arduino IDE](#using-arduino-ide)
+  + [Using PlatformIO](#using-platformio)
+  + [Using as ESP-IDF component](#using-as-esp-idf-component)
+- [ESP32Dev Board PINMAP](#esp32dev-board-pinmap)  
+
+## Development Status
 Not everything is working yet, you can not get it through package manager, but you can give it a go and help us find bugs in the things that are implemented :)
 
 The framework can also be downloaded as component in an IDF project and be used like that.
@@ -21,11 +27,11 @@ Things that work:
 WiFiClient, WiFiServer and WiFiUdp are not quite ready yet because there are still some small hiccups in LwIP to be overcome.
 You can try WiFiClient but you need to disconnect the client yourself to be sure that connection is closed.
 
-### Installation
+## Using Arduino IDE
 
-####[Instructions for Windows](doc/windows.md)
+###[Instructions for Windows](doc/windows.md)
 
-#### Instructions for Mac
+### Instructions for Mac
 - Install latest Arduino IDE from [arduino.cc](https://www.arduino.cc/en/Main/Software)
 - Open Terminal and execute the following command (copy->paste and hit enter):
 
@@ -41,7 +47,7 @@ You can try WiFiClient but you need to disconnect the client yourself to be sure
   ```
 - Restart Arduino IDE
 
-#### Instructions for Debian/Ubuntu Linux
+### Instructions for Debian/Ubuntu Linux
 - Install latest Arduino IDE from [arduino.cc](https://www.arduino.cc/en/Main/Software)
 - Open Terminal and execute the following command (copy->paste and hit enter):
 
@@ -59,7 +65,21 @@ You can try WiFiClient but you need to disconnect the client yourself to be sure
   ```
 - Restart Arduino IDE
 
-#### Instructions for using as esp-idf component
+## Using PlatformIO
+
+[PlatformIO](http://platformio.org) is an open source ecosystem for IoT
+development with cross platform build system, library manager and full support
+for Espressif ESP32 development. It works on the popular host OS: Mac OS X, Windows,
+Linux 32/64, Linux ARM (like Raspberry Pi, BeagleBone, CubieBoard).
+
+- [What is PlatformIO?](http://docs.platformio.org/page/what-is-platformio.html)
+- [PlatformIO IDE](http://platformio.org/platformio-ide)
+- Quick Start with [PlatformIO IDE](http://docs.platformio.org/page/ide/atom.html#quick-start) or [PlatformIO Core](http://docs.platformio.org/page/core.html)
+- [Integration with Cloud and Standalone IDEs](http://docs.platformio.org/page/ide.html) -
+  Cloud9, Codeanywehre, Eclipse Che (Codenvy), Atom, CLion, Eclipse, Emacs, NetBeans, Qt Creator, Sublime Text, VIM and Visual Studio
+- [Project Examples](https://github.com/platformio/platform-espressif32/tree/develop/examples)
+
+## Using as ESP-IDF component
 - Download and install [esp-idf](https://github.com/espressif/esp-idf)
 - Create blank idf project (from one of the examples)
 - in the project folder, create a folder called components and clone this repository inside
@@ -112,4 +132,6 @@ You can try WiFiClient but you need to disconnect the client yourself to be sure
         - Else it will wait for WiFi.begin
 - ```make flash monitor``` will build, upload and open serial monitor to your board
 
+## ESP32Dev Board PINMAP
+
 ![Pin Functions](doc/esp32_pinmap.png)
diff --git a/cores/esp32/Arduino.h b/cores/esp32/Arduino.h
@@ -100,12 +100,20 @@ extern "C" {
 #define bitClear(value, bit) ((value) &= ~(1UL << (bit)))
 #define bitWrite(value, bit, bitvalue) (bitvalue ? bitSet(value, bit) : bitClear(value, bit))
 
+// avr-libc defines _NOP() since 1.6.2
+#ifndef _NOP
+#define _NOP() do { __asm__ volatile ("nop"); } while (0)
+#endif
+
+typedef unsigned int word;
+
 #define bit(b) (1UL << (b))
 #define _BV(b) (1UL << (b))
 
 #define digitalPinToPort(pin)       (((pin)>31)?1:0)
-#define digitalPinToBitMask(pin)    (1UL << (pin))
+#define digitalPinToBitMask(pin)    (1UL << (((pin)>31)?((pin)-31):(pin)))
 #define digitalPinToTimer(pin)      (0)
+#define analogInPinToBit(P)         (P)
 #define portOutputRegister(port)    ((volatile uint32_t*)((port)?GPIO_OUT1_REG:GPIO_OUT_REG))
 #define portInputRegister(port)     ((volatile uint32_t*)((port)?GPIO_IN1_REG:GPIO_IN_REG))
 #define portModeRegister(port)      ((volatile uint32_t*)((port)?GPIO_ENABLE1_REG:GPIO_ENABLE_REG))
@@ -118,6 +126,13 @@ extern "C" {
 typedef bool boolean;
 typedef uint8_t byte;
 
+void init(void);
+void initVariant(void);
+void initArduino(void);
+
+void setup(void);
+void loop(void);
+
 uint8_t shiftIn(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder);
 void shiftOut(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder, uint8_t val);
 
diff --git a/cores/esp32/IPAddress.cpp b/cores/esp32/IPAddress.cpp
@@ -72,7 +72,7 @@ size_t IPAddress::printTo(Print& p) const
     return n;
 }
 
-String IPAddress::toString()
+String IPAddress::toString() const
 {
     char szRet[16];
     sprintf(szRet,"%u.%u.%u.%u", _address.bytes[0], _address.bytes[1], _address.bytes[2], _address.bytes[3]);
@@ -119,4 +119,4 @@ bool IPAddress::fromString(const char *address)
     }
     _address.bytes[3] = acc;
     return true;
-}
+}
diff --git a/cores/esp32/IPAddress.h b/cores/esp32/IPAddress.h
@@ -81,7 +81,7 @@ class IPAddress: public Printable
     IPAddress& operator=(uint32_t address);
 
     virtual size_t printTo(Print& p) const;
-    String toString();
+    String toString() const;
 
     friend class EthernetClass;
     friend class UDP;
diff --git a/cores/esp32/esp32-hal-gpio.c b/cores/esp32/esp32-hal-gpio.c
@@ -26,6 +26,8 @@
 
 #define ETS_GPIO_INUM       12
 
+const int8_t esp32_adc2gpio[20] = {36, -1, -1, 39, 32, 33, 34, 35, -1, -1, 4, 0, 2, 15, 13, 12, 14, 27, 25, 26};
+
 const DRAM_ATTR esp32_gpioMux_t esp32_gpioMux[GPIO_PIN_COUNT]={
     {0x44, 11, 11, 1},
     {0x88, -1, -1, -1},
diff --git a/cores/esp32/esp32-hal-gpio.h b/cores/esp32/esp32-hal-gpio.h
@@ -65,6 +65,7 @@ typedef struct {
 } esp32_gpioMux_t;
 
 extern const esp32_gpioMux_t esp32_gpioMux[40];
+extern const int8_t esp32_adc2gpio[20];
 
 #define digitalPinIsValid(pin)          ((pin) < 40 && esp32_gpioMux[(pin)].reg)
 #define digitalPinCanOutput(pin)        ((pin) < 34 && esp32_gpioMux[(pin)].reg)
diff --git a/cores/esp32/main.cpp b/cores/esp32/main.cpp
@@ -1,21 +1,13 @@
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
-#include "esp32-hal.h"
+#include "Arduino.h"
 
 #if CONFIG_AUTOSTART_ARDUINO
 
-extern "C" void initArduino();
-extern void loop();
-extern void setup();
-
 void loopTask(void *pvParameters)
 {
-    bool setup_done = false;
+    setup();
     for(;;) {
-        if(!setup_done) {
-            setup();
-            setup_done = true;
-        }
         loop();
     }
 }
diff --git a/variants/esp32/pins_arduino.h b/variants/esp32/pins_arduino.h
@@ -5,7 +5,7 @@
 #define NUM_DIGITAL_PINS        40
 #define NUM_ANALOG_INPUTS       16
 
-#define analogInputToDigitalPin(p)
+#define analogInputToDigitalPin(p)  (((p)<20)?(esp32_adc2gpio[(p)]):-1)
 #define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
 #define digitalPinHasPWM(p)         (p < 34)
 
diff --git a/variants/esp320/pins_arduino.h b/variants/esp320/pins_arduino.h
@@ -5,7 +5,7 @@
 #define NUM_DIGITAL_PINS        12
 #define NUM_ANALOG_INPUTS       5
 
-#define analogInputToDigitalPin(p)
+#define analogInputToDigitalPin(p)  (((p)<20)?(esp32_adc2gpio[(p)]):-1)
 #define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
 #define digitalPinHasPWM(p)         (p < 34)
 
diff --git a/variants/espea32/pins_arduino.h b/variants/espea32/pins_arduino.h
@@ -5,7 +5,7 @@
 #define NUM_DIGITAL_PINS        40
 #define NUM_ANALOG_INPUTS       16
 
-#define analogInputToDigitalPin(p)
+#define analogInputToDigitalPin(p)  (((p)<20)?(esp32_adc2gpio[(p)]):-1)
 #define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
 #define digitalPinHasPWM(p)         (p < 34)
 
diff --git a/variants/lolin32/pins_arduino.h b/variants/lolin32/pins_arduino.h
@@ -5,7 +5,7 @@
 #define NUM_DIGITAL_PINS        40
 #define NUM_ANALOG_INPUTS       16
 
-#define analogInputToDigitalPin(p)
+#define analogInputToDigitalPin(p)  (((p)<20)?(esp32_adc2gpio[(p)]):-1)
 #define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
 #define digitalPinHasPWM(p)         (p < 34)
 
diff --git a/variants/nano32/pins_arduino.h b/variants/nano32/pins_arduino.h
@@ -5,7 +5,7 @@
 #define NUM_DIGITAL_PINS        38
 #define NUM_ANALOG_INPUTS       16
 
-#define analogInputToDigitalPin(p)
+#define analogInputToDigitalPin(p)  (((p)<20)?(esp32_adc2gpio[(p)]):-1)
 #define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
 #define digitalPinHasPWM(p)         (p < 34)
 
diff --git a/variants/node32s/pins_arduino.h b/variants/node32s/pins_arduino.h
@@ -5,7 +5,7 @@
 #define NUM_DIGITAL_PINS        40
 #define NUM_ANALOG_INPUTS       16
 
-#define analogInputToDigitalPin(p)
+#define analogInputToDigitalPin(p)  (((p)<20)?(esp32_adc2gpio[(p)]):-1)
 #define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
 #define digitalPinHasPWM(p)         (p < 34)
 
diff --git a/variants/quantum/pins_arduino.h b/variants/quantum/pins_arduino.h
@@ -5,7 +5,7 @@
 #define NUM_DIGITAL_PINS        40
 #define NUM_ANALOG_INPUTS       16
 
-#define analogInputToDigitalPin(p)
+#define analogInputToDigitalPin(p)  (((p)<20)?(esp32_adc2gpio[(p)]):-1)
 #define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
 #define digitalPinHasPWM(p)         (p < 34)
 

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ size_t IPAddress::printTo(Print& p) const`
`72`	`72`	`return n;`
`73`	`73`	`}`
`74`	`74`
`75`		`-String IPAddress::toString()`
	`75`	`+String IPAddress::toString() const`
`76`	`76`	`{`
`77`	`77`	`char szRet[16];`
`78`	`78`	`sprintf(szRet,"%u.%u.%u.%u", _address.bytes[0], _address.bytes[1], _address.bytes[2], _address.bytes[3]);`
`@@ -119,4 +119,4 @@ bool IPAddress::fromString(const char *address)`
`119`	`119`	`}`
`120`	`120`	`_address.bytes[3] = acc;`
`121`	`121`	`return true;`
`122`		`-}`
	`122`	`+}`