Update README.md

增加烧录说明引用

README.md

@@ -60,7 +60,9 @@ TC1 排插硬件分 A1 A2 两个版本, 本固件仅支持 **A1 版本**. A1 A2
 - [x] 后台可自定义设备名称，此名称将会同至ha mqtt作为mqtt中插座名称的前缀
 - [x] 后台可自定义按键连击，长按等功能
 - [x] 定时开关现在支持更多操作项，与按键功能自定义一样
-
+- [x] 现在可以上传本地文件来更新固件，同时可以在最新发布的固件说明中参考使用我搭建的文件服务来在线更新
+# 固件烧录
+- 参考原始固件代码提供者[a2633063](https://github.com/a2633063/zTC1/wiki/固件烧录)大佬提供的说明
 # 编译固件
 
 - windows环境，先安装python2.7,下载安装的时候添加环境变量到Path，默认安装路径需要添加两个环境变量C:\Python27；C:\Python27\Scripts

TC1/ota_server/ota_server.h

@@ -32,7 +32,7 @@
 #define __ota_server_H
 
 #define OTA_DEBUG     (1)
-#define OTA_USE_HTTPS (0)
+#define OTA_USE_HTTPS (1)
 
 #define OTA_MD5_LENTH 32
 #define OTA_SEND_HEAD_SIZE 256
@@ -109,34 +109,34 @@ typedef struct _ota_server_context_t{
   * @return   kNoErr        : on success.
   * @return   kGeneralErr   : if an error occurred
   */
-OSStatus OtaServerStart(char *url, char *md5, ota_server_cb_fn call_back);
+OSStatus ota_server_start( char *url, char *md5, ota_server_cb_fn call_back );
 
 
 /** @brief    Get OTA server state
  *
  *  @return   OTA_CONTROL_E  : state
  */
-OTA_CONTROL_E OtaServerStateGet(void);
+OTA_CONTROL_E ota_server_state_get( void );
 
 
 /** @brief    Pause OTA server daemons
  *
  *  @return   No
  */
-void OtaServerPause(void);
+void ota_server_pause( void );
 
 
 /** @brief    Continue OTA server daemons
  *
  *  @return   No
  */
-void OtaServerContinue(void);
+void ota_server_continue( void );
 
 
 /** @brief    Stop OTA server daemons
  *
  *  @return   No
  */
-void OtaServerStop(void);
+void ota_server_stop( void );
 
 #endif

TC1/ota_server/user_ota.c

@@ -36,6 +36,6 @@ void UserOtaStart(char *url, char *md5)
 {
     ota_progress = 0;
     ota_log("ready to ota:%s",url);
-    OtaServerStart(url, md5, OtaServerStatusHandler);
+    ota_server_start(url, md5, OtaServerStatusHandler);
 }
 

mico-os/libraries/daemons/http_server/httpd_handle.c

@@ -135,12 +135,24 @@ int httpd_send_chunk(int conn, const char *buf, int len)
 int httpd_send(int conn, const char *buf, int len)
 {
     int num;
+    struct timeval t;
+    fd_set writefds;
+
+    t.tv_sec = 0;
+    t.tv_usec = 200*1000;
+
     do {
 #ifdef CONFIG_ENABLE_HTTPS
         if (httpd_is_https_active())
 			num = tls_send(httpd_tls_handle, buf, len);
 		else
 #endif /* ENABLE_HTTPS */
+        FD_ZERO( &writefds );
+        FD_SET( conn, &writefds );
+
+        select( conn + 1, NULL, &writefds, NULL, &t );
+        if( FD_ISSET( conn, &writefds) )
+        {
             num = send(conn, buf, len, 0);
             if (num < 0) {
                 httpd_d("send() failed: %d" ,conn);
@@ -148,6 +160,7 @@ int httpd_send(int conn, const char *buf, int len)
             }
             len -= num;
             buf += num;
+        }
     } while (len > 0);
 
 
@@ -156,12 +169,29 @@ int httpd_send(int conn, const char *buf, int len)
 
 int httpd_recv(int fd, void *buf, size_t n, int flags)
 {
+    int len = 0;
+    struct timeval t;
+    fd_set readfds;
+
+    FD_ZERO( &readfds );
+    FD_SET( fd, &readfds );
+
+    t.tv_sec = 0;
+    t.tv_usec = 200*1000;
+
 #ifdef CONFIG_ENABLE_HTTPS
     if (httpd_is_https_active())
 		return tls_recv(httpd_tls_handle, buf, n);
 	else
 #endif /* ENABLE_HTTPS */
     return recv(fd, buf, n, flags);
+    select( fd + 1, &readfds, NULL, NULL, &t );
+
+    if( FD_ISSET( fd, &readfds) )
+    {
+        len =  recv( fd, buf, n, flags );
+    }
+    return len;
 }
 
 int httpd_send_hdr_from_code(int sock, int stat_code,

mico-os/libraries/daemons/ota_server/ota_server.c

@@ -104,7 +104,7 @@ static OSStatus ota_server_connect( struct sockaddr_in *addr, socklen_t addrlen
     }
 #endif
 
-exit:
+    exit:
     return err;
 }
 
@@ -340,7 +340,7 @@ static void ota_server_thread( mico_thread_arg_t arg )
         continue;
 
     }
-DELETE:
+    DELETE:
     HTTPHeaderDestory( &httpHeader );
     ota_server_socket_close( );
     if( ota_server_context != NULL ){
@@ -421,7 +421,7 @@ static OSStatus ota_server_set_url( char *url )
         strcpy( ota_server_context->download_url.url, pos );
     }
 
-exit:
+    exit:
     url_free( url_t );
     return err;
 }
@@ -461,7 +461,7 @@ OSStatus ota_server_start( char *url, char *md5, ota_server_cb_fn call_back )
     ota_server_context->ota_server_cb = call_back;
 
     err = mico_rtos_create_thread( NULL, MICO_APPLICATION_PRIORITY, "OTA", ota_server_thread, OTA_SERVER_THREAD_STACK_SIZE, 0 );
-exit:
+    exit:
     return err;
 }
 

