GitHub/zTC1
1
0
Fork 0
mirror of https://github.com/oopuuu/zTC1.git synced 2026-05-12 03:04:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

移除user_udp, 运行OK

Browse Source
This commit is contained in:
zogodo
2020-02-17 15:54:32 +08:00
parent 2b8067a6cd
commit 5f800d131d
11 changed files with 0 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
TC1/TC1.mk
View File

@@ -28,7 +28,6 @@ $(NAME)_SOURCES := main.c\
ota_server/ota_server.c\
user_wifi.c\
user_gpio.c\
user_udp.c\
time_server/user_rtc.c\
mqtt_server/user_mqtt_client.c\
ota_server/user_ota.c\

3
TC1/main.c
View File

@@ -3,7 +3,6 @@
#include "user_gpio.h"
#include "user_wifi.h"
#include "time_server/user_rtc.h"
#include "user_udp.h"
#include "user_power.h"
#include "mqtt_server/user_mqtt_client.h"
#include "http_server/app_httpd.h"
@@ -128,7 +127,6 @@ int application_start(void)
sys_config->micoSystemConfig.user_key);
}
}
UserUdpInit();
KeyInit();
err = UserMqttInit();
require_noerr(err, exit);
@@ -150,7 +148,6 @@ int application_start(void)
//SetPowerRecord(&power_record, real_time_power);
sprintf(power_buf, "{\"mac\":\"%s\",\"power\":\"%u.%u\",\"total_time\":%u}",
str_mac, (unsigned int)(real_time_power/10), (unsigned int)(real_time_power%10), (unsigned int)total_time);
UserSend(0, power_buf);
UserMqttHassPower();
time_t now = time(NULL);

2
TC1/mqtt_server/net.c
View File

@@ -1,2 +0,0 @@

8
TC1/mqtt_server/net.h
View File

@@ -1,8 +0,0 @@
void UserSend(int udp_flag, char *s)
{
if (udp_flag || !UserMqttIsConnect())
UserUdpSend(s); //发送数据
else
UserMqttSend(s);
}

9
TC1/mqtt_server/user_mqtt_client.c
View File

@@ -28,7 +28,6 @@
#include "MQTTClient.h"
#include "user_gpio.h"
#include "user_mqtt_client.h"
#include "user_udp.h"
typedef struct
{
@@ -610,11 +609,3 @@ bool UserMqttIsConnect()
{
return isconnect;
}
void UserSend(int udp_flag, char *s)
{
if (udp_flag || !UserMqttIsConnect())
UserUdpSend(s); //发送数据
else
UserMqttSend(s);
}

1
TC1/mqtt_server/user_mqtt_client.h
View File

@@ -17,7 +17,6 @@
#define MQTT_SERVER user_config->mqtt_ip
#define MQTT_SERVER_PORT user_config->mqtt_port
void UserSend(int udp_flag, char *s);
extern OSStatus UserMqttInit(void);
extern OSStatus UserMqttSend(char *arg);
extern bool UserMqttIsConnect(void);

5
TC1/ota_server/user_ota.c
View File

@@ -4,7 +4,6 @@
#include "mico.h"
#include "ota_server/ota_server.h"
#include "main.h"
#include "user_udp.h"
#include "mqtt_server/user_mqtt_client.h"
float ota_progress = 0;
@@ -32,10 +31,6 @@ static void OtaServerStatusHandler(OTA_STATE_E state, float progress)
default:
break;
}
if (str[0] > 0)
{
UserSend(true, str);
}
}
void UserOtaStart(char *url, char *md5)

1
TC1/user_gpio.c
View File

@@ -4,7 +4,6 @@
#include "main.h"
#include "user_gpio.h"
#include "mqtt_server/user_mqtt_client.h"
#include "user_udp.h"
mico_gpio_t relay[Relay_NUM] = { Relay_0, Relay_1, Relay_2, Relay_3, Relay_4, Relay_5 };

1
TC1/user_power.c
View File

@@ -4,7 +4,6 @@
#include "mico.h"
#include "main.h"
#include "user_udp.h"
#include "mqtt_server/user_mqtt_client.h"
#include "user_power.h"

177
TC1/user_udp.c
View File

