delete '!!!'

This commit is contained in:
pvvx 2017-02-28 10:40:07 +03:00
parent de57c04fb4
commit ed4c83a935
44 changed files with 206 additions and 187 deletions

View file

@ -314,7 +314,7 @@ static int wps_connect_to_AP_by_certificate(rtw_network_info_t *wifi)
if(retry_count == RETRY_COUNT)
rtw_msleep_os(1000); //When start wps with OPEN AP, AP will send a disassociate frame after STA connected, need reconnect here.
if(RTW_SUCCESS == wifi_is_connected_to_ap( )){
//printf("\r\n[WPS]Ready to tranceive!!\n");
//printf("\r\n[WPS]Ready to tranceive!\n");
wps_check_and_show_connection_info();
break;
}
@ -501,7 +501,7 @@ int wps_start(u16 wps_config, char *pin, u8 channel, char *ssid)
wifi_set_wps_phase(ENABLE);
ret = wps_connect_to_AP_by_open_system(target_ssid);
if(ret < 0){
printf("WPS: WPS Fail!!\n");
printf("WPS: WPS Fail!\n");
goto exit;
}
os_xqueue_receive(queue_for_credential, &dev_cred, 120);
@ -511,9 +511,9 @@ int wps_start(u16 wps_config, char *pin, u8 channel, char *ssid)
ret = wps_connect_to_AP_by_certificate(&wifi);
goto exit1;
} else {
printf("WPS: WPS FAIL!!!\n");
// printf("\n\rWPS: WPS FAIL!!!\n");
// printf("\n\rWPS: WPS FAIL!!!\n");
printf("WPS: WPS FAIL!\n");
// printf("\n\rWPS: WPS FAIL!\n");
// printf("\n\rWPS: WPS FAIL!\n");
ret = -1;
}
exit:

View file

