Commit graph

29 commits

Author SHA1 Message Date
a9f1904db9 Update readme.md 2019-08-21 13:38:38 +00:00
657f8855a0 Merge pull request #5 in WAT/waterishos-generation-2-rev-1.0 from development to master
* commit '2209ff87be':
  no message
2019-08-21 13:38:24 +00:00
2209ff87be Merge branch 'development' of https://git.siwatsystem.com/scm/wat/waterishos-generation-2-rev-1.0 into development 2019-08-21 20:37:47 +07:00
6e78cdf9e3 no message 2019-08-21 20:37:28 +07:00
d4330672e8 Merge pull request #4 in WAT/waterishos-generation-2-rev-1.0 from development to master
* commit '4310f55d05':
  add debug serial print
  uplaod first error free source
  add wifi library and code diagnostic
  code cleanup
  branding
2019-08-21 13:27:17 +00:00
56ffecfca6 Automatic merge from master -> development
* commit 'd4330672e8':
  Update readme.md
2019-08-21 13:27:17 +00:00
4310f55d05 add debug serial print 2019-08-21 20:26:40 +07:00
f43bc9bc5b uplaod first error free source 2019-08-21 20:25:15 +07:00
82c50d3fd9 add wifi library and code diagnostic 2019-08-21 20:17:09 +07:00
4968c752e5 Merge branch 'development' of https://git.siwatsystem.com/scm/wat/waterishos-generation-2-rev-1.0 into development 2019-08-21 19:53:24 +07:00
1abc8bc03c code cleanup 2019-08-21 19:53:07 +07:00
300df03808 branding 2019-08-21 19:51:02 +07:00
6faf903b4c Update readme.md 2019-08-21 12:42:34 +00:00
5025db0e83 Automatic merge from master -> development
* commit '180120955f':
2019-08-21 12:41:51 +00:00
180120955f Merge pull request #3 in WAT/waterishos-generation-2-rev-1.0 from development to master
* commit '9b246310de':
  Creating new file readme.md
  update code
  edit main mesh source code
  Delete Rogue Example File
  code edit
2019-08-21 12:41:51 +00:00
9b246310de Creating new file readme.md 2019-08-21 12:41:21 +00:00
337c5e00a0 Merge branch 'development' of https://git.siwatsystem.com/scm/wat/waterishos-generation-2-rev-1.0 into development 2019-08-21 19:40:24 +07:00
15d0655fdd update code 2019-08-21 19:39:58 +07:00
0ea69e53eb edit main mesh source code 2019-08-21 19:38:47 +07:00
d68779759b Delete Rogue Example File 2019-08-21 19:38:36 +07:00
5c7d1b691a code edit 2019-08-21 19:31:52 +07:00
a7183cf0d4 Automatic merge from master -> development
* commit 'f1a742f360':
2019-08-21 12:29:50 +00:00
f1a742f360 Merge pull request #2 in WAT/waterishos-generation-2-rev-1.0 from development to master
* commit 'feb8decd23':
  settings.h deleted online with Bitbucket
  seperate settings to settings.h
  add mesh example
2019-08-21 12:29:49 +00:00
feb8decd23 settings.h deleted online with Bitbucket 2019-08-21 12:28:14 +00:00
b6b6617ada Merge pull request #1 in WAT/waterishos-generation-2-rev-1.0 from master to development
* commit '6bfa1357bf':
  Creating new file .gitignore
2019-08-21 12:27:07 +00:00
0400524798 seperate settings to settings.h 2019-08-21 19:25:07 +07:00
6bfa1357bf Creating new file .gitignore 2019-08-21 12:24:11 +00:00
331825732e add mesh example 2019-08-21 19:19:51 +07:00
62cab61fbb initial commit 2019-08-21 19:06:21 +07:00