IoTManager

iotmanager/IoTManager

Fork 0

mirror of https://github.com/IoTManagerProject/IoTManager.git synced 2026-05-26 20:59:23 +03:00

Commit Graph

Select branches

Hide Pull Requests

ver3

ver3dev

ver4dev

ver4stable

#1

#10

#100

#101

#102

#103

#104

#105

#106

#107

#108

#109

#11

#110

#111

#112

#113

#114

#115

#116

#117

#118

#119

#12

#120

#121

#122

#123

#124

#125

#126

#127

#128

#129

#13

#130

#131

#132

#133

#134

#135

#136

#137

#138

#139

#14

#140

#141

#142

#143

#144

#145

#146

#147

#148

#149

#15

#150

#151

#152

#153

#154

#154

#155

#157

#158

#159

#16

#160

#161

#162

#163

#164

#165

#166

#167

#168

#169

#17

#170

#171

#172

#173

#174

#175

#176

#177

#178

#179

#18

#180

#181

#183

#184

#185

#186

#187

#188

#189

#19

#190

#191

#192

#193

#194

#195

#196

#197

#198

#199

#2

#20

#200

#201

#202

#203

#204

#205

#206

#207

#208

#209

#21

#210

#211

#212

#213

#214

#215

#216

#217

#218

#219

#22

#220

#221

#222

#223

#224

#225

#226

#227

#228

#229

#23

#230

#231

#232

#233

#234

#235

#236

#237

#238

#239

#24

#240

#241

#242

#243

#244

#245

#246

#247

#248

#249

#25

#250

#251

#252

#253

#254

#255

#255

#256

#257

#258

#259

#26

#260

#261

#261

#262

#263

#264

#265

#266

#267

#268

#269

#27

#270

#271

#272

#273

#274

#275

#276

#277

#278

#279

#28

#280

#281

#282

#283

#284

#285

#286

#288

#289

#29

#290

#291

#292

#293

#294

#295

#296

#297

#3

#30

#302

#303

#304

#305

#306

#307

#308

#309

#31

#310

#311

#312

#313

#314

#315

#316

#317

#318

#319

#32

#320

#321

#322

#323

#324

#325

#326

#327

#328

#329

#33

#330

#331

#332

#333

#334

#335

#336

#337

#338

#339

#34

#340

#341

#342

#343

#344

#345

#346

#347

#348

#349

#35

#350

#351

#352

#353

#354

#355

#356

#357

#358

#359

#36

#360

#361

#362

#363

#364

#365

#366

#367

#368

#369

#37

#370

#371

#372

#373

#374

#375

#376

#377

#378

#379

#38

#380

#381

#382

#383

#384

#385

#386

#387

#388

#389

#39

#390

#391

#392

#393

#395

#396

#397

#398

#399

#4

#40

#400

#401

#402

#403

#404

#405

#406

#407

#408

#409

#41

#410

#410

#411

#412

#413

#413

#42

#43

#44

#45

#46

#47

#48

#49

#5

#50

#51

#52

#53

#54

#55

#56

#57

#58

#59

#6

#60

#61

#62

#63

#65

#66

#67

#68

#69

#7

#70

#71

#72

#73

#74

#75

#76

#77

#78

#8

#80

#81

#82

#84

#85

#86

#87

#88

#89

#9

#92

#93

#94

#95

#96

#97

#98

#99

2.1.0

2.1.1

2.2

2.2_esp32

2.3.1

2.3.2

2.3.3

2.3.4

2.3_esp32

2.3_esp8266

264

267

275

276

278