mico-os/libraries/utilities/HTTPUtils.c

@@ -117,7 +117,7 @@ int SocketReadHTTPHeader( int inSock, HTTPHeader_t *inHeader )
     else
         return kNoErr;
 
-exit:
+    exit:
     return err;
 }
 
@@ -172,7 +172,8 @@ OSStatus SocketReadHTTPBody( int inSock, HTTPHeader_t *inHeader )
 
                     if( readResult  > 0 ) inHeader->extraDataLen += readResult;
                     else { err = kConnectionErr; goto exit; }
-          (inHeader->onReceivedDataCallback)(inHeader, inHeader->extraDataLen - readResult, (uint8_t *)inHeader->extraDataPtr, readResult, inHeader->userContext);
+                    err = (inHeader->onReceivedDataCallback)(inHeader, inHeader->extraDataLen - readResult, (uint8_t *)inHeader->extraDataPtr, readResult, inHeader->userContext);
+                    if( err != kNoErr ) goto exit;
                 }
 
                 err = kNoErr;
@@ -185,10 +186,11 @@ OSStatus SocketReadHTTPBody( int inSock, HTTPHeader_t *inHeader )
                                     *(inHeader->extraDataPtr + inHeader->contentLength + 1 ) == '\n',
                                     exit, err = kMalformedErr);
 
