Commit Graph

398 Commits (8a93a5eebee513b99875696d78a21a8d4d4f60c1)
 

Author SHA1 Message Date
Thorsten von Eicken ef01fc76b7 makefile tweak 9 years ago
Thorsten von Eicken 222ee3a74e Merge pull request #41 from brunnels/master 9 years ago
Benjamin Runnels 47b33f837f merge error fix 9 years ago
Benjamin Runnels 248f2f3f47 mergeing mqtt into master 9 years ago
Benjamin Runnels c11cf7def5 Merge pull request #7 from jeelabs/master 9 years ago
Benjamin Runnels 36303a2b67 finished mqtt 9 years ago
Thorsten von Eicken 1c761abaf7 update readme for v2.0.beta2 9 years ago
Thorsten von Eicken 1c5679f9c8 fix REST repsonse issues 9 years ago
Thorsten von Eicken e440289628 fix flash target in Makefile 9 years ago
Thorsten von Eicken 0ec9630221 Merge pull request #39 from brunnels/sensorcb 9 years ago
Thorsten von Eicken f05bb652bb improve make release #2 9 years ago
Thorsten von Eicken 4a77c56b30 improve make release 9 years ago
Benjamin Runnels a2bb08186f Setup user code area and moved esp-link to it's own module 9 years ago
Benjamin Runnels c2e60809f6 more mqtt work 9 years ago
Benjamin Runnels 634cfa6887 Merge branch 'master' into windows 9 years ago
Benjamin Runnels ad29e07d04 Merge pull request #6 from brunnels/sensorcb 9 years ago
Benjamin Runnels e74b9f5a0b fixing merge problems 9 years ago
Benjamin Runnels 31d308416b Merging 9 years ago
Benjamin Runnels 7b722c4314 Merge branch 'master' into sensorcb 9 years ago
Benjamin Runnels aa4c174ab1 Merge pull request #5 from jeelabs/master 9 years ago
Benjamin Runnels ecafbf7485 pre-merge 9 years ago
Thorsten von Eicken 74f61c07b9 rest lib tweak 9 years ago
Thorsten von Eicken 276fcb0433 Merge pull request #37 from brunnels/master 9 years ago
Benjamin Runnels b3408a7022 all warnings fixed 9 years ago
Benjamin Runnels f90bf5bb30 Started adding in mqtt module from tuan 9 years ago
Benjamin Runnels 059692dfad Fixed mkespfsimage makefile and removed espfstest 9 years ago
Benjamin Runnels 1f411e16fa Fixed makefile and removed espfstest 9 years ago
Benjamin Runnels b8890e5aaf fixed dupe variable 9 years ago
Benjamin Runnels 67100d8665 sensor callbacks 9 years ago
Benjamin Runnels c286473be9 no message 9 years ago
Benjamin Runnels 546b9c3774 Merge pull request #4 from jeelabs/master 9 years ago
Benjamin Runnels 8e1516aacb merge regressions 9 years ago
Benjamin Runnels ef12b96f1d Merge branch 'master' of github.com:brunnels/esp-link into windows 9 years ago
Benjamin Runnels 38b0e2c03f Merge pull request #3 from jeelabs/master 9 years ago
Benjamin Runnels 3892238388 dynamic arduino callback support 9 years ago
Thorsten von Eicken fb1d7f6298 REST library fixes 9 years ago
Thorsten von Eicken a2b5f94e14 send initial wifi state to MCU 9 years ago
Benjamin Runnels c586f38765 swapped out for offsite web files 9 years ago
Benjamin Runnels c68a281580 Fixed VS includes and replaced missing cmd module 9 years ago
Benjamin Runnels f3d18243ae Reverting some things that didn't merge right 9 years ago
Benjamin Runnels 6cbad0d160 Fixed merge misses 9 years ago
Benjamin Runnels 319bb7f336 Merge pull request #2 from brunnels/windows 9 years ago
Benjamin Runnels 5ad0353a8a Merge branch 'master' into windows 9 years ago
Benjamin Runnels 9911225895 Merge branch 'master' of github.com:brunnels/esp-link 9 years ago
Benjamin Runnels 1261344e2e Added gitignores 9 years ago
Benjamin Runnels b9defa2b0f Merge pull request #1 from jeelabs/master 9 years ago
Thorsten von Eicken ddd2af1a65 incorporated tuanpmt's slip protocol and rest library 9 years ago
Thorsten von Eicken 7490e45aab fix indentation to use spaces 9 years ago
Benjamin Runnels 706ae4844e Weird line endings or something throwing make error, fixed now. 9 years ago
Benjamin Runnels 80f3788564 Added Makefile comment 9 years ago