fix:优化sntp服务

fix:主函数中初始化增加错误判断处理
代码格式化

TC1/TC1.mk

@@ -29,6 +29,7 @@ $(NAME)_SOURCES := main.c\
 				   user_wifi.c\
 				   user_key.c\
 				   user_sntp.c\
+				   user_rtc.c\
 				   user_mqtt_client.c\
 				   user_function.c
 				   

TC1/main.c

@@ -2,10 +2,12 @@
 
 #include "user_key.h"
 #include "user_wifi.h"
+#include "user_rtc.h"
 #include "user_mqtt_client.h"
 
 #define os_log(format, ...)  custom_log("TC1", format, ##__VA_ARGS__)
 
+char rtc_init=0;
 system_config_t * sys_config;
 user_config_t * user_config;
 
@@ -31,6 +33,7 @@ void appRestoreDefault_callback( void * const user_config_data, uint32_t size )
             userConfigDefault->plug[i].task[j].minute=0;
             userConfigDefault->plug[i].task[j].repeat=0x80;
             userConfigDefault->plug[i].task[j].on=0;
+            userConfigDefault->plug[i].task[j].action=1;
         }
     }
 
@@ -91,8 +94,10 @@ int application_start( void )
 
     wifi_init( );
     key_init( );
-    user_mqtt_init( );
+    err = user_mqtt_init( );
-
+    require_noerr( err, exit );
+    err = user_rtc_init();
+    require_noerr( err, exit );
     while ( 1 )
     {
 //        mico_thread_msleep(500);
@@ -101,6 +106,7 @@ int application_start( void )
 //        mico_rtos_delay_milliseconds(1000);
     }
     exit:
+    os_log("application_start ERROR!");
     return 0;
 }
 

TC1/main.h

@@ -47,6 +47,8 @@ typedef struct {
     user_plug_config_t plug[PLUG_NUM];
 } user_config_t;
 
+
+extern char rtc_init;
 extern system_config_t * sys_config;
 extern user_config_t * user_config;
 

TC1/user_function.c

@@ -42,8 +42,6 @@ void user_function_cmd_received( uint8_t *pusrdata )
     }
     else if ( p_idx && cJSON_IsNumber( p_idx ) && p_idx->valueint == 3 )  //idx
     {
-
-
         os_log("val:%d",user_config->idx);
         os_log("name:%s",sys_config->micoSystemConfig.name);
         os_log("seed:%d",sys_config->micoSystemConfig.seed);

TC1/user_mqtt_client.c

@@ -110,22 +110,21 @@ OSStatus user_recv_handler( void *arg );
  *               Variables Definitions
  ******************************************************/
 
-mico_queue_t   mqtt_msg_send_queue = NULL;
+mico_queue_t mqtt_msg_send_queue = NULL;
 
 Client c;  // mqtt client object
 Network n;  // socket network for mqtt client
 
-static mico_worker_thread_t  mqtt_client_worker_thread; /* Worker thread to manage send/recv events */
+static mico_worker_thread_t mqtt_client_worker_thread; /* Worker thread to manage send/recv events */
-static mico_timed_event_t   mqtt_client_send_event;
+static mico_timed_event_t mqtt_client_send_event;
 
 /******************************************************
  *               Function Definitions
  ******************************************************/
 
 /* Application entrance */
-OSStatus user_mqtt_init( void *arg )
+OSStatus user_mqtt_init( void )
 {
-    UNUSED_PARAMETER( arg );
     OSStatus err = kNoErr;
 
 #ifdef MQTT_CLIENT_SSL_ENABLE
@@ -135,16 +134,17 @@ OSStatus user_mqtt_init( void *arg )
 #endif
     uint32_t mqtt_lib_version = MQTTClientLibVersion( );
     app_log( "MQTT client version: [%ld.%ld.%ld]",
-             0xFF & (mqtt_lib_version >> 16), 0xFF & (mqtt_lib_version >> 8), 0xFF & mqtt_lib_version);
+        0xFF & (mqtt_lib_version >> 16), 0xFF & (mqtt_lib_version >> 8), 0xFF & mqtt_lib_version);
 
     /* create mqtt msg send queue */
     err = mico_rtos_init_queue( &mqtt_msg_send_queue, "mqtt_msg_send_queue", sizeof(p_mqtt_send_msg_t),
-                                MAX_MQTT_SEND_QUEUE_SIZE );
+    MAX_MQTT_SEND_QUEUE_SIZE );
     require_noerr_action( err, exit, app_log("ERROR: create mqtt msg send queue err=%d.", err) );
 
     /* start mqtt client */
     err = mico_rtos_create_thread( NULL, MICO_APPLICATION_PRIORITY, "mqtt_client",
-                                   (mico_thread_function_t)mqtt_client_thread, mqtt_thread_stack_size, 0 );
+                                   (mico_thread_function_t) mqtt_client_thread,
+                                   mqtt_thread_stack_size, 0 );
     require_noerr_string( err, exit, "ERROR: Unable to start the mqtt client thread." );
 
     /* Create a worker thread for user handling MQTT data event  */