@ -1000,7 +1000,7 @@ int wifi_rf_off(void)
int wifi_on(rtw_mode_t mode)
{
int ret = 0;
//pvvx int timeout = 20; // 20 sec ??!!
//pvvx int timeout = 20; // 20 sec ?!
int timeout = wifi_test_timeout_ms/wifi_test_timeout_step_ms;
int idx;
int devnum = 1;
@ -1063,7 +1063,7 @@ int wifi_on(rtw_mode_t mode)
int wifi_off(void)
{
// int ret = 0;
//pvvx int timeout = 20; // 20 sec ??!!
//pvvx int timeout = 20; // 20 sec ?!
int timeout = wifi_test_timeout_ms/10;
if((rltk_wlan_running(WLAN0_IDX) == 0) &&

View file

@ -999,7 +999,7 @@ void print_simple_config_result(enum sc_result sc_code)
printf("\n");
switch (sc_code) {
case SC_NO_CONTROLLER_FOUND:
printf("Simple Config timeout!! Can't get Ap profile. Please try again\n");
printf("Simple Config timeout! Can't get Ap profile. Please try again\n");
break;
case SC_CONTROLLER_INFO_PARSE_FAIL:
printf("Simple Config fail, cannot parse target ap info from controller\n");
@ -1014,7 +1014,7 @@ void print_simple_config_result(enum sc_result sc_code)
printf("Simple Config fail, cannot get dhcp ip address\n");
break;
case SC_UDP_SOCKET_CREATE_FAIL:
printf("Simple Config Ack socket create fail!!!\n");
printf("Simple Config Ack socket create fail!\n");
break;
case SC_TERMINATE:
printf("Simple Config terminate\n");

View file

@ -153,7 +153,7 @@ int uartadapter_uart_read(ua_socket_t *ua_socket, void *read_buf, size_t size)
if(!ua_socket->uart.overlap){
memcpy(ptr, (ua_socket->uart.recv_buf+ pread_local), read_bytes );
}else {
ua_printf(UA_DEBUG, "uart recv buf is write overlap!!");
ua_printf(UA_DEBUG, "uart recv buf is write overlap!");
if((pread_local + read_bytes) > UA_UART_RECV_BUFFER_LEN){
memcpy(ptr,(ua_socket->uart.recv_buf+ pread_local),(UA_UART_RECV_BUFFER_LEN-pread_local));
memcpy(ptr+(UA_UART_RECV_BUFFER_LEN-pread_local), ua_socket->uart.recv_buf,read_bytes-(UA_UART_RECV_BUFFER_LEN- pread_local));
@ -187,7 +187,7 @@ int uartadapter_uart_write(ua_socket_t *ua_socket, char *pbuf, size_t size)
while(RtlDownSema(&ua_socket->uart.dma_tx) == pdTRUE){
ret = serial_send_stream_dma(&ua_socket->uart.uart_sobj, pbuf, size);
if(ret != HAL_OK){
ua_printf(UA_ERROR, "uart dma tx error %d!!", ret);
ua_printf(UA_ERROR, "uart dma tx error %d!", ret);
RtlUpSema(&ua_socket->uart.dma_tx);
return -1;
}else{
@ -459,7 +459,7 @@ void uartadapter_systemreload(void)
void uartadapter_gpio_irq (uint32_t id, gpio_irq_event event)
{
ua_printf(UA_DEBUG, "GPIO push button!!");
ua_printf(UA_DEBUG, "GPIO push button!");
ua_gpio_irq_happen = 1;
RtlUpSemaFromISR(&ua_exception_sema);
@ -510,7 +510,7 @@ void uartadapter_gpio_led_mode(ua_socket_t *ua_socket, ua_led_mode_t mode)
(void*)uartadapter_gtimer_timeout_handler, (uint32_t)&ua_socket->gpio.gpio_led);
break;
default:
ua_printf(UA_ERROR, "Unknown GPIO LED mode!!");
ua_printf(UA_ERROR, "Unknown GPIO LED mode!");
break;
}
}

View file

@ -51,7 +51,7 @@ void cloud_link_task(void *param){
sprintf(j, "%.2f", humidity);
#endif
if(ret < 0)
printf("\n<-----LOCAL LINK FAILED!!(get infor failed)\n");
printf("\n<-----LOCAL LINK FAILED!(get infor failed)\n");
else{
gen_json_data(i,j, data);
printf("\nCLOUD-LINK--Sending data : \n%s\n", data);
@ -60,10 +60,10 @@ void cloud_link_task(void *param){
if(gn_put(&googlenest, URI, data) != 0)
printf("PUT data failed!\n");
gn_close(&googlenest);
printf("\n<=====CLOUD LINK OK!!\n");
printf("\n<=====CLOUD LINK OK!\n");
}
else{
printf("\n<=====CLOUD LINK FAILED!!(google nest connecting)\n");
printf("\n<=====CLOUD LINK FAILED!(google nest connecting)\n");
}
free(data);
vTaskDelay(10000);
@ -72,7 +72,7 @@ void cloud_link_task(void *param){
}
else
printf("\n<=====CLOUD LINK FAILED!!(flash reading)\n");
printf("\n<=====CLOUD LINK FAILED!(flash reading)\n");
}

View file

@ -318,15 +318,15 @@ static void local_link_task(void *param)
sprintf(j, "%.2f", humidity);
#endif
if(ret < 0)
printf("\r\n\r\n<-----LOCAL LINK FAILED!!(get infor failed)\r\n\r\n");
printf("\r\n\r\n<-----LOCAL LINK FAILED!(get infor failed)\r\n\r\n");
else{
printf("\r\n\r\n----->START LOCAL LINKING\r\n\r\n");
gen_json_data(i, j, data);
printf("Sending data : %s\r\n", data);
if (local_link(data) < 0)
printf("\r\n\r\n<-----LOCAL LINK FAILED!!\r\n\r\n");
printf("\r\n\r\n<-----LOCAL LINK FAILED!\r\n\r\n");
else
printf("\r\n\r\n<-----LOCAL LINK OK!!\r\n\r\n");
printf("\r\n\r\n<-----LOCAL LINK OK!\r\n\r\n");
vTaskDelay(1000);
}
}
@ -502,10 +502,10 @@ static void pair_device_task(void)
temp = NULL;
}
if(pair_device(tx_buffer, rx_buffer, 1) >= 0)
printf("\r\n\r\n<===First handshake OK!!\r\n\r\n");
printf("\r\n\r\n<===First handshake OK!\r\n\r\n");
else{
i--;
printf("\r\n\r\n<===First handshake FAILED!!\r\n\r\n");
printf("\r\n\r\n<===First handshake FAILED!\r\n\r\n");
}
}
//Second handshake
@ -558,11 +558,11 @@ static void pair_device_task(void)
flash_stream_write(&iot_flash, FLASH_IOT_DATA, 33, (uint8_t *) data);
IOT_DEBUG("PAIR_STATE: %d\r\n", PAIR_STATE[0]);
}
printf("\r\n\r\n<=====Second handshake OK!!\r\n\r\n");
printf("\r\n\r\n<=====Second handshake OK!\r\n\r\n");
}
else{
i = i - 2;
printf("\r\n\r\n<=====Second handshake FAILED!!\r\n\r\n");
printf("\r\n\r\n<=====Second handshake FAILED!\r\n\r\n");
}
}
//Third handshake
@ -586,15 +586,15 @@ static void pair_device_task(void)
flash_stream_write(&iot_flash, FLASH_IOT_DATA, 97, (uint8_t *) data);
IOT_DEBUG("PAIR_STATE: %d\r\n", PAIR_STATE[0]);
printf("\r\n\r\n<=======Third handshake OK!!\r\n\r\n");
printf("\r\n\r\n<=======Third handshake OK!\r\n\r\n");
}
else{
i = i - 3;
printf("\r\n\r\n<=======Third handshake FAILED!!\r\n\r\n");
printf("\r\n\r\n<=======Third handshake FAILED!\r\n\r\n");
}
}
}
printf("\r\n\r\n<=========Pairing OK!!\r\n\r\n");
printf("\r\n\r\n<=========Pairing OK!\r\n\r\n");
}
static void mdns_task(void *param)
@ -657,7 +657,7 @@ static void mdns_task(void *param)
TXTRecordSetValue(&txtRecord, "CONTROL_TYPE", strlen("0"), "0");
dnsServiceRef = mDNSRegisterService("ht_sensor", "_Ameba._tcp", "local", PORT, &txtRecord);
TXTRecordDeallocate(&txtRecord);
printf("\r\n\r\n<========Registering mDNS service OK!!\r\n\r\n");
printf("\r\n\r\n<========Registering mDNS service OK!\r\n\r\n");
pair_device_task();
}
//The device was paired
@ -676,7 +676,7 @@ static void mdns_task(void *param)
dnsServiceRef = mDNSRegisterService("ht_sensor", "_Ameba._tcp", "local", PORT, &txtRecord);
TXTRecordDeallocate(&txtRecord);
printf("\r\n\r\n<========Registering mDNS service OK!! PAIR_STATE = 1\r\n\r\n");
printf("\r\n\r\n<========Registering mDNS service OK! PAIR_STATE = 1\r\n\r\n");
}
#if PSEUDO_DATA
printf("\r\n\r\n========>Using the speudo data\r\n\r\n");

