Skip to content

Commit

Permalink
verwijder oude v1 spullen
Browse files Browse the repository at this point in the history
  • Loading branch information
mhendriks committed Jun 7, 2020
1 parent 5fdf346 commit 1c0d60d
Show file tree
Hide file tree
Showing 13 changed files with 235 additions and 1,274 deletions.
15 changes: 3 additions & 12 deletions DSMRloggerAPI.h
Original file line number Diff line number Diff line change
Expand Up @@ -67,21 +67,12 @@ P1Reader slimmeMeter(&swSer1, DTR_ENABLE);
#define DATA_CSV_HEADER "YYMMDDHH; EDT1; EDT2; ERT1; ERT2; GDT;"
#define DATA_RECLEN 75

#define HOURS_FILE "/RINGhours.csv"
#define _NO_HOUR_SLOTS_ (48 +1)

#define DAYS_FILE "/RINGdays.csv"
#define _NO_DAY_SLOTS_ (14 +1)

#define MONTHS_FILE "/RINGmonths.csv"
#define _NO_MONTH_SLOTS_ (24 +1)

enum { PERIOD_UNKNOWN, HOURS, DAYS, MONTHS, YEARS };

typedef enum E_ringfiletype {RINGHOURS, RINGDAYS, RINGMONTHS};

typedef struct {
String filename;
char filename[18];
int8_t slots;
unsigned int seconds;
} S_ringfile;
Expand Down Expand Up @@ -158,7 +149,7 @@ using MyData = ParsedData<

enum { TAB_UNKNOWN, TAB_ACTUEEL, TAB_LAST24HOURS, TAB_LAST7DAYS, TAB_LAST24MONTHS, TAB_GRAPHICS, TAB_SYSINFO, TAB_EDITOR };

typedef struct {
/*typedef struct {
uint32_t Label;
float EDT1;
float EDT2;
Expand All @@ -170,7 +161,7 @@ typedef struct {
static dataStruct hourData; // 0 + 1-24
static dataStruct dayData; // 1 - 7 (0=header, 1=sunday)
static dataStruct monthData; // 0 + year1 1 t/m 12 + year2 1 t/m 12

*/
const char *weekDayName[] { "Unknown", "Zondag", "Maandag", "Dinsdag", "Woensdag"
, "Donderdag", "Vrijdag", "Zaterdag", "Unknown" };
const char *monthName[] { "00", "Januari", "Februari", "Maart", "April", "Mei", "Juni", "Juli"
Expand Down
9 changes: 4 additions & 5 deletions DSMRloggerAPI.ino
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,17 @@
***************************************************************************
*
* TODO
* - verwijderen v1
* - v1/dev/settings .js file (opslaan settings)
* Future development
* - ringfile : fout bestaande file - oude renamen en nieuwe maken
* - api: laatste 10 errors/excepties
* - eport ringfiles to private cloud -> using API
* - upload ringfiles to private cloud -> using API
Arduino-IDE settings for DSMR-logger Version 4 (ESP-12):
Arduino-IDE settings for DSMR-logger Version 1 (ESP-M3):
- Board: "Generic ESP8266 Module"
- Flash mode: "DOUT" | "DIO" // change only after power-off and on again!
- Flash size: "4MB (FS: 2MB OAT:~1019KB)" << LET OP! 2MB SPIFFS
- Flash size: "1MB (FS: 128KB OAT:~438KB)"
- DebugT port: "Disabled"
- DebugT Level: "None"
- IwIP Variant: "v2 Lower Memory"
Expand All @@ -30,7 +29,7 @@
- VTables: "Flash"
- Flash Frequency: "40MHz"
- CPU Frequency: "80 MHz"
- Buildin Led: "2" // GPIO02 for Wemos and ESP-12
- Buildin Led: "2" // GPIO02
- Upload Speed: "115200"
- Erase Flash: "Only Sketch"
- Port: <select correct port>
Expand Down
Loading

0 comments on commit 1c0d60d

Please sign in to comment.