Merge pull request #127 from Links2004/esp8266

ram macro, fix warnings, #125
esp8266 · Apr 26, 2015 · f1e6a72 · f1e6a72
2 parents 196992a + 29cf4c4
commit f1e6a72
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 10 deletions.
diff --git a/hardware/esp8266com/esp8266/cores/esp8266/Arduino.h b/hardware/esp8266com/esp8266/cores/esp8266/Arduino.h
@@ -108,6 +108,7 @@ void ets_intr_unlock();
 typedef unsigned int word;
 
 #define bit(b) (1UL << (b))
+#define _BV(b) (1UL << (b))
 
 typedef uint8_t boolean;
 typedef uint8_t byte;

diff --git a/hardware/esp8266com/esp8266/cores/esp8266/HardwareSerial.cpp b/hardware/esp8266com/esp8266/cores/esp8266/HardwareSerial.cpp
@@ -101,7 +101,7 @@ UARTnr_t uart_get_debug();
 // ####################################################################################################
 // ####################################################################################################
 
-void uart_interrupt_handler(uart_t* uart) {
+void ICACHE_RAM_ATTR uart_interrupt_handler(uart_t* uart) {
 
     // -------------- UART 0 --------------
     uint32_t status = READ_PERI_REG(UART_INT_ST(0));

diff --git a/hardware/esp8266com/esp8266/cores/esp8266/core_esp8266_noniso.c b/hardware/esp8266com/esp8266/cores/esp8266/core_esp8266_noniso.c
@@ -180,7 +180,7 @@ char * dtostrf(double number, signed char width, unsigned char prec, char *s) {
     // Extract the integer part of the number and print it
     unsigned long int_part = (unsigned long) number;
     double remainder = number - (double) int_part;
-    out += sprintf(out, "%d", int_part);
+    out += sprintf(out, "%ld", int_part);
 
     // Print the decimal point, but only if there are digits beyond
     if(prec > 0) {

diff --git a/hardware/esp8266com/esp8266/cores/esp8266/core_esp8266_wiring_digital.c b/hardware/esp8266com/esp8266/cores/esp8266/core_esp8266_wiring_digital.c
@@ -63,7 +63,6 @@ volatile uint32_t* portModeRegister(uint32_t port) {
 enum PinFunction {
     GPIO, PWM
 };
-static uint32_t g_gpio_function[PINCOUNT] = { GPIO };
 
 extern void __pinMode(uint8_t pin, uint8_t mode) {
     if(pin == 16) {

diff --git a/hardware/esp8266com/esp8266/libraries/ESP8266WebServer/src/ESP8266WebServer.cpp b/hardware/esp8266com/esp8266/libraries/ESP8266WebServer/src/ESP8266WebServer.cpp
@@ -259,7 +259,7 @@ void ESP8266WebServer::_parseArguments(String data)
 		Serial.print(" &@ ");
 		Serial.println(next_arg_index);
 #endif
-		if (equal_sign_index == -1 || equal_sign_index > next_arg_index && next_arg_index != -1) {
+		if ((equal_sign_index == -1) || ((equal_sign_index > next_arg_index) && (next_arg_index != -1))) {
 #ifdef DEBUG
 			Serial.print("arg missing value: ");
 			Serial.println(iarg);

diff --git a/hardware/esp8266com/esp8266/libraries/ESP8266WiFi/src/lwip/mem_manager.h b/hardware/esp8266com/esp8266/libraries/ESP8266WiFi/src/lwip/mem_manager.h
@@ -44,7 +44,7 @@
 //#define configADJUSTED_HEAP_SIZE	( configTOTAL_HEAP_SIZE - portBYTE_ALIGNMENT )
 
 //static unsigned char ucHeap[ configTOTAL_HEAP_SIZE ];
-static unsigned char *ucHeap;
+//static unsigned char *ucHeap;
 
 typedef struct A_BLOCK_LINK
 {
@@ -56,16 +56,16 @@ static const unsigned short heapSTRUCT_SIZE	= ( sizeof( xBlockLink ) + portBYTE_
 
 //static const size_t xTotalHeapSize = ( ( size_t ) configADJUSTED_HEAP_SIZE ) & ( ( size_t ) ~portBYTE_ALIGNMENT_MASK );
 
-static xBlockLink xStart, *pxEnd = NULL;
+//static xBlockLink xStart, *pxEnd = NULL;
 
 //static size_t xFreeBytesRemaining = ( ( size_t ) configADJUSTED_HEAP_SIZE ) & ( ( size_t ) ~portBYTE_ALIGNMENT_MASK );
 
 
 /*------------------------º¯ÊýÉùÃ÷-----------------------------------*/
 
-static void prvInsertBlockIntoFreeList( xBlockLink *pxBlockToInsert ) ;//ICACHE_FLASH_ATTR;
+//static void prvInsertBlockIntoFreeList( xBlockLink *pxBlockToInsert ) ;//ICACHE_FLASH_ATTR;
 
-static void prvHeapInit( void ) ;//ICACHE_FLASH_ATTR;
+//static void prvHeapInit( void ) ;//ICACHE_FLASH_ATTR;
 
 void vApplicationMallocFailedHook( void ) ;//ICACHE_FLASH_ATTR;
 

diff --git a/hardware/tools/esp8266/sdk/include/c_types.h b/hardware/tools/esp8266/sdk/include/c_types.h
@@ -66,10 +66,12 @@ typedef enum {
 #define SHMEM_ATTR
 
 #ifdef ICACHE_FLASH
-#define ICACHE_FLASH_ATTR __attribute__((section(".irom0.text")))
-#define ICACHE_RODATA_ATTR __attribute__((section(".irom.text")))
+#define ICACHE_FLASH_ATTR   __attribute__((section(".irom0.text")))
+#define ICACHE_RAM_ATTR     __attribute__((section(".text")))
+#define ICACHE_RODATA_ATTR  __attribute__((section(".irom.text")))
 #else
 #define ICACHE_FLASH_ATTR
+#define ICACHE_RAM_ATTR
 #define ICACHE_RODATA_ATTR
 #endif /* ICACHE_FLASH */