View file

@ -103,7 +103,7 @@ void mii_intr_handler(u32 Event, u32 Data)
break;
default:
DBG_8195A("Unknown event !!\n");
DBG_8195A("Unknown event!\n");
break;
}
}

View file

@ -5,8 +5,8 @@
#define MII_TX_DESC_CNT 4
#define MII_RX_DESC_CNT 10
#if CONFIG_ETHERNET
extern s8 rltk_mii_send(struct eth_drv_sg *sg_list, int sg_len, int total_len);
extern void rltk_mii_recv(struct eth_drv_sg *sg_list, int sg_len);
#endif
#endif // __MII_ETHERNETIF_H__

View file

@ -310,9 +310,9 @@ static void dhcps_send_offer(struct pbuf *packet_buffer)
#if 0
memset(&ip_table, 0, sizeof(struct table));
mark_ip_in_table((uint8_t)ip4_addr4(&dhcps_local_address));
printf("reset ip table!!");
printf("reset ip table!");
#endif
printf("No useable ip!!!!");
printf("No useable ip!");
}
IP4_ADDR(&dhcps_allocated_client_address, (ip4_addr1(&dhcps_network_id)),
@ -502,7 +502,7 @@ struct pbuf *udp_packet_buffer, struct ip_addr *sender_addr, uint16_t sender_por
dhcp_message_repository = (struct dhcp_msg *)udp_packet_buffer->payload;
if (udp_packet_buffer == NULL) {
printf("Error!!!! System doesn't allocate any buffer\n");
printf("Error! System doesn't allocate any buffer\n");
return;
}
if (sender_port == DHCP_CLIENT_PORT) {
@ -580,7 +580,7 @@ void dhcps_init(struct netif * pnetif)
dhcps_pcb = udp_new();
if (dhcps_pcb == NULL) {
printf("Error!!!upd_new error\n");
printf("Error! upd_new error\n");
return;
}
IP4_ADDR(&dhcps_send_broadcast_address, 255, 255, 255, 255);

View file

@ -56,13 +56,16 @@
#include "ethernetif.h"
#include "queue.h"
#include "lwip_netconf.h"
#include "ethernet_mii/ethernet_mii.h"
//#include "lwip/ethip6.h" //Add for ipv6
#include <platform/platform_stdlib.h>
#include "platform_opts.h"
#if CONFIG_ETHERNET
#include "ethernet_mii/ethernet_mii.h"
#endif
#if CONFIG_WLAN
#include <lwip_intf.h>
#endif
@ -159,6 +162,7 @@ static err_t low_level_output(struct netif *netif, struct pbuf *p)
return ERR_OK;
}
#if CONFIG_ETHERNET
/*for ethernet mii interface*/
static err_t low_level_output_mii(struct netif *netif, struct pbuf *p)
{
@ -177,7 +181,7 @@ static err_t low_level_output_mii(struct netif *netif, struct pbuf *p)
}
return ERR_OK;
}
#endif
/**
* Should allocate a pbuf and transfer the bytes of the incoming
@ -241,7 +245,7 @@ void ethernetif_recv(struct netif *netif, int total_len)
}
#if CONFIG_ETHERNET
void ethernetif_mii_recv(struct netif *netif, int total_len)
{
struct eth_drv_sg sg_list[MAX_ETH_DRV_SG];
@ -270,6 +274,7 @@ void ethernetif_mii_recv(struct netif *netif, int total_len)
pbuf_free(p);
}
#endif
/**
* Should be called at the beginning of the program to set up the
* network interface. It calls the function low_level_init() to do the
@ -307,7 +312,7 @@ err_t ethernetif_init(struct netif *netif)
return ERR_OK;
}
#if CONFIG_ETHERNET
err_t ethernetif_mii_init(struct netif *netif)
{
LWIP_ASSERT("netif != NULL", (netif != NULL));
@ -329,7 +334,7 @@ err_t ethernetif_mii_init(struct netif *netif)
return ERR_OK;
}
#endif
static void arp_timer(void *arg)
{
etharp_tmr();

View file

@ -1011,7 +1011,7 @@ lwip_write(int s, const void *data, size_t size)
* set in the sets has events. On return, readset, writeset and exceptset have
* the sockets enabled that had events.
*
* exceptset is not used for now!!!
* exceptset is not used for now!
*
* @param maxfdp1 the highest socket index in the sets
* @param readset_in: set of sockets to check for read events

View file

@ -311,7 +311,7 @@ snmp_asn1_enc_length_cnt(u16_t length, u8_t *octets_needed)
*
* @note ASN coded integers are _always_ signed. E.g. +0xFFFF is coded
* as 0x00,0xFF,0xFF. Note the leading sign octet. A positive value
* of 0xFFFFFFFF is preceded with 0x00 and the length is 5 octets!!
* of 0xFFFFFFFF is preceded with 0x00 and the length is 5 octets!
*/
void
snmp_asn1_enc_u32t_cnt(u32_t value, u16_t *octets_needed)
@ -337,7 +337,7 @@ snmp_asn1_enc_u32t_cnt(u32_t value, u16_t *octets_needed)
*
* @note ASN coded integers are _always_ signed. E.g. +0xFFFF is coded
* as 0x00,0xFF,0xFF. Note the leading sign octet. A positive value
* of 0xFFFFFFFF is preceded with 0x00 and the length is 5 octets!!
* of 0xFFFFFFFF is preceded with 0x00 and the length is 5 octets!
*/
void
snmp_asn1_enc_u64t_cnt(const u32_t *value, u16_t *octets_needed)
@ -479,7 +479,7 @@ snmp_asn1_dec_tlv(struct snmp_pbuf_stream* pbuf_stream, struct snmp_asn1_tlv* tl
*
* @note ASN coded integers are _always_ signed. E.g. +0xFFFF is coded
* as 0x00,0xFF,0xFF. Note the leading sign octet. A positive value
* of 0xFFFFFFFF is preceded with 0x00 and the length is 5 octets!!
* of 0xFFFFFFFF is preceded with 0x00 and the length is 5 octets!
*/
err_t
snmp_asn1_dec_u32t(struct snmp_pbuf_stream *pbuf_stream, u16_t len, u32_t *value)
@ -519,7 +519,7 @@ snmp_asn1_dec_u32t(struct snmp_pbuf_stream *pbuf_stream, u16_t len, u32_t *value
*
* @note ASN coded integers are _always_ signed. E.g. +0xFFFF is coded
* as 0x00,0xFF,0xFF. Note the leading sign octet. A positive value
* of 0xFFFFFFFF is preceded with 0x00 and the length is 5 octets!!
* of 0xFFFFFFFF is preceded with 0x00 and the length is 5 octets!
*/
err_t
snmp_asn1_dec_u64t(struct snmp_pbuf_stream *pbuf_stream, u16_t len, u32_t *value)

View file

@ -876,7 +876,7 @@ dns_enqueue(const char *name, dns_found_callback found, void *callback_arg)
/**
* Resolve a hostname (string) into an IP address.
* NON-BLOCKING callback version for use with raw API!!!
* NON-BLOCKING callback version for use with raw API!
*
* Returns immediately with one of err_t return codes:
* - ERR_OK if hostname is a valid IP address string or the host

View file

@ -15,7 +15,7 @@
*
* So, a packet queue consists of one or more pbuf chains, each of
* which consist of one or more pbufs. CURRENTLY, PACKET QUEUES ARE
* NOT SUPPORTED!!! Use helper structs to queue multiple packets.
* NOT SUPPORTED! Use helper structs to queue multiple packets.
*
* The differences between a pbuf chain and a packet queue are very
* precise but subtle.
@ -359,7 +359,7 @@ pbuf_alloc(pbuf_layer layer, u16_t length, pbuf_type type)
* @param payload_mem pointer to the buffer that is used for payload and headers,
* must be at least big enough to hold 'length' plus the header size,
* may be NULL if set later.
* ATTENTION: The caller is responsible for correct alignment of this buffer!!
* ATTENTION: The caller is responsible for correct alignment of this buffer!
* @param payload_mem_len the size of the 'payload_mem' buffer, must be at least
* big enough to hold 'length' plus the header size
*/

View file

@ -261,7 +261,7 @@ int uart_read(uart_socket_t *u, void *read_buf, size_t size)
if(!u->rxoverlap){
memcpy(ptr, (u->recv_buf+ pread_local), read_bytes );
} else {
uart_printf("uart recv buf is write through!!\n");
uart_printf("uart recv buf is write through!\n");
if((pread_local + read_bytes) > UART_RECV_BUFFER_LEN){
memcpy(ptr,(u->recv_buf+ pread_local), (UART_RECV_BUFFER_LEN-pread_local));
memcpy(ptr+(UART_RECV_BUFFER_LEN-pread_local), u->recv_buf, read_bytes-(UART_RECV_BUFFER_LEN- pread_local));

View file

@ -612,7 +612,7 @@ exit:
//if anything goes wrong or transfer over,we kill ourself.
if(error_bit || transfer_over){
if(error_bit)
printf("error!!! error bit = %d\r\n",error_bit);
printf("error! error bit = %d\r\n",error_bit);
else{
printf(" [%s, %d Bytes] transfer_over!\r\n",ymodem_ptr->filename,ymodem_ptr->filelen);
set_signature(ymodem_ptr);

View file

@ -1057,7 +1057,7 @@ static u8_t ProcessPostMessage(struct netbuf *pxRxBuffer, portCHAR *LocalBuf)
pcRxString = LocalBuf;
p = pxRxBuffer->p;
usLength = p->tot_len;
//printf("\r\n !!!!!!!!!POST!p->tot_len =%d p->len=%d\n", p->tot_len, p->len);
//printf("\r\n !POST!p->tot_len =%d p->len=%d\n", p->tot_len, p->len);
while(p)
{
memcpy(pcRxString, p->payload, p->len);
@ -1342,7 +1342,7 @@ void stop_web_server()
netconn_delete(pxHTTPListener);
pxHTTPListener = NULL;
}
printf("\r\nWEB: Take webs sema(%p) failed!!!!!!!!!!!\n", webs_sema);
printf("\r\nWEB: Take webs sema(%p) failed!\n", webs_sema);
}
vSemaphoreDelete(webs_sema);
webs_sema = NULL;