提交

app/MDKProject/lora_gateway.uvoptx

@@ -180,12 +180,22 @@
           <WinNumber>1</WinNumber>
           <ItemText>mqtt_recvbuffer</ItemText>
         </Ww>
+        <Ww>
+          <count>5</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>time1</ItemText>
+        </Ww>
+        <Ww>
+          <count>6</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>time2,0x0A</ItemText>
+        </Ww>
       </WatchWindow1>
       <MemoryWindow1>
         <Mm>
           <WinNumber>1</WinNumber>
           <SubType>8</SubType>
-          <ItemText>cJSONstring</ItemText>
+          <ItemText>device_config_json</ItemText>
           <AccSizeX>0</AccSizeX>
         </Mm>
       </MemoryWindow1>
@@ -1803,7 +1813,7 @@
 
   <Group>
     <GroupName>MQTT</GroupName>
-    <tvExp>0</tvExp>
+    <tvExp>1</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
@@ -2079,7 +2089,7 @@
 
   <Group>
     <GroupName>MODBUS</GroupName>
-    <tvExp>0</tvExp>
+    <tvExp>1</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>

app/System/source/sys_mqtt.c

@@ -23,7 +23,7 @@ int mqtt_userConnect(void)
 {
 	GATEWAY_PARAMS* get;
 	get = get_gateway_config_params();
-	char* MQTT_SERVER_ADDR = get->host;
+	char* MQTT_SERVER_ADDR = (char*)get->host;
 	int MQTT_SERVER_PORT = get->port;
 	int sock = -1;
 	

app/System/source/task.c

@@ -244,18 +244,16 @@ void WRITE_MODBUS_DATA(char* cJSONstring){
 	uint16_t data;
 	
 	while(current_device){
-		char* device_ID = current_device->deviceID;
+		char* device_ID = (char*)current_device->deviceID;
 		GATEWAY_WRITE_MODBUS_COMMAND *currentModbusParams = current_device->params->gateway_write_modbus_command;
-		int time = 900;//60
 		if(!strcmp(device_ID,deviceId)){
-			OSTimeDlyHMSM(0, 0, 0, time);	
+			OSTimeDlyHMSM(0, 0, 0, 60);
 			OSIntEnter();
 			if(power){
 					slaveAddress = currentModbusParams->slaveAddress;
 					number =currentModbusParams->registerAddress;
 					data = power->valueint;
 					mmodbus_writeHoldingRegister16i(slaveAddress, number, data);
-					OSTimeDlyHMSM(0, 0, 0, time);
 			}
 			if(temp){
 					currentModbusParams = currentModbusParams->nextParams;
@@ -263,7 +261,7 @@ void WRITE_MODBUS_DATA(char* cJSONstring){
 					number =currentModbusParams->registerAddress;
 					data = temp->valueint;
 					mmodbus_writeHoldingRegister16i(slaveAddress, number, data);
-					OSTimeDlyHMSM(0, 0, 0, time);
+
 			}
 			if(mode){
 					currentModbusParams = currentModbusParams->nextParams;
@@ -271,7 +269,7 @@ void WRITE_MODBUS_DATA(char* cJSONstring){
 					number =currentModbusParams->registerAddress;
 					data = mode->valueint;
 					mmodbus_writeHoldingRegister16i(slaveAddress, number, data);
-					OSTimeDlyHMSM(0, 0, 0, time);
+
 			}
 			if(fan){
 					currentModbusParams = currentModbusParams->nextParams;
@@ -279,9 +277,9 @@ void WRITE_MODBUS_DATA(char* cJSONstring){
 					number =currentModbusParams->registerAddress;
 					data = fan->valueint;
 					mmodbus_writeHoldingRegister16i(slaveAddress, number, data);
-					OSTimeDlyHMSM(0, 0, 0, time);
+
 			}
-		OSIntExit();
+			OSIntExit();
 		}
 		current_device = current_device->nextDevice;
 	}

app/USER/main.c

@@ -70,6 +70,7 @@ void load_unique(void);
 char  gatewayId[11];
 int main(void)
 {
+	int status;
 	load_unique();
 	sprintf(gatewayId,"DTtest0001");//DT8pd3ac6h  DTbma5ac6h  DTtest0001
 	NVIC_Configuration();
@@ -82,7 +83,11 @@ int main(void)
 	USART_485_config();	
   USART_485_DE_TX();
   USART_232_config();	
-	NAND_Init();
+	status = NAND_Init();
+	while(status){
+		NAND_Format();
+		status = NAND_Init();
+	}
 	OSInit();
 	#if 0
 	//OSTaskCreate(start_task,(void*)0,(OS_STK*)&START_TASK_STK[START_STK_SIZE-1],START_TASK_PRIO);