Commit Graph

Select branches

Hide Pull Requests

core3

dev

https_36

main

patch

test

#102

#1038

#104

#1068

#1069

#1075

#1077

#1082

#1083

#1084

#1085

#1086

#1088

#1089

#109

#1090

#1093

#1094

#1095

#1097

#1099

#1100

#1101

#1103

#1105

#1106

#1107

#1108

#1110

#1111

#1113

#1114

#1115

#1117

#1118

#1119

#1121

#1122

#1123

#1124

#1128

#1129

#1135

#1137

#1138

#1139

#1140

#1141

#1142

#1143

#1145

#1149

#1150

#1151

#1153

#1154

#1156

#1157

#1159

#1162

#1175

#1176

#1177

#1180

#1181

#1183

#1184

#1185

#1186

#1189

#1200

#1201

#1202

#1203

#1205

#1206

#1207

#1208

#1209

#1211

#1214

#1219

#1220

#1221

#1222

#1223

#1225

#1226

#1227

#1228

#1229

#1230

#1231

#1232

#1234

#1235

#1236

#1237

#1239

#1245

#1249

#1250

#1251

#1252

#1253

#1254

#1257

#1258

#1260

#1261

#1263

#1266

#1272

#1273

#1277

#1279

#1284

#1285

#1286

#1288

#1289

#1290

#1291

#1292

#1296

#1298

#130

#1302

#1303

#1304

#1306

#1309

#131

#1310

#1311

#1312

#1316

#1318

#1319

#132

#1332

#1333

#1336

#1339

#134

#1340

#1341

#1343

#1346

#135

#1352

#1353

#1355

#1356

#1358

#1362

#1365

#1368

#1369

#1371

#1372

#1374

#1376

#1377

#1381

#1383

#1384

#1390

#1391

#1395

#1400

#1402

#1405

#1407

#1408

#1409

#1411

#1417

#1418

#1422

#1425

#1426

#1428

#1429

#1430

#1432

#1434

#1435

#1436

#1437

#1438

#1439

#1444

#1445

#1451

#1455

#1457

#1458

#1460

#1461

#1464

#1465

#1470

#1471

#1473

#1478

#1481

#1482

#1485

#1490

#1493

#1496

#1497

#1499

#1500

#1501

#1502

#1503

#1504

#1505

#1506

#1507

#1508

#1509

#1510

#1511

#1512

#1513

#1514

#1515

#1517

#1518

#1519

#1522

#1523

#1524

#1525

#1529

#1530

#1532

#1533

#1537

#1539

#1542

#1543

#1544

#1546

#1547

#1548

#1552

#1555

#1558

#1559

#1567

#1568

#1569

#1570

#1571

#1572

#1574

#1575

#1578

#1579

#1589

#1591

#1592

#1603

#1606

#1608

#1610

#1615

#1618

#1626

#1627

#1631

#1632

#1633

#1638

#1639

#1646

#1647

#1649

#1651

#1653

#1654

#1655

#1658

#1661

#1662

#1667

#1668

#1669

#1670

#1672

#1674

#1675

#1681

#1682

#1683

#1685

#1686

#1694

#1698

#1705

#1707

#1711

#1718

#1719

#1721

#1722

#1726

#1727

#1729

#1730

#1731

#1733

#1736

#1739

#1741

#1742

#1743

#1746

#1748

#1749

#1750

#1751

#1752

#1753

#1754

#1757

#1758

#1759

#1760

#1761

#1762

#1763

#1769

#1770

#1780

#1782

#1783

#1784

#1785

#1786

#1787

#1788

#1790

#1791

#1792

#1793

#1798

#1799

#1802

#1803

#1805

#1807

#1809

#181

#1810

#1811

#1812

#1813

#1814

#1816

#1817

#1818

#1819

#1820

#1821

#1825

#1826

#1827

#1828

#1829

#1830

#1831

#1832

#1833

#1834

#1839

#1840

#1843

#1844

