From febf58df6e5d0d0f08e653a97eddc692a5ecb6de Mon Sep 17 00:00:00 2001 From: Jeroen Domburg Date: Tue, 14 Oct 2014 16:11:54 +0200 Subject: [PATCH] Fixed WiFi cgi stuff. Also: cleaned up everything so it compiles without warnings. include/espmissingincludes.h adds the missing protoypes for that. --- html/wifi/140medley.min.js | 2 + html/wifi/connecting.html | 7 ++++ html/wifi/wifi.tpl | 74 ++++++++++++++++++++++++++++++++++++ include/espmissingincludes.h | 35 +++++++++++++++++ include/stdint.h | 8 ++++ 5 files changed, 126 insertions(+) create mode 100644 html/wifi/140medley.min.js create mode 100644 html/wifi/connecting.html create mode 100644 html/wifi/wifi.tpl create mode 100644 include/espmissingincludes.h create mode 100644 include/stdint.h diff --git a/html/wifi/140medley.min.js b/html/wifi/140medley.min.js new file mode 100644 index 0000000..d1495d1 --- /dev/null +++ b/html/wifi/140medley.min.js @@ -0,0 +1,2 @@ +var t=function(a,b){return function(c,d){return a.replace(/#{([^}]*)}/g,function(a,f){return Function("x","with(x)return "+f).call(c,d||b||{})})}},s=function(a,b){return b?{get:function(c){return a[c]&&b.parse(a[c])},set:function(c,d){a[c]=b.stringify(d)}}:{}}(this.localStorage||{},JSON),p=function(a,b,c,d){c=c||document;d=c[b="on"+b];a=c[b]=function(e){d=d&&d(e=e||c.event);return(a=a&&b(e))?b:d};c=this},m=function(a,b,c){b=document;c=b.createElement("p");c.innerHTML=a;for(a=b.createDocumentFragment();b= +c.firstChild;)a.appendChild(b);return a},$=function(a,b){a=a.match(/^(\W)?(.*)/);return(b||document)["getElement"+(a[1]?a[1]=="#"?"ById":"sByClassName":"sByTagName")](a[2])},j=function(a){for(a=0;a<4;a++)try{return a?new ActiveXObject([,"Msxml2","Msxml3","Microsoft"][a]+".XMLHTTP"):new XMLHttpRequest}catch(b){}}; diff --git a/html/wifi/connecting.html b/html/wifi/connecting.html new file mode 100644 index 0000000..efa574f --- /dev/null +++ b/html/wifi/connecting.html @@ -0,0 +1,7 @@ + +Connecting + + +Connecting to AP now... + + diff --git a/html/wifi/wifi.tpl b/html/wifi/wifi.tpl new file mode 100644 index 0000000..233716c --- /dev/null +++ b/html/wifi/wifi.tpl @@ -0,0 +1,74 @@ +WiFi connection + + + + +

+Current WiFi mode: %WiFiMode% +

+
+

+To connect to a WiFi network, please select one of the detected networks...
+

Scanning...
+
+WiFi password, if applicable:
+
+ +

diff --git a/include/espmissingincludes.h b/include/espmissingincludes.h new file mode 100644 index 0000000..faeb085 --- /dev/null +++ b/include/espmissingincludes.h @@ -0,0 +1,35 @@ +#ifndef ESPMISSINGINCLUIDES_H +#define ESPMISSINGINCLUIDES_H + +#include + +//Missing function prototypes in include folders. Gcc will warn on these if we don't define 'em anywhere. +//MOST OF THESE ARE GUESSED! but they seem to swork and shut up the compiler. +void ets_isr_attach(int routine, void* something, void *buff); +void uart_div_modify(int no, int div); +void ets_isr_unmask(int something); +void ets_install_putc1(void* routine); +void *pvPortMalloc(size_t xWantedSize); +void pvPortFree(void *ptr); +void *vPortMalloc(size_t xWantedSize); +void vPortFree(void *ptr); +void *ets_memcpy(void *dest, const void *src, size_t n); +void *ets_memset(void *s, int c, size_t n); +void ets_timer_arm_new(ETSTimer *a, int b, int c, int isMstimer); +void ets_timer_setfn(ETSTimer *t, ETSTimerFunc *fn, void *parg); +void ets_timer_disarm(ETSTimer *a); +int atoi(const char *nptr); +int ets_strncmp(const char *s1, const char *s2, int len); +int ets_strcmp(const char *s1, const char *s2); +int ets_strlen(const char *s); +char *ets_strcpy(char *dest, const char *src); +char *ets_strncpy(char *dest, const char *src, size_t n); +char *ets_strstr(const char *haystack, const char *needle); +int ets_sprintf(char *str, const char *format, ...) __attribute__ ((format (printf, 2, 3))); +int os_printf(const char *format, ...) __attribute__ ((format (printf, 1, 2))); +void uart_div_modify(int no, int freq); +void ets_isr_unmask(int intr); +void ets_install_putc1(void *routine); +void ets_isr_attach(int intr, void *handler, void *arg); + +#endif \ No newline at end of file diff --git a/include/stdint.h b/include/stdint.h new file mode 100644 index 0000000..02723c6 --- /dev/null +++ b/include/stdint.h @@ -0,0 +1,8 @@ + +//Including the system-wide stdint.h messes stuff up... but I don't want to change heatshrink +//not to do it. Including this dummy file fixes it too, tho'. + +#ifndef __ets__ +//Do include stdint for testing builds. +#include_next +#endif \ No newline at end of file