Commit Graph

67 Commits

Author SHA1 Message Date
susisstrolch
d092075818 merge upstream:master 2015-09-21 23:12:35 +02:00
Benjamin Runnels
2ab194f83c Added ifdef checks for mqtt enabled
Added better handling of compile time config of SSID and PASSWORD
Removed default disable of ESP SDK debug log messages
2015-09-20 16:18:26 -05:00
Thorsten von Eicken
82c65718cf improve mqtt disconnect/reconnect 2015-09-19 23:31:43 -07:00
Thorsten von Eicken
ad053a8dea temp merge brunnels-ifdefs into ifdefs 2015-09-11 23:37:13 -07:00
Thorsten von Eicken
b2d7d2a579 fix-up MQTT page 2015-09-11 23:31:03 -07:00
Benjamin Runnels
3337cc1508 merged in ifdefs for debug and mqtt webpage additions 2015-09-11 16:40:28 -05:00
Benjamin Runnels
b7dd0b180f lots of ifdef 2015-09-11 15:56:51 -05:00
Benjamin Runnels
965b70a408 Merge branch 'master' into windows
Conflicts:
	Makefile
	cmd/handlers.c
	esp-link/cgi.c
	esp-link/cgiwifi.c
	html/console.html
	html/style.css
	html/ui.js
	httpd/httpd.c
	mqtt/mqtt.c
	mqtt/mqtt.h
	mqtt/mqtt_cmd.c
	user/user_main.c
2015-09-09 07:36:36 -05:00
Thorsten von Eicken
c1ed3695a9 server-side handling of MQTT web page 2015-09-08 23:24:49 -07:00
Thorsten von Eicken
d698b94ac6 fix flash config CRC; add MQTT web page 2015-09-07 23:38:07 -07:00
Thorsten von Eicken
9e4cbb0dbd massive rework of MQTT 2015-09-07 19:53:23 -07:00
Thorsten von Eicken
4039eaab42 oops, readd mistakenly deleted file 2015-08-25 17:30:05 +02:00
Thorsten von Eicken
2fd2072411 reduce size of icons 2015-08-25 17:29:52 +02:00
Benjamin Runnels
c586f38765 swapped out for offsite web files 2015-08-24 15:48:12 -05:00
Thorsten von Eicken
fa96241aeb merge TCP Client branch into master 2015-08-01 22:49:32 -07:00
Thorsten von Eicken
77baa64eb5 Merge pull request #32 from jeelabs/http
Add TCP client support
2015-08-01 21:48:47 -07:00
Thorsten von Eicken
54edb154f9 added wifi channel to display info 2015-08-01 21:38:56 -07:00
Thorsten von Eicken
2fbd9953d5 TCP client support; Grovestreams RSSI submission support 2015-08-01 13:56:13 -07:00
Thorsten von Eicken
886ce62df0 initial support for TCP client connections from uC 2015-07-28 11:29:20 -07:00
Thorsten von Eicken
14058427e4 oops, readd mistakenly deleted file 2015-07-14 00:09:21 -07:00
Thorsten von Eicken
9ee1182d04 reduce size of icons 2015-07-13 10:25:29 -07:00
iothing
776b9d4d76 added CHANGE_TO_STA define so that you can disable the automatic mode change via the makefile 2015-07-08 03:02:19 +02:00
Thorsten von Eicken
2ff7e703ce fix js issues 2015-07-04 11:10:51 -07:00
Thorsten von Eicken
c570a31751 add UART debug log control UI 2015-07-01 23:22:50 -07:00
Thorsten von Eicken
62e6839788 fix serial LED; fixes #22 2015-06-28 23:57:53 -07:00
Thorsten von Eicken
ca0b9958c0 highlight current menu entry 2015-06-28 23:48:26 -07:00
Thorsten von Eicken
1f8cdb66b4 switch to 4 col grid; use pure-css source; tweak responsive layout; fix hamburger menu 2015-06-28 23:35:05 -07:00
Thorsten von Eicken
9d859cb77b html clean-up 2015-06-27 21:36:47 -07:00
Thorsten von Eicken
bdf67b65dc improve dhcp/static-ip UI 2015-06-27 21:28:46 -07:00
Thorsten von Eicken
4147496132 removed all templating and heatshrink, only use gzip 2015-06-27 01:05:27 -07:00
Thorsten von Eicken
d679340035 added no-cache headers; shrunk favicon; minimal support for static ip & hostname 2015-06-22 23:27:47 -07:00
Thorsten von Eicken
49a2d01f97 lots of UI tweaks 2015-06-19 12:30:59 -07:00
Thorsten von Eicken
e412390d84 support for dynamically changing gpio pin assignments 2015-06-17 23:23:24 -07:00
Thorsten von Eicken
279da6dcef added UI to change pin assignments 2015-06-15 00:21:41 -07:00
Thorsten von Eicken
8b3161a3f4 fix IE issues 2015-06-14 19:09:44 -07:00
Thorsten von Eicken
d29fa0423f finished UI refactoring to ajax 2015-06-14 01:22:16 -07:00
Thorsten von Eicken
ccd91bd150 switch all pages to ajax; wifi not complete 2015-06-12 00:45:54 -07:00
Thorsten von Eicken
1b1ee532de added reset button and baud rate switching 2015-06-06 12:17:32 -07:00
Thorsten von Eicken
c2e56bed4a switched uC console to ajax with auto-refresh 2015-06-06 11:12:11 -07:00
Thorsten von Eicken
7ff16bc321 defines for GPIO pin assignments; version string 2015-06-03 21:33:06 -07:00
Thorsten von Eicken
7ade39d986 switch layout to purecss 2015-05-26 00:31:12 -07:00
Thorsten von Eicken
8bb8e1124b added uController console; misc improvements 2015-05-25 19:37:27 -07:00
Thorsten von Eicken
6edc289da9 more web page tweaks 2015-05-23 23:03:22 -07:00
Thorsten von Eicken
c55485cf61 update web pages 2015-05-23 22:47:46 -07:00
Thorsten von Eicken
47eb82c4d7 html tweaks 2015-05-23 20:03:09 -07:00
Thorsten von Eicken
1e0e8a4aaf fix wifi connecting status update 2015-05-23 19:41:17 -07:00
Thorsten von Eicken
ef94f504bb improve wifi, use 11g; fix serial pull-up issue 2015-05-21 00:11:41 -07:00
Thorsten von Eicken
f3fe029705 wifi improvements 2015-05-18 23:57:28 -07:00
Thorsten von Eicken
57662b0824 added console web page 2015-05-17 22:54:23 -07:00
Thorsten von Eicken
42ba248831 rename to esp-link; add serial bridge code; remove jpgs 2015-05-17 21:16:29 -07:00