feab9e9afd Fix bug with bme pressure Dmitry Borisenko 2020-08-01 20:06:15 +02:00
924b6a1e84 switch in progress Dmitry Borisenko 2020-07-31 01:52:57 +02:00
f4a5bc0218 pwm add Dmitry Borisenko 2020-07-31 01:29:16 +02:00
217cdfc080 Buttons done Dmitry Borisenko 2020-07-31 00:56:10 +02:00
b0fe94ddd4 Change name Dmitry Borisenko 2020-07-30 21:39:50 +02:00
6831c49a13 working with class Dmitry Borisenko 2020-07-30 21:18:04 +02:00
715ae0584a Merge branch 'beta' of https://github.com/IoTManagerProject/IoTManager into beta Dmitry Borisenko 2020-07-30 21:15:39 +02:00
3dab9e484f Merge pull request #50 from IoTManagerProject/stable IoTManagerProject 2020-07-30 21:15:19 +02:00
1eac8a2f0e ESP8266httpUpdate renaming Dmitry Borisenko 2020-07-30 21:08:48 +02:00
2434602d78 fixed bug with missing dallas lib dep Dmitry Borisenko 2020-07-30 21:04:25 +02:00
854d5f42e5 наследование Dmitry Borisenko 2020-07-30 11:27:12 +02:00
7806aa1ae8 changge Dmitry Borisenko 2020-07-29 21:53:32 +02:00
98d59615a3 changed Dmitry Borisenko 2020-07-29 21:44:49 +02:00
7134c07f60 Class Dmitry Borisenko 2020-07-29 21:41:12 +02:00
9fa3ec05c2 class Dmitry Borisenko 2020-07-29 21:38:39 +02:00
832e6a36f1 Add class item for all items in systed Dmitry Borisenko 2020-07-29 00:58:59 +02:00
5aa6f9482f button with name Dmitry Borisenko 2020-07-28 22:22:14 +02:00
bcbec5a9d8 change name Dmitry Borisenko 2020-07-28 19:45:03 +02:00
2e66c93814 add button with name (wo number) Dmitry Borisenko 2020-07-28 00:52:49 +02:00
e04bb7bb78 Merge pull request #49 from IoTManagerProject/beta IoTManagerProject 2020-07-27 22:25:58 +02:00
110fc167a1 Удаление сканера one wire Dmitry Borisenko 2020-07-27 21:10:11 +02:00
be60311f35 Merge pull request #48 from IoTManagerProject/beta IoTManagerProject 2020-07-27 20:21:02 +02:00
bdd9f1d3bd Fixed bug with little fs system in platformio ini Dmitry Borisenko 2020-07-27 00:59:41 +02:00
291373fe6f Merge pull request #47 from IoTManagerProject/beta IoTManagerProject 2020-07-27 00:58:27 +02:00
b653ce1e87 start version Dmitry Borisenko 2020-07-26 23:48:19 +02:00
4aa0dc39b9 dell all Dmitry Borisenko 2020-07-26 23:47:00 +02:00
f7f4e176b2 Merge pull request #39 from IoTManagerProject/dev Dmitry Borisenko 2020-06-27 11:20:14 +02:00
62d0355a1e Merge pull request #38 from DmitryBorisenko33/dev Dmitry Borisenko 2020-06-27 11:19:24 +02:00
9b94aef8ca Изменил версию на 2.3.5 Dmitry Borisenko 2020-06-27 11:17:38 +02:00
3dc49f66a8 Merge pull request #37 from IoTManagerProject/dev Dmitry Borisenko 2020-06-27 11:13:10 +02:00
d96ba8cb2c Merge pull request #36 from ytrikoz/dev Dmitry Borisenko 2020-06-27 11:12:18 +02:00
2dfca14478 Merge pull request #25 from ytrikoz/dev Dmitry Borisenko 2020-06-27 11:06:31 +02:00
b6eedca37e extract isScenarioEnabled() Yuri Trikoz 2020-06-27 05:22:24 +03:00
d7e6e0e9b8 skip time Yuri Trikoz 2020-06-27 04:37:11 +03:00
9e291bfc9c Merge pull request #24 from ytrikoz/dev Dmitry Borisenko 2020-06-27 03:23:22 +02:00
7ac0691347 clock fix Yuri Trikoz 2020-06-27 04:20:48 +03:00
eb2881ee0a Merge pull request #23 from ytrikoz/dev Dmitry Borisenko 2020-06-27 03:19:18 +02:00
39a3cb04ed clock timezone Yuri Trikoz 2020-06-27 02:37:30 +03:00
e561f82b02 Merge pull request #22 from ytrikoz/dev Dmitry Borisenko 2020-06-27 00:35:48 +02:00
00fd9f9bb9 clock Yuri Trikoz 2020-06-27 01:21:58 +03:00
b51ec4d0e2 Merge pull request #2 from DmitryBorisenko33/dev Yuri Trikoz 2020-06-26 22:13:23 +03:00
e60269ed1e Merge pull request #35 from DmitryBorisenko33/dev Dmitry Borisenko 2020-06-26 16:43:36 +02:00
0f0d2ea209 Merge pull request #34 from DmitryBorisenko33/dev Dmitry Borisenko 2020-06-26 16:43:14 +02:00
5faa708c83 Some changes Dmitry Borisenko 2020-06-26 16:41:39 +02:00
3ece57fc18 Merge pull request #33 from DmitryBorisenko33/dev Dmitry Borisenko 2020-06-26 15:23:56 +02:00
f75f0b5a50 Merge pull request #32 from DmitryBorisenko33/dev Dmitry Borisenko 2020-06-26 15:23:33 +02:00
9add7c9e8e Проверил полностью модуль serial Dmitry Borisenko 2020-06-26 15:20:56 +02:00
5de838beb8 Merge pull request #31 from DmitryBorisenko33/dev Dmitry Borisenko 2020-06-26 01:09:05 +02:00
b7899aa059 Merge pull request #30 from DmitryBorisenko33/dev Dmitry Borisenko 2020-06-26 01:08:10 +02:00
c0b7cdddf8 Merge pull request #29 from ytrikoz/dev Dmitry Borisenko 2020-06-26 01:06:23 +02:00
d802758b6f Merge pull request #21 from ytrikoz/dev Dmitry Borisenko 2020-06-26 01:04:43 +02:00
a13dda46ca time works Yuri Trikoz 2020-06-26 01:38:29 +03:00
a73747c3dc Merge pull request #20 from ytrikoz/dev Dmitry Borisenko 2020-06-25 20:08:33 +02:00
e9a8e44a7a time Yuri Trikoz 2020-06-25 20:13:20 +03:00
cd6008435e Обновление брокера mqtt Dmitry Borisenko 2020-06-25 19:11:43 +02:00
6277d2a9db Merge branch 'dev' of https://github.com/ytrikoz/IoTManager into dev Yuri Trikoz 2020-06-25 17:57:30 +03:00
d0c6d34f4a BusScanner Yuri Trikoz 2020-06-25 17:57:17 +03:00
428efff8d5 BusScanner Yuri Trikoz 2020-06-25 17:55:22 +03:00
7330849262 Merge pull request #28 from IoTManagerProject/dev IoTManagerProject 2020-06-25 15:59:53 +02:00
3dfee0eabe Merge pull request #27 from ytrikoz/dev Dmitry Borisenko 2020-06-25 15:58:18 +02:00
b6d346f779 Merge pull request #19 from ytrikoz/dev Dmitry Borisenko 2020-06-25 15:57:34 +02:00
a1bd008867 typos fix Yuri Trikoz 2020-06-25 14:20:22 +03:00
1264f12314 Merge pull request #18 from ytrikoz/dev Dmitry Borisenko 2020-06-25 11:38:10 +02:00
7c61ff2810 getData Yuri Trikoz 2020-06-25 09:21:42 +03:00
5ed1c23c62 widgets Yuri Trikoz 2020-06-25 07:08:09 +03:00
b50e1c9791 renaming Yuri Trikoz 2020-06-25 05:09:11 +03:00
baba0b77b2 Merge pull request #17 from ytrikoz/dev Dmitry Borisenko 2020-06-24 23:16:36 +02:00
3daa517c7e renaming Yuri Trikoz 2020-06-25 00:15:10 +03:00
6618e6fa7e Merge pull request #26 from DmitryBorisenko33/dev Dmitry Borisenko 2020-06-24 23:10:02 +02:00
688a769798 Merge pull request #16 from ytrikoz/dev Dmitry Borisenko 2020-06-24 23:09:01 +02:00
a25288ef79 Merge pull request #1 from DmitryBorisenko33/dev Yuri Trikoz 2020-06-24 22:12:44 +03:00
5643804d77 Переименовал файлы присетов! Добавил присет для модуля uart Dmitry Borisenko 2020-06-24 15:54:15 +02:00
90a342bc27 Порядок Dmitry Borisenko 2020-06-24 14:40:47 +02:00
c4dfdee7e5 Changed preset order to correct one Dmitry Borisenko 2020-06-24 14:28:13 +02:00
a422c72565 No need replace Dmitry Borisenko 2020-06-24 14:26:52 +02:00
2c3efd6309 Merge pull request #15 from ytrikoz/platformio Dmitry Borisenko 2020-06-24 01:51:50 +02:00
e400de1e1c Serial active on create Yuri Trikoz 2020-06-24 02:49:44 +03:00
cc3c17dfb2 Serial Yuri Trikoz 2020-06-24 02:11:08 +03:00
f9933ea55e Serial Yuri Trikoz 2020-06-24 01:46:05 +03:00
59f65abda8 Merge pull request #14 from ytrikoz/platformio Dmitry Borisenko 2020-06-24 00:44:04 +02:00
7dd13b7fcf Serial Yuri Trikoz 2020-06-24 01:42:56 +03:00
f54cac95bb Merge pull request #13 from ytrikoz/platformio Dmitry Borisenko 2020-06-24 00:41:48 +02:00
cb9c0efac6 Serial Yuri Trikoz 2020-06-24 01:40:35 +03:00
06bbecd0bb Merge pull request #12 from ytrikoz/platformio Dmitry Borisenko 2020-06-24 00:34:35 +02:00
dfeb25a8fa Serial Yuri Trikoz 2020-06-24 01:33:42 +03:00
ecd124dacc Merge pull request #11 from IoTManagerProject/dev Dmitry Borisenko 2020-06-24 00:25:15 +02:00
6e97ec5845 Merge pull request #25 from DmitryBorisenko33/dev Dmitry Borisenko 2020-06-24 00:24:51 +02:00
e375cca3dc Terminal Yuri Trikoz 2020-06-24 01:16:00 +03:00
8f76cbac74 Merge pull request #10 from IoTManagerProject/platformio Dmitry Borisenko 2020-06-22 22:32:18 +02:00
b50911ddcf mqtt publish state fix Yuri Trikoz 2020-06-22 18:09:39 +03:00
8f395ccc8a SoftwareSerial Yuri Trikoz 2020-06-22 17:40:29 +03:00
fea662aed2 Merge pull request #9 from IoTManagerProject/platformio Dmitry Borisenko 2020-06-22 13:58:08 +02:00
f7e3515c82 Merge pull request #24 from ytrikoz/platformio Yuri Trikoz 2020-06-22 14:06:42 +03:00
1bfe58766d Merge branch 'platformio' of https://github.com/ytrikoz/esp32-esp8266_iot-manager_modules_firmware into platformio Yuri Trikoz 2020-06-22 14:01:54 +03:00
274678f17a Updates Yuri Trikoz 2020-06-22 14:01:12 +03:00
059b08fb8b Merge pull request #8 from IoTManagerProject/platformio Dmitry Borisenko 2020-06-22 02:22:33 +02:00
f638de4139 Merge pull request #23 from ytrikoz/platformio Yuri Trikoz 2020-06-22 03:20:40 +03:00
8cdc271c48 Merge branch 'platformio' into platformio Yuri Trikoz 2020-06-22 03:18:19 +03:00
092bec7dde 32 broken Yuri Trikoz 2020-06-22 03:11:02 +03:00
4967f66238 Merge pull request #22 from DmitryBorisenko33/platformio Dmitry Borisenko 2020-06-21 18:10:56 +02:00

... 19 20 21 22 23 ...