Skip to content

Commit 4e21826

Browse files
committed
Merge branch 'shaper' of https://github.com/KipK/ESP32_WiFi_V4.x into shaper
2 parents 90d61bc + 616a89c commit 4e21826

16 files changed

+7162
-181
lines changed

divert_sim/.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,4 +82,7 @@ $RECYCLE.BIN/
8282

8383
*.o
8484
divert_sim
85-
output
85+
86+
*.csv
87+
test_results.xml
88+
!*_master.csv

divert_sim/output/CloudyMorning_master.csv

Lines changed: 957 additions & 0 deletions
Large diffs are not rendered by default.
Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
Date,Solar,Grid IE,Pilot,Charge Power,Min Charge Power,State,Smoothed Available
2+
01/01/2020 00:15:00,0,0,0,0,1440,254,0
3+
01/01/2020 00:30:00,0,0,0,0,1440,254,0
4+
01/01/2020 00:45:00,0,0,0,0,1440,254,0
5+
01/01/2020 01:00:00,0,0,0,0,1440,254,0
6+
01/01/2020 01:15:00,0,0,0,0,1440,254,0
7+
01/01/2020 01:30:00,0,0,0,0,1440,254,0
8+
01/01/2020 01:45:00,0,0,0,0,1440,254,0
9+
01/01/2020 02:00:00,0,0,0,0,1440,254,0
10+
01/01/2020 02:15:00,0,0,0,0,1440,254,0
11+
01/01/2020 02:30:00,0,0,0,0,1440,254,0
12+
01/01/2020 02:45:00,0,0,0,0,1440,254,0
13+
01/01/2020 03:00:00,0,0,0,0,1440,254,0
14+
01/01/2020 03:15:00,0,0,0,0,1440,254,0
15+
01/01/2020 03:30:00,0,0,0,0,1440,254,0
16+
01/01/2020 03:45:00,0,0,0,0,1440,254,0
17+
01/01/2020 04:00:00,0,0,0,0,1440,254,0
18+
01/01/2020 04:15:00,0,0,0,0,1440,254,0
19+
01/01/2020 04:30:00,0,0,0,0,1440,254,0
20+
01/01/2020 04:45:00,0,0,0,0,1440,254,0
21+
01/01/2020 05:00:00,0,0,0,0,1440,254,0
22+
01/01/2020 05:15:00,0,0,0,0,1440,254,0
23+
01/01/2020 05:30:00,0,0,0,0,1440,254,0
24+
01/01/2020 05:45:00,0,0,0,0,1440,254,0
25+
01/01/2020 06:00:00,0,0,0,0,1440,254,0
26+
01/01/2020 06:15:00,0,0,0,0,1440,254,0
27+
01/01/2020 06:30:00,20,0,0,0,1440,254,8
28+
01/01/2020 06:45:00,72,0,0,0,1440,254,33.6
29+
01/01/2020 07:00:00,128,0,0,0,1440,254,71.36
30+
01/01/2020 07:15:00,192,0,0,0,1440,254,119.616
31+
01/01/2020 07:30:00,272,0,0,0,1440,254,180.57
32+
01/01/2020 07:45:00,436,0,0,0,1440,254,282.742
33+
01/01/2020 08:00:00,752,0,0,0,1440,254,470.445
34+
01/01/2020 08:15:00,1368,0,0,0,1440,254,829.467
35+
01/01/2020 08:30:00,1444,0,0,0,1440,254,1075.28
36+
01/01/2020 08:45:00,1432,0,0,0,1440,254,1217.97
37+
01/01/2020 09:00:00,1572,0,0,0,1440,254,1359.58
38+
01/01/2020 09:15:00,2160,0,9,2160,1440,3,1679.75
39+
01/01/2020 09:30:00,2748,0,11,2640,1440,3,2107.05
40+
01/01/2020 09:45:00,3248,0,13,3120,1440,3,2563.43
41+
01/01/2020 10:00:00,3804,0,15,3600,1440,3,3059.66
42+
01/01/2020 10:15:00,4280,0,17,4080,1440,3,3547.79
43+
01/01/2020 10:30:00,4568,0,19,4560,1440,3,3955.88
44+
01/01/2020 10:45:00,4788,0,19,4560,1440,3,4288.73
45+
01/01/2020 11:00:00,5160,0,21,5040,1440,3,4637.24
46+
01/01/2020 11:15:00,5660,0,23,5520,1440,3,5046.34
47+
01/01/2020 11:30:00,6276,0,26,6240,1440,3,5538.2
48+
01/01/2020 11:45:00,6468,0,26,6240,1440,3,5910.12
49+
01/01/2020 12:00:00,6708,0,27,6480,1440,3,6229.27
50+
01/01/2020 12:15:00,6788,0,28,6720,1440,3,6452.76
51+
01/01/2020 12:30:00,6820,0,28,6720,1440,3,6599.66
52+
01/01/2020 12:45:00,6816,0,28,6720,1440,3,6686.2
53+
01/01/2020 13:00:00,6864,0,28,6720,1440,3,6757.32
54+
01/01/2020 13:15:00,6908,0,28,6720,1440,3,6817.59
55+
01/01/2020 13:30:00,6928,0,28,6720,1440,3,6861.75
56+
01/01/2020 13:45:00,6852,0,28,6720,1440,3,6857.85
57+
01/01/2020 14:00:00,6716,0,27,6480,1440,3,6801.11
58+
01/01/2020 14:15:00,6392,0,26,6240,1440,3,6637.47
59+
01/01/2020 14:30:00,6364,0,26,6240,1440,3,6528.08
60+
01/01/2020 14:45:00,6064,0,25,6000,1440,3,6342.45
61+
01/01/2020 15:00:00,5744,0,23,5520,1440,3,6103.07
62+
01/01/2020 15:15:00,4792,0,19,4560,1440,3,5578.64
63+
01/01/2020 15:30:00,4080,0,17,4080,1440,3,4979.18
64+
01/01/2020 15:45:00,3708,0,15,3600,1440,3,4470.71
65+
01/01/2020 16:00:00,3172,0,13,3120,1440,3,3951.23
66+
01/01/2020 16:15:00,2464,0,10,2400,1440,3,3356.34
67+
01/01/2020 16:30:00,1800,0,7,1680,1440,3,2733.8
68+
01/01/2020 16:45:00,1404,0,6,1440,1440,3,2201.88
69+
01/01/2020 17:00:00,1020,0,6,1440,1440,3,1729.13
70+
01/01/2020 17:15:00,812,0,0,0,1440,254,1362.28
71+
01/01/2020 17:30:00,604,0,0,0,1440,254,1058.97
72+
01/01/2020 17:45:00,428,0,0,0,1440,254,806.58
73+
01/01/2020 18:00:00,244,0,0,0,1440,254,581.548
74+
01/01/2020 18:15:00,124,0,0,0,1440,254,398.529
75+
01/01/2020 18:30:00,32,0,0,0,1440,254,251.917
76+
01/01/2020 18:45:00,0,0,0,0,1440,254,151.15
77+
01/01/2020 19:00:00,0,0,0,0,1440,254,90.6902
78+
01/01/2020 19:15:00,0,0,0,0,1440,254,54.4141
79+
01/01/2020 19:30:00,0,0,0,0,1440,254,32.6485
80+
01/01/2020 19:45:00,0,0,0,0,1440,254,19.5891
81+
01/01/2020 20:00:00,0,0,0,0,1440,254,11.7535
82+
01/01/2020 20:15:00,0,0,0,0,1440,254,7.05207
83+
01/01/2020 20:30:00,0,0,0,0,1440,254,4.23124
84+
01/01/2020 20:45:00,0,0,0,0,1440,254,2.53875
85+
01/01/2020 21:00:00,0,0,0,0,1440,254,1.52325
86+
01/01/2020 21:15:00,0,0,0,0,1440,254,0.913948
87+
01/01/2020 21:30:00,0,0,0,0,1440,254,0.548369
88+
01/01/2020 21:45:00,0,0,0,0,1440,254,0.329021
89+
01/01/2020 22:00:00,0,0,0,0,1440,254,0.197413
90+
01/01/2020 22:15:00,0,0,0,0,1440,254,0.118448
91+
01/01/2020 22:30:00,0,0,0,0,1440,254,0.0710686
92+
01/01/2020 22:45:00,0,0,0,0,1440,254,0.0426412
93+
01/01/2020 23:00:00,0,0,0,0,1440,254,0.0255847
94+
01/01/2020 23:15:00,0,0,0,0,1440,254,0.0153508
95+
01/01/2020 23:30:00,0,0,0,0,1440,254,0.00921049
96+
01/01/2020 23:45:00,0,0,0,0,1440,254,0.0055263
Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
Date,Solar,Grid IE,Pilot,Charge Power,Min Charge Power,State,Smoothed Available
2+
01/01/2020 00:15:00,0,0,0,0,1440,254,0
3+
01/01/2020 00:30:00,0,0,0,0,1440,254,0
4+
01/01/2020 00:45:00,0,0,0,0,1440,254,0
5+
01/01/2020 01:00:00,0,0,0,0,1440,254,0
6+
01/01/2020 01:15:00,0,0,0,0,1440,254,0
7+
01/01/2020 01:30:00,0,0,0,0,1440,254,0
8+
01/01/2020 01:45:00,0,0,0,0,1440,254,0
9+
01/01/2020 02:00:00,0,0,0,0,1440,254,0
10+
01/01/2020 02:15:00,0,0,0,0,1440,254,0
11+
01/01/2020 02:30:00,0,0,0,0,1440,254,0
12+
01/01/2020 02:45:00,0,0,0,0,1440,254,0
13+
01/01/2020 03:00:00,0,0,0,0,1440,254,0
14+
01/01/2020 03:15:00,0,0,0,0,1440,254,0
15+
01/01/2020 03:30:00,0,0,0,0,1440,254,0
16+
01/01/2020 03:45:00,0,0,0,0,1440,254,0
17+
01/01/2020 04:00:00,0,0,0,0,1440,254,0
18+
01/01/2020 04:15:00,0,0,0,0,1440,254,0
19+
01/01/2020 04:30:00,0,0,0,0,1440,254,0
20+
01/01/2020 04:45:00,0,0,0,0,1440,254,0
21+
01/01/2020 05:00:00,0,0,0,0,1440,254,0
22+
01/01/2020 05:15:00,0,0,0,0,1440,254,0
23+
01/01/2020 05:30:00,0,0,0,0,1440,254,0
24+
01/01/2020 05:45:00,0,0,0,0,1440,254,0
25+
01/01/2020 06:00:00,0,0,0,0,1440,254,0
26+
01/01/2020 06:15:00,0,0,0,0,1440,254,0
27+
01/01/2020 06:30:00,0,0,0,0,1440,254,0
28+
01/01/2020 06:45:00,0,0,0,0,1440,254,0
29+
01/01/2020 07:00:00,16,0,0,0,1440,254,6.4
30+
01/01/2020 07:15:00,68,0,0,0,1440,254,31.04
31+
01/01/2020 07:30:00,124,0,0,0,1440,254,68.224
32+
01/01/2020 07:45:00,180,0,0,0,1440,254,112.934
33+
01/01/2020 08:00:00,292,0,0,0,1440,254,184.561
34+
01/01/2020 08:15:00,508,0,0,0,1440,254,313.936
35+
01/01/2020 08:30:00,700,0,0,0,1440,254,468.362
36+
01/01/2020 08:45:00,1064,0,0,0,1440,254,706.617
37+
01/01/2020 09:00:00,1524,0,0,0,1440,254,1033.57
38+
01/01/2020 09:15:00,2108,0,8,1920,1440,3,1463.34
39+
01/01/2020 09:30:00,2292,0,9,2160,1440,3,1794.81
40+
01/01/2020 09:45:00,2312,0,9,2160,1440,3,2001.68
41+
01/01/2020 10:00:00,2564,0,10,2400,1440,3,2226.61
42+
01/01/2020 10:15:00,3008,0,12,2880,1440,3,2539.17
43+
01/01/2020 10:30:00,3488,0,14,3360,1440,3,2918.7
44+
01/01/2020 10:45:00,3960,0,16,3840,1440,3,3335.22
45+
01/01/2020 11:00:00,4744,0,19,4560,1440,3,3898.73
46+
01/01/2020 11:15:00,5272,0,21,5040,1440,3,4448.04
47+
01/01/2020 11:30:00,4812,0,20,4800,1440,3,4593.62
48+
01/01/2020 11:45:00,4996,0,20,4800,1440,3,4754.57
49+
01/01/2020 12:00:00,3532,0,14,3360,1440,3,4265.54
50+
01/01/2020 12:15:00,4176,0,17,4080,1440,3,4229.73
51+
01/01/2020 12:30:00,3064,0,12,2880,1440,3,3763.44
52+
01/01/2020 12:45:00,2564,0,10,2400,1440,3,3283.66
53+
01/01/2020 13:00:00,2848,0,11,2640,1440,3,3109.4
54+
01/01/2020 13:15:00,2336,0,9,2160,1440,3,2800.04
55+
01/01/2020 13:30:00,2780,0,11,2640,1440,3,2792.02
56+
01/01/2020 13:45:00,4440,0,18,4320,1440,3,3451.21
57+
01/01/2020 14:00:00,3920,0,16,3840,1440,3,3638.73
58+
01/01/2020 14:15:00,2860,0,11,2640,1440,3,3327.24
59+
01/01/2020 14:30:00,1848,0,7,1680,1440,3,2735.54
60+
01/01/2020 14:45:00,1712,0,7,1680,1440,3,2326.13
61+
01/01/2020 15:00:00,1272,0,6,1440,1440,3,1904.48
62+
01/01/2020 15:15:00,1140,0,6,1440,1440,3,1598.69
63+
01/01/2020 15:30:00,1056,0,0,0,1440,254,1381.61
64+
01/01/2020 15:45:00,988,0,0,0,1440,254,1224.17
65+
01/01/2020 16:00:00,928,0,0,0,1440,254,1105.7
66+
01/01/2020 16:15:00,696,0,0,0,1440,254,941.82
67+
01/01/2020 16:30:00,584,0,0,0,1440,254,798.692
68+
01/01/2020 16:45:00,744,0,0,0,1440,254,776.815
69+
01/01/2020 17:00:00,1140,0,0,0,1440,254,922.089
70+
01/01/2020 17:15:00,1032,0,0,0,1440,254,966.053
71+
01/01/2020 17:30:00,1584,0,0,0,1440,254,1213.23
72+
01/01/2020 17:45:00,1256,0,0,0,1440,254,1230.34
73+
01/01/2020 18:00:00,736,0,0,0,1440,254,1032.6
74+
01/01/2020 18:15:00,644,0,0,0,1440,254,877.162
75+
01/01/2020 18:30:00,596,0,0,0,1440,254,764.697
76+
01/01/2020 18:45:00,412,0,0,0,1440,254,623.618
77+
01/01/2020 19:00:00,452,0,0,0,1440,254,554.971
78+
01/01/2020 19:15:00,212,0,0,0,1440,254,417.783
79+
01/01/2020 19:30:00,48,0,0,0,1440,254,269.87
80+
01/01/2020 19:45:00,8,0,0,0,1440,254,165.122
81+
01/01/2020 20:00:00,0,0,0,0,1440,254,99.073
82+
01/01/2020 20:15:00,0,0,0,0,1440,254,59.4438
83+
01/01/2020 20:30:00,0,0,0,0,1440,254,35.6663
84+
01/01/2020 20:45:00,0,0,0,0,1440,254,21.3998
85+
01/01/2020 21:00:00,0,0,0,0,1440,254,12.8399
86+
01/01/2020 21:15:00,0,0,0,0,1440,254,7.70392
87+
01/01/2020 21:30:00,0,0,0,0,1440,254,4.62235
88+
01/01/2020 21:45:00,0,0,0,0,1440,254,2.77341
89+
01/01/2020 22:00:00,0,0,0,0,1440,254,1.66405
90+
01/01/2020 22:15:00,0,0,0,0,1440,254,0.998428
91+
01/01/2020 22:30:00,0,0,0,0,1440,254,0.599057
92+
01/01/2020 22:45:00,0,0,0,0,1440,254,0.359434
93+
01/01/2020 23:00:00,0,0,0,0,1440,254,0.21566
94+
01/01/2020 23:15:00,0,0,0,0,1440,254,0.129396
95+
01/01/2020 23:30:00,0,0,0,0,1440,254,0.0776378
96+
01/01/2020 23:45:00,0,0,0,0,1440,254,0.0465827
Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
Date,Solar,Grid IE,Pilot,Charge Power,Min Charge Power,State,Smoothed Available
2+
01/01/2020 00:15:00,0,0,0,0,1440,254,0
3+
01/01/2020 00:30:00,0,0,0,0,1440,254,0
4+
01/01/2020 00:45:00,0,0,0,0,1440,254,0
5+
01/01/2020 01:00:00,0,0,0,0,1440,254,0
6+
01/01/2020 01:15:00,0,0,0,0,1440,254,0
7+
01/01/2020 01:30:00,0,0,0,0,1440,254,0
8+
01/01/2020 01:45:00,0,0,0,0,1440,254,0
9+
01/01/2020 02:00:00,0,0,0,0,1440,254,0
10+
01/01/2020 02:15:00,0,0,0,0,1440,254,0
11+
01/01/2020 02:30:00,0,0,0,0,1440,254,0
12+
01/01/2020 02:45:00,0,0,0,0,1440,254,0
13+
01/01/2020 03:00:00,0,0,0,0,1440,254,0
14+
01/01/2020 03:15:00,0,0,0,0,1440,254,0
15+
01/01/2020 03:30:00,0,0,0,0,1440,254,0
16+
01/01/2020 03:45:00,0,0,0,0,1440,254,0
17+
01/01/2020 04:00:00,0,0,0,0,1440,254,0
18+
01/01/2020 04:15:00,0,0,0,0,1440,254,0
19+
01/01/2020 04:30:00,0,0,0,0,1440,254,0
20+
01/01/2020 04:45:00,0,0,0,0,1440,254,0
21+
01/01/2020 05:00:00,0,0,0,0,1440,254,0
22+
01/01/2020 05:15:00,0,0,0,0,1440,254,0
23+
01/01/2020 05:30:00,0,0,0,0,1440,254,0
24+
01/01/2020 05:45:00,0,0,0,0,1440,254,0
25+
01/01/2020 06:00:00,0,0,0,0,1440,254,0
26+
01/01/2020 06:15:00,0,0,0,0,1440,254,0
27+
01/01/2020 06:30:00,0,0,0,0,1440,254,0
28+
01/01/2020 06:45:00,0,0,0,0,1440,254,0
29+
01/01/2020 07:00:00,0,0,0,0,1440,254,0
30+
01/01/2020 07:15:00,0,0,0,0,1440,254,0
31+
01/01/2020 07:30:00,0,0,0,0,1440,254,0
32+
01/01/2020 07:45:00,0,0,0,0,1440,254,0
33+
01/01/2020 08:00:00,8,0,0,0,1440,254,3.2
34+
01/01/2020 08:15:00,44,0,0,0,1440,254,19.52
35+
01/01/2020 08:30:00,40,0,0,0,1440,254,27.712
36+
01/01/2020 08:45:00,92,0,0,0,1440,254,53.4272
37+
01/01/2020 09:00:00,128,0,0,0,1440,254,83.2563
38+
01/01/2020 09:15:00,152,0,0,0,1440,254,110.754
39+
01/01/2020 09:30:00,172,0,0,0,1440,254,135.252
40+
01/01/2020 09:45:00,252,0,0,0,1440,254,181.951
41+
01/01/2020 10:00:00,292,0,0,0,1440,254,225.971
42+
01/01/2020 10:15:00,432,0,0,0,1440,254,308.382
43+
01/01/2020 10:30:00,1180,0,0,0,1440,254,657.029
44+
01/01/2020 10:45:00,1736,0,0,0,1440,254,1088.62
45+
01/01/2020 11:00:00,2048,0,8,1920,1440,3,1472.37
46+
01/01/2020 11:15:00,2748,0,11,2640,1440,3,1982.62
47+
01/01/2020 11:30:00,5100,0,21,5040,1440,3,3229.57
48+
01/01/2020 11:45:00,5448,0,22,5280,1440,3,4116.94
49+
01/01/2020 12:00:00,3780,0,15,3600,1440,3,3982.17
50+
01/01/2020 12:15:00,6944,0,28,6720,1440,3,5166.9
51+
01/01/2020 12:30:00,7204,0,30,7200,1440,3,5981.74
52+
01/01/2020 12:45:00,7480,0,31,7440,1440,3,6581.04
53+
01/01/2020 13:00:00,8168,0,31,7440,1440,3,7215.83
54+
01/01/2020 13:15:00,7268,0,30,7200,1440,3,7236.7
55+
01/01/2020 13:30:00,3628,0,15,3600,1440,3,5793.22
56+
01/01/2020 13:45:00,5316,0,22,5280,1440,3,5602.33
57+
01/01/2020 14:00:00,2016,0,8,1920,1440,3,4167.8
58+
01/01/2020 14:15:00,3988,0,16,3840,1440,3,4095.88
59+
01/01/2020 14:30:00,7472,0,31,7440,1440,3,5446.33
60+
01/01/2020 14:45:00,6052,0,25,6000,1440,3,5688.6
61+
01/01/2020 15:00:00,6540,0,27,6480,1440,3,6029.16
62+
01/01/2020 15:15:00,7404,0,30,7200,1440,3,6579.09
63+
01/01/2020 15:30:00,6848,0,28,6720,1440,3,6686.66
64+
01/01/2020 15:45:00,6676,0,27,6480,1440,3,6682.39
65+
01/01/2020 16:00:00,6796,0,28,6720,1440,3,6727.84
66+
01/01/2020 16:15:00,6204,0,25,6000,1440,3,6518.3
67+
01/01/2020 16:30:00,6108,0,25,6000,1440,3,6354.18
68+
01/01/2020 16:45:00,4548,0,18,4320,1440,3,5631.71
69+
01/01/2020 17:00:00,2648,0,11,2640,1440,3,4438.23
70+
01/01/2020 17:15:00,2276,0,9,2160,1440,3,3573.34
71+
01/01/2020 17:30:00,4456,0,18,4320,1440,3,3926.4
72+
01/01/2020 17:45:00,2488,0,10,2400,1440,3,3351.04
73+
01/01/2020 18:00:00,976,0,6,1440,1440,3,2401.02
74+
01/01/2020 18:15:00,644,0,6,1440,1440,3,1698.21
75+
01/01/2020 18:30:00,636,0,0,0,1440,254,1273.33
76+
01/01/2020 18:45:00,356,0,0,0,1440,254,906.397
77+
01/01/2020 19:00:00,292,0,0,0,1440,254,660.638
78+
01/01/2020 19:15:00,208,0,0,0,1440,254,479.583
79+
01/01/2020 19:30:00,144,0,0,0,1440,254,345.35
80+
01/01/2020 19:45:00,92,0,0,0,1440,254,244.01
81+
01/01/2020 20:00:00,36,0,0,0,1440,254,160.806
82+
01/01/2020 20:15:00,0,0,0,0,1440,254,96.4836
83+
01/01/2020 20:30:00,0,0,0,0,1440,254,57.8901
84+
01/01/2020 20:45:00,0,0,0,0,1440,254,34.7341
85+
01/01/2020 21:00:00,0,0,0,0,1440,254,20.8404
86+
01/01/2020 21:15:00,0,0,0,0,1440,254,12.5043
87+
01/01/2020 21:30:00,0,0,0,0,1440,254,7.50256
88+
01/01/2020 21:45:00,0,0,0,0,1440,254,4.50154
89+
01/01/2020 22:00:00,0,0,0,0,1440,254,2.70092
90+
01/01/2020 22:15:00,0,0,0,0,1440,254,1.62055
91+
01/01/2020 22:30:00,0,0,0,0,1440,254,0.972332
92+
01/01/2020 22:45:00,0,0,0,0,1440,254,0.583399
93+
01/01/2020 23:00:00,0,0,0,0,1440,254,0.35004
94+
01/01/2020 23:15:00,0,0,0,0,1440,254,0.210024
95+
01/01/2020 23:30:00,0,0,0,0,1440,254,0.126014
96+
01/01/2020 23:45:00,0,0,0,0,1440,254,0.0756085

0 commit comments

Comments
 (0)