-          (inHeader->onReceivedDataCallback)(inHeader,  pos, 
+                    err = (inHeader->onReceivedDataCallback)(inHeader,  pos,
                                                              (uint8_t *)inHeader->extraDataPtr,
                             inHeader->contentLength,
                             inHeader->userContext);
+                    if( err != kNoErr ) goto exit;
                     pos+=inHeader->contentLength;
 
                     /* Move next chunk to chunked data buffer header point */
@@ -204,10 +206,11 @@ OSStatus SocketReadHTTPBody( int inSock, HTTPHeader_t *inHeader )
                     require_action( *(inHeader->chunkedDataBufferPtr + inHeader->extraDataLen - 1) == '\r' ,
                                     exit, err = kMalformedErr);
 
-          (inHeader->onReceivedDataCallback)(inHeader,  pos, 
+                    err = (inHeader->onReceivedDataCallback)(inHeader,  pos,
                                                              (uint8_t *)inHeader->extraDataPtr,
                             inHeader->extraDataLen - chunckheaderLen-1,
                             inHeader->userContext);
+                    if( err != kNoErr ) goto exit;
                     pos+=inHeader->extraDataLen - chunckheaderLen-1;
                     selectResult = select( inSock + 1, &readSet, NULL, NULL, NULL );
                     require_action( selectResult >= 1, exit, err = kNotReadableErr );
@@ -222,10 +225,11 @@ OSStatus SocketReadHTTPBody( int inSock, HTTPHeader_t *inHeader )
                 }
                 else{
                     /* Callback , read , callback , read CRLF */
-          (inHeader->onReceivedDataCallback)(inHeader, pos, 
+                    err = (inHeader->onReceivedDataCallback)(inHeader, pos,
                                                              (uint8_t *)inHeader->extraDataPtr,
                             inHeader->extraDataLen - chunckheaderLen,
                             inHeader->userContext);
+                    if( err != kNoErr ) goto exit;
                     pos += inHeader->extraDataLen - chunckheaderLen;
 
                     while ( inHeader->extraDataLen < inHeader->contentLength + chunckheaderLen  ){
@@ -244,10 +248,11 @@ OSStatus SocketReadHTTPBody( int inSock, HTTPHeader_t *inHeader )
                         if( readResult  > 0 ) inHeader->extraDataLen += readResult;
                         else { err = kConnectionErr; goto exit; }
 
-            (inHeader->onReceivedDataCallback)(inHeader, pos, 
+                        err = (inHeader->onReceivedDataCallback)(inHeader, pos,
                                                                  (uint8_t *)inHeader->extraDataPtr,
                                 readResult,
                                 inHeader->userContext);
+                        if( err != kNoErr ) goto exit;
                         pos += readResult;
                     }
 
@@ -317,7 +322,7 @@ OSStatus SocketReadHTTPBody( int inSock, HTTPHeader_t *inHeader )
     }
     err = kNoErr;
 
-exit:
+    exit:
     if(err != kNoErr) inHeader->len = 0;
     return err;
 }
@@ -373,7 +378,8 @@ OSStatus SocketReadHTTPSBody( mico_ssl_t ssl, HTTPHeader_t *inHeader )
 
                     if( readResult  > 0 ) inHeader->extraDataLen += readResult;
                     else { err = kConnectionErr; goto exit; }
-          (inHeader->onReceivedDataCallback)(inHeader, inHeader->extraDataLen - readResult, (uint8_t *)inHeader->extraDataPtr, readResult, inHeader->userContext);
+                    err = (inHeader->onReceivedDataCallback)(inHeader, inHeader->extraDataLen - readResult, (uint8_t *)inHeader->extraDataPtr, readResult, inHeader->userContext);
+                    if( err != kNoErr ) goto exit;
                 }
 
                 err = kNoErr;
@@ -386,10 +392,11 @@ OSStatus SocketReadHTTPSBody( mico_ssl_t ssl, HTTPHeader_t *inHeader )
                                     *(inHeader->extraDataPtr + inHeader->contentLength + 1 ) == '\n',
                                     exit, err = kMalformedErr);
 