#1845

#1846

#1847

#185

#1850

#1851

#1853

#1855

#1863

#1864

#1865

#1866

#1868

#1869

#1872

#1873

#1874

#1875

#1876

#1877

#1878

#1879

#188

#1880

#1881

#1883

#1885

#1888

#189

#1891

#1895

#1899

#1900

#1901

#1906

#1907

#1912

#1913

#1914

#1917

#1919

#1921

#1923

#1924

#1925

#1927

#1928

#193

#1931

#1939

#194

#1941

#1942

#1943

#1945

#1946

#1948

#1949

#195

#1951

#1952

#1954

#1956

#1959

#1967

#1969

#197

#1970

#1972

#1973

#1974

#1975

#1976

#1977

#1980

#1981

#1985

#1986

#1987

#1988

#1991

#1992

#1993

#1994

#1995

#1997

#1998

#1999

#2000

#2005

#2006

#2007

#2008

#2009

#201

#2010

#2012

#2013

#2014

#2015

#2017

#2018

#2019

#2021

#2022

#2023

#2024

#2027

#2028

#2029

#203

#2031

#2032

#2035

#2036

#2037

#2040

#2041

#2042

#2043

#2045

#2047

#2048

#2049

#2050

#2051

#2053

#2055

#2057

#2061

#2063

#2065

#2066

#2070

#208

#2083

#2089

#2091

#2092

#2094

#2097

#2100

#2102

#2105

#2106

#2107

#2112

#2113

#2117

#2120

#2121

#2126

#2127

#2128

#2129

#2131

#2133

#2134

#2139

#2141

#2143

#2144

#2145

#2146

#215

#2150

#2154

#2157

#2158

#2159

#2160

#2163

#217

#2172

#2173

#2175

#2176

#2178

#218

#2183

#2185

#2187

#2195

#2196

#2199

#220

#2202

#2203

#2204

#2205

#2208

#2209

#2210

#2211

#2221

#2222

#2224

#2227

#2231

#2235

#2236

#2237

#2238

#2239

#2241

#2244

#2246

#2248

#2249

#2250

#2251

#2255

#2256

#2258

#2259

#226

#2260

#2265

#227

#2270

#2272

#2275

#2280

#2283

#2291

#2292

#2296

#2298

#230

#2301

#2302

#2303

#2305

#2307

#2311

#2315

#2316

#2317

#2318

#2320

#2322

#2328

#233

#2331

#2332

#2337

#2338

#234

#2341

#2343

#235

#2352

#2356

#236

#2360

#2361

#2362

#2363

#2366

#2367

#2368

#2370

#2371

#2373

#238

#2380

#2381

#2382

#2388

#239

#2390

#2391

#2392

#2393

#2396

#2398

#2399

#2404

#2405

#2406

#2407

#2414

#2415

#2416

#2419

#2420

#2422

#2423

#2424

#2425

#2426

#2428

#2429

#2430

#2431

#2432

#2434

#2435

#2436

#2439

#2441

#2442

#2443

#2444

#2445

#2447

#2449

#245

#2452

#2453

#2458

#2459

#2460

#2461

#2464

#2466

#2468

#2469

#2471

#2472

#2474

#2475

#2478

#2479

#2487

#2488

#249

#2491

#2493

#2496

#2498

#2504

#2506

#2508

#2513

#2515

#2517

#2519

#2521

#2522

#2526

#2527

#2528

#2529

#2530

#2532

#2535

#2538

#2539

#2547

#255

#2554

#2556

#2557

#2558

#2559

#2560

#2561

#2565

#2566

#2572

#2575

#258

#2580

#2582

#2587

#2588

#259

#2593

#2594

#260

#2603

#261

#2613

#2614

#2615

#2617

#262

#2620

#2623

#263

#2630

#2647

#2650

#2651

#2652

#2655

#2656

#266

#2660

#2665

#2666

#2671

#2672

#2674

#2675

#2676

#2677

