Merge pull request #294 from pennam/set-time

Add command to set nina-fw system time

Author: pennam

src/WiFi.cpp

@@ -360,6 +360,11 @@ unsigned long WiFiClass::getTime()
 	return WiFiDrv::getTime();
 }
 
+int WiFiClass::setTime(unsigned long unixTime)
+{
+	return WiFiDrv::setTime(unixTime);
+}
+
 void WiFiClass::lowPowerMode()
 {
 	WiFiDrv::setPowerMode(1);

src/WiFi.h

@@ -277,6 +277,7 @@ class WiFiClass
     int hostByName(const char* aHostname, IPAddress& aResult);
 
     unsigned long getTime();
+    int setTime(unsigned long unixTime);
 
     void lowPowerMode();
     void noLowPowerMode();

src/utility/wifi_drv.cpp

@@ -862,6 +862,36 @@ uint32_t WiFiDrv::getTime()
     return _data;
 }
 
+int WiFiDrv::setTime(uint32_t epochTime)
+{
+    WAIT_FOR_SLAVE_SELECT();
+    // Send Command
+    SpiDrv::sendCmd(SET_TIME_CMD, PARAM_NUMS_1);
+    SpiDrv::sendParam((uint8_t*)&epochTime, sizeof(epochTime), LAST_PARAM);
+
+    // pad to multiple of 4
+    int commandSize = 5 + sizeof(epochTime);
+    while (commandSize % 4) {
+        SpiDrv::readChar();
+        commandSize++;
+    }
+
+    SpiDrv::spiSlaveDeselect();
+    //Wait the reply elaboration
+    SpiDrv::waitForSlaveReady();
+    SpiDrv::spiSlaveSelect();
+
+    // Wait for reply
+    uint8_t _data = 0;
+    uint8_t _dataLen = 0;
+    if (!SpiDrv::waitResponseCmd(SET_TIME_CMD, PARAM_NUMS_1, &_data, &_dataLen))
+    {
+        WARN("error waitResponse");
+    }
+    SpiDrv::spiSlaveDeselect();
+    return _data;
+}
+
 void WiFiDrv::setPowerMode(uint8_t mode)
 {
     WAIT_FOR_SLAVE_SELECT();

src/utility/wifi_drv.h

@@ -280,6 +280,7 @@ class WiFiDrv
     static const char* getFwVersion();
 
     static uint32_t getTime();
+    static int setTime(uint32_t epochTime);
 
     static void setPowerMode(uint8_t mode);
 

src/utility/wifi_spi.h

@@ -24,128 +24,131 @@
 #include <inttypes.h>
 #include "utility/wl_definitions.h"
 
-#define CMD_FLAG        0
-#define REPLY_FLAG      1<<7
-#define DATA_FLAG 		0x40
+#define CMD_FLAG            0
+#define REPLY_FLAG          1<<7
+#define DATA_FLAG           0x40
 
 #define WIFI_SPI_ACK        1
 #define WIFI_SPI_ERR        0xFF
 
-#define TIMEOUT_CHAR    1000
+#define TIMEOUT_CHAR        1000
 
-//#define	MAX_SOCK_NUM		4	/**< Maximum number of socket  */
+//#define    MAX_SOCK_NUM     4    /**< Maximum number of socket  */
 #define NO_SOCKET_AVAIL     255
 
-#define START_CMD   0xE0
-#define END_CMD     0xEE
-#define ERR_CMD   	0xEF
-#define CMD_POS			1		// Position of Command OpCode on SPI stream
-#define PARAM_LEN_POS 	2		// Position of Param len on SPI stream
+#define START_CMD           0xE0
+#define END_CMD             0xEE
+#define ERR_CMD             0xEF
+#define CMD_POS             1        // Position of Command OpCode on SPI stream
+#define PARAM_LEN_POS       2        // Position of Param len on SPI stream
 
 
 enum {
-	SET_NET_CMD 		= 0x10,
-	SET_PASSPHRASE_CMD	= 0x11,
-	SET_KEY_CMD	        = 0x12,
-//	TEST_CMD	        = 0x13,
-	SET_IP_CONFIG_CMD	= 0x14,
-	SET_DNS_CONFIG_CMD	= 0x15,
-	SET_HOSTNAME_CMD	= 0x16,
-	SET_POWER_MODE_CMD	= 0x17,
-	SET_AP_NET_CMD		= 0x18,
-	SET_AP_PASSPHRASE_CMD = 0x19,
-	SET_DEBUG_CMD		= 0x1A,
-	GET_TEMPERATURE_CMD = 0x1B,
-	GET_DNS_CONFIG_CMD = 0x1E,
-	GET_REASON_CODE_CMD = 0x1F,
-
-	GET_CONN_STATUS_CMD	= 0x20,
-	GET_IPADDR_CMD		= 0x21,
-	GET_MACADDR_CMD		= 0x22,
-	GET_CURR_SSID_CMD	= 0x23,
-	GET_CURR_BSSID_CMD	= 0x24,
-	GET_CURR_RSSI_CMD	= 0x25,
-	GET_CURR_ENCT_CMD	= 0x26,
-	SCAN_NETWORKS		= 0x27,
-	START_SERVER_TCP_CMD= 0x28,
-	GET_STATE_TCP_CMD   = 0x29,
-	DATA_SENT_TCP_CMD	= 0x2A,
-    AVAIL_DATA_TCP_CMD	= 0x2B,
-    GET_DATA_TCP_CMD	= 0x2C,
-    START_CLIENT_TCP_CMD= 0x2D,
-    STOP_CLIENT_TCP_CMD = 0x2E,
-    GET_CLIENT_STATE_TCP_CMD= 0x2F,
-    DISCONNECT_CMD		= 0x30,
-//	GET_IDX_SSID_CMD	= 0x31,
-	GET_IDX_RSSI_CMD	= 0x32,
-	GET_IDX_ENCT_CMD	= 0x33,
-	REQ_HOST_BY_NAME_CMD= 0x34,
-	GET_HOST_BY_NAME_CMD= 0x35,
-	START_SCAN_NETWORKS	= 0x36,
-	GET_FW_VERSION_CMD	= 0x37,
-//	GET_TEST_CMD		= 0x38,
-	SEND_DATA_UDP_CMD	= 0x39,
-	GET_REMOTE_DATA_CMD = 0x3A,
-	GET_TIME_CMD		= 0x3B,
-	GET_IDX_BSSID		= 0x3C,
-	GET_IDX_CHANNEL_CMD = 0x3D,
-	PING_CMD			= 0x3E,
-	GET_SOCKET_CMD		= 0x3F,
+    SET_NET_CMD              = 0x10,
+    SET_PASSPHRASE_CMD       = 0x11,
+    SET_KEY_CMD              = 0x12,
+//    TEST_CMD                 = 0x13,
+    SET_IP_CONFIG_CMD        = 0x14,
+    SET_DNS_CONFIG_CMD       = 0x15,
+    SET_HOSTNAME_CMD         = 0x16,
+    SET_POWER_MODE_CMD       = 0x17,
+    SET_AP_NET_CMD           = 0x18,
+    SET_AP_PASSPHRASE_CMD    = 0x19,
+    SET_DEBUG_CMD            = 0x1A,
+    GET_TEMPERATURE_CMD      = 0x1B,
+    GET_DNS_CONFIG_CMD       = 0x1E,
+    GET_REASON_CODE_CMD      = 0x1F,
+
+    GET_CONN_STATUS_CMD      = 0x20,
+    GET_IPADDR_CMD           = 0x21,
+    GET_MACADDR_CMD          = 0x22,
+    GET_CURR_SSID_CMD        = 0x23,
+    GET_CURR_BSSID_CMD       = 0x24,
+    GET_CURR_RSSI_CMD        = 0x25,
+    GET_CURR_ENCT_CMD        = 0x26,
+    SCAN_NETWORKS            = 0x27,
+    START_SERVER_TCP_CMD     = 0x28,
+    GET_STATE_TCP_CMD        = 0x29,
+    DATA_SENT_TCP_CMD        = 0x2A,
+    AVAIL_DATA_TCP_CMD       = 0x2B,
+    GET_DATA_TCP_CMD         = 0x2C,
+    START_CLIENT_TCP_CMD     = 0x2D,
+    STOP_CLIENT_TCP_CMD      = 0x2E,
+    GET_CLIENT_STATE_TCP_CMD = 0x2F,
+    DISCONNECT_CMD           = 0x30,
+//    GET_IDX_SSID_CMD         = 0x31,
+    GET_IDX_RSSI_CMD         = 0x32,
+    GET_IDX_ENCT_CMD         = 0x33,
+    REQ_HOST_BY_NAME_CMD     = 0x34,
+    GET_HOST_BY_NAME_CMD     = 0x35,
+    START_SCAN_NETWORKS      = 0x36,
+    GET_FW_VERSION_CMD       = 0x37,
+//    GET_TEST_CMD             = 0x38,
+    SEND_DATA_UDP_CMD        = 0x39,
+    GET_REMOTE_DATA_CMD      = 0x3A,
+    GET_TIME_CMD             = 0x3B,
+    GET_IDX_BSSID            = 0x3C,
+    GET_IDX_CHANNEL_CMD      = 0x3D,
+    PING_CMD                 = 0x3E,
+    GET_SOCKET_CMD           = 0x3F,
 
     // All command with DATA_FLAG 0x40 send a 16bit Len
-	SET_ENT_CMD			= 0x40,
+    SET_ENT_CMD              = 0x40,
 
-	SEND_DATA_TCP_CMD		= 0x44,
-    GET_DATABUF_TCP_CMD		= 0x45,
-    INSERT_DATABUF_CMD		= 0x46,
+    SEND_DATA_TCP_CMD        = 0x44,
+    GET_DATABUF_TCP_CMD      = 0x45,
+    INSERT_DATABUF_CMD       = 0x46,
 
     // regular format commands
-    SET_PIN_MODE		= 0x50,
-    SET_DIGITAL_WRITE	= 0x51,
-    SET_ANALOG_WRITE	= 0x52,
-    GET_DIGITAL_READ    = 0x53,
-	GET_ANALOG_READ     = 0x54,
-
-	// Prefrences api
-	PREFERENCES_BEGIN   = 0x55,
-	PREFERENCES_END     = 0x56,
-	PREFERENCES_CLEAR   = 0x57,
-	PREFERENCES_REMOVE  = 0x58,
-	PREFERENCES_LEN     = 0x59,
-	PREFERENCES_STAT    = 0x5A,
-	PREFERENCES_PUT     = 0x5B,
-	PREFERENCES_GET     = 0x5C,
-	PREFERENCES_GETTYPE = 0x5D,
+    SET_PIN_MODE             = 0x50,
+    SET_DIGITAL_WRITE        = 0x51,
+    SET_ANALOG_WRITE         = 0x52,
+    GET_DIGITAL_READ         = 0x53,
+    GET_ANALOG_READ          = 0x54,
+
+    // Prefrences api
+    PREFERENCES_BEGIN        = 0x55,
+    PREFERENCES_END          = 0x56,
+    PREFERENCES_CLEAR        = 0x57,
+    PREFERENCES_REMOVE       = 0x58,
+    PREFERENCES_LEN          = 0x59,
+    PREFERENCES_STAT         = 0x5A,
+    PREFERENCES_PUT          = 0x5B,
+    PREFERENCES_GET          = 0x5C,
+    PREFERENCES_GETTYPE      = 0x5D,
 
     // regular format commands
-    WRITE_FILE			= 0x60,
-    READ_FILE			= 0x61,
-    DELETE_FILE			= 0x62,
-    EXISTS_FILE			= 0x63,
-    DOWNLOAD_FILE		= 0x64,
-    APPLY_OTA_COMMAND	= 0x65,
-	RENAME_FILE			= 0x66,
-	DOWNLOAD_OTA		= 0x67,
-	BRSSL_SET_EC_TA     = 0x68,
-	BRSSL_ERROR_CODE    = 0x69,
-
-	// Low-level BSD-like sockets functions.
-	// From 0x70 to 0x7F
+    SET_TIME_CMD             = 0x5F,
+
+    // regular format commands
+    WRITE_FILE               = 0x60,
+    READ_FILE                = 0x61,
+    DELETE_FILE              = 0x62,
+    EXISTS_FILE              = 0x63,
+    DOWNLOAD_FILE            = 0x64,
+    APPLY_OTA_COMMAND        = 0x65,
+    RENAME_FILE              = 0x66,
+    DOWNLOAD_OTA             = 0x67,
+    BRSSL_SET_EC_TA          = 0x68,
+    BRSSL_ERROR_CODE         = 0x69,
+
+    // Low-level BSD-like sockets functions.
+    // From 0x70 to 0x7F
 };
 
 
 enum wl_tcp_state {
-	CLOSED      = 0,
-	LISTEN      = 1,
-	SYN_SENT    = 2,
-	SYN_RCVD    = 3,
-	ESTABLISHED = 4,
-	FIN_WAIT_1  = 5,
-	FIN_WAIT_2  = 6,
-	CLOSE_WAIT  = 7,
-	CLOSING     = 8,
-	LAST_ACK    = 9,
-	TIME_WAIT   = 10
+    CLOSED      = 0,
+    LISTEN      = 1,
+    SYN_SENT    = 2,
+    SYN_RCVD    = 3,
+    ESTABLISHED = 4,
+    FIN_WAIT_1  = 5,
+    FIN_WAIT_2  = 6,
+    CLOSE_WAIT  = 7,
+    CLOSING     = 8,
+    LAST_ACK    = 9,
+    TIME_WAIT   = 10
 };
 
 
@@ -165,58 +168,58 @@ enum numParams{
 
 typedef struct  __attribute__((__packed__))
 {
-	uint8_t     paramLen;
-	char*	    param;
+    uint8_t     paramLen;
+    char*       param;
 }tParam;
 
 typedef struct  __attribute__((__packed__))
 {
-	uint16_t     dataLen;
-	char*	     data;
+    uint16_t     dataLen;
+    char*        data;
 }tDataParam;
 
 
 typedef struct  __attribute__((__packed__))
 {
-	unsigned char	cmd;
-	unsigned char	tcmd;
-	unsigned char	nParam;
-	tParam	params[MAX_PARAMS];
+    unsigned char    cmd;
+    unsigned char    tcmd;
+    unsigned char    nParam;
+    tParam           params[MAX_PARAMS];
 }tSpiMsg;
 
 typedef struct  __attribute__((__packed__))
 {
-	unsigned char	cmd;
-	unsigned char	tcmd;
-	unsigned char	nParam;
-	tDataParam		params[MAX_PARAMS];
+    unsigned char    cmd;
+    unsigned char    tcmd;
+    unsigned char    nParam;
+    tDataParam       params[MAX_PARAMS];
 }tSpiMsgData;
 
 
 typedef struct  __attribute__((__packed__))
 {
-	unsigned char	cmd;
-	unsigned char	tcmd;
-	//unsigned char	totLen;
-	unsigned char	nParam;
+    unsigned char    cmd;
+    unsigned char    tcmd;
+    //unsigned char    totLen;
+    unsigned char    nParam;
 }tSpiHdr;
 
 typedef struct  __attribute__((__packed__))
 {
-	uint8_t     paramLen;
-	uint32_t	param;
+    uint8_t     paramLen;
+    uint32_t    param;
 }tLongParam;
 
 typedef struct  __attribute__((__packed__))
 {
-	uint8_t     paramLen;
-	uint16_t	param;
+    uint8_t     paramLen;
+    uint16_t    param;
 }tIntParam;
 
 typedef struct  __attribute__((__packed__))
 {
-	uint8_t     paramLen;
-	uint8_t		param;
+    uint8_t     paramLen;
+    uint8_t     param;
 }tByteParam;
 
 #endif