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
209 Commits 4 Branches 15 Tags
4aa0dc39b9635a6fec4a32434d3d942611bd923b
Commit Graph

209 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitry Borisenko
4aa0dc39b9 dell all 2020-07-26 23:47:00 +02:00
Dmitry Borisenko
f7f4e176b2 Merge pull request #39 from IoTManagerProject/dev 
Dev
 2020-06-27 11:20:14 +02:00
Dmitry Borisenko
62d0355a1e Merge pull request #38 from DmitryBorisenko33/dev 
Изменил версию
 2020-06-27 11:19:24 +02:00
Dmitry Borisenko
9b94aef8ca Изменил версию на 2.3.5 2020-06-27 11:17:38 +02:00
Dmitry Borisenko
3dc49f66a8 Merge pull request #37 from IoTManagerProject/dev 
Dev
 2020-06-27 11:13:10 +02:00
Dmitry Borisenko
d96ba8cb2c Merge pull request #36 from ytrikoz/dev 
Dev
 2020-06-27 11:12:18 +02:00
Dmitry Borisenko
2dfca14478 Merge pull request #25 from ytrikoz/dev 
Dev
 2020-06-27 11:06:31 +02:00
Yuri Trikoz
b6eedca37e extract isScenarioEnabled() 2020-06-27 05:22:24 +03:00
Yuri Trikoz
d7e6e0e9b8 skip time 2020-06-27 04:37:11 +03:00
Dmitry Borisenko
9e291bfc9c Merge pull request #24 from ytrikoz/dev 
clock fix
 2020-06-27 03:23:22 +02:00
Yuri Trikoz
7ac0691347 clock fix 2020-06-27 04:20:48 +03:00
Dmitry Borisenko
eb2881ee0a Merge pull request #23 from ytrikoz/dev 
clock timezone
 2020-06-27 03:19:18 +02:00
Yuri Trikoz
39a3cb04ed clock timezone 2020-06-27 02:37:30 +03:00
Dmitry Borisenko
e561f82b02 Merge pull request #22 from ytrikoz/dev 
Dev
 2020-06-27 00:35:48 +02:00
Yuri Trikoz
00fd9f9bb9 clock 2020-06-27 01:21:58 +03:00
Yuri Trikoz
b51ec4d0e2 Merge pull request #2 from DmitryBorisenko33/dev 
Проверил модуль serial работают все функции
 2020-06-26 22:13:23 +03:00
Dmitry Borisenko
e60269ed1e Merge pull request #35 from DmitryBorisenko33/dev 
Some changes
 2020-06-26 16:43:36 +02:00
Dmitry Borisenko
0f0d2ea209 Merge pull request #34 from DmitryBorisenko33/dev 
Some changes
 2020-06-26 16:43:14 +02:00
Dmitry Borisenko
5faa708c83 Some changes 2020-06-26 16:41:39 +02:00
Dmitry Borisenko
3ece57fc18 Merge pull request #33 from DmitryBorisenko33/dev 
Проверил полностью модуль serial
 2020-06-26 15:23:56 +02:00
Dmitry Borisenko
f75f0b5a50 Merge pull request #32 from DmitryBorisenko33/dev 
Проверил полностью модуль serial
 2020-06-26 15:23:33 +02:00
Dmitry Borisenko
9add7c9e8e Проверил полностью модуль serial 2020-06-26 15:20:56 +02:00
Dmitry Borisenko
5de838beb8 Merge pull request #31 from DmitryBorisenko33/dev 
12
 2020-06-26 01:09:05 +02:00
Dmitry Borisenko
b7899aa059 Merge pull request #30 from DmitryBorisenko33/dev 
123
 2020-06-26 01:08:10 +02:00
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