Skip to content

Commit 65e8bec

Browse files
committed
Fix issue compiler option
1 parent 2cd2551 commit 65e8bec

File tree

2 files changed

+14
-16
lines changed

2 files changed

+14
-16
lines changed

wifiHD/src/ard_spi.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1129,13 +1129,13 @@ cmd_spi_state_t get_client_state_tcp_cmd_cb(char* recv, char* reply, void* ctx,
11291129
{
11301130

11311131
_state = getStateTcp(p, 1);
1132-
INFO_TCP_VER("CLI> p=%p _ttcp=%p state(tpcb):%d state:%d\n",
1132+
INFO_SPI_VER("CLI> p=%p _ttcp=%p state(tpcb):%d state:%d\n",
11331133
p, ((struct ttcp*) p)->tpcb,
11341134
((struct ttcp*) p)->tpcb->state,
11351135
_state);
11361136
}else {
11371137
_state = getStateTcp(p, 1);
1138-
INFO_TCP_VER("SER> p=%p _ttcp=%p state(tpcb):%d state(lpcb):%d state:%d\n",
1138+
INFO_SPI_VER("SER> p=%p _ttcp=%p state(tpcb):%d state(lpcb):%d state:%d\n",
11391139
p, ((struct ttcp*) p)->tpcb,
11401140
((struct ttcp*) p)->tpcb->state,
11411141
((struct ttcp*) p)->lpcb->state,
@@ -1466,7 +1466,7 @@ bool checkMsgFormat(uint8_t* _recv, int len, int* offset)
14661466
unsigned char* recv = getStartCmdSeq(_recv, len, offset);
14671467
if ((recv == NULL)||(recv!=_recv))
14681468
{
1469-
if ((verboseDebug & INFO_SPI_FLAG)&&(len < 20)) //TODO stamp only short messages wrong
1469+
if ((/*verboseDebug & */INFO_SPI_FLAG)&&(len < 20)) //TODO stamp only short messages wrong
14701470
dump((char*)_recv, len);
14711471

14721472
if (recv == NULL)

wifiHD/src/ard_tcp.c

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -325,6 +325,10 @@ static err_t atcp_poll(void *arg, struct tcp_pcb *pcb) {
325325
return ERR_ABRT;
326326
}
327327

328+
WARN("ARD TCP [%p-%p] arg=%p retries=%d\n", (_ttcp)?_ttcp->tpcb:0, pcb, arg, tcp_poll_retries);
329+
if (_ttcp) tcp_send_data(_ttcp);
330+
else WARN("ttcp NULL!");
331+
328332
if (pending_close)
329333
{
330334
err_t err = tcp_close(pcb);
@@ -338,12 +342,7 @@ static err_t atcp_poll(void *arg, struct tcp_pcb *pcb) {
338342
}
339343

340344
INFO_TCP("ARD TCP [%p-%p] try to close pending:%d\n", pcb, (_ttcp)?_ttcp->tpcb:0, pending_close);
341-
}else{
342-
WARN("ARD TCP [%p-%p] arg=%p retries=%d\n", (_ttcp)?_ttcp->tpcb:0, pcb, arg, tcp_poll_retries);
343-
if (_ttcp) tcp_send_data(_ttcp);
344-
else WARN("ttcp NULL!");
345345
}
346-
347346
return ERR_OK;
348347
}
349348

@@ -362,6 +361,10 @@ static err_t atcp_poll_conn(void *arg, struct tcp_pcb *pcb) {
362361
return ERR_ABRT;
363362
}
364363

364+
WARN("ARD TCP [%p-%p] arg=%p retries=%d\n", (_ttcp)?_ttcp->tpcb:0, pcb, arg, tcp_poll_retries);
365+
if (_ttcp) tcp_send_data(_ttcp);
366+
else WARN("ttcp NULL!");
367+
365368
if (pending_close)
366369
{
367370
err_t err = tcp_close(pcb);
@@ -375,12 +378,7 @@ static err_t atcp_poll_conn(void *arg, struct tcp_pcb *pcb) {
375378
}
376379

377380
INFO_TCP("ARD TCP [%p-%p] try to close pending:%d\n", pcb, (_ttcp)?_ttcp->tpcb:0, pending_close);
378-
}else{
379-
WARN("ARD TCP [%p-%p] arg=%p retries=%d\n", (_ttcp)?_ttcp->tpcb:0, pcb, arg, tcp_poll_retries);
380-
if (_ttcp) tcp_send_data(_ttcp);
381-
else WARN("ttcp NULL!");
382381
}
383-
384382
return ERR_OK;
385383
}
386384

@@ -737,18 +735,18 @@ static err_t tcp_data_sent(void *arg, struct tcp_pcb *pcb, u16_t len) {
737735

738736
tcp_poll_retries = 0;
739737

740-
INFO_TCP_VER("Packet sent pcb:%p len:%d dur:%d\n", pcb, len, timer_get_ms() - startTime);
738+
INFO_TCP("Packet sent pcb:%p len:%d dur:%d left:%d\n", pcb, len, timer_get_ms() - startTime,
739+
(_ttcp)?(_ttcp->left):0);
741740

742741
if ((_ttcp)&&(_ttcp->left > 0)) {
743-
INFO_TCP("data left: %d\n", _ttcp->left );
744742
tcp_send_data(_ttcp);
745743
}
746744

747745
return ERR_OK;
748746
}
749747

750748
int sendTcpData(void* p, uint8_t* buf, uint16_t len) {
751-
INFO_TCP_VER("buf:%p len:%d\n", buf, len);
749+
INFO_TCP("buf:%p len:%d\n", buf, len);
752750
DUMP_TCP(buf,len);
753751

754752
struct ttcp* _ttcp = (struct ttcp*) p;

0 commit comments

Comments
 (0)