Commit Graph

45 Commits

Author SHA1 Message Date
Thorsten von Eicken
02b31b1818 merge megaflash and split-up-recv back in 2017-06-18 21:13:23 -07:00
cskarai
491931b7d2 Web-Server to use CMD_RESP_CB 2016-10-07 06:54:37 +02:00
Thorsten von Eicken
6659f0ed21 resolve merge conflicts from beegee's branch 2016-10-01 11:39:46 -07:00
Thorsten von Eicken
c67750ad18 add support to reset slip communication 2016-09-27 23:33:57 -07:00
beegee-tokyo
0654c1d038 Synced master branch with upstream from jeelabs
Signed-off-by: beegee-tokyo <bernd@giesecke.tk>
2016-09-27 16:56:42 +08:00
cskarai
c81aaa5b08 Fixed: WEB_JSON_DATA WEB_DATA change (uses SLIP protocol) 2016-09-22 20:46:34 -07:00
Karai Csaba
f6f1fbb926 Refactored web-server 2016-09-22 20:46:34 -07:00
Karai Csaba
f75c1acf95 Button feature is working 2016-09-22 20:46:34 -07:00
beegee-tokyo
b46eca6ff2 Combined UDP and TCP socket functions into one socket.c and socket.h
Signed-off-by: beegee-tokyo <bernd@giesecke.tk>
2016-09-16 21:47:36 +08:00
beegee-tokyo
e714be5915 Added functionality for UDP socket client, TCP socket client and server
Added tools (download links in Makefile are not working)
Adjusted Makefile
Adjusted .gitignore
2016-09-07 22:09:05 +08:00
Thorsten von Eicken
ef6a611045 Reduce memory consumption; fix syslog alloc when disabled 2016-06-19 23:05:37 -07:00
Thorsten von Eicken
56e76c6bc4 Revert "TvEmaster"
This reverts commit f577c140df.
2016-04-03 10:15:31 -07:00
susisstrolch
e3e19ffa38 TvEmaster
Syslog and debug printing fixes
2016-04-03 10:11:34 -07:00
Alastair D'Silva
80d9945266 Fix warnings reported in #113 (format warnings, differing types) 2016-04-01 19:48:37 +11:00
Thorsten von Eicken
69f09ebbb9 fix slip protocol argument padding 2016-02-20 11:22:25 -08:00
Thorsten von Eicken
219b6c8006 fix mqtt for new slip protocol 2016-01-31 17:39:15 -08:00
Thorsten von Eicken
5a891c3c1e new SLIP protocol; basic REST working 2016-01-31 00:09:21 -08:00
Thorsten von Eicken
109c10c3f2 make new slip proto work 2016-01-24 09:48:33 -08:00
Thorsten von Eicken
5dbebcd841 change SLIP to std escape chars; add to readme 2016-01-18 13:18:38 -08:00
Benjamin Runnels
59eb02daa9 Added in sntp update 2015-12-03 23:43:19 -06:00
Benjamin Runnels
e39ee808c9 DOH! missing semicolon 2015-12-01 15:26:11 -06:00
Benjamin Runnels
b8567ad2ef Updated DBG macros as suggested by susisstrolch 2015-12-01 15:20:20 -06:00
Benjamin Runnels
26339962bf Updates for SDK 1.5 2015-11-29 08:05:02 -06:00
Thorsten von Eicken
d87468e3c7 streamline CMD function 2015-09-20 10:23:45 -07:00
Thorsten von Eicken
e9b0132eeb fix issues with MQTT CMD callbacks 2015-09-13 23:54:10 -07: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
Benjamin Runnels
028e6e1239 Merge branch 'master' into windows
Conflicts:
	Makefile
	cmd/handlers.c
	include/esp8266.h
	user/user_main.c
2015-09-09 07:23:37 -05:00
Benjamin Runnels
33f9ede084 Merge branch 'master' of https://github.com/jeelabs/esp-link into jeelabs-master
Conflicts:
	esp-link/cgi.c
	include/user_config.h
	mqtt/mqtt.h
	user/user_main.c
2015-09-09 07:08:20 -05:00
Thorsten von Eicken
9e4cbb0dbd massive rework of MQTT 2015-09-07 19:53:23 -07:00
Benjamin Runnels
bc3856334d Made some modules optional 2015-08-30 12:03:18 -05:00
Benjamin Runnels
483800fd8d Working on latch 2015-08-30 10:38:07 -05:00
Benjamin Runnels
248f2f3f47 mergeing mqtt into master 2015-08-29 16:13:52 -05:00
Benjamin Runnels
36303a2b67 finished mqtt 2015-08-29 15:48:51 -05:00
Thorsten von Eicken
1c5679f9c8 fix REST repsonse issues 2015-08-29 13:04:24 -07:00
Benjamin Runnels
c2e60809f6 more mqtt work 2015-08-29 11:29:40 -05:00
Benjamin Runnels
7b722c4314 Merge branch 'master' into sensorcb 2015-08-29 05:09:29 -05:00
Thorsten von Eicken
74f61c07b9 rest lib tweak 2015-08-28 22:27:48 -07:00
Benjamin Runnels
8e1516aacb merge regressions 2015-08-28 15:23:34 -05:00
Benjamin Runnels
ef12b96f1d Merge branch 'master' of github.com:brunnels/esp-link into windows 2015-08-28 15:12:18 -05:00
Benjamin Runnels
3892238388 dynamic arduino callback support 2015-08-28 15:00:59 -05:00
Thorsten von Eicken
fb1d7f6298 REST library fixes 2015-08-28 12:33:36 -07:00
Thorsten von Eicken
a2b5f94e14 send initial wifi state to MCU 2015-08-28 12:33:23 -07:00
Benjamin Runnels
c586f38765 swapped out for offsite web files 2015-08-24 15:48:12 -05:00
Thorsten von Eicken
ddd2af1a65 incorporated tuanpmt's slip protocol and rest library 2015-08-24 10:25:24 -07:00