Mirrors/esp-link
2
0
Fork 0
mirror of https://github.com/jeelabs/esp-link.git synced 2026-03-12 04:06:49 +01:00
Code Issues Packages Projects Releases Wiki Activity
335 Commits 7 Branches 41 Tags
90bc0a32dad1e11faafedbfcff33bd7acc3d2baf
Commit Graph

21 Commits

Author SHA1 Message Date
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