Mirrors/esp-link
2
0
Fork 0
mirror of https://github.com/jeelabs/esp-link.git synced 2026-03-24 18:06:51 +01:00
Code Issues Packages Projects Releases Wiki Activity
285 Commits 7 Branches 41 Tags
v2.0.beta2
Commit Graph

285 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
e74b9f5a0b fixing merge problems 2015-08-29 05:33:26 -05:00
Benjamin Runnels
31d308416b Merging 2015-08-29 05:26:37 -05:00
Benjamin Runnels
7b722c4314 Merge branch 'master' into sensorcb 2015-08-29 05:09:29 -05:00
Benjamin Runnels
aa4c174ab1 Merge pull request #5 from jeelabs/master 
merge with upstream
 2015-08-29 05:07:57 -05:00
Benjamin Runnels
ecafbf7485 pre-merge 2015-08-29 05:04:23 -05:00
Thorsten von Eicken
74f61c07b9 rest lib tweak 2015-08-28 22:27:48 -07:00
Thorsten von Eicken
276fcb0433 Merge pull request #37 from brunnels/master 
Adds in windows support
 2015-08-28 21:48:21 -07:00
Benjamin Runnels
059692dfad Fixed mkespfsimage makefile and removed espfstest 2015-08-28 19:23:16 -05:00
Benjamin Runnels
1f411e16fa Fixed makefile and removed espfstest 2015-08-28 18:36:00 -05:00
Benjamin Runnels
b8890e5aaf fixed dupe variable 2015-08-28 17:37:43 -05:00
Benjamin Runnels
67100d8665 sensor callbacks 2015-08-28 15:42:16 -05:00
Benjamin Runnels
c286473be9 no message 2015-08-28 15:37:50 -05:00
Benjamin Runnels
546b9c3774 Merge pull request #4 from jeelabs/master 
merge with upstream
 2015-08-28 15:35:39 -05: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
38b0e2c03f Merge pull request #3 from jeelabs/master 
merge with upstream
 2015-08-28 15:03:46 -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
Benjamin Runnels
c68a281580 Fixed VS includes and replaced missing cmd module 2015-08-24 14:30:24 -05:00
Benjamin Runnels
f3d18243ae Reverting some things that didn't merge right 2015-08-24 14:02:06 -05:00
Benjamin Runnels
6cbad0d160 Fixed merge misses 2015-08-24 13:47:36 -05:00
Benjamin Runnels
319bb7f336 Merge pull request #2 from brunnels/windows 
Windows
 2015-08-24 13:36:38 -05:00
Benjamin Runnels
5ad0353a8a Merge branch 'master' into windows 2015-08-24 13:31:40 -05:00
Benjamin Runnels
9911225895 Merge branch 'master' of github.com:brunnels/esp-link 2015-08-24 13:20:48 -05:00
Benjamin Runnels
1261344e2e Added gitignores 2015-08-24 13:20:13 -05:00
Benjamin Runnels
b9defa2b0f Merge pull request #1 from jeelabs/master 
merge with upstream
 2015-08-24 13:15:19 -05:00
Thorsten von Eicken
ddd2af1a65 incorporated tuanpmt's slip protocol and rest library 2015-08-24 10:25:24 -07:00
Thorsten von Eicken
7490e45aab fix indentation to use spaces 2015-08-22 10:29:51 -07:00
Benjamin Runnels
706ae4844e Weird line endings or something throwing make error, fixed now. 2015-08-22 06:42:57 -05:00
Benjamin Runnels
80f3788564 Added Makefile comment 2015-08-22 06:08:09 -05:00
Benjamin Runnels
3d2ac525e3 Removed heatshrink and modified Makefiles 2015-08-22 05:51:46 -05:00
Thorsten von Eicken
6867989b47 remove heatshrink submodule; switch to SDK 1.3 2015-08-21 23:10:41 -07:00
Benjamin Runnels
5cec16c3fd Added windows build support 2015-08-21 17:52:40 -05:00
Thorsten von Eicken
a2990767e1 makefile tweak 
Conflicts:
	Makefile
 2015-08-19 22:04:21 -07:00
Thorsten von Eicken
aa7eadb382 small flash config improvement plus more comments 
Conflicts:
	user/config.c
 2015-08-19 22:03:07 -07:00
Thorsten von Eicken
bc063ef71d correct reset codes 2015-08-19 22:02:00 -07:00
Thorsten von Eicken
a58904f1be cgiflash cleanup 2015-08-19 22:01:49 -07:00
Thorsten von Eicken
dd7f9a16a9 better support for 4MB flash, add 1MB flash 2015-08-19 22:01:29 -07:00
Thorsten von Eicken
b48614c373 makefile tweak v1.0.1 2015-08-19 21:43:08 -07:00
Thorsten von Eicken
cd0754071b small flash config improvement plus more comments 2015-08-19 19:30:59 -07:00
Thorsten von Eicken
dcadb70df8 correct reset codes 2015-08-19 19:14:10 -07:00
Thorsten von Eicken
0d2eed1957 cgiflash cleanup 2015-08-19 19:13:55 -07:00