Skip to content

Commit 246c42c

Browse files
KipKKipK
committed
Merge branch 'master' into newflags
2 parents 94cef5a + 8ce9db4 commit 246c42c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+16755
-427
lines changed

‎api.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -193,9 +193,9 @@ paths:
193193
value:
194194
divert_type: 0
195195
divert_enabled: true
196-
divert_attack_smoothing_factor: 0.4
197-
divert_decay_smoothing_factor: 0.05
198-
divert_min_charge_time: 60
196+
divert_attack_smoothing_time: 8
197+
divert_decay_smoothing_time: 300
198+
divert_min_charge_time: 20
199199
Set normal charging mode:
200200
value:
201201
charge_mode: fast

‎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/Makefile‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ CPPFLAGS := \
3636
# \
3737
# -D ENABLE_DEBUG \
3838
# -D ENABLE_DEBUG_DIVERT \
39+
# -D ENABLE_DEBUG_INPUT_FILTER \
3940
# -D ENABLE_DEBUG_EVSE_MAN \
4041
# -D ENABLE_DEBUG_EVSE_MONITOR
4142
LDFLAGS := -pthread
@@ -65,6 +66,7 @@ STREAM_SPY_OBJ := \
6566
StreamSpy.o \
6667

6768
OPENEVSE_WIFI_OBJ := \
69+
input_filter.o \
6870
divert.o \
6971
current_shaper.o \
7072
evse_man.o \
@@ -135,7 +137,7 @@ clean:
135137
rm -f $(TARGETS) $(OBJ)
136138

137139
server:
138-
python3 -m http.server
140+
python3 server.py
139141

140142
$(OBJ): %.o : %.cpp $(DEPS)
141143
$(CPP) -c -o $@ $< $(CPPFLAGS)

‎divert_sim/data/config-default.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"divert_PV_ratio": 1.1,
3+
"divert_attack_smoothing_time": 20,
4+
"divert_decay_smoothing_time": 600,
5+
"divert_min_charge_time": 600
6+
}

‎divert_sim/data/config-inputfilter-noimport.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"divert_PV_ratio": 1.1,
3+
"divert_attack_smoothing_time": 300,
4+
"divert_decay_smoothing_time": 20,
5+
"divert_min_charge_time": 600
6+
}

‎divert_sim/data/config-inputfilter-nowaste.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"divert_PV_ratio": 0.5,
3+
"divert_attack_smoothing_time": 20,
4+
"divert_decay_smoothing_time": 600,
5+
"divert_min_charge_time": 600
6+
}

‎divert_sim/data/test_config.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"divert_PV_ratio": 0.5,
3-
"divert_attack_smoothing_factor": 0.4,
4-
"divert_decay_smoothing_factor": 0.05,
2+
"divert_PV_ratio": 1.1,
3+
"divert_attack_smoothing_time": 20,
4+
"divert_decay_smoothing_time": 600,
55
"divert_min_charge_time": 600
66
}

‎divert_sim/interactive.html‎

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
<!DOCTYPE html>
2+
<html>
3+
4+
<head>
5+
<title>OpenEVSE Solar Divert Simulations</title>
6+
<script type="text/javascript" src="https://canvasjs.com/assets/script/jquery-1.11.1.min.js"></script>
7+
<script type="text/javascript" src="https://canvasjs.com/assets/script/canvasjs.min.js"></script>
8+
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.24.0/moment.min.js"></script>
9+
<script type="text/javascript" src="simulations.js"></script>
10+
<script type="text/javascript">
11+
var profiles = [
12+
"master",
13+
"interactive"
14+
];
15+
16+
function run_simulation() {
17+
$.post("simulation", JSON.stringify({
18+
"divert_PV_ratio": parseFloat($("#divert_PV_ratio").val()),
19+
"divert_attack_smoothing_time": parseInt($("#divert_attack_smoothing_time").val()),
20+
"divert_decay_smoothing_time": parseInt($("#divert_decay_smoothing_time").val()),
21+
"divert_min_charge_time": parseInt($("#divert_min_charge_time").val())
22+
}), () => {
23+
init_summary(profiles);
24+
loadSummary("output/summary_master.csv", () => {
25+
loadSummary("output/summary_interactive.csv", () => {
26+
generate_summary_table(profiles);
27+
for (const dataset of datasets) {
28+
var id = dataset.id + "_interactive";
29+
loadChart(id, "output/"+ id + ".csv", dataset.title + " (interactive)", dataset.class);
30+
}
31+
}, "interactive");
32+
});
33+
});
34+
}
35+
</script>
36+
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" />
37+
<link rel="stylesheet" href="simulations.css" />
38+
</head>
39+
40+
<body>
41+
<h1>OpenEVSE Solar Divert Simulations</h1>
42+
43+
<a href="view.html">Test Results</a><br/>
44+
45+
<label for="divert_PV_ratio">divert_PV_ratio</label>
46+
<input type="text" id="divert_PV_ratio" value="1.1"><br/>
47+
<label for="divert_attack_smoothing_time">divert_attack_smoothing_time</label>
48+
<input type="text" id="divert_attack_smoothing_time" value="20"><br/>
49+
<label for="divert_decay_smoothing_time">divert_decay_smoothing_time</label>
50+
<input type="text" id="divert_decay_smoothing_time" value="200"><br/>
51+
<label for="divert_min_charge_time">divert_min_charge_time</label>
52+
<input type="text" id="divert_min_charge_time" value="600"><br/>
53+
54+
<button onclick="run_simulation()">Run Simulation</button>
55+
56+
<h2>Summary</h2>
57+
<div id="summary_table">
58+
</div>
59+
60+
<script type="text/javascript">
61+
62+
for (const dataset of datasets) {
63+
var id = generate_chart(dataset, "master");;
64+
loadChart(id, "output/"+ id + ".csv", dataset.title + " (master)", dataset.class);
65+
generate_chart(dataset, "interactive");
66+
}
67+
//<div id="day1_default" style="width:100%; height:300px;" class="solar" csv="output/day1_default.csv" title="Day 1"></div>
68+
69+
</script>
70+
71+
</body>
72+
73+
</html>

0 commit comments

Comments
 (0)