Merge pull request #8 from esp8266/esp8266

Esp8266

Author: me-no-dev

cores/esp8266/Esp.h

@@ -45,13 +45,22 @@ typedef enum {
 #define cli()        ets_intr_lock()       // IRQ Disable
 #define sei()        ets_intr_unlock()     // IRQ Enable
 
-enum WakeMode {
-    WAKE_RF_DEFAULT = 0, // RF_CAL or not after deep-sleep wake up, depends on init data byte 108.
-    WAKE_RFCAL = 1,      // RF_CAL after deep-sleep wake up, there will be large current.
-    WAKE_NO_RFCAL = 2,   // no RF_CAL after deep-sleep wake up, there will only be small current.
-    WAKE_RF_DISABLED = 4 // disable RF after deep-sleep wake up, just like modem sleep, there will be the smallest current.
+enum RFMode {
+    RF_DEFAULT = 0, // RF_CAL or not after deep-sleep wake up, depends on init data byte 108.
+    RF_CAL = 1,      // RF_CAL after deep-sleep wake up, there will be large current.
+    RF_NO_CAL = 2,   // no RF_CAL after deep-sleep wake up, there will only be small current.
+    RF_DISABLED = 4 // disable RF after deep-sleep wake up, just like modem sleep, there will be the smallest current.
 };
 
+#define RF_MODE(mode) extern "C" int __get_rf_mode() { return mode; }
+
+// compatibility definitions
+#define WakeMode RFMode
+#define WAKE_RF_DEFAULT  RF_DEFAULT
+#define WAKE_RFCAL       RF_CAL
+#define WAKE_NO_RFCAL    RF_NO_CAL
+#define WAKE_RF_DISABLED RF_DISABLED
+
 typedef enum {
      FM_QIO = 0x00,
      FM_QOUT = 0x01,
@@ -72,7 +81,7 @@ class EspClass {
         void wdtDisable();
         void wdtFeed();
 
-        void deepSleep(uint32_t time_us, WakeMode mode = WAKE_RF_DEFAULT);
+        void deepSleep(uint32_t time_us, RFMode mode = RF_DEFAULT);
 
         void reset();
         void restart();

cores/esp8266/abi.cpp

@@ -58,6 +58,14 @@ namespace std {
 void __throw_bad_function_call() {
     abort();
 }
+
+void __throw_length_error(char const*) {
+	abort();
+}
+
+void __throw_bad_alloc() {
+	abort();
+}
 }
 
 // TODO: rebuild windows toolchain to make this unnecessary:

cores/esp8266/cont.S

@@ -106,7 +106,7 @@ cont_resume:
 
 cont_norm:
 	/* calculate pointer to cont_ctx.struct_start from sp */
-	l32i	a2,	a1, 8
+	l32i	a2,	a1, 4
 	/* sp <- cont_ctx.sp_ret */
 	l32i	a1, a2, 4
 

cores/esp8266/cont.h

@@ -33,6 +33,8 @@ typedef struct cont_ {
         unsigned* sp_yield;
 
         unsigned* stack_end;
+        unsigned unused1;
+        unsigned unused2;
         unsigned stack_guard1;
 
         unsigned stack[CONT_STACKSIZE / 4];

cores/esp8266/cont_util.c

@@ -25,7 +25,7 @@
 void cont_init(cont_t* cont) {
     cont->stack_guard1 = CONT_STACKGUARD;
     cont->stack_guard2 = CONT_STACKGUARD;
-    cont->stack_end = cont->stack + (sizeof(cont->stack) / 4 - 1);
+    cont->stack_end = cont->stack + (sizeof(cont->stack) / 4);
     cont->struct_start = (unsigned*) cont;
 }
 

cores/esp8266/core_esp8266_main.cpp

@@ -59,7 +59,7 @@ void preloop_update_frequency() {
 extern void (*__init_array_start)(void);
 extern void (*__init_array_end)(void);
 
-static cont_t g_cont;
+cont_t g_cont __attribute__ ((aligned (16)));
 static os_event_t g_loop_queue[LOOP_QUEUE_SIZE];
 
 static uint32_t g_micros_at_task_start;
@@ -118,9 +118,15 @@ void init_done() {
     esp_schedule();
 }
 
+extern "C" int __get_rf_mode()  __attribute__((weak));
+extern "C" int __get_rf_mode()
+{
+    return 0;  // default mode
+}
+
 extern "C" {
 void user_rf_pre_init() {
-    
+    system_phy_set_rfoption(__get_rf_mode());
 }
 }
 
@@ -129,9 +135,6 @@ void user_init(void) {
     uart_div_modify(0, UART_CLK_FREQ / (74480));
 
     system_rtc_mem_read(0, &resetInfo, sizeof(struct rst_info));
-    if(resetInfo.reason == REASON_WDT_RST || resetInfo.reason == REASON_EXCEPTION_RST) {
-        os_printf("Last Reset:\n - flag=%d\n - Fatal exception (%d):\n - epc1=0x%08x,epc2=0x%08x,epc3=0x%08x,excvaddr=0x%08x,depc=0x%08x\n", resetInfo.reason, resetInfo.exccause, resetInfo.epc1, resetInfo.epc2, resetInfo.epc3, resetInfo.excvaddr, resetInfo.depc);
-    }
     struct rst_info info = { 0 };
     system_rtc_mem_write(0, &info, sizeof(struct rst_info));
 

cores/esp8266/core_esp8266_postmortem.c

@@ -0,0 +1,130 @@
+/* 
+ postmortem.c - output of debug info on sketch crash
+ Copyright (c) 2015 Ivan Grokhotkov. All rights reserved.
+ This file is part of the esp8266 core for Arduino environment.
+ 
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+
+#include <stdint.h>
+#include <stddef.h>
+#include <stdbool.h>
+#include "ets_sys.h"
+#include "user_interface.h"
+#include "esp8266_peri.h"
+#include "cont.h"
+
+extern void __real_system_restart_local();
+extern cont_t g_cont;
+
+static void uart0_write_char_d(char c);
+static void print_stack(uint32_t start, uint32_t end);
+static void print_pcs(uint32_t start, uint32_t end);
+
+void __wrap_system_restart_local() {
+    register uint32_t sp asm("a1");
+
+    struct rst_info rst_info = {0};
+    system_rtc_mem_read(0, &rst_info, sizeof(rst_info));
+    if (rst_info.reason != REASON_SOFT_WDT_RST && 
+        rst_info.reason != REASON_EXCEPTION_RST &&
+        rst_info.reason != REASON_WDT_RST) 
+    {
+        return;
+    }
+
+    ets_install_putc1(&uart0_write_char_d);
+
+    if (rst_info.reason == REASON_EXCEPTION_RST) {
+        ets_printf("\nException (%d):\nepc1=0x%08x epc2=0x%08x epc3=0x%08x excvaddr=0x%08x depc=0x%08x\n", 
+            rst_info.exccause, rst_info.epc1, rst_info.epc2, rst_info.epc3, rst_info.excvaddr, rst_info.depc);
+    }
+
+    uint32_t cont_stack_start = (uint32_t) &(g_cont.stack);
+    uint32_t cont_stack_end = (uint32_t) g_cont.stack_end;
+    uint32_t stack_end;
+
+    // amount of stack taken by interrupt or exception handler 
+    // and everything up to __wrap_system_restart_local
+    // (determined empirically, might break)
+    uint32_t offset = 0;
+    if (rst_info.reason == REASON_SOFT_WDT_RST) {
+        offset = 0x1b0;
+    }
+    else if (rst_info.reason == REASON_EXCEPTION_RST) {
+        offset = 0x1a0;
+    }
+    else if (rst_info.reason == REASON_WDT_RST) {
+        offset = 0x10;
+    }
+
+    if (sp > cont_stack_start && sp < cont_stack_end) {
+        ets_printf("\nctx: cont \n");
+        stack_end = cont_stack_end;
+    }
+    else {
+        ets_printf("\nctx: sys \n");
+        stack_end = 0x3fffffb0;  
+        // it's actually 0x3ffffff0, but the stuff below ets_run 
+        // is likely not really relevant to the crash
+    }
+    
+    ets_printf("sp: %08x end: %08x offset: %04x\n", sp, stack_end, offset);
+    
+    // print_pcs(sp + offset, stack_end);
+    print_stack(sp + offset, stack_end);
+    delayMicroseconds(10000);
+    __real_system_restart_local();
+}
+
+
+static void print_stack(uint32_t start, uint32_t end) {
+    ets_printf("\n>>>stack>>>\n");
+    for (uint32_t pos = start; pos < end; pos += 0x10) {
+        uint32_t* values = (uint32_t*)(pos);
+
+        // rough indicator: stack frames usually have SP saved as the second word
+        bool looksLikeStackFrame = (values[2] == pos + 0x10);
+
+        ets_printf("%08x:  %08x %08x %08x %08x %c\n", 
+            pos, values[0], values[1], values[2], values[3], (looksLikeStackFrame)?'<':' ');
+    }
+    ets_printf("<<<stack<<<\n");
+}
+
+static void print_pcs(uint32_t start, uint32_t end) {
+    uint32_t n = 0;
+    ets_printf("\n>>>pc>>>\n");
+    for (uint32_t pos = start; pos < end; pos += 16, ++n) {
+        uint32_t* sf = (uint32_t*) pos;
+
+        uint32_t pc_ret = sf[3];
+        uint32_t sp_ret = sf[2];
+        if (pc_ret < 0x40000000 || pc_ret > 0x40f00000 || sp_ret != pos + 16)
+            continue;
+        ets_printf("%08x\n", pc_ret);
+    }
+    ets_printf("<<<pc<<<\n");
+}
+
+void uart0_write_char_d(char c) {
+    while (((USS(0) >> USTXC) & 0xff) >= 0x7e) { }
+
+    if (c == '\n') {
+        USF(0) = '\r';
+    }
+    USF(0) = c;
+}

cores/esp8266/debug.h

@@ -5,7 +5,10 @@
 // #define DEBUGV(...) ets_printf(__VA_ARGS__)
 #define DEBUGV(...)
 
+#ifdef __cplusplus
 void hexdump(uint8_t *mem, uint32_t len, uint8_t cols = 16);
-
+#else
+void hexdump(uint8_t *mem, uint32_t len, uint8_t cols);
+#endif
 
 #endif//ARD_DEBUG_H

cores/esp8266/libc_replacements.c

@@ -36,6 +36,7 @@
 #include "osapi.h"
 #include "mem.h"
 #include "user_interface.h"
+#include "debug.h"
 
 void* malloc(size_t size) {
     size = ((size + 3) & ~((size_t)0x3));
@@ -471,75 +472,7 @@ int isblank(int c) {
 static int errno_var = 0;
 
 int* ICACHE_FLASH_ATTR __errno(void) {
-    os_printf("__errno is called last error: %d (not current)\n", errno_var);
+    DEBUGV("__errno is called last error: %d (not current)\n", errno_var);
     return &errno_var;
 }
 
-// ##########################################################################
-//                     __ieee754  functions
-// ##########################################################################
-
-double ICACHE_FLASH_ATTR __ieee754_sinh(double x) {
-    return sinh(x);
-}
-
-double ICACHE_FLASH_ATTR __ieee754_hypot(double x, double y) {
-    return hypot(x, y);
-}
-
-float ICACHE_FLASH_ATTR __ieee754_hypotf(float x, float y) {
-    return hypotf(x, y);
-}
-
-float ICACHE_FLASH_ATTR __ieee754_logf(float x) {
-    return logf(x);
-}
-
-double ICACHE_FLASH_ATTR __ieee754_log10(double x) {
-    return log10(x);
-}
-
-double ICACHE_FLASH_ATTR __ieee754_exp(double x) {
-    return exp(x);
-}
-
-double ICACHE_FLASH_ATTR __ieee754_cosh(double x) {
-    return cosh(x);
-}
-
-float ICACHE_FLASH_ATTR __ieee754_expf(float x) {
-    return expf(x);
-}
-
-float ICACHE_FLASH_ATTR __ieee754_log10f(float x) {
-    return log10f(x);
-}
-
-double ICACHE_FLASH_ATTR __ieee754_atan2(double x, double y) {
-    return atan2(x, y);
-}
-
-float ICACHE_FLASH_ATTR __ieee754_sqrtf(float x) {
-    return sqrtf(x);
-}
-
-float ICACHE_FLASH_ATTR __ieee754_sinhf(float x) {
-    return sinhf(x);
-}
-
-double ICACHE_FLASH_ATTR __ieee754_log(double x) {
-    return log(x);
-}
-
-double ICACHE_FLASH_ATTR __ieee754_sqrt(double x) {
-    return sqrt(x);
-}
-
-float ICACHE_FLASH_ATTR __ieee754_coshf(float x) {
-    return coshf(x);
-}
-
-float ICACHE_FLASH_ATTR __ieee754_atan2f(float x, float y) {
-    return atan2f(x, y);
-}
-

libraries/ESP8266WiFi/examples/WiFiAccessPoint/WiFiAccessPoint.ino

@@ -55,9 +55,6 @@ void setup() {
 	/* You can remove the password parameter if you want the AP to be open. */
 	WiFi.softAP(ssid, password);
 
-	while (WiFi.status() != WL_CONNECTED) { delay(500); Serial.print("."); }
-
-	Serial.println("done");
 	IPAddress myIP = WiFi.softAPIP();
 	Serial.print("AP IP address: ");
 	Serial.println(myIP);

libraries/ESP8266WiFiMesh/examples/HelloMesh/HelloMesh.ino

@@ -0,0 +1,44 @@
+#include <ESP8266WiFi.h>
+#include <ESP8266WiFiMesh.h>
+
+/* Create the mesh node object */
+ESP8266WiFiMesh mesh_node = ESP8266WiFiMesh(ESP.getChipId(), manageRequest);
+
+/**
+ * Callback for when other nodes send you data
+ *
+ * @request The string received from another node in the mesh
+ * @returns The string to send back to the other node
+ */
+String manageRequest(String request)
+{
+	/* Print out received message */
+	Serial.print("received: ");
+	Serial.println(request);
+
+	/* return a string to send back */
+	return String("Hello world response.");
+}
+
+void setup()
+{
+	Serial.begin(115200);
+	delay(10);
+
+	Serial.println();
+	Serial.println();
+	Serial.println("Setting up mesh node...");
+
+	/* Initialise the mesh node */
+	mesh_node.begin();
+}
+
+void loop()
+{
+	/* Accept any incoming connections */
+	mesh_node.acceptRequest();
+
+	/* Scan for other nodes and send them a message */
+	mesh_node.attemptScan("Hello world request.");
+	delay(1000);
+}