mawei
/
panda
mirror of https://github.com/commaai/panda.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add 5s udp timeout

This commit is contained in:
Firmware Batman 2017-05-17 18:35:26 -07:00
parent 4175227663
commit 625b34cba7
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
boardesp/proxy.c
View File

@ -145,17 +145,28 @@ void ICACHE_FLASH_ATTR poll_can(void *arg) {
}
}
int timer_started = 0;
int udp_sending = 0;
static volatile os_timer_t udp_timeout;
void ICACHE_FLASH_ATTR udp_timeout_func(void *arg) {
udp_sending = 0;
}
void ICACHE_FLASH_ATTR inter_recv_cb(void *arg, char *pusrdata, unsigned short length) {
os_printf("UDP recv\n");
remot_info *premot = NULL;
if (espconn_get_connection_info(&inter_conn,&premot,0) == ESPCONN_OK) {
timer_started = 1;
udp_sending = 1;
inter_conn.proto.udp->remote_port = premot->remote_port;
inter_conn.proto.udp->remote_ip[0] = premot->remote_ip[0];
inter_conn.proto.udp->remote_ip[1] = premot->remote_ip[1];
inter_conn.proto.udp->remote_ip[2] = premot->remote_ip[2];
inter_conn.proto.udp->remote_ip[3] = premot->remote_ip[3];
// start 5 second timer
os_timer_disarm(&udp_timeout);
os_timer_setfn(&udp_timeout, (os_timer_func_t *)udp_timeout_func, NULL);
os_timer_arm(&udp_timeout, 5*1000, 0);
}
}
@ -293,7 +304,7 @@ void ICACHE_FLASH_ATTR user_init()
void ICACHE_FLASH_ATTR loop(os_event_t *events) {
if (timer_started) {
if (udp_sending) {
if (queue_send_len == -1) {
poll_can(NULL);
} else {

3
boardesp/webserver.c
View File

@ -19,7 +19,8 @@
char resp[0x800];
char staticpage[] = "HTTP/1.0 200 OK\nContent-Type: text/html\n\n"
"<pre>This is your comma.ai panda<br/><br/>"
"It's open source. Find the code <a href=\"https://github.com/commaai/panda\">here</a><br/>";
"It's open source. Find the code <a href=\"https://github.com/commaai/panda\">here</a><br/>"
"Designed to work with our dashcam, <a href=\"http://chffr.comma.ai\">chffr</a><br/>";
static struct espconn web_conn;
static esp_tcp web_proto;