-          (inHeader->onReceivedDataCallback)(inHeader,  pos, 
+                    err = (inHeader->onReceivedDataCallback)(inHeader,  pos,
                                                              (uint8_t *)inHeader->extraDataPtr,
                             inHeader->contentLength,
                             inHeader->userContext);
+                    if( err != kNoErr ) goto exit;
                     pos+=inHeader->contentLength;
 
                     /* Move next chunk to chunked data buffer header point */
@@ -405,10 +412,11 @@ OSStatus SocketReadHTTPSBody( mico_ssl_t ssl, HTTPHeader_t *inHeader )
                     require_action( *(inHeader->chunkedDataBufferPtr + inHeader->extraDataLen - 1) == '\r' ,
                                     exit, err = kMalformedErr);
 
-          (inHeader->onReceivedDataCallback)(inHeader,  pos, 
+                    err = (inHeader->onReceivedDataCallback)(inHeader,  pos,
                                                              (uint8_t *)inHeader->extraDataPtr,
                             inHeader->extraDataLen - chunckheaderLen-1,
                             inHeader->userContext);
+                    if( err != kNoErr ) goto exit;
                     pos+=inHeader->extraDataLen - chunckheaderLen-1;
                     selectResult = select( inSock + 1, &readSet, NULL, NULL, NULL );
                     require_action( selectResult >= 1, exit, err = kNotReadableErr );
@@ -423,10 +431,11 @@ OSStatus SocketReadHTTPSBody( mico_ssl_t ssl, HTTPHeader_t *inHeader )
                 }
                 else{
                     /* Callback , read , callback , read CRLF */
-          (inHeader->onReceivedDataCallback)(inHeader, pos, 
+                    err = (inHeader->onReceivedDataCallback)(inHeader, pos,
                                                              (uint8_t *)inHeader->extraDataPtr,
                             inHeader->extraDataLen - chunckheaderLen,
                             inHeader->userContext);
+                    if( err != kNoErr ) goto exit;
                     pos += inHeader->extraDataLen - chunckheaderLen;
 
                     while ( inHeader->extraDataLen < inHeader->contentLength + chunckheaderLen  ){
@@ -445,10 +454,11 @@ OSStatus SocketReadHTTPSBody( mico_ssl_t ssl, HTTPHeader_t *inHeader )
                         if( readResult  > 0 ) inHeader->extraDataLen += readResult;
                         else { err = kConnectionErr; goto exit; }
 
-            (inHeader->onReceivedDataCallback)(inHeader, pos, 
+                        err = (inHeader->onReceivedDataCallback)(inHeader, pos,
                                                                  (uint8_t *)inHeader->extraDataPtr,
                                 readResult,
                                 inHeader->userContext);
+                        if( err != kNoErr ) goto exit;
                         pos += readResult;
                     }
 
@@ -492,8 +502,10 @@ OSStatus SocketReadHTTPSBody( mico_ssl_t ssl, HTTPHeader_t *inHeader )
 
     while ( inHeader->extraDataLen < inHeader->contentLength )
     {
+        if ( !ssl_pending(ssl) ) {
             selectResult = select( inSock + 1, &readSet, NULL, NULL, (struct timeval *)&t );
             require_action( selectResult >= 1, exit, err = kNotReadableErr );
+        }
 
         if(inHeader->isCallbackSupported == true){
             /* We has extra data, and we give these data to application by onReceivedDataCallback function */
@@ -518,7 +530,7 @@ OSStatus SocketReadHTTPSBody( mico_ssl_t ssl, HTTPHeader_t *inHeader )
     }
     err = kNoErr;
 
-exit:
+    exit:
     if(err != kNoErr) inHeader->len = 0;
     return err;
 }
@@ -594,7 +606,7 @@ int SocketReadHTTPSHeader( mico_ssl_t ssl, HTTPHeader_t *inHeader )
     else
         return kNoErr;
 
-exit:
+    exit:
     return err;
 }
 
@@ -773,7 +785,7 @@ OSStatus HTTPHeaderParse( HTTPHeader_t *ioHeader )
 
     err = kNoErr;
 
-exit:
+    exit:
     return err;
 }
 
@@ -935,7 +947,7 @@ int HTTPScanFHeaderValue( const char *inHeaderPtr, size_t inHeaderLen, const cha
     n = VSNScanF( valuePtr, valueLen, inFormat, args );
     va_end( args );
 
-exit:
+    exit:
     return( n );
 }
 
@@ -981,7 +993,7 @@ HTTPHeader_t * HTTPHeaderCreateWithCallback( size_t bufLen, onReceivedDataCallba
     httpHeader->onReceivedDataCallback = inRecvFunc;
     httpHeader->onClearCallback = onClearFunc;
 
-exit:
+    exit:
     if(err != kNoErr && httpHeader != NULL){ //httpHeader->buf cannot be created
         free(httpHeader);
     }
@@ -1058,7 +1070,7 @@ OSStatus CreateSimpleHTTPOKMessage( uint8_t **outMessage, size_t *outMessageSize
 
     err = kNoErr;
 
-exit:
+    exit:
     return err;
 }
 
@@ -1093,7 +1105,7 @@ OSStatus CreateSimpleHTTPMessage( const char *contentType, uint8_t *inData, size
     memcpy( endOfHTTPHeader, inData, inDataLen );
     err = kNoErr;
 
-exit:
+    exit:
     return err;
 }
 
@@ -1119,7 +1131,7 @@ OSStatus CreateSimpleHTTPMessageNoCopy( const char *contentType, size_t inDataLe
     *outMessageSize = strlen( (char*)*outMessage );
     err = kNoErr;
 
-exit:
+    exit:
     return err;
 }
 
@@ -1172,7 +1184,7 @@ OSStatus CreateHTTPRespondMessageNoCopy( int status, const char *contentType, si
     *outMessageSize = strlen( (char*)*outMessage );
     err = kNoErr;
 
-exit:
+    exit:
     return err;
 }
 
@@ -1205,7 +1217,7 @@ OSStatus CreateHTTPMessage( const char *methold, const char *url, const char *co
     memcpy( endOfHTTPHeader, inData, inDataLen );
     err = kNoErr;
 
-exit:
+    exit:
     return err;
 }
 
@@ -1243,7 +1255,7 @@ OSStatus CreateHTTPMessageWithHost( const char *methold, const char *url,
     memcpy( endOfHTTPHeader, inData, inDataLen );
     err = kNoErr;
 
-exit:
+    exit:
     return err;
 }
 
@@ -1264,4 +1276,3 @@ void PrintHTTPHeader( HTTPHeader_t *inHeader )
     http_utils_log("Content length: %ld", (uint32_t)(inHeader->contentLength));
     http_utils_log("Persistent: %s", YesOrNo( inHeader->persistent ));
 }
-

mico-os/libraries/utilities/HTTPUtils.h

@@ -40,33 +40,35 @@
 #include "URLUtils.h"
 #include "stdbool.h"
 
+#define Boolean bool
+
 #define kHTTPPostMethod     "POST"
 
-      // Status-Code    =
+// Status-Code    =
-      //       "100"  ; Section 10.1.1: Continue
+//       "100"  ; Section 10.1.1: Continue
-      //     | "101"  ; Section 10.1.2: Switching Protocols
+//     | "101"  ; Section 10.1.2: Switching Protocols
-      //     | "200"  ; Section 10.2.1: OK
+//     | "200"  ; Section 10.2.1: OK
-      //     | "201"  ; Section 10.2.2: Created
+//     | "201"  ; Section 10.2.2: Created
-      //     | "202"  ; Section 10.2.3: Accepted
+//     | "202"  ; Section 10.2.3: Accepted
-      //     | "203"  ; Section 10.2.4: Non-Authoritative Information
+//     | "203"  ; Section 10.2.4: Non-Authoritative Information
-      //     | "204"  ; Section 10.2.5: No Content
+//     | "204"  ; Section 10.2.5: No Content
-      //     | "205"  ; Section 10.2.6: Reset Content
+//     | "205"  ; Section 10.2.6: Reset Content
-      //     | "206"  ; Section 10.2.7: Partial Content
+//     | "206"  ; Section 10.2.7: Partial Content
-      //     | "207"  ; ???           : Multi-Status
+//     | "207"  ; ???           : Multi-Status
-      //     | "300"  ; Section 10.3.1: Multiple Choices
+//     | "300"  ; Section 10.3.1: Multiple Choices
-      //     | "301"  ; Section 10.3.2: Moved Permanently
+//     | "301"  ; Section 10.3.2: Moved Permanently
-      //     | "302"  ; Section 10.3.3: Found
+//     | "302"  ; Section 10.3.3: Found
-      //     | "303"  ; Section 10.3.4: See Other
+//     | "303"  ; Section 10.3.4: See Other
-      //     | "304"  ; Section 10.3.5: Not Modified
+//     | "304"  ; Section 10.3.5: Not Modified
-      //     | "305"  ; Section 10.3.6: Use Proxy
+//     | "305"  ; Section 10.3.6: Use Proxy
-      //     | "307"  ; Section 10.3.8: Temporary Redirect
+//     | "307"  ; Section 10.3.8: Temporary Redirect
-      //     | "400"  ; Section 10.4.1: Bad Request
+//     | "400"  ; Section 10.4.1: Bad Request
-      //     | "401"  ; Section 10.4.2: Unauthorized
+//     | "401"  ; Section 10.4.2: Unauthorized
-      //     | "402"  ; Section 10.4.3: Payment Required
+//     | "402"  ; Section 10.4.3: Payment Required
-      //     | "403"  ; Section 10.4.4: Forbidden
+//     | "403"  ; Section 10.4.4: Forbidden
-      //     | "404"  ; Section 10.4.5: Not Found
+//     | "404"  ; Section 10.4.5: Not Found
-      //     | "405"  ; Section 10.4.6: Method Not Allowed
+//     | "405"  ; Section 10.4.6: Method Not Allowed
-      //     | "406"  ; Section 10.4.7: Not Acceptable
+//     | "406"  ; Section 10.4.7: Not Acceptable
 
 
 #define kStatusAccept               202
@@ -202,4 +204,3 @@ OSStatus CreateHTTPMessageWithHost( const char *methold, const char *url,
                                     uint8_t **outMessage, size_t *outMessageSize );
 
 #endif // __HTTPUtils_h__
-