#2678

#2679

#2680

#2681

#2682

#2683

#2685

#2687

#2688

#2689

#2694

#2696

#2697

#27

#2701

#2705

#2709

#2715

#2717

#2719

#2724

#2727

#2729

#2730

#2734

#2737

#2738

#2739

#2741

#2743

#2744

#2745

#2746

#2747

#2748

#2749

#2750

#2762

#2773

#2774

#2775

#2778

#2782

#2788

#279

#2792

#2793

#2795

#2796

#2804

#2805

#2806

#2811

#2813

#2814

#2815

#2817

#2819

#2820

#2821

#2822

#2823

#2824

#2827

#2829

#2836

#2838

#2839

#2840

#2842

#2847

#2858

#2859

#2863

#2864

#2865

#2867

#2869

#287

#2870

#2871

#2872

#2875

#2877

#2878

#2882

#2884

#2888

#2892

#2894

#2898

#2903

#2904

#2905

#2907

#2909

#291

#2911

#2912

#2913

#2914

#2915

#2916

#2917

#2919

#2920

#2921

#2923

#2930

#2934

#2939

#2940

#2942

#2947

#2953

#2954

#296

#2963

#2966

#297

#2975

#2978

#298

#2982

#2985

#2986

#2990

#2993

#2994

#2995

#2996

#3005

#3006

#3009

#3016

#302

#3020

#3022

#3023

#3025

#3026

#3027

#3028

#3029

#3030

#3031

#3032

#3033

#3035

#3036

#3037

#304

#3040

#3041

#3042

#3043

#3045

#3048

#3052

#3054

#3056

#3057

#3058

#3059

#3059

#307

#308

#310

#319

#320

#323

#324

#330

#332

#346

#347

#348

#352

#360

#361

#362

#364

#365

#366

#367

#369

#370

#375

#378

#379

#380

#382

#384

#385

#389

#391

#394

#397

#40

#401

#404

#409

#413

#414

#415

#416

#417

#420

#421

#422

#423

#424

#425

#426

#427

#428

#429

#430

#431

#432

#433

#434

#435

#44

#442

#445

#447

#449

#452

#453

#455

#457

#458

#460

#467

#471

#472

#475

#478

#479

#480

#481

#482

#483

#484

#485

#486

#487

#488

#489

#49

#492

#493

#494

#495

#497

#502

#506

#510

#511

#512

#514

#515

#516

#518

#520

#521

#525

#526

#527

#531

#532

#533

#534

#537

#538

#540

#544

#545

#546

#551

#552

#556

#557

#558

#560

#561

#562

#563

#566

#567

#568

#57

#571

#572

#579

#58

#580

#583

#585

#586

#588

#588

#589

#597

#603

#606

#607

#611

#613

#617

#618

#620

#622

#623

#626

#627

#630

#632

#633

#639

#640

#642

#643

#650

#651

#660

#661

#662

#664

#667

#668

#672

#675

#676

#677

#679

#680

#683

#684

#685

#688

#690

#693

#694

#696

#700

#702

#705

#706

#708

#711

#712

#713

#715

#718

#719

#721

#722

#723

#724

#725

#726

#730

#733

#734

#737

#739

#740

#741

#742

#743

#745

#746

#750

#753

#755

#761

#764

#775

#776

#778

#779

#780

#781

#791

#793

#797

#798

#799

#800

#801

#807

#808

#815

#816

#817

#818

#819

#825

#827

#830

#836

#840

#842

#845

#849

#851

#854

#856

#858

#864

#866

#870

#873

#876

#885

#887

#897

#901

#909

#923

#924

#925

#926

#927

#929

#935

#936

#937

#939

#940

#941

#947

#948

#949

latest

test

v3.0.0

v3.0.1

v3.1.0

v3.1.1

v3.2.0

v3.2.1

v3.3.0

v3.3.1

v3.4.0

v3.4.1

v3.4.2

v3.4.3

v3.4.4

