PowLu/TencentOS-tiny
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improve at firmware

Browse Source
This commit is contained in:
mculover666
2021-01-26 10:59:47 +08:00
parent 4cbeadbc19
commit 5ecbc13f64
15 changed files with 497 additions and 537 deletions
Download Patch File Download Diff File Expand all files Collapse all files

139
devices/ec20/ec20.c
View File

@@ -32,7 +32,7 @@ typedef struct ip_addr_st {
}ip_addr_t;
static ip_addr_t domain_parser_addr = {0};
k_sem_t domain_parser_sem;
static k_sem_t domain_parser_sem;
static int ec20_echo_close(void)
{
@@ -40,8 +40,7 @@ static int ec20_echo_close(void)
tos_at_echo_create(&echo, NULL, 0, NULL);
tos_at_cmd_exec(&echo, 1000, "ATE0\r\n");
if (echo.status == AT_ECHO_STATUS_OK)
{
if (echo.status == AT_ECHO_STATUS_OK) {
return 0;
}
return -1;
@@ -53,8 +52,7 @@ static int ec20_sim_card_check(void)
char echo_buffer[32];
tos_at_echo_create(&echo, echo_buffer, sizeof(echo_buffer), NULL);
while (try++ < 10)
{
while (try++ < 10) {
tos_at_cmd_exec(&echo, 1000, "AT+CPIN?\r\n");
if (echo.status != AT_ECHO_STATUS_OK) {
@@ -77,8 +75,7 @@ static int ec20_signal_quality_check(void)
int try = 0;
tos_at_echo_create(&echo, echo_buffer, sizeof(echo_buffer), NULL);
while (try++ < 10)
{
while (try++ < 10) {
tos_at_cmd_exec(&echo, 1000, "AT+CSQ\r\n");
if (echo.status != AT_ECHO_STATUS_OK)
{
@@ -106,16 +103,14 @@ static int ec20_gsm_network_check(void)
int try = 0;
tos_at_echo_create(&echo, echo_buffer, sizeof(echo_buffer), NULL);
while (try++ < 10)
{
while (try++ < 10) {
tos_at_cmd_exec(&echo, 1000, "AT+CREG?\r\n");
if (echo.status != AT_ECHO_STATUS_OK) {
return -1;
}
str = strstr(echo.buffer, "+CREG:");
if (!str)
{
if (!str) {
return -1;
}
sscanf(str, "+CREG:%d,%d", &n, &stat);
@@ -134,23 +129,19 @@ static int ec20_gprs_network_check(void)
int try = 0;
tos_at_echo_create(&echo, echo_buffer, sizeof(echo_buffer), NULL);
while (try++ < 10)
{
while (try++ < 10) {
tos_at_cmd_exec(&echo, 1000, "AT+CGREG?\r\n");
if (echo.status != AT_ECHO_STATUS_OK)
{
if (echo.status != AT_ECHO_STATUS_OK) {
return -1;
}
str = strstr(echo.buffer, "+CGREG:");
if (!str)
{
if (!str) {
return -1;
}
sscanf(str, "+CGREG:%d,%d", &n, &stat);
if (stat == 1)
{
if (stat == 1) {
return 0;
}
}
@@ -164,8 +155,7 @@ static int ec20_close_apn(void)
tos_at_echo_create(&echo, NULL, 0, NULL);
tos_at_cmd_exec(&echo, 3000, "AT+QIDEACT=1\r\n");
if (echo.status == AT_ECHO_STATUS_OK)
{
if (echo.status == AT_ECHO_STATUS_OK) {
return 0;
}
@@ -178,14 +168,12 @@ static int ec20_set_apn(void)
tos_at_echo_create(&echo, NULL, 0, NULL);
tos_at_cmd_exec(&echo, 300, "AT+QICSGP=1,1,\"CMNET\"\r\n");
if (echo.status != AT_ECHO_STATUS_OK)
{
if (echo.status != AT_ECHO_STATUS_OK) {
return -1;
}
tos_at_cmd_exec_until(&echo, 3000, "AT+QIACT=1\r\n");
if (echo.status != AT_ECHO_STATUS_OK)
{
if (echo.status != AT_ECHO_STATUS_OK) {
return -1;
}
@@ -196,38 +184,32 @@ static int ec20_init(void)
{
printf("Init ec20 ...\n" );
if (ec20_echo_close() != 0)
{
if (ec20_echo_close() != 0) {
printf("echo close failed,please check your module\n");
return -1;
}
if(ec20_sim_card_check() != 0)
{
if(ec20_sim_card_check() != 0) {
printf("sim card check failed,please insert your card\n");
return -1;
}
if (ec20_signal_quality_check() != 0)
{
if (ec20_signal_quality_check() != 0) {
printf("signal quality check status failed\n");
return -1;
}
if(ec20_gsm_network_check() != 0)
{
if(ec20_gsm_network_check() != 0) {
printf("GSM network register status check fail\n");
return -1;
}
if(ec20_gprs_network_check() != 0)
{
if(ec20_gprs_network_check() != 0) {
printf("GPRS network register status check fail\n");
return -1;
}
if(ec20_close_apn() != 0)
{
if(ec20_close_apn() != 0) {
printf("close apn failed\n");
return -1;
}
@@ -245,25 +227,30 @@ static int ec20_connect(const char *ip, const char *port, sal_proto_t proto)
{
int id;
at_echo_t echo;
char except_str[16];
id = tos_at_channel_alloc(ip, port);
if (id == -1)
{
if (id == -1) {
return -1;
}
tos_at_cmd_exec(NULL, 1000, "AT+QICLOSE=%d\r\n", id);
tos_at_echo_create(&echo, NULL, 0, "CONNECT OK");
tos_at_cmd_exec(&echo, 4000, "AT+QIOPEN=1,%d,\"%s\",\"%s\",%d,0,1\r\n",
id, proto == TOS_SAL_PROTO_UDP ? "UDP" : "TCP", ip, atoi(port));
if (echo.status == AT_ECHO_STATUS_OK)
{
return id;
tos_at_echo_create(&echo, NULL, 0, NULL);
tos_at_cmd_exec(&echo, 1000, "AT+QICLOSE=%d\r\n", id);
if (echo.status != AT_ECHO_STATUS_OK) {
tos_at_channel_free(id);
return -1;
}
tos_at_channel_free(id);
return -1;
sprintf(except_str, "+QIOPEN: %d,0", id);
tos_at_echo_create(&echo, NULL, 0, except_str);
tos_at_cmd_exec_until(&echo, 4000, "AT+QIOPEN=1,%d,\"%s\",\"%s\",%d,0,1\r\n",
id, proto == TOS_SAL_PROTO_UDP ? "UDP" : "TCP", ip, atoi(port));
if (echo.status != AT_ECHO_STATUS_EXPECT) {
tos_at_channel_free(id);
return -1;
}
return id;
}
static int ec20_recv_timeout(int id, void *buf, size_t len, uint32_t timeout)
@@ -284,25 +271,22 @@ int ec20_send(int id, const void *buf, size_t len)
return -1;
}
if (tos_at_global_lock_pend() != 0)
{
if (tos_at_global_lock_pend() != 0) {
return -1;
}
tos_at_echo_create(&echo, NULL, 0, ">");
tos_at_cmd_exec(&echo, 1000, "AT+QISEND=%d,%d\r\n", id, len);
tos_at_cmd_exec_until(&echo, 1000, "AT+QISEND=%d,%d\r\n", id, len);
if (echo.status != AT_ECHO_STATUS_OK && echo.status != AT_ECHO_STATUS_EXPECT)
{
if (echo.status != AT_ECHO_STATUS_EXPECT) {
tos_at_global_lock_post();
return -1;
}
tos_at_echo_create(&echo, NULL, 0, "SEND OK");
tos_at_raw_data_send_until(&echo, 10000, (uint8_t *)buf, len);
if (echo.status != AT_ECHO_STATUS_OK && echo.status != AT_ECHO_STATUS_EXPECT)
{
if (echo.status != AT_ECHO_STATUS_EXPECT) {
tos_at_global_lock_post();
return -1;
}
@@ -326,25 +310,22 @@ int ec20_sendto(int id, char *ip, char *port, const void *buf, size_t len)
{
at_echo_t echo;
if (tos_at_global_lock_pend() != 0)
{
if (tos_at_global_lock_pend() != 0) {
return -1;
}
tos_at_echo_create(&echo, NULL, 0, ">");
tos_at_cmd_exec(&echo, 1000, "AT+QISEND=%d,%d\r\n", id, len);
tos_at_cmd_exec_until(&echo, 1000, "AT+QISEND=%d,%d\r\n", id, len);
if (echo.status != AT_ECHO_STATUS_OK && echo.status != AT_ECHO_STATUS_EXPECT)
{
if (echo.status != AT_ECHO_STATUS_EXPECT) {
tos_at_global_lock_post();
return -1;
}
tos_at_echo_create(&echo, NULL, 0, "SEND OK");
tos_at_raw_data_send(&echo, 1000, (uint8_t *)buf, len);
if (echo.status != AT_ECHO_STATUS_OK && echo.status != AT_ECHO_STATUS_EXPECT)
{
if (echo.status != AT_ECHO_STATUS_EXPECT) {
tos_at_global_lock_post();
return -1;
}
@@ -356,14 +337,20 @@ int ec20_sendto(int id, char *ip, char *port, const void *buf, size_t len)
static void ec20_transparent_mode_exit(void)
{
at_echo_t echo;
tos_at_echo_create(&echo, NULL, 0, NULL);
tos_at_cmd_exec(NULL, 500, "+++");
}
static int ec20_close(int id)
{
at_echo_t echo;
ec20_transparent_mode_exit();
tos_at_cmd_exec(NULL, 1000, "AT+QICLOSE=%d\r\n", id);
tos_at_echo_create(&echo, NULL, 0, NULL);
tos_at_cmd_exec(&echo, 1000, "AT+QICLOSE=%d\r\n", id);
tos_at_channel_free(id);
@@ -404,36 +391,28 @@ __STATIC__ void ec20_incoming_data_process(void)
<data content>
*/
while (1)
{
if (tos_at_uart_read(&data, 1) != 1)
{
while (1) {
if (tos_at_uart_read(&data, 1) != 1) {
return;
}
if (data == ',')
{
if (data == ',') {
break;
}
channel_id = channel_id * 10 + (data - '0');
}
while (1)
{
if (tos_at_uart_read(&data, 1) != 1)
{
while (1) {
if (tos_at_uart_read(&data, 1) != 1) {
return;
}
if (data == '\r')
{
if (data == '\r') {
break;
}
data_len = data_len * 10 + (data - '0');
}
if (tos_at_uart_read(&data, 1) != 1)
{
if (tos_at_uart_read(&data, 1) != 1) {
return;
}