2.1.0-follow-up master drop

Makefile

@@ -188,7 +188,8 @@ endef
 
 $(BINODIR)/%.bin: $(IMAGEODIR)/%.out
 	@mkdir -p $(BINODIR)
-	$(ESPTOOL) elf2image $< -o $(FIRMWAREDIR)
+	@$(NM) $< | grep -w U && { echo "Firmware has undefined (but unused) symbols!"; exit 1; } || true
+	$(ESPTOOL) elf2image --flash_mode dio --flash_freq 40m $< -o $(FIRMWAREDIR)
 
 #############################################################
 # Rules base

app/Makefile

@@ -48,7 +48,8 @@ SUBDIRS= 					\
 	websocket				\
 	swTimer					\
 	misc					\
-	pm						\
+	pm					\
+	sjson					\
 
 
 endif # } PDIR
@@ -94,14 +95,15 @@ COMPONENTS_eagle.app.v6 = 			\
 	dhtlib/libdhtlib.a 			\
 	tsl2561/tsl2561lib.a			\
 	http/libhttp.a				\
-	pm/libpm.a					\
+	pm/libpm.a				\
 	websocket/libwebsocket.a		\
 	esp-gdbstub/libgdbstub.a		\
 	net/libnodemcu_net.a			\
-	mbedtls/libmbedtls.a      \
+	mbedtls/libmbedtls.a      		\
 	modules/libmodules.a			\
 	swTimer/libswtimer.a			\
-	misc/libmisc.a					\
+	misc/libmisc.a				\
+	sjson/libsjson.a			\
 
 
 # Inspect the modules library and work out which modules need to be linked.

app/crypto/sha2.c

@@ -32,6 +32,8 @@
  *
  */
 
+/* ESP8266-specific tweaks by Johny Mattsson <[email protected]> */
+
 #include "user_config.h"
 
 #ifdef SHA2_ENABLE
@@ -491,7 +493,14 @@ void ICACHE_FLASH_ATTR SHA256_Update(SHA256_CTX* context, const sha2_byte *data,
 	}
 	while (len >= SHA256_BLOCK_LENGTH) {
 		/* Process as many complete blocks as we can */
-		SHA256_Transform(context, (sha2_word32*)data);
+    if ((int)data & (sizeof(sha2_word32)-1))
+    {
+      // have to bounce via buffer, otherwise we'll hit unaligned load exception
+      MEMCPY_BCOPY(context->buffer, data, SHA256_BLOCK_LENGTH);
+			SHA256_Transform(context, (sha2_word32*)context->buffer);
+    }
+    else
+      SHA256_Transform(context, (sha2_word32*)data);
 		context->bitcount += SHA256_BLOCK_LENGTH << 3;
 		len -= SHA256_BLOCK_LENGTH;
 		data += SHA256_BLOCK_LENGTH;
@@ -782,7 +791,14 @@ void ICACHE_FLASH_ATTR SHA512_Update(SHA512_CTX* context, const sha2_byte *data,
 	}
 	while (len >= SHA512_BLOCK_LENGTH) {
 		/* Process as many complete blocks as we can */
-		SHA512_Transform(context, (sha2_word64*)data);
+    if ((int)data & (sizeof(sha2_word64)-1))
+    {
+      // have to bounce via buffer, otherwise we'll hit unaligned load exception
+      MEMCPY_BCOPY(context->buffer, data, SHA512_BLOCK_LENGTH);
+			SHA512_Transform(context, (sha2_word64*)context->buffer);
+    }
+    else
+      SHA512_Transform(context, (sha2_word64*)data);
 		ADDINC128(context->bitcount, SHA512_BLOCK_LENGTH << 3);
 		len -= SHA512_BLOCK_LENGTH;
 		data += SHA512_BLOCK_LENGTH;

app/http/httpclient.c

@@ -451,20 +451,33 @@ static void ICACHE_FLASH_ATTR http_timeout_callback( void *arg )
 	struct espconn * conn = (struct espconn *) arg;
 	if ( conn == NULL )
 	{
+		HTTPCLIENT_DEBUG( "Connection is NULL" );
 		return;
 	}
 	if ( conn->reverse == NULL )
 	{
+		HTTPCLIENT_DEBUG( "Connection request data (reverse) is NULL" );
 		return;
 	}
 	request_args_t * req = (request_args_t *) conn->reverse;
+	HTTPCLIENT_DEBUG( "Calling disconnect" );
 	/* Call disconnect */
+	sint8 result;
 #ifdef CLIENT_SSL_ENABLE
 	if ( req->secure )
-		espconn_secure_disconnect( conn );
+		result = espconn_secure_disconnect( conn );
 	else
 #endif
-		espconn_disconnect( conn );
+		result = espconn_disconnect( conn );
+
+	if (result == ESPCONN_OK || result == ESPCONN_INPROGRESS)
+		return;
+	else
+	{
+		/* not connected; execute the callback ourselves. */
+		HTTPCLIENT_DEBUG( "manually Calling disconnect callback due to error %d", result );
+		http_disconnect_callback( arg );
+	}		
 }
 
 

app/include/lwip/app/dhcpserver.h

@@ -21,9 +21,7 @@ typedef struct dhcps_msg {
         uint8_t chaddr[16];
         uint8_t sname[64];
         uint8_t file[128];
-	// Recommendation from Espressif:
-	// To avoid crash in DHCP big packages modify option length from 312 to MTU - IPHEAD(20) - UDPHEAD(8) - DHCPHEAD(236).
-        uint8_t options[IP_FRAG_MAX_MTU - 20 - 8 - 236];
+        uint8_t options[312];
 }dhcps_msg;
 
 #ifndef LWIP_OPEN_SRC

app/include/rtc/rtctime.h

@@ -62,6 +62,7 @@ struct rtc_tm{
 
 void TEXT_SECTION_ATTR rtctime_early_startup (void);
 void rtctime_late_startup (void);
+void rtctime_adjust_rate (int rate);
 void rtctime_gettimeofday (struct rtc_timeval *tv);
 void rtctime_settimeofday (const struct rtc_timeval *tv);
 bool rtctime_have_time (void);