@@ -1,177 +0,0 @@
#include "http_server/web_log.h"
#define os_log(format, ...) do { custom_log("UDP", format, ##__VA_ARGS__); web_log(format, ##__VA_ARGS__) } while(0)
#include "main.h"
#define LOCAL_UDP_PORT 10182
#define REMOTE_UDP_PORT 10181
#define MAX_UDP_DATA_SIZE (1024)
#define MAX_UDP_SEND_QUEUE_SIZE (5)
mico_queue_t UdpMsgSend_queue = NULL;
typedef struct
{
uint32_t datalen;
char data[MAX_UDP_DATA_SIZE];
} udp_send_msg_t, *p_udp_send_msg_t;
static OSStatus UdpMsgSend(int socket, const unsigned char* msg, uint32_t msg_len);
void UdpThread(void *arg);
OSStatus UserUdpInit(void)
{
OSStatus err = kNoErr;
/* start udp client */
err = mico_rtos_create_thread(NULL, MICO_APPLICATION_PRIORITY, "udp",
(mico_thread_function_t) UdpThread,
0x1000, 0);
require_noerr_string(err, exit, "ERROR: Unable to start the rtc thread.");
if (kNoErr != err) os_log("ERROR3, app thread exit err: %d kNoErr[%d]", err, kNoErr);
exit:
return err;
}
/*create udp socket*/
void UdpThread(void *arg)
{
UNUSED_PARAMETER(arg);
OSStatus err;
struct sockaddr_in addr;
fd_set readfds;
socklen_t addrLen = sizeof(addr);
int udp_fd = -1, len;
p_udp_send_msg_t p_send_msg = NULL;
int msg_send_event_fd = -1;
char ip_address[16];
char *buf = NULL;
/* create udp msg send queue */
err = mico_rtos_init_queue(&UdpMsgSend_queue, "uqp_msg_send_queue", sizeof(p_udp_send_msg_t),
MAX_UDP_SEND_QUEUE_SIZE);
require_noerr_action(err, exit, os_log("ERROR: create udp msg send queue err=%d.", err));
/* create msg send queue event fd */
msg_send_event_fd = mico_create_event_fd(UdpMsgSend_queue);
require_action(msg_send_event_fd >= 0, exit, os_log("ERROR: create msg send queue event fd failed!!!"));
buf = malloc(1024);
require_action(buf, exit, err = kNoMemoryErr);
/*Establish a UDP port to receive any data sent to this port*/
udp_fd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
require_action(IsValidSocket(udp_fd), exit, err = kNoResourcesErr);
addr.sin_family = AF_INET;
addr.sin_addr.s_addr = INADDR_ANY;
addr.sin_port = htons(LOCAL_UDP_PORT);
err = bind(udp_fd, (struct sockaddr *) &addr, sizeof(addr));
require_noerr(err, exit);
os_log("Open local UDP port %d", LOCAL_UDP_PORT);
while (1)
{
FD_ZERO(&readfds);
FD_SET(msg_send_event_fd, &readfds);
FD_SET(udp_fd, &readfds);
select(udp_fd + 1, &readfds, NULL, NULL, NULL);
/*Read data from udp and send data back */
if (FD_ISSET(udp_fd, &readfds))
{
len = recvfrom(udp_fd, buf, 1024, 0, (struct sockaddr *) &addr, &addrLen);
require_action(len >= 0, exit, err = kConnectionErr);
strcpy(ip_address, inet_ntoa(addr.sin_addr));
if(len<1024) buf[len]=0;
os_log("udp recv from %s:%d, len:%d ", ip_address,addr.sin_port, len);
//UserFunctionCmdReceived(1,buf); //ºóÃÅ?
// sendto(udp_fd, buf, len, 0, (struct sockaddr *) &addr, sizeof(struct sockaddr_in));
}
/* recv msg from user worker thread to be sent to server */
if (FD_ISSET(msg_send_event_fd, &readfds))
{
while (mico_rtos_is_queue_empty(&UdpMsgSend_queue) == false)
{
// get msg from send queue
mico_rtos_pop_from_queue(&UdpMsgSend_queue, &p_send_msg, 0);
require_string(p_send_msg, exit, "Wrong data point");
// send message to server
err = UdpMsgSend(udp_fd, (const unsigned char*)p_send_msg->data, p_send_msg->datalen);
// require_noerr_string(err, MQTT_reconnect, "ERROR: udp publish data err");
//os_log("udp send data success! msg=[%ld].\r\n", p_send_msg->datalen);
free(p_send_msg);
p_send_msg = NULL;
}
}
}
exit:
if (err != kNoErr)
os_log("UDP thread exit with err: %d", err);
if (buf != NULL) free(buf);
mico_rtos_delete_thread(NULL);
}
// send msg to udp
static OSStatus UdpMsgSend(int socket, const unsigned char* msg, uint32_t msg_len)
{
OSStatus err = kUnknownErr;
require(msg_len && msg, exit);
struct sockaddr_in addr;
addr.sin_family = AF_INET;
addr.sin_addr.s_addr = INADDR_ANY;
addr.sin_port = htons(LOCAL_UDP_PORT);
addr.sin_family = AF_INET;
addr.sin_addr.s_addr = INADDR_BROADCAST;
addr.sin_port = htons(REMOTE_UDP_PORT);
/*the receiver should bind at port=20000*/
sendto(socket, msg, msg_len, 0, (struct sockaddr *) &addr, sizeof(addr));
exit:
return err;
}
/* Application collect data and seng them to udp send queue */
OSStatus UserUdpSend(char *arg)
{
OSStatus err = kUnknownErr;
p_udp_send_msg_t p_send_msg = NULL;
// app_log("======App prepare to send ![%d]======", MicoGetMemoryInfo()->free_memory);
/* Send queue is full, pop the oldest */
if (mico_rtos_is_queue_full(&UdpMsgSend_queue) == true)
{
mico_rtos_pop_from_queue(&UdpMsgSend_queue, &p_send_msg, 0);
free(p_send_msg);
p_send_msg = NULL;
}
/* Push the latest data into send queue*/
p_send_msg = calloc(1, sizeof(udp_send_msg_t));
require_action(p_send_msg, exit, err = kNoMemoryErr);
p_send_msg->datalen = strlen(arg);
memcpy(p_send_msg->data, arg, p_send_msg->datalen);
err = mico_rtos_push_to_queue(&UdpMsgSend_queue, &p_send_msg, 0);
require_noerr(err, exit);
//app_log("Push user msg into send queue success!");
exit:
if (err != kNoErr && p_send_msg) free(p_send_msg);
return err;
}

14
TC1/user_udp.h
View File

@@ -1,14 +0,0 @@
#ifndef __USER_UDP_H_
#define __USER_UDP_H_
#include "mico.h"
#include "micokit_ext.h"
OSStatus UserUdpInit(void);
OSStatus UserUdpSend(char *arg);
#endif