Skip to content

Commit

Permalink
Geschikt voor Core 2.6.3 (mrWheel#32)
Browse files Browse the repository at this point in the history
* Ready for core 2.6.3

* Ready for core 2.6.3

* Ready for core 2.6.3
  • Loading branch information
mrWheel authored Jan 7, 2020
1 parent effca6f commit a61ac72
Show file tree
Hide file tree
Showing 18 changed files with 137 additions and 296 deletions.
24 changes: 14 additions & 10 deletions DSMRloggerWS.ino
Original file line number Diff line number Diff line change
Expand Up @@ -2,29 +2,33 @@
***************************************************************************
** Program : DSMRloggerWS (WebSockets)
*/
#define _FW_VERSION "v1.0.4 (29-12-2019)"
#define _FW_VERSION "v1.0.5 (07-01-2020)"
/*
** Copyright (c) 2019 Willem Aandewiel
** Copyright (c) 2020 Willem Aandewiel
**
** TERMS OF USE: MIT License. See bottom of file.
***************************************************************************
*
Use Boards Manager to install Arduino ESP8266 core 2.6.3 (https://github.com/esp8266/Arduino/releases)
Arduino-IDE settings for DSMR-logger Version 4 (ESP-12):
- Board: "Generic ESP8266 Module"
- Buildin Led: "2" // ESP-01 (Black) GPIO01 - Pin 2 // "2" for Wemos and ESP-01S
- Upload Speed: "115200" - "460800"
- CPU Frequency: "80 MHz"
- Crystal Frequency: "26 MHz"
- Flash size: "4MB (FS: 1MB OTA:~1019KB)" // ESP-01 "1MB (256KB SPIFFS)" // PUYA flash chip won't work
- Flash mode: "DOUT" | "DIO" // if you change from one to the other OTA may fail!
- Flash size: "4M (1M SPIFFS)" // ESP-01 "1M (256K SPIFFS)" // PUYA flash chip won't work
- Flash Frequency: "80MHz"
- Reset Method: "no dtr (aka ck)" // but will depend on the programmer!
- DebugT port: "Disabled"
- DebugT Level: "None"
- IwIP Variant: "v2 Lower Memory"
- Reset Method: "none" // but will depend on the programmer!
- Crystal Frequency: "26 MHz"
- VTables: "Flash"
- Flash Frequency: "40MHz"
- CPU Frequency: "80 MHz"
- Buildin Led: "2" // ESP-01 (Black) GPIO01 - Pin 2 // "2" for Wemos and ESP-01S
- Upload Speed: "115200"
- Erase Flash: "Only Sketch"
- Espressif FW: "nonos-sdk 2.2.1 (legacy)"
- SSL Support: "All SSL ciphers (most compatible)"
- Port: <select correct port>
*/

Expand Down Expand Up @@ -252,7 +256,7 @@ uint16_t GasDeviceType;

String lastReset = "";
bool spiffsNotPopulated = false; // v1.0.3b
bool OTAinProgress = false, doLog = false, Verbose1 = false, Verbose2 = false, showRaw = false;
bool Verbose1 = false, Verbose2 = false, showRaw = false;
int8_t thisHour = -1, prevNtpHour = 0, thisDay = -1, thisMonth = -1, lastMonth, thisYear = 15;
int32_t thisHourKey = -1;
int8_t forceMonth = 0, forceDay = 0;
Expand Down
2 changes: 1 addition & 1 deletion Debug.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
** Program : Debug.h, part of DSMRloggerWS
** Version : v1.0.4
**
** Copyright (c) 2019 Willem Aandewiel
** Copyright (c) 2020 Willem Aandewiel
** Met dank aan Erik
**
** TERMS OF USE: MIT License. See bottom of file.
Expand Down
2 changes: 1 addition & 1 deletion MinderGas.ino
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
** Copyright (c) 2019 Robert van den Breemen
** Copyright (c) 2020 Robert van den Breemen
**
** TERMS OF USE: MIT License. See bottom of file.
***************************************************************************
Expand Down
9 changes: 9 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,15 @@
<br>
<table>
<tr><th>Versie</th><th>Opmerking</th></tr>
<tr>
<td valign="top">1.0.5</td>
<td>Dit is een 'tussen' release
<br>
<br> * Geschikt voor esp8266 core 2.6.3 (niét meer voor 2.5.x)
<br> * Nieuwe Update Library (moet geïnstalleerd worden)
<br> &nbsp; &nbsp; ---> https://github.com/mrWheel/ModUpdateServer
</td>
</tr>
<tr>
<td valign="top">1.0.4</td>
<td>[RvdB] Koppeling met MinderGas.nl
Expand Down
2 changes: 1 addition & 1 deletion SPIFFSstuff.ino
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
** Program : SPIFFSstuff, part of DSMRloggerWS
** Version : v1.0.4
**
** Copyright (c) 2019 Willem Aandewiel
** Copyright (c) 2020 Willem Aandewiel
**
** TERMS OF USE: MIT License. See bottom of file.
***************************************************************************
Expand Down
207 changes: 0 additions & 207 deletions UpdateServer.cpp

This file was deleted.

64 changes: 0 additions & 64 deletions UpdateServer.h

This file was deleted.

Loading

0 comments on commit a61ac72

Please sign in to comment.