Commit Graph

Select branches

Hide Pull Requests

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

#287

#291

#296

#297

#298

#302

#304

#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

Mono Color

• b9e80ad5d8 merged with michael's changes - https://github.com/proddy/EMS-ESP/pull/393 proddy 2020-06-03 18:49:31 +02:00
• 9fe21c42b9 Merge pull request #393 from MichaelDvP/v2 Proddy 2020-06-03 18:46:35 +02:00
• be7445d024 Merge branch 'v2' of https://github.com/proddy/EMS-ESP into v2 MichaelDvP 2020-06-03 17:55:43 +02:00
• c43b915a86 default boot in non-debug mode proddy 2020-06-03 17:37:05 +02:00
• fa2e7f127b updated readme text proddy 2020-06-03 17:31:37 +02:00
• 9d1f6b9479 fix typo proddy 2020-06-03 17:31:27 +02:00
• 13aae48bff added test for unknown devices proddy 2020-06-03 17:28:32 +02:00
• 2d1627be3c remove interval. using mark instead proddy 2020-06-03 17:28:21 +02:00
• 85fb40d310 added no sleep mode to wifi proddy 2020-06-03 17:28:07 +02:00
• 848689c100 version bump to a12 proddy 2020-06-03 17:27:51 +02:00
• 1562c98c3a clang formatting proddy 2020-06-03 17:27:37 +02:00
• caba2a9df0 added telnet write timeout proddy 2020-06-03 17:26:13 +02:00
• 456fdcb895 revert to original. use pio_local for local settings proddy 2020-06-03 17:25:55 +02:00
• 2cc1001623 update things todo proddy 2020-06-03 17:25:33 +02:00
• 83c90dec08 start console before network, added delay to help telnet performance proddy 2020-06-03 17:25:20 +02:00
• 1ae7d24bd3 Boiler: sort values, delete doubles, thermostat: add mode to change temp MichaelDvP 2020-06-03 12:51:08 +02:00
• 14b7e80506 Merge pull request #392 from MichaelDvP/v2 Proddy 2020-06-03 12:18:16 +02:00
• 4247633850 don't wait in rx loop MichaelDvP 2020-06-02 15:14:51 +02:00
• 3300f1e757 esp8266 uart with irq disabled MichaelDvP 2020-06-02 14:01:35 +02:00
• ba08fb65ef Typos, version string MichaelDvP 2020-06-01 14:12:29 +02:00
• 19abeb7456 Merge branch 'v2 a11' of https://github.com/proddy/EMS-ESP into v2 MichaelDvP 2020-05-31 10:05:39 +02:00
• f6854b8ad4 esp32 uart timing, RC35 thermostat mqtt enhancement, fix type_id display MichaelDvP 2020-05-29 18:17:04 +02:00
• cfeb1ce291 michael's updates Paul 2020-05-30 14:13:24 +02:00
• bf5172eefb Merge branch 'v2' of https://github.com/proddy/EMS-ESP into v2 esp32 uart MichaelDvP 2020-05-29 16:06:10 +02:00
• 348df3e96f uart and some small fixes MichaelDvP 2020-05-29 12:20:26 +02:00
• f73c3b01d7 Merge branch 'v2'a9 of https://github.com/proddy/EMS-ESP into v2 MichaelDvP 2020-05-28 08:35:09 +02:00
• c976d330d2 change tx_mode without needing a restart Paul 2020-05-28 23:40:47 +02:00
• b4aca3bcb9 more updates Paul 2020-05-28 23:17:25 +02:00
• 5f1d6adaf5 Merge branch 'v2a8' of https://github.com/proddy/EMS-ESP into v2 MichaelDvP 2020-05-28 08:25:36 +02:00
• f807eac26a a9 - roll back uart changes for esp8266 Paul 2020-05-26 13:28:23 +02:00
• 55c60365f6 small change MichaelDvP 2020-05-26 11:42:28 +02:00
• 69646c1a1c a8 Paul 2020-05-25 23:18:30 +02:00
• d3953d90ca a7 Paul 2020-05-25 17:13:05 +02:00
• 91f8afd3b1 Merge branch 'v2' of https://github.com/proddy/EMS-ESP into v2 MichaelDvP 2020-05-25 11:58:03 +02:00
• 4d5e512952 esp32 uart and wemos d1-mini32 MichaelDvP 2020-05-25 08:45:09 +02:00
• b2bb8e2b5a a6 Paul 2020-05-23 14:00:14 +02:00
• 1ceef8afd5 esp32 support Paul 2020-05-19 17:03:00 +02:00
• be4f075663 alpha v4 Paul 2020-05-18 21:00:38 +02:00
• 97ddf80ea8 mixing updates Paul 2020-05-12 18:15:22 +02:00
• 3801042ea5 alpha 0.2 - add solar, mixing, heatpump Paul 2020-05-11 23:00:53 +02:00
• 30b502a1e4 initial commit Paul 2020-05-08 16:04:53 +02:00
• 26b201ea2f 1.9.5 - Merge remote-tracking branch 'origin/dev' Paul 2020-04-30 10:47:55 +02:00
• 487cda0841 SM200 energy to 32 bit, fixes #372 Paul 2020-04-28 19:02:01 +02:00
• 1a5be8e404 Merge pull request #376 from MichaelDvP/SM_energy Proddy 2020-04-28 18:46:03 +02:00
• 0f2b4b27b9 add _setValue32() for energy-values MichaelDvP 2020-04-27 13:31:33 +02:00
• d284a3c1b8 solar energy values changed to 32bit MichaelDvP 2020-04-26 12:02:12 +02:00
• 743e09e5f4 render unsigned shorts correctly - #372 Paul 2020-04-24 10:41:12 +02:00
• 48bcd06e25 merged with PR366 with fixed to RC20 and MM50 Paul 2020-04-22 16:25:55 +02:00
• 2eefb7a688 Merge pull request #366 from MichaelDvP/RC20N Proddy 2020-04-22 16:20:14 +02:00
• e0dd9b4068 Merge branch 'dev' into RC20N Proddy 2020-04-22 16:19:51 +02:00
• 2f58f88ee3 minor prep for PR merge Paul 2020-04-22 15:58:16 +02:00
• 0e750d44a0 mqtt temperature pushback, read seltemp on RC35, MM50 fix, use first found thermostat MichaelDvP 2020-04-19 15:47:52 +02:00
• 4c6410d9ba rename RC20StatusMessage3 to RC20NStatusMessage MichaelDvP 2020-04-09 10:56:02 +02:00
• 32e3e64b4a add bin-file MichaelDvP 2020-04-09 09:56:09 +02:00
• ff1b45fd8b add new RC20 thermostat (messages 0xAD, 0xAE) MichaelDvP 2020-04-09 09:52:14 +02:00
• b51d34add0 merge of Yves' "Added retrieving settings (0xA5)" feature Paul 2020-03-23 11:40:48 +01:00
• 2545361984 Merge pull request #352 from ypaindaveine/dev Proddy 2020-03-23 11:30:26 +01:00
• 393f920116 minor updates Paul 2020-03-23 11:26:09 +01:00
• 850e3cb65c minor dimension of JSON msg. ypaindaveine 2020-03-22 22:29:44 +01:00
• 7253299469 Added retrieving settings (0xA5) (validated on RC30N), and MQTT cmd to set display, building type and language. ypaindaveine 2020-03-22 20:02:22 +01:00
• 9321b53e40 start topic show datetime #347 #348 Paul 2020-03-12 14:35:08 +01:00
• f5f2791bcf lowered sel flow temp #344 Paul 2020-03-12 14:33:54 +01:00
• 6397754a05 more thermostat mode generalization Paul 2020-03-09 18:03:58 +01:00
• 37fe454278 use DHW temp instead of boiler temp, removed return temp - #345 Paul 2020-03-08 21:49:09 +01:00
• c55ed82c30 optimize thermostat modes - #138 Paul 2020-03-08 19:41:21 +01:00
• b8fb03a5ff use MQTT start topic to show version & IP & boottime - #342 Paul 2020-03-07 12:33:27 +01:00
• 1385af3d54 added IP and version to MQTT start payload, added support for RC100/Moduline 1010, Fixed Junkers thermostat writing Paul 2020-03-06 17:13:29 +01:00
• 64def6e4cd #335 fix again Paul 2020-03-04 21:05:15 +01:00
• 8874543a75 fix for #335 Paul 2020-03-04 19:19:10 +01:00
• 98a41db973 support writing to FR100 - #335 Paul 2020-03-03 22:23:53 +01:00
• 3c66031870 minor text changes Paul 2020-03-01 17:03:52 +01:00
• 006fae89c4 Merge branch 'dev' of https://github.com/proddy/EMS-ESP into dev Paul 2020-03-01 16:47:38 +01:00
• 4cc670f010 emsplus for Tx Paul 2020-03-01 16:47:26 +01:00
• f626e0a004 Merge pull request #338 from ypaindaveine/dev Proddy 2020-03-01 16:46:53 +01:00
• 634e7cb7cd Added mixer log, and stub for EMS type 0xAC. ypaindaveine 2020-03-01 12:23:13 +01:00
• f06ebee15c Corrected comment. ypaindaveine 2020-02-29 21:33:25 +01:00
• 658a230ea3 Add features to WW messages (0x33, 0x34) to improve WW monitoring. ypaindaveine 2020-02-29 21:11:49 +01:00
• 81188eccd9 make Moduline 200 behave like RC10 Paul 2020-02-28 14:22:41 +01:00
• 51535a2dcf fix for multiple Heating Circuits on Junkers thermostats Paul 2020-02-28 14:06:58 +01:00
• b43fd46e27 NTP debug text change Paul 2020-02-28 14:06:31 +01:00
• b7dad9d9d9 removed no-write flag for Junkers FR100 Paul 2020-02-28 14:05:27 +01:00
• 9aba737f0a added RC20 support - #334 Paul 2020-02-26 18:31:38 +01:00
• 52d8231229 added RC20 and SM200 to MQTT Paul 2020-02-26 18:14:51 +01:00
• e08efa7475 show SM200 in telnet console Paul 2020-02-26 12:59:09 +01:00
• 42d6cb1c9d added @PhillyGilly SM200 PR - #267 Paul 2020-02-26 12:14:16 +01:00
• c8c95eeadc rename mqttlog to mqttqueue Paul 2020-02-26 12:13:38 +01:00
• 459610be51 text changes proddy 2020-02-25 16:58:28 +01:00
• 74ef11631c added Moduline 200 & Sieger ES72 proddy 2020-02-25 15:47:28 +01:00
• 9a6c5eeca0 add enough mqtt memory for all boiler objects proddy 2020-02-24 16:20:35 +01:00
• e48d380e26 web mqtt size fix - #298 Paul 2020-02-24 09:51:59 +01:00
• 5d7feb1722 added 2 x warm water boiler temps Paul 2020-02-23 15:47:14 +01:00
• e7dacc2c15 fix typo Paul 2020-02-23 14:26:31 +01:00
• 89a2dcac05 optimized MQTT json Paul 2020-02-23 14:23:10 +01:00
• 7d402d4518 added compile flag for #327 Paul 2020-02-23 14:22:57 +01:00
• 059861a14f use flash mem for strings when we can Paul 2020-02-23 14:22:46 +01:00
• 6c39154e90 minor fix for default mqtt_nestedjson cmd Paul 2020-02-22 11:48:13 +01:00
• 9eda49b46a added mqtt_nestedjson Paul 2020-02-22 11:37:55 +01:00
• 97aaff07ef add mqtt queue to help publish failures - #326 #298 Paul 2020-02-21 17:51:25 +01:00
• fd93758da3 update to 4.2.0 standard Paul 2020-02-21 17:50:22 +01:00
• 9dc0de275f fix devices scan - #326 Paul 2020-02-20 00:01:05 +01:00