v3.5.0

v3.5.1

v3.6.0

v3.6.1

v3.6.2

v3.6.4

v3.6.5

v3.7.0

v3.7.1

v3.7.2

v3.8.0

v3.8.1

Mono Color

• ddbd19c031 Merge pull request #450 from joanwa/v2 Proddy 2020-08-04 18:57:21 +02:00
• 5e938a3f29 * add Heat exchanger temperature * add cylinder primary pump modulation when using an external heat exchanger * make all solar mqtt names consistently camelCase * add comments and sensor shortnames according to english MS200 documentation Johannes Wagner 2020-08-04 17:49:41 +02:00
• 7fee545cb6 Merge branch 'v2' of https://github.com/proddy/EMS-ESP into v2 Johannes Wagner 2020-08-04 17:44:05 +02:00
• b55e647cce supress hot water/heating displaying in web if there are no values proddy 2020-08-04 15:59:09 +02:00
• b8da3dc397 new pic showing sensors proddy 2020-08-04 15:55:35 +02:00
• b2b51b757e rename gpio to pin command - #445 proddy 2020-08-04 15:44:17 +02:00
• e8c3b07cc6 fix for mqtt resubscribe when mqtt drops-out. renamed topic to "system_cmd" - #445 proddy 2020-08-04 15:17:39 +02:00
• c3d81d8841 Michael's fixes for (v2) normalize command infrastructure for devices (mqtt & console) #445 proddy 2020-08-04 13:50:49 +02:00
• e19296075f added gpio command proddy 2020-08-04 13:35:39 +02:00
• a9679fbec3 added v2_cmd proddy 2020-08-04 13:35:31 +02:00
• 939debdc0b minor changes, added gpio command - #445 proddy 2020-08-04 13:34:16 +02:00
• 725d63a518 only show heating circuit in cmd for thermostats and mixers proddy 2020-08-03 23:31:08 +02:00
• 6154ff38f2 initial commit with refactored mqtt commands proddy 2020-08-03 23:14:43 +02:00
• 56c4e043fe Merge pull request #448 from MichaelDvP/v2 Proddy 2020-08-03 10:40:47 +02:00
• 6df1f3f708 thermostat allow master, snc commands MichaelDvP 2020-08-03 07:00:25 +02:00
• 91573f5594 onewire for esp32 improved, retry for sensors MichaelDvP 2020-08-02 08:54:30 +02:00
• 277f12197c Merge pull request #446 from MichaelDvP/v2 Proddy 2020-08-02 08:07:29 +02:00
• e735ac0338 update readme (add mqtt) MichaelDvP 2020-08-01 12:20:55 +02:00
• d2549d025b add thermostat values, change output thermostat mqtt-custom to single format MichaelDvP 2020-08-01 12:20:16 +02:00
• bbc40e5bfb add solar values MichaelDvP 2020-08-01 12:19:01 +02:00
• 2936de3e3f add boler values MichaelDvP 2020-08-01 12:18:20 +02:00
• d6c5321a5f update uarts MichaelDvP 2020-08-01 12:17:31 +02:00
• 6a434f0cef round sensor values, no yield for esp32 (dualcore) MichaelDvP 2020-08-01 12:14:49 +02:00
• 7ca593f374 enlarge json buffer to hold sensor and boiler values MichaelDvP 2020-08-01 12:12:42 +02:00
• 163fbba917 2.0.0b11 - with flow/max/min boiler temps - #59 proddy 2020-07-31 16:08:58 +02:00
• 09895bb461 clean-up code proddy 2020-07-31 13:59:40 +02:00
• 4fc6797f4e rename collector - #267 proddy 2020-07-31 13:59:32 +02:00
• 1d3a31b9f3 show external dallas temp sensors in web UI proddy 2020-07-31 13:59:06 +02:00
• 34f7796bd8 add NTP service, only for ESP32 proddy 2020-07-31 13:58:20 +02:00
• 11fe8e71b4 bump to b10 proddy 2020-07-30 21:23:57 +02:00
• ab8e873ab4 Merge pull request #442 from MichaelDvP/v2 Proddy 2020-07-30 21:20:27 +02:00
• fc32f0d4b0 merge in build flags proddy 2020-07-30 21:18:38 +02:00
• d70fb41711 fix watch for CRC Rx errors proddy 2020-07-30 21:18:28 +02:00
• b20c6d4c01 only add OTA delay for ESP32 proddy 2020-07-30 21:18:09 +02:00
• c48e5bd518 minor cleanup proddy 2020-07-30 21:17:57 +02:00
• 2923fae1a6 clean up build settings proddy 2020-07-30 21:17:26 +02:00
• d655e50e36 turn off watch when starting new console proddy 2020-07-30 21:17:07 +02:00
• 251fadc2f3 supress warnings proddy 2020-07-30 21:16:00 +02:00
• 931dc6dd18 Fix #441 MichaelDvP 2020-07-30 20:43:18 +02:00
• 56398ccb85 fix standalone proddy 2020-07-28 17:20:10 +02:00
• 4175fe56fd fix standalone (use make run) proddy 2020-07-28 17:18:42 +02:00
• 9b9c7df1d8 bump to b9 proddy 2020-07-28 11:54:14 +02:00
• 53bfbcee06 minor cleanups proddy 2020-07-28 11:53:48 +02:00
• b1c92b6f14 send warning to console/syslog if master boiler is restarted proddy 2020-07-28 11:53:19 +02:00
• 242770838d call services after settings have been persisted proddy 2020-07-28 11:52:56 +02:00
• 3ab7134ca0 reset_tx() takes tx_mode from settings file proddy 2020-07-28 11:52:23 +02:00
• 53aa698bbb test code only for standalone mode proddy 2020-07-28 11:50:31 +02:00
• b196fbd0fd merged from v2_uart proddy 2020-07-27 18:57:26 +02:00
• 9b7d6aa6ed minor change proddy 2020-07-27 18:57:05 +02:00
• f5b214a1b2 added data to web ui proddy 2020-07-27 18:56:52 +02:00
• ced2d2df47 tx_mode optimizations proddy 2020-07-27 18:56:37 +02:00
• b062f30bdd tx_mode optimizations proddy 2020-07-27 18:56:24 +02:00
• 8caa452c25 move mem calc before creating json obj proddy 2020-07-27 18:55:30 +02:00
• bb3e8b6dff added fetch command proddy 2020-07-27 18:55:03 +02:00
• 63737833ae renamed command refresh to fetch proddy 2020-07-27 18:54:53 +02:00
• fe13b7559d renamed telegram MaintenanceSettings to MaintenanceData proddy 2020-07-27 18:54:24 +02:00
• b59d711ed4 merged Michael's latest UART code for ESP8266 proddy 2020-07-26 22:36:18 +02:00
• 2ec35d1fbc added save function to write settings to fS proddy 2020-07-26 22:35:55 +02:00
• 5c354af1ba added system command wifi reconnect proddy 2020-07-26 22:35:33 +02:00
• b7e72fd18f force debug log when compiled with -DEMSESP_DEBUG proddy 2020-07-26 21:41:45 +02:00
• 7109bb0d62 merge in Michael's change from v2_uart branch proddy 2020-07-26 21:40:56 +02:00
• 09ab9fe655 clean up web code proddy 2020-07-26 20:30:38 +02:00
• b18e0a1918 force saving settings during a 'restart' proddy 2020-07-26 20:30:03 +02:00
• fab2fba64f add more mqtt logging for disonnect proddy 2020-07-26 20:29:45 +02:00
• 90d33259f2 tidy up how EMS bus line state is handled proddy 2020-07-26 20:29:30 +02:00
• ce30346ac3 prevent forcing DEBUG logging on an ESP32 proddy 2020-07-26 16:04:17 +02:00
• 1a2e405ffe do not reset wifi when value changed (in progress) - #435 proddy 2020-07-26 16:03:52 +02:00
• 38f00946da show device info on Web proddy 2020-07-26 16:03:06 +02:00
• 39e5fb1a68 fix build error on esp8266 proddy 2020-07-25 18:47:05 +02:00
• 0b0ab3121c doing all web dev on ESP32 as standard now, just quicker proddy 2020-07-25 18:30:44 +02:00
• 760cef9058 remove bogus logging proddy 2020-07-25 18:30:12 +02:00
• b2b6413149 optimizing mqtt proddy 2020-07-25 18:28:23 +02:00
• 87f1858d5e optimizing mqtt proddy 2020-07-25 18:27:52 +02:00
• 580f3ea45c optimizing mqtt proddy 2020-07-25 18:27:37 +02:00
• 82d8210754 b8 proddy 2020-07-25 18:27:23 +02:00
• bb8e1676f8 cleanup proddy 2020-07-25 18:27:13 +02:00
• 2917f6c1a3 Merge branch 'v2' of https://github.com/proddy/EMS-ESP into v2 proddy 2020-07-25 18:24:57 +02:00
• 61a711c8f6 added show users command - #435 proddy 2020-07-25 18:24:45 +02:00
• 7a88601ccd fix hostname when using static ip - #432 Paul 2020-07-25 11:00:27 +02:00
• b0fa45ecca removed bogus files Paul 2020-07-25 10:59:48 +02:00
• a09dd3b735 fix warning in console when setting wifi params proddy 2020-07-23 12:03:50 +02:00
• 5cd1c4eb7d loop() doesn't need to be static anymore proddy 2020-07-23 12:03:25 +02:00
• d30b0ce505 supress compile warnings proddy 2020-07-23 12:02:58 +02:00
• e9d4994cac change default baud rate to 115200 due to issues with higher speeds on macOS Johannes Wagner 2020-07-22 19:09:33 +02:00
• 665221e628 add Bosch MB LAN 2 as alternative gateway name Johannes Wagner 2020-07-22 19:04:50 +02:00
• 4932b00f12 automate migration from 1.9.x to 2.0 (in progress) proddy 2020-07-22 16:11:13 +02:00
• 2b43a955d5 minor comments proddy 2020-07-22 16:10:39 +02:00
• 2e6cee3429 remove passing mqtt client to function proddy 2020-07-22 16:10:12 +02:00
• dbaf6fe4b4 more stable OTA uploads. disable UART and stop Mqtt during upload. proddy 2020-07-22 16:09:43 +02:00
• 1c4033fb71 register thermostat with Homeassistant discovery when a new heating circuit is detected proddy 2020-07-22 16:08:59 +02:00
• 250f0cc2aa tidied up commands proddy 2020-07-22 10:33:12 +02:00
• 5bad7accf0 Merge pull request #430 from MichaelDvP/v2 Proddy 2020-07-21 21:00:22 +02:00
• e9ef79a7c4 local copyu of 1-wire Proddy 2020-07-21 15:01:40 +02:00
• 993b3b8546 removed onewire library, and replaced with local proddy 2020-07-21 14:43:15 +02:00
• 7f01c7d72b make console::loop() static so telnet can be refreshed within lambda functions proddy 2020-07-21 14:42:47 +02:00
• 92eaa070b4 various formatting proddy 2020-07-21 14:38:23 +02:00
• f632f471f9 remove mqtt subscription to cmd, added telnet message after changing wifi settings, proddy 2020-07-21 14:38:01 +02:00
• b5694c71f5 fix rendering of wwcircpumptype and wwcirc proddy 2020-07-21 14:36:58 +02:00
• 14dd9fe4c2 b6 proddy 2020-07-21 14:36:04 +02:00
• 2346682eea fix publish, added subscriptions to show mqtt. Subscribe to cmd during initialization proddy 2020-07-21 14:35:57 +02:00