espressif/ESP8266_RTOS_SDK
1
0
Fork 0
mirror of https://github.com/espressif/ESP8266_RTOS_SDK.git synced 2025-06-05 05:01:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/sc_ack_send_information' into 'master'

Browse Source 
feat(smartconfig): Add a function for change the smartconfig's ACK information

See merge request sdk/ESP8266_RTOS_SDK!595
This commit is contained in:
Dong Heng
2018-11-05 09:59:44 +08:00
parent 343f6c5450 a357054c3e
commit c4d0998136
2 changed files with 39 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
components/smartconfig_ack/include/smartconfig_ack.h
View File

@ -68,6 +68,16 @@ void sc_ack_send(sc_ack_t *param);
*/
void sc_ack_send_stop(void);
/**
* @brief Fill smartconfig ACK information to cellphone.
*
* @attention The API is only used in libsmartconfig.a.
*
* @param buffer: Transmits the data in the buffer;
* @param size: The size argument specifies the number of bytes to be transmitted.
*/
bool sc_ack_send_info(void *buffer, size_t size);
#ifdef __cplusplus
}
#endif

30
components/smartconfig_ack/smartconfig_ack.c
View File

@ -32,6 +32,8 @@ static const char *TAG = "smartconfig";
/* Flag to indicate sending smartconfig ACK or not. */
static bool s_sc_ack_send = false;
static void *s_sc_ack_info = NULL;
static size_t s_sc_ack_info_size = 0;
static int sc_ack_send_get_errno(int fd)
{
@ -91,7 +93,12 @@ static void sc_ack_send_task(void *pvParameters)
/* Send smartconfig ACK every 100ms. */
vTaskDelay(100 / portTICK_RATE_MS);
sendlen = sendto(send_sock, &ack->ctx, ack_len, 0, (struct sockaddr*) &server_addr, sin_size);
if (s_sc_ack_info) {
sendlen = sendto(send_sock, s_sc_ack_info, s_sc_ack_info_size, 0, (struct sockaddr*) &server_addr, sin_size);
} else {
sendlen = sendto(send_sock, &ack->ctx, ack_len, 0, (struct sockaddr*) &server_addr, sin_size);
}
if (sendlen > 0) {
/* Totally send 30 smartconfig ACKs. Then smartconfig is successful. */
if (packet_count++ >= SC_ACK_MAX_COUNT) {
@ -124,6 +131,11 @@ _end:
if ((send_sock >= LWIP_SOCKET_OFFSET) && (send_sock <= (FD_SETSIZE - 1))) {
close(send_sock);
}
if (s_sc_ack_info) {
free(s_sc_ack_info);
s_sc_ack_info = NULL;
s_sc_ack_info_size = 0;
}
free(ack);
vTaskDelete(NULL);
}
@ -156,3 +168,19 @@ void sc_ack_send_stop(void)
{
s_sc_ack_send = false;
}
bool sc_ack_send_info(void *buffer, size_t size)
{
if (!buffer || !size)
return false;
s_sc_ack_info = s_sc_ack_info ? realloc(s_sc_ack_info, size + 1) : malloc(size + 1);
if (!s_sc_ack_info)
return false;
s_sc_ack_info_size = size;
memset(s_sc_ack_info, 0, size + 1);
memcpy(s_sc_ack_info, buffer, size);
return true;
}