IoTManager

iotmanager/IoTManager

Fork 0

mirror of https://github.com/IoTManagerProject/IoTManager.git synced 2026-03-26 14:12:16 +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

#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

c02687aa05 Merge branch 'IoTManagerProject:ver4dev' into ver4dev Ilya Belyakov 2023-10-03 22:27:12 +03:00
680a342a64 Merge pull request #313 from DmitriyTychina/FixLog Ilya Belyakov 2023-10-03 22:27:00 +03:00
7a00131813 Merge branch 'ver4dev' into FixLog Ilya Belyakov 2023-10-03 22:26:05 +03:00
09e4b4e877 Merge branch 'IoTManagerProject:ver4dev' into ver4dev Ilya Belyakov 2023-10-03 22:14:31 +03:00
a0751f20f7 Merge pull request #297 from DmitriyTychina/v4dev Ilya Belyakov 2023-10-03 22:14:19 +03:00
6db1ef5bfd Merge branch 'ver4dev' into v4dev Ilya Belyakov 2023-10-03 22:04:54 +03:00
160321ced0 Merge branch 'IoTManagerProject:ver4dev' into ver4dev Ilya Belyakov 2023-10-03 21:31:03 +03:00
eae29bd680 вспышка Mit4el 2023-10-03 20:57:12 +03:00
137a5a43b8 bugfix ExternalMqtt Mit4el 2023-10-02 23:16:29 +03:00
e47eb4969a Merge branch 'ver4dev' into tlgrm_fast Mit4el 2023-10-02 21:46:25 +03:00
0e679f132d Telegram V2 & espCAM Mit4el 2023-10-02 21:29:02 +03:00
aec78a4d03 Merge pull request #322 from IoTManagerProject/ver4dev IoT Manager 2023-10-02 15:28:28 +02:00
d391bbbd63 wifi по старому пока IoT Manager 2023-10-02 15:27:56 +02:00
8c8a070fbb Merge pull request #321 from IoTManagerProject/ver4dev IoT Manager 2023-10-02 15:06:44 +02:00
37cd897257 применяем изменения IoT Manager 2023-10-02 15:05:09 +02:00
cafe008f7d Merge pull request #320 from IoTManagerProject/ver4dev IoT Manager 2023-10-02 14:48:44 +02:00
07c0bb166b Merge pull request #310 from Mit4el/ver4dev IoT Manager 2023-10-02 14:45:55 +02:00
2edb067369 Merge pull request #319 from IoTManagerProject/ver4dev IoT Manager 2023-10-02 14:01:08 +02:00
1a239f1f02 исправление бага кеширования IoT Manager 2023-10-02 13:59:37 +02:00
c76306faf5 Merge pull request #318 from IoTManagerProject/ver4dev IoT Manager 2023-10-02 12:36:07 +02:00
082496997c исправляем баг кеширования - теперь веб грузится очень быстро IoT Manager 2023-10-02 12:32:49 +02:00
34c6213100 подписка на внешние mqtt Mit4el 2023-10-01 22:05:07 +03:00
9bb40e3846 wifi array с обратной совместимостью mit4el 2023-10-01 19:55:09 +03:00
fc3dfc389f SSD1306_128x64 IoT Manager 2023-10-01 18:27:58 +02:00
d9bfacba3c Merge pull request #317 from IoTManagerProject/ver4dev IoT Manager 2023-10-01 16:03:30 +02:00
0b83a72dc4 синхронизация IoT Manager 2023-10-01 16:02:58 +02:00
44fab264eb исправление имени IoT Manager 2023-10-01 16:02:07 +02:00
ed50bd8c44 Merge pull request #316 from IoTManagerProject/ver4dev IoT Manager 2023-10-01 15:56:04 +02:00
7c0ffe7af5 применение нового модуля IoT Manager 2023-10-01 15:55:47 +02:00
0eb6494772 отключаем по умолчанию IoT Manager 2023-10-01 15:52:10 +02:00
97288a1f21 экран oled IoT Manager 2023-10-01 15:48:23 +02:00
4e9ef86393 Merge pull request #315 from IoTManagerProject/ver4dev IoT Manager 2023-10-01 15:15:57 +02:00
11c7e50f83 градусы IoT Manager 2023-10-01 15:15:31 +02:00
022829f494 Merge pull request #314 from IoTManagerProject/ver4dev IoT Manager 2023-10-01 15:06:10 +02:00
6cd40fceee исправление виджета для серво IoT Manager 2023-10-01 12:47:57 +02:00
8eb719ea6c tlgrm_v2 alfa ver Mit4el 2023-09-27 23:00:44 +03:00
668bbbff87 fix wifi esp32 Mit4el 2023-09-24 21:35:50 +03:00
307786f087 wifi multipoint v2 array Mit4el 2023-09-24 20:58:51 +03:00
e48d13faae pre Betta WIFI array Mit4el 2023-09-24 07:49:48 +00:00
98a5f5f5a3 first commit Mit4el 2023-09-23 00:36:17 +03:00
48ccdd7e86 fix wifi esp32 Mit4el 2023-09-22 21:54:51 +03:00
32d61805fa wifi multi point Mit4el 2023-09-22 20:57:50 +03:00
2a275cc1a5 fix ld2410 instance function Mit4el 2023-09-22 20:52:30 +03:00
b3a426bdc4 add partition esp32_16 in myProfile Mit4el 2023-09-22 13:11:59 +03:00
fe9789fc52 исправление вывода лога в режиме AP DmitriyTychina 2023-09-20 13:02:27 +03:00
014f450761 Merge pull request #312 from IoTManagerProject/ver4dev IoT Manager 2023-09-18 16:57:13 +02:00
d4bdcc13ff 8266 IoT Manager 2023-09-15 01:02:14 +02:00
63be5b5aac Merge branch 'ver4dev' of https://github.com/IoTManagerProject/IoTManager into ver4dev IoT Manager 2023-09-15 00:59:33 +02:00
848bbaab96 migration IoT Manager 2023-09-15 00:59:30 +02:00
319dc8d6ce Merge pull request #15 from IoTManagerProject/ver4dev Mit4el 2023-09-12 19:54:57 +03:00
dab8d5323c Merge pull request #311 from DmitriyTychina/ver4dev-x Ilya Belyakov 2023-09-10 20:16:21 +03:00
6892beeb38 в "Update device data: " давал непечатаемый сивол DmitriyTychina 2023-09-10 18:32:49 +03:00
1019143d0d не шлем данные Ws-клиентам если их нет DmitriyTychina 2023-09-10 18:24:55 +03:00
5195e71eb1 default project Mit4el 2023-09-09 13:44:38 +03:00
cd62326845 fix lib TM16XX Mit4el 2023-09-09 13:43:49 +03:00
7ec9b6e2a6 size patrition esp8266_16m Mit4el 2023-09-09 13:40:35 +03:00
d774612fbb Merge branch 'pr/Mit4el/14' into ver4dev Mit4el 2023-09-09 13:20:12 +03:00
123412285d Add esp32_16m & esp8266_16m Mit4el 2023-09-09 12:19:22 +03:00
81099f3727 Merge pull request #309 from IoTManagerProject/ver4dev IoT Manager 2023-09-09 02:31:20 +02:00
6c7c81f2c2 добавляем bootloader files for esp32 IoT Manager 2023-09-09 02:30:01 +02:00
6d2dc1a454 Merge pull request #308 from IoTManagerProject/ver4dev IoT Manager 2023-09-07 13:33:08 +02:00
16d935964b адреса IoT Manager 2023-09-07 13:32:47 +02:00
a7a4a34737 Merge pull request #307 from IoTManagerProject/ver4dev IoT Manager 2023-09-07 13:24:20 +02:00
e6b19233b7 синхронизация IoT Manager 2023-09-07 13:24:01 +02:00
5003f9a684 Merge pull request #306 from IoTManagerProject/ver4dev IoT Manager 2023-09-07 13:11:57 +02:00
bd902c51e1 добавление новых профилей в конфигуратор IoT Manager 2023-09-07 13:10:21 +02:00
4bcc00b1e5 Merge pull request #305 from IoTManagerProject/ver4dev IoT Manager 2023-09-07 01:47:34 +02:00
016fedfe25 добавляем адреса для каждой прошивки! IoT Manager 2023-09-07 01:42:54 +02:00
b9fc5e3f04 Merge pull request #304 from IoTManagerProject/ver4dev IoT Manager 2023-09-06 16:58:11 +02:00
70f51b9a70 синхронизация профилей IoT Manager 2023-09-06 16:57:15 +02:00
4731dca6a9 исправляем проблему компиляции esp32 servo IoT Manager 2023-09-06 16:52:00 +02:00
e7843fe16d Merge pull request #303 from IoTManagerProject/ver4dev IoT Manager 2023-09-06 14:59:18 +02:00
bd721965ca исправление описаний IoT Manager 2023-09-06 14:58:08 +02:00
5d38442eba Merge pull request #302 from IoTManagerProject/ver4dev IoT Manager 2023-09-05 20:27:36 +02:00
a4dae52b1c фиксируем версию c++ для esp32 IoT Manager 2023-09-05 18:23:17 +02:00
7178745482 перевод IoT Manager 2023-09-05 17:32:58 +02:00
de74bc8d7f тотальное переименование на англ язык IoT Manager 2023-09-05 17:28:02 +02:00
2def3f2825 поправил change() в ButtonOut с учетом "inv" DmitriyTychina 2023-09-05 00:43:18 +03:00
fbe7b1cf02 pulse() в ButtonOut, +прочие корректировки DmitriyTychina 2023-09-05 00:20:03 +03:00
93dfa8ee83 используем везде isNetworkActive() DmitriyTychina 2023-09-03 19:33:40 +03:00
5715da0baa Merge pull request #294 from IoTManagerProject/ver4dev IoT Manager 2023-09-03 15:36:31 +02:00
a1d053c37d Добавляем в ядро реакцию одного элемента от другого Необходимо просто добавить в конфигурацию элемента поле trackingID с указанием ИД отслеживаемого элемента важное требование - такие следящие элементы должны располагаться ниже отслеживаемых Ilya Belyakov 2023-09-03 11:42:21 +03:00
646128b999 Merge pull request #286 from Mit4el/ver4dev Ilya Belyakov 2023-09-03 09:04:51 +03:00
67a432d7ad Merge pull request #284 from DmitriyTychina/ver4dev Ilya Belyakov 2023-09-03 09:04:07 +03:00
357dd39a11 Merge pull request #293 from IoTManagerProject/ver4dev IoT Manager 2023-09-03 02:07:28 +02:00
34010801ef меняем во всем коде IoTManagerProject 2023-09-03 02:05:55 +02:00
3212fc914c Меняем названия групп устройств на правильные IoTManagerProject 2023-09-03 02:04:38 +02:00
0513326776 Merge pull request #292 from IoTManagerProject/ver4dev IoT Manager 2023-09-02 21:59:20 +02:00
c1ec63d155 def profile IoTManagerProject 2023-09-02 21:58:42 +02:00
fab1e15168 Merge pull request #291 from IoTManagerProject/ver4dev IoT Manager 2023-09-02 21:53:09 +02:00
85ee98d312 добавление профилей прошивки для компилятора IoTManagerProject 2023-09-02 21:52:21 +02:00
6a23c635a1 Merge pull request #290 from IoTManagerProject/ver4dev IoT Manager 2023-09-02 20:28:33 +02:00
adda80feb1 Merge pull request #289 from IoTManagerProject/ver4stable IoT Manager 2023-09-02 20:27:11 +02:00
3bd8d34b97 инициализация IoTManagerProject 2023-08-30 21:50:31 +02:00
4ed4f240a6 Проект по умолчанию Mit4el 2023-08-24 21:52:10 +03:00
5bc4471424 Update BuildTime script Mit4el 2023-08-24 21:31:07 +03:00
8f95eec4b0 Update README.md Dmitry Borisenko 2023-08-15 12:17:48 +02:00
840cd56c1d Update README.md Dmitry Borisenko 2023-08-14 16:47:03 +02:00
6fe5e97ea0 Update README.md Dmitry Borisenko 2023-08-14 15:47:49 +02:00
89e8c1fdcc Add Ina226, Update Ina219 Mit4el 2023-08-09 23:36:49 +03:00

... 3 4 5 6 7 ...