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

335 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Benjamin Runnels
90bc0a32da Changed mqtt statusTopicStr to not pre-pend client_id 2015-09-20 10:20:35 -05:00
Benjamin Runnels
5068fa28cb Added buildtime wifi config ability 
Added SDK_DBG parameter to turn off nonsense SDK debug output
 2015-09-19 14:11:02 -05:00
Benjamin Runnels
587df27d78 Merge branch 'master' of https://github.com/jeelabs/esp-link 2015-09-19 13:51:55 -05:00
Thorsten von Eicken
45d56f2d27 merge v1.0.4 into master (serbridge buffer overflow fixes) 2015-09-15 21:48:52 -07:00
Thorsten von Eicken
2c29e2940a handle dead connections in serbridge v1.0.4 2015-09-15 21:00:37 -07:00
Thorsten von Eicken
726d45869a add logging to serbridge 2015-09-15 20:27:48 -07:00
Thorsten von Eicken
e9b0132eeb fix issues with MQTT CMD callbacks 2015-09-13 23:54:10 -07:00
Thorsten von Eicken
737fabbd4c support programming-only port in serbridge 2015-09-13 23:53:47 -07:00
Benjamin Runnels
ae5eaeddea mqtt_client updates 2015-09-13 09:19:25 -05:00
Thorsten von Eicken
f057a65d1f converted some DBG macros; misc tweaks 2015-09-12 21:54:10 -07:00
Thorsten von Eicken
35c2eb65c8 add DBG_MQTT macro to remove ifdefs 2015-09-12 00:02:44 -07:00
Thorsten von Eicken
3ca4d9f239 fix a few minor merge errors 2015-09-11 23:49:41 -07:00
Thorsten von Eicken
34a6420910 Merge branch 'brunnels-ifdefs' 2015-09-11 23:44:09 -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
Thorsten von Eicken
6158d8f957 port serbridge buffering rewrite from v1.0.3 2015-09-11 23:00:59 -07:00
Thorsten von Eicken
2a8f7583ea fix serbridge issue v1.0.3 2015-09-11 21:23:54 -07:00
Thorsten von Eicken
8d137394a8 Merge tag 'v1.0.2' into v1.0 2015-09-11 21:23:29 -07:00
Thorsten von Eicken
45cfe914d5 rewrite serbridge buffering v1.0.2 2015-09-11 20:56:51 -07:00
Benjamin Runnels
b080f5243b Fixed whitespace 2015-09-11 16:48:56 -05:00
Benjamin Runnels
3337cc1508 merged in ifdefs for debug and mqtt webpage additions 2015-09-11 16:40:28 -05:00
Benjamin Runnels
1feb736c24 Merge branch 'master' of https://github.com/jeelabs/esp-link 2015-09-11 15:57:54 -05:00
Benjamin Runnels
b7dd0b180f lots of ifdef 2015-09-11 15:56:51 -05:00
Thorsten von Eicken
215da43a44 ensure reconnect rexmits pending messages 2015-09-10 22:49:48 -07:00
Thorsten von Eicken
19693a11ec mqtt status client hook-up 2015-09-10 22:28:04 -07:00
Thorsten von Eicken
aecaa26c65 mqtt status client hook-up 2015-09-10 22:26:47 -07: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
5d03ac55aa Merge branch 'jeelabs-master' 2015-09-09 07:08:49 -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
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
da7a1b913f indentation changes 2015-09-06 10:12:59 -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
Thorsten von Eicken
0bb7dba498 readme update 2015-08-29 19:01:40 -07:00
Thorsten von Eicken
ef01fc76b7 makefile tweak 2015-08-29 19:01:40 -07:00
Thorsten von Eicken
222ee3a74e Merge pull request #41 from brunnels/master 
mqtt client and cmd support
 2015-08-29 19:00:25 -07:00
Benjamin Runnels
47b33f837f merge error fix 2015-08-29 16:24:44 -05:00
Benjamin Runnels
248f2f3f47 mergeing mqtt into master 2015-08-29 16:13:52 -05:00
Benjamin Runnels
c11cf7def5 Merge pull request #7 from jeelabs/master 
merge with upstream
 2015-08-29 15:51:38 -05:00
Benjamin Runnels
36303a2b67 finished mqtt 2015-08-29 15:48:51 -05:00
Thorsten von Eicken
1c761abaf7 update readme for v2.0.beta2 v2.0.beta2 2015-08-29 13:38:07 -07:00
Thorsten von Eicken
1c5679f9c8 fix REST repsonse issues 2015-08-29 13:04:24 -07:00
Thorsten von Eicken
e440289628 fix flash target in Makefile 2015-08-29 12:09:53 -07:00
Thorsten von Eicken
0ec9630221 Merge pull request #39 from brunnels/sensorcb 
Added sensor callback tracking
 2015-08-29 10:17:12 -07:00
Thorsten von Eicken
f05bb652bb improve make release #2 2015-08-29 10:08:44 -07:00
Thorsten von Eicken
4a77c56b30 improve make release 2015-08-29 09:40:37 -07:00
Benjamin Runnels
a2bb08186f Setup user code area and moved esp-link to it's own module 2015-08-29 11:40:08 -05:00