@@ -154,12 +154,12 @@ OSStatus user_mqtt_init( void *arg )
 //    /* Trigger a period send event */
 //    mico_rtos_register_timed_event( &mqtt_client_send_event, &mqtt_client_worker_thread, user_send_handler, 2000, NULL );
     
-exit:
+    exit:
-    if ( kNoErr != err )  app_log("ERROR, app thread exit err: %d", err);
+    if ( kNoErr != err ) app_log("ERROR, app thread exit err: %d", err);
     return err;
 }
 
-static OSStatus mqtt_client_release( Client *c, Network *n)
+static OSStatus mqtt_client_release( Client *c, Network *n )
 {
     OSStatus err = kNoErr;
 
@@ -167,7 +167,8 @@ static OSStatus mqtt_client_release( Client *c, Network *n)
 
     n->disconnect( n );  // close connection
 
-    if ( MQTT_SUCCESS != MQTTClientDeinit( c ) ) {
+    if ( MQTT_SUCCESS != MQTTClientDeinit( c ) )
+    {
         app_log("MQTTClientDeinit failed!");
         err = kDeletedErr;
     }
@@ -183,7 +184,7 @@ static OSStatus mqtt_msg_publish( Client *c, const char* topic, char qos, char r
     int ret = 0;
     MQTTMessage publishData = MQTTMessage_publishData_initializer;
 
-    require( topic && msg_len && msg, exit);
+    require( topic && msg_len && msg, exit );
 
     // upload data qos0
     publishData.qos = (enum QoS) qos;
@@ -193,15 +194,18 @@ static OSStatus mqtt_msg_publish( Client *c, const char* topic, char qos, char r
 
     ret = MQTTPublish( c, topic, &publishData );
 
-    if ( MQTT_SUCCESS == ret ) {
+    if ( MQTT_SUCCESS == ret )
+    {
         err = kNoErr;
-    } else if ( MQTT_SOCKET_ERR == ret ) {
+    } else if ( MQTT_SOCKET_ERR == ret )
+    {
         err = kConnectionErr;
-    } else {
+    } else
+    {
         err = kUnknownErr;
     }
 
-exit:
+    exit:
     return err;
 }
 
@@ -229,7 +233,7 @@ void mqtt_client_thread( mico_thread_arg_t arg )
     msg_send_event_fd = mico_create_event_fd( mqtt_msg_send_queue );
     require_action( msg_send_event_fd >= 0, exit, mqtt_log("ERROR: create msg send queue event fd failed!!!") );
 
-MQTT_start:
+    MQTT_start:
     /* 1. create network connection */
 #ifdef MQTT_CLIENT_SSL_ENABLE
     ssl_settings.ssl_enable = true;
@@ -241,17 +245,19 @@ MQTT_start:
     ssl_settings.ssl_enable = false;
 #endif
     LinkStatusTypeDef LinkStatus;
-    while( 1 ){
+    while ( 1 )
+    {
 
-        micoWlanGetLinkStatus(&LinkStatus);
+        micoWlanGetLinkStatus( &LinkStatus );
-        if(LinkStatus.is_connected!=1){
+        if ( LinkStatus.is_connected != 1 )
+        {
             mqtt_log("ERROR:WIFI not connection , waiting 3s for connecting and then connecting MQTT ", rc);
             mico_rtos_thread_sleep( 3 );
             continue;
         }
 
         rc = NewNetwork( &n, MQTT_SERVER, MQTT_SERVER_PORT, ssl_settings );
-        if( rc == MQTT_SUCCESS ) break;
+        if ( rc == MQTT_SUCCESS ) break;
         mqtt_log("ERROR: MQTT network connection err=%d, reconnect after 3s...", rc);
         mico_rtos_thread_sleep( 3 );
     }
@@ -261,7 +267,7 @@ MQTT_start:
     /* 2. init mqtt client */
     //c.heartbeat_retry_max = 2;
     rc = MQTTClientInit( &c, &n, MQTT_CMD_TIMEOUT );
-    require_noerr_string(rc, MQTT_reconnect, "ERROR: MQTT client init err.");
+    require_noerr_string( rc, MQTT_reconnect, "ERROR: MQTT client init err." );
 
     mqtt_log("MQTT client init success!");
 
@@ -275,18 +281,17 @@ MQTT_start:
     connectData.cleansession = 1;
 
     rc = MQTTConnect( &c, &connectData );
-    require_noerr_string(rc, MQTT_reconnect, "ERROR: MQTT client connect err.");
+    require_noerr_string( rc, MQTT_reconnect, "ERROR: MQTT client connect err." );
 
     mqtt_log("MQTT client connect success!");
 
     /* 4. mqtt client subscribe */
     rc = MQTTSubscribe( &c, MQTT_CLIENT_SUB_TOPIC1, QOS0, messageArrived );
-    require_noerr_string(rc, MQTT_reconnect, "ERROR: MQTT client subscribe err.");
+    require_noerr_string( rc, MQTT_reconnect, "ERROR: MQTT client subscribe err." );
     mqtt_log("MQTT client subscribe success! recv_topic=[%s].", MQTT_CLIENT_SUB_TOPIC1);
 
-
     rc = MQTTSubscribe( &c, MQTT_CLIENT_SUB_TOPIC2, QOS0, messageArrived );
-    require_noerr_string(rc, MQTT_reconnect, "ERROR: MQTT client subscribe err.");
+    require_noerr_string( rc, MQTT_reconnect, "ERROR: MQTT client subscribe err." );
     mqtt_log("MQTT client subscribe success! recv_topic=[%s].", MQTT_CLIENT_SUB_TOPIC2);
 
     /* 5. client loop for recv msg && keepalive */
@@ -313,7 +318,7 @@ MQTT_start:
             {
                 // get msg from send queue
                 mico_rtos_pop_from_queue( &mqtt_msg_send_queue, &p_send_msg, 0 );
-                require_string( p_send_msg, exit, "Wrong data point");
+                require_string( p_send_msg, exit, "Wrong data point" );
 
                 // send message to server
                 err = mqtt_msg_publish( &c, p_send_msg->topic, p_send_msg->qos, p_send_msg->retained,
@@ -337,15 +342,15 @@ MQTT_start:
         }
     }
 
-MQTT_reconnect:
+    MQTT_reconnect:
     mqtt_log("Disconnect MQTT client, and reconnect after 5s, reason: mqtt_rc = %d, err = %d", rc, err );
     mqtt_client_release( &c, &n );
     mico_rtos_thread_sleep( 5 );
     goto MQTT_start;
 
-exit:
+    exit:
     mqtt_log("EXIT: MQTT client exit with err = %d.", err);
-    mqtt_client_release( &c, &n);
+    mqtt_client_release( &c, &n );
     mico_rtos_delete_thread( NULL );
 }
 
@@ -357,10 +362,9 @@ static void messageArrived( MessageData* md )
     MQTTMessage* message = md->message;
     /*
      app_log("MQTT messageArrived callback: topiclen=[%d][%s],\t payloadlen=[%d][%s]",md->topicName->lenstring.len,
-                                     md->topicName->lenstring.data,(int)message->payloadlen,(char*)message->payload);
+     md->topicName->lenstring.data,(int)message->payloadlen,(char*)message->payload);
      */
 //    mqtt_log("======MQTT received callback ![%d]======", MicoGetMemoryInfo()->free_memory );
-
     p_recv_msg = (p_mqtt_recv_msg_t) calloc( 1, sizeof(mqtt_recv_msg_t) );
     require_action( p_recv_msg, exit, err = kNoMemoryErr );
 
@@ -373,15 +377,15 @@ static void messageArrived( MessageData* md )
     err = mico_rtos_send_asynchronous_event( &mqtt_client_worker_thread, user_recv_handler, p_recv_msg );
     require_noerr( err, exit );
 
-exit:
+    exit:
-    if ( err != kNoErr ) {
+    if ( err != kNoErr )
+    {
         app_log("ERROR: Recv data err = %d", err);
-        if( p_recv_msg ) free( p_recv_msg );
+        if ( p_recv_msg ) free( p_recv_msg );
     }
     return;
 }
 
-
 /* Application process MQTT received data */
 OSStatus user_recv_handler( void *arg )
 {
@@ -390,10 +394,10 @@ OSStatus user_recv_handler( void *arg )
     require( p_recv_msg, exit );
 
     app_log("user get data success! from_topic=[%s], msg=[%ld][%s].\r\n", p_recv_msg->topic, p_recv_msg->datalen, p_recv_msg->data);
-    user_function_cmd_received(p_recv_msg->data);
+    user_function_cmd_received( p_recv_msg->data );
     free( p_recv_msg );
 
-exit:
+    exit:
     return err;
 }
 
@@ -406,7 +410,8 @@ OSStatus user_mqtt_send( char *arg )
 //    app_log("======App prepare to send ![%d]======", MicoGetMemoryInfo()->free_memory);
 
     /* Send queue is full, pop the oldest */
-    if ( mico_rtos_is_queue_full( &mqtt_msg_send_queue ) == true ){
+    if ( mico_rtos_is_queue_full( &mqtt_msg_send_queue ) == true )
+    {
         mico_rtos_pop_from_queue( &mqtt_msg_send_queue, &p_send_msg, 0 );
         free( p_send_msg );
         p_send_msg = NULL;
@@ -427,8 +432,8 @@ OSStatus user_mqtt_send( char *arg )
 
     //app_log("Push user msg into send queue success!");
 
-exit:
+    exit:
-    if( err != kNoErr && p_send_msg ) free( p_send_msg );
+    if ( err != kNoErr && p_send_msg ) free( p_send_msg );
     return err;
 
 }

TC1/user_mqtt_client.h

@@ -6,7 +6,7 @@
 
 
 
-extern void user_mqtt_init(void);
+extern OSStatus user_mqtt_init(void);
 extern OSStatus user_mqtt_send( char *arg );
 
 

TC1/user_rtc.c

@@ -0,0 +1,156 @@
+#define os_log(format, ...)  custom_log("RTC", format, ##__VA_ARGS__)
+
+#include "main.h"
+//#include "key.h"
+#include "sntp.h"
+#include "user_sntp.h"
+
+void rtc_thread( mico_thread_arg_t arg );
+
+OSStatus user_sntp_get_time( )
+{
+    OSStatus err = kNoErr;
+    ntp_timestamp_t current_time;
+
+    struct hostent * hostent_content = NULL;
+    char ** pptr = NULL;
+    struct in_addr ipp;
+
+    mico_rtc_time_t rtc_time;
+
+    hostent_content = gethostbyname( "pool.ntp.org" );
+    pptr = hostent_content->h_addr_list;
+    ipp.s_addr = *(uint32_t *) (*pptr);
+    err = sntp_get_time( &ipp, &current_time );
+    if ( err != kNoErr )
+    {
+        os_log("sntp_get_time1 err = %d.retry", err);
+        ipp.s_addr = 0xd248912c;
+        err = sntp_get_time( &ipp, &current_time );
+    }
+    if ( err != kNoErr )
+    {
+        os_log("sntp_get_time2 err = %d.", err);
+    }
+
+    if ( err == kNoErr )
+    {
+        mico_utc_time_ms_t utc_time_ms = (uint64_t) current_time.seconds * (uint64_t) 1000
+                                         + (current_time.microseconds / 1000);
+        mico_time_set_utc_time_ms( &utc_time_ms );
+//        mico_utc_time_t utc_time = utc_time_ms / 1000 + 28800; //+8:00
+//        struct tm * currentTime = localtime( (const time_t *) &utc_time );
+//        rtc_time.sec = currentTime->tm_sec;
+//        rtc_time.min = currentTime->tm_min;
+//        rtc_time.hr = currentTime->tm_hour;
+//        rtc_time.date = currentTime->tm_mday;
+//        rtc_time.weekday = currentTime->tm_wday;
+//        rtc_time.month = currentTime->tm_mon + 1;
+//        rtc_time.year = (currentTime->tm_year + 1900) % 100;
+//        MicoRtcSetTime( &rtc_time );
+    }
+    else
+    {
+        return err;
+    }
+
+}
+
+OSStatus user_rtc_init( void )
+{
+    OSStatus err = kNoErr;
+
+//    mico_rtc_time_t rtc_time;
+//    rtc_time.sec = 0;
+//    rtc_time.min = 0;
+//    rtc_time.hr = 0;
+//
+//    rtc_time.date = 1;
+//    rtc_time.weekday = 1;
+//    rtc_time.month = 1;
+//    rtc_time.year = 1;
+//
+//    MicoRtcSetTime( &rtc_time );
+
+//    /* create mqtt msg send queue */
+//    err = mico_rtos_init_queue( &mqtt_msg_send_queue, "mqtt_msg_send_queue", sizeof(p_mqtt_send_msg_t),
+//                                MAX_MQTT_SEND_QUEUE_SIZE );
+//    require_noerr_action( err, exit, app_log("ERROR: create mqtt msg send queue err=%d.", err) );
+
+    /* start mqtt client */
+    err = mico_rtos_create_thread( NULL, MICO_APPLICATION_PRIORITY, "rtc",
+                                   (mico_thread_function_t) rtc_thread,
+                                   0x1000, 0 );
+    require_noerr_string( err, exit, "ERROR: Unable to start the rtc thread." );
+
+    if ( kNoErr != err ) os_log("ERROR, app thread exit err: %d", err);
+
+    exit:
+    return err;
+}
+
+void rtc_thread( mico_thread_arg_t arg )
+{
+    iso8601_time_t iso8601_time;
+    OSStatus err = kUnknownErr;
+    LinkStatusTypeDef LinkStatus;
+    mico_rtc_time_t rtc_time;
+
+    while ( 1 )
+    {   //<2F>ϵ<EFBFBD><CFB5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>wifi<66>ſ<EFBFBD>ʼ<EFBFBD><CABC>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD><EFBFBD>ȴ<EFBFBD><C8B4><EFBFBD><EFBFBD><EFBFBD>
+        micoWlanGetLinkStatus( &LinkStatus );
+        if ( LinkStatus.is_connected == 1 )
+        {
+            err = user_sntp_get_time( );
+            if ( err == kNoErr )
+            {
+                rtc_init = 1;
+                break;
+            }
+        }
+
+        mico_rtos_thread_sleep( 3 );
+    }
+
+    while ( 1 )
+    {
+        if ( rtc_init == 0 || rtc_time.sec == 0 && rtc_time.min == 0 ) //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ÿСʱУ׼һ<D7BC><D2BB>
+        {
+            micoWlanGetLinkStatus( &LinkStatus );
+            if ( LinkStatus.is_connected == 1 )
+            {
+                err = user_sntp_get_time( );
+                if ( err == kNoErr ) rtc_init = 1;
+            }
+        }
+        //        MicoRtcGetTime( &rtc_time );
+//        os_log("time:20%02d/%02d/%02d %d %02d:%02d:%02d",rtc_time.year,rtc_time.month,rtc_time.date,rtc_time.weekday,rtc_time.hr,rtc_time.min,rtc_time.sec);
+
+        os_log("rtc_thread");
+
+        mico_utc_time_t utc_time;
+        mico_rtc_time_t rtc_time;
+
+        mico_time_get_utc_time( &utc_time );
+        utc_time+= 28800;
+        struct tm * currentTime = localtime( (const time_t *) &utc_time );
+        rtc_time.sec = currentTime->tm_sec;
+        rtc_time.min = currentTime->tm_min;
+        rtc_time.hr = currentTime->tm_hour;
+
+        rtc_time.date = currentTime->tm_mday;
+        rtc_time.weekday = currentTime->tm_wday;
+        rtc_time.month = currentTime->tm_mon + 1;
+        rtc_time.year = (currentTime->tm_year + 1900) % 100;
+
+//        MicoRtcSetTime( &rtc_time );      //MicoRtc<74><63><EFBFBD>Զ<EFBFBD><D4B6><EFBFBD>ʱ!
+        os_log("time:20%02d/%02d/%02d %d %02d:%02d:%02d",rtc_time.year,rtc_time.month,rtc_time.date,rtc_time.weekday,rtc_time.hr,rtc_time.min,rtc_time.sec);
+
+        mico_rtos_thread_msleep( 900 );
+    }
+
+    exit:
+    os_log("EXIT: rtc exit with err = %d.", err);
+    mico_rtos_delete_thread( NULL );
+}
+

TC1/user_rtc.h

@@ -0,0 +1,13 @@
+
+#ifndef __USER_RTC_H_
+#define __USER_RTC_H_
+
+
+#include "mico.h"
+#include "MiCOKit_EXT.h"
+
+
+extern OSStatus user_rtc_init(void);
+
+
+#endif

TC1/user_sntp.c

@@ -41,5 +41,10 @@ void sntp_init(void)
 {
     struct in_addr ipp;ipp.s_addr=0xd248912c;
     sntp_set_server_ip_address (0,ipp);
-    sntp_start_auto_time_sync (86400000,  sntp_time_call_back);        //ÿСʱУ׼һ<D7BC><D2BB>
+    sntp_start_auto_time_sync (15000,  sntp_time_call_back);        //ÿСʱУ׼һ<D7BC><D2BB>
+
+    mico_rtc_time_t rtc_time;
+    MicoRtcGetTime(&rtc_time);
+    os_log("time:20%d/%d/%d %d %d:%d:%d",rtc_time.year,rtc_time.month,rtc_time.date,rtc_time.weekday,rtc_time.hr,rtc_time.min,rtc_time.sec);
+
 }

TC1/user_wifi.c

@@ -140,7 +140,7 @@ void wifi_init( void )
     mico_system_notify_register( mico_notify_DHCP_COMPLETED, (void *) wifi_get_ip_callback, NULL );
     //wifi<66><69><EFBFBD><EFBFBD>״̬<D7B4>ı<EFBFBD><C4B1>ص<EFBFBD>
     mico_system_notify_register( mico_notify_WIFI_STATUS_CHANGED, (void*) wifi_status_callback, NULL );
-    sntp_init();
+    //sntp_init();
     //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD>ʼ<EFBFBD><CABC><EFBFBD><EFBFBD>wifi<66><69><EFBFBD><EFBFBD>
     if ( !mico_rtos_is_timer_running( &wifi_led_timer ) ) mico_rtos_start_timer( &wifi_led_timer );