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
357 Commits 7 Branches 41 Tags
bb5dfd082ace58f1716ef02a767f673b4a1f7cea
Commit Graph

357 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
susisstrolch
bb5dfd082a conditionaly include "local.conf" from Makefile 
for convenience reasons included from Makefile, added to gitignore..
 2015-10-10 11:57:31 +02:00
susisstrolch
d092075818 merge upstream:master 2015-09-21 23:12:35 +02:00
Thorsten von Eicken
9051d0bec8 Update BOARDS.md 2015-09-21 10:20:47 -07:00
Thorsten von Eicken
e0a78c12b7 Add wifi-link-12 info to boards.md 2015-09-21 10:19:09 -07:00
Thorsten von Eicken
e7311d54f3 misc mqtt tweaks v2.0.rc1 2015-09-20 21:30:44 -07:00
Thorsten von Eicken
de7207ac1d tweaks 2015-09-20 20:41:56 -07:00
Thorsten von Eicken
b912c4babe Merge pull request #49 from brunnels/master 
mqtt_client updates from brunnels
 2015-09-20 19:39:59 -07:00
Thorsten von Eicken
d9b2a0466b improve & reduce the http logging 2015-09-20 18:40:11 -07:00
Benjamin Runnels
7211ea0508 Missing statement 2015-09-20 16:30:02 -05:00
Benjamin Runnels
b323a339c1 Missing define 2015-09-20 16:27:45 -05: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
f5b4177b8c shorten http logging a bit 2015-09-20 10:39:28 -07:00
Thorsten von Eicken
d87468e3c7 streamline CMD function 2015-09-20 10:23:45 -07:00
Thorsten von Eicken
2a47c81999 fix getStringAre type 2015-09-20 10:23:30 -07:00
Thorsten von Eicken
0e096f0cc5 skip initial chars on uC reset 2015-09-20 10:22:51 -07:00
Benjamin Runnels
2b501913f2 Merge branch 'master' of https://github.com/jeelabs/esp-link 2015-09-20 10:24:19 -05:00
Benjamin Runnels
90bc0a32da Changed mqtt statusTopicStr to not pre-pend client_id 2015-09-20 10:20:35 -05:00
Thorsten von Eicken
82c65718cf improve mqtt disconnect/reconnect 2015-09-19 23:31:43 -07:00
Thorsten von Eicken
658c4d8b31 make compile with SDK 1.4.0 2015-09-19 20:57:59 -07: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