iotmanager/IoTManager
1
0
Fork 0
mirror of https://github.com/IoTManagerProject/IoTManager.git synced 2026-03-26 22:22:16 +03:00
Code Issues Packages Projects Releases Wiki Activity
1,885 Commits 4 Branches 15 Tags
b25398bff44e14d63e14fdff75dbd85657c089bf
Commit Graph

1885 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitry Borisenko
c0b7cdddf8 Merge pull request #29 from ytrikoz/dev 
Dev
 2020-06-26 01:06:23 +02:00
Dmitry Borisenko
d802758b6f Merge pull request #21 from ytrikoz/dev 
time works
 2020-06-26 01:04:43 +02:00
Yuri Trikoz
a13dda46ca time works 2020-06-26 01:38:29 +03:00
Dmitry Borisenko
a73747c3dc Merge pull request #20 from ytrikoz/dev 
Dev
 2020-06-25 20:08:33 +02:00
Yuri Trikoz
e9a8e44a7a time 2020-06-25 20:13:20 +03:00
Dmitry Borisenko
cd6008435e Обновление брокера mqtt 2020-06-25 19:11:43 +02:00
Yuri Trikoz
6277d2a9db Merge branch 'dev' of https://github.com/ytrikoz/IoTManager into dev 2020-06-25 17:57:30 +03:00
Yuri Trikoz
d0c6d34f4a BusScanner 2020-06-25 17:57:17 +03:00
Yuri Trikoz
428efff8d5 BusScanner 2020-06-25 17:55:22 +03:00
IoTManagerProject
7330849262 Merge pull request #28 from IoTManagerProject/dev 
First stable version
 2020-06-25 15:59:53 +02:00
Dmitry Borisenko
3dfee0eabe Merge pull request #27 from ytrikoz/dev 
Dev
 2020-06-25 15:58:18 +02:00
Dmitry Borisenko
b6d346f779 Merge pull request #19 from ytrikoz/dev 
typos fix
 2020-06-25 15:57:34 +02:00
Yuri Trikoz
a1bd008867 typos fix 2020-06-25 14:20:22 +03:00
Dmitry Borisenko
1264f12314 Merge pull request #18 from ytrikoz/dev 
Dev
 2020-06-25 11:38:10 +02:00
Yuri Trikoz
7c61ff2810 getData 2020-06-25 09:21:42 +03:00
Yuri Trikoz
5ed1c23c62 widgets 2020-06-25 07:08:09 +03:00
Yuri Trikoz
b50e1c9791 renaming 2020-06-25 05:09:11 +03:00
Dmitry Borisenko
baba0b77b2 Merge pull request #17 from ytrikoz/dev 
renaming
 2020-06-24 23:16:36 +02:00
Yuri Trikoz
3daa517c7e renaming 2020-06-25 00:15:10 +03:00
Dmitry Borisenko
6618e6fa7e Merge pull request #26 from DmitryBorisenko33/dev 
изменения
 2020-06-24 23:10:02 +02:00
Dmitry Borisenko
688a769798 Merge pull request #16 from ytrikoz/dev 
Merge pull request #1 from DmitryBorisenko33/dev
 2020-06-24 23:09:01 +02:00
Yuri Trikoz
a25288ef79 Merge pull request #1 from DmitryBorisenko33/dev 
Data
 2020-06-24 22:12:44 +03:00
Dmitry Borisenko
5643804d77 Переименовал файлы присетов! Добавил присет для модуля uart 2020-06-24 15:54:15 +02:00
Dmitry Borisenko
90a342bc27 Порядок 2020-06-24 14:40:47 +02:00
Dmitry Borisenko
c4dfdee7e5 Changed preset order to correct one 2020-06-24 14:28:13 +02:00
Dmitry Borisenko
a422c72565 No need replace 2020-06-24 14:26:52 +02:00
Dmitry Borisenko
2c3efd6309 Merge pull request #15 from ytrikoz/platformio 
12
 2020-06-24 01:51:50 +02:00
Yuri Trikoz
e400de1e1c Serial active on create 2020-06-24 02:49:44 +03:00
Yuri Trikoz
cc3c17dfb2 Serial 2020-06-24 02:11:08 +03:00
Yuri Trikoz
f9933ea55e Serial 2020-06-24 01:46:05 +03:00
Dmitry Borisenko
59f65abda8 Merge pull request #14 from ytrikoz/platformio 
Serial
 2020-06-24 00:44:04 +02:00
Yuri Trikoz
7dd13b7fcf Serial 2020-06-24 01:42:56 +03:00
Dmitry Borisenko
f54cac95bb Merge pull request #13 from ytrikoz/platformio 
Serial
 2020-06-24 00:41:48 +02:00
Yuri Trikoz
cb9c0efac6 Serial 2020-06-24 01:40:35 +03:00
Dmitry Borisenko
06bbecd0bb Merge pull request #12 from ytrikoz/platformio 
изменения
 2020-06-24 00:34:35 +02:00
Yuri Trikoz
dfeb25a8fa Serial 2020-06-24 01:33:42 +03:00
Dmitry Borisenko
ecd124dacc Merge pull request #11 from IoTManagerProject/dev 
Merge pull request #25 from DmitryBorisenko33/dev
 2020-06-24 00:25:15 +02:00
Dmitry Borisenko
6e97ec5845 Merge pull request #25 from DmitryBorisenko33/dev 
123
 2020-06-24 00:24:51 +02:00
Yuri Trikoz
e375cca3dc Terminal 2020-06-24 01:16:00 +03:00
Dmitry Borisenko
8f76cbac74 Merge pull request #10 from IoTManagerProject/platformio 
Изменения
 2020-06-22 22:32:18 +02:00
Yuri Trikoz
b50911ddcf mqtt publish state fix 2020-06-22 18:09:39 +03:00
Yuri Trikoz
8f395ccc8a SoftwareSerial 2020-06-22 17:40:29 +03:00
Dmitry Borisenko
fea662aed2 Merge pull request #9 from IoTManagerProject/platformio 
Изменения
 2020-06-22 13:58:08 +02:00
Yuri Trikoz
f7e3515c82 Merge pull request #24 from ytrikoz/platformio 
some updates
 2020-06-22 14:06:42 +03:00
Yuri Trikoz
1bfe58766d Merge branch 'platformio' of https://github.com/ytrikoz/esp32-esp8266_iot-manager_modules_firmware into platformio 2020-06-22 14:01:54 +03:00
Yuri Trikoz
274678f17a Updates 2020-06-22 14:01:12 +03:00
Dmitry Borisenko
059b08fb8b Merge pull request #8 from IoTManagerProject/platformio 
Изменения 4
 2020-06-22 02:22:33 +02:00
Yuri Trikoz
f638de4139 Merge pull request #23 from ytrikoz/platformio 
32 broken
 2020-06-22 03:20:40 +03:00
Yuri Trikoz
8cdc271c48 Merge branch 'platformio' into platformio 2020-06-22 03:18:19 +03:00
Yuri Trikoz
092bec7dde 32 broken 2020-06-22 03:11:02 +03:00