retropilot
/
panda
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add version to webpage

master
George Hotz 2017-05-03 20:13:56 -07:00
parent 57ff14bf15
commit 49c1e9c3da
4 changed files with 41 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
boardesp/.gitignore vendored
View File

@ -3,3 +3,4 @@ proxy
esp-open-sdk
a.out
cert.h
gitversion.h

15
boardesp/Makefile
View File

@ -26,7 +26,20 @@ proxy.o: proxy.c
cert.h:
../crypto/getcertheader.py ../certs/debugesp.pub ../certs/releaseesp.pub > cert.h
webserver.o: webserver.c cert.h
ifneq ($(wildcard ../.git/HEAD),)
gitversion.h: ../.git/HEAD ../.git/index
echo "const uint8_t gitversion[] = \"$(shell git rev-parse HEAD)\";" > $@
else
ifneq ($(wildcard ../../.git/modules/panda/HEAD),)
gitversion.h: ../../.git/modules/panda/HEAD ../../.git/modules/panda/index
echo "const uint8_t gitversion[] = \"$(shell git rev-parse HEAD)\";" > $@
else
gitversion.h:
echo "const uint8_t gitversion[] = \"RELEASE\";" > $@
endif
endif
webserver.o: webserver.c cert.h gitversion.h
sha.o: ../crypto/sha.c
$(CC) $(CFLAGS) -c $^ -o $@

4
boardesp/proxy.c
View File

@ -19,6 +19,7 @@
__typeof__ (b) _b = (b); \
_a > _b ? _a : _b; })
char ssid[32];
static const int pin = 2;
// Structure holding the TCP connection information.
@ -93,7 +94,7 @@ int ICACHE_FLASH_ATTR spi_comm(char *dat, int len, uint32_t *recvData, int recvD
gpio_output_set((1 << pin), 0, 0, 0);
}
__spi_comm(dat, len, recvData, recvDataLen);
return __spi_comm(dat, len, recvData, recvDataLen);
}
static void ICACHE_FLASH_ATTR tcp_rx_cb(void *arg, char *data, uint16_t len) {
@ -160,7 +161,6 @@ void ICACHE_FLASH_ATTR inter_connect_cb(void *arg) {
void ICACHE_FLASH_ATTR wifi_init() {
// default ssid and password
char ssid[32];
memset(ssid, 0, 32);
os_sprintf(ssid, "panda-%08x-BROKEN", system_get_chip_id());
char password[] = "testing123";

27
boardesp/webserver.c
View File

@ -10,17 +10,20 @@
#include "crypto/rsa.h"
#include "crypto/sha.h"
#include "gitversion.h"
#include "cert.h"
#define min(a,b) ((a) < (b) ? (a) : (b))
#define espconn_send_string(conn, x) espconn_send(conn, x, strlen(x))
char resp[0x800];
char staticpage[] = "HTTP/1.0 200 OK\nContent-Type: text/html\n\n"
"<html><body><tt>This is your comma.ai panda<br/><br/>\n"
"It's open source. Find the code <a href=\"https://github.com/commaai/panda\">here</a>";
"<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/>";
static struct espconn web_conn;
static esp_tcp web_proto;
extern char ssid[];
LOCAL os_timer_t ota_reboot_timer;
@ -95,7 +98,25 @@ static void ICACHE_FLASH_ATTR web_rx_cb(void *arg, char *data, uint16_t len) {
// index
if (memcmp(data, "GET / ", 6) == 0) {
espconn_send_string(&web_conn, staticpage);
strcpy(resp, staticpage);
ets_strcat(resp, "<br/>ssid: ");
ets_strcat(resp, ssid);
ets_strcat(resp, "<br/>");
ets_strcat(resp, "<br/>st version: ");
uint32_t recvData[0x11];
int len = spi_comm("\x00\x00\x00\x00\x40\xD6\x00\x00\x00\x00\x40\x00", 0xC, recvData, 0x40);
ets_memcpy(resp+strlen(resp), recvData+1, len);
ets_strcat(resp, "<br/>esp version: ");
ets_strcat(resp, gitversion);
uint8_t current = system_upgrade_userbin_check();
if (current == UPGRADE_FW_BIN1) {
ets_strcat(resp, "<br/>esp flash file: user2.bin");
} else {
ets_strcat(resp, "<br/>esp flash file: user1.bin");
}
espconn_send_string(&web_conn, resp);
espconn_disconnect(conn);
} else if (memcmp(data, "PUT /stupdate ", 14) == 0) {
os_printf("init st firmware\n");