Skip to content

Commit c6af913

Browse files
glynhudsonglynhudson
authored
Merge pull request #76 from OpenEVSE/divert_mode_off
Divert mode updates
2 parents c3f36e9 + b389054 commit c6af913

Some content is hidden

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

77 files changed

+16468
-1932
lines changed

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,3 +83,6 @@ ubuntu-xenial-16.04-cloudimg-console.log
8383

8484
# Dev Libraries links
8585
lib/ArduinoMongoose
86+
lib/ConfigJson
87+
lib/OpenEVSE
88+
lib/ESPAL

‎.travis.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
# < http://docs.platformio.org/page/userguide/cmd_ci.html >
1515
#
1616

17+
1718
language: python
1819

1920
python:
@@ -30,7 +31,9 @@ env:
3031
#- PIO_ENV=openevse_staging_libs
3132
- PIO_ENV=openevse_nodemcu-32s
3233
- PIO_ENV=openevse_esp-wrover-kit
34+
- PIO_ENV=openevse_esp-wrover-kit_idf
3335
- PIO_ENV=openevse_huzzah32
36+
- PIO_ENV=openevse_huzzah32_idf
3437
- PIO_ENV=openevse_featheresp32
3538
- PIO_ENV=openevse_esp32-gateway
3639
- PIO_ENV=openevse_esp32-gateway-e

‎divert_sim/.gitattributes‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
*.sh text eol=lf

‎divert_sim/.gitignore‎

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
2+
# Created by https://www.gitignore.io/api/osx,linux,windows,code
3+
# Edit at https://www.gitignore.io/?templates=osx,linux,windows,code
4+
5+
### Code ###
6+
.vscode/*
7+
!.vscode/settings.json
8+
!.vscode/tasks.json
9+
!.vscode/launch.json
10+
!.vscode/extensions.json
11+
12+
### Linux ###
13+
*~
14+
15+
# temporary files which can be created if a process still has a handle open of a deleted file
16+
.fuse_hidden*
17+
18+
# KDE directory preferences
19+
.directory
20+
21+
# Linux trash folder which might appear on any partition or disk
22+
.Trash-*
23+
24+
# .nfs files are created when an open file is removed but is still being accessed
25+
.nfs*
26+
27+
### OSX ###
28+
# General
29+
.DS_Store
30+
.AppleDouble
31+
.LSOverride
32+
33+
# Icon must end with two \r
34+
Icon
35+
36+
# Thumbnails
37+
._*
38+
39+
# Files that might appear in the root of a volume
40+
.DocumentRevisions-V100
41+
.fseventsd
42+
.Spotlight-V100
43+
.TemporaryItems
44+
.Trashes
45+
.VolumeIcon.icns
46+
.com.apple.timemachine.donotpresent
47+
48+
# Directories potentially created on remote AFP share
49+
.AppleDB
50+
.AppleDesktop
51+
Network Trash Folder
52+
Temporary Items
53+
.apdisk
54+
55+
### Windows ###
56+
# Windows thumbnail cache files
57+
Thumbs.db
58+
Thumbs.db:encryptable
59+
ehthumbs.db
60+
ehthumbs_vista.db
61+
62+
# Dump file
63+
*.stackdump
64+
65+
# Folder config file
66+
[Dd]esktop.ini
67+
68+
# Recycle Bin used on file shares
69+
$RECYCLE.BIN/
70+
71+
# Windows Installer files
72+
*.cab
73+
*.msi
74+
*.msix
75+
*.msm
76+
*.msp
77+
78+
# Windows shortcuts
79+
*.lnk
80+
81+
# End of https://www.gitignore.io/api/osx,linux,windows,code
82+
83+
*.o
84+
divert_sim
85+
output

‎divert_sim/.vscode/launch.json‎

Lines changed: 103 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,103 @@
1+
{
2+
// Use IntelliSense to learn about possible attributes.
3+
// Hover to view descriptions of existing attributes.
4+
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
5+
"version": "0.2.0",
6+
"configurations": [
7+
{
8+
"name": "divert_sim: day1.csv",
9+
"type": "cppdbg",
10+
"request": "launch",
11+
"program": "${workspaceFolder}/divert_sim",
12+
"args": [
13+
"<", "${workspaceFolder}/data/day1.csv"
14+
],
15+
"stopAtEntry": false,
16+
"cwd": "${workspaceFolder}",
17+
"environment": [],
18+
"externalConsole": false,
19+
"MIMode": "gdb",
20+
"setupCommands": [
21+
{
22+
"description": "Enable pretty-printing for gdb",
23+
"text": "-enable-pretty-printing",
24+
"ignoreFailures": true
25+
}
26+
],
27+
"preLaunchTask": "build",
28+
"miDebuggerPath": "/usr/bin/gdb"
29+
},
30+
{
31+
"name": "divert_sim: Day 1 Grid IE.csv",
32+
"type": "cppdbg",
33+
"request": "launch",
34+
"program": "${workspaceFolder}/divert_sim",
35+
"args": [
36+
"-g", "2",
37+
"<", "${workspaceFolder}/data/Day 1 Grid IE.csv"
38+
],
39+
"stopAtEntry": false,
40+
"cwd": "${workspaceFolder}",
41+
"environment": [],
42+
"externalConsole": false,
43+
"MIMode": "gdb",
44+
"setupCommands": [
45+
{
46+
"description": "Enable pretty-printing for gdb",
47+
"text": "-enable-pretty-printing",
48+
"ignoreFailures": true
49+
}
50+
],
51+
"preLaunchTask": "build",
52+
"miDebuggerPath": "/usr/bin/gdb"
53+
},
54+
{
55+
"name": "divert_sim: solar-vrms.csv",
56+
"type": "cppdbg",
57+
"request": "launch",
58+
"program": "${workspaceFolder}/divert_sim",
59+
"args": [
60+
"-v", "2",
61+
"<", "${workspaceFolder}/data/solar-vrms.csv"
62+
],
63+
"stopAtEntry": false,
64+
"cwd": "${workspaceFolder}",
65+
"environment": [],
66+
"externalConsole": false,
67+
"MIMode": "gdb",
68+
"setupCommands": [
69+
{
70+
"description": "Enable pretty-printing for gdb",
71+
"text": "-enable-pretty-printing",
72+
"ignoreFailures": true
73+
}
74+
],
75+
"preLaunchTask": "build",
76+
"miDebuggerPath": "/usr/bin/gdb"
77+
},
78+
{
79+
"name": "divert_sim: Energy_and_Power_Day_2020-03-22.csv",
80+
"type": "cppdbg",
81+
"request": "launch",
82+
"program": "${workspaceFolder}/divert_sim",
83+
"args": [
84+
"--sep", "\\;", "--kw",
85+
"<", "${workspaceFolder}/data/Energy_and_Power_Day_2020-03-22.csv"
86+
],
87+
"stopAtEntry": false,
88+
"cwd": "${workspaceFolder}",
89+
"environment": [],
90+
"externalConsole": false,
91+
"MIMode": "gdb",
92+
"setupCommands": [
93+
{
94+
"description": "Enable pretty-printing for gdb",
95+
"text": "-enable-pretty-printing",
96+
"ignoreFailures": true
97+
}
98+
],
99+
"preLaunchTask": "build",
100+
"miDebuggerPath": "/usr/bin/gdb"
101+
}
102+
]
103+
}

‎divert_sim/.vscode/tasks.json‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"tasks": [
3+
{
4+
"type": "shell",
5+
"label": "build",
6+
"command": "/usr/bin/make",
7+
"options": {
8+
"cwd": "${workspaceFolder}"
9+
},
10+
"problemMatcher": [
11+
"$gcc"
12+
]
13+
}
14+
],
15+
"version": "2.0.0"
16+
}

‎divert_sim/FakeDuino/Arduino.h‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
/*
2+
Arduino.h - LinuxDuino main header
3+
(You can inlcude multiple Arduino.h headers if you use
4+
this folder, but you can't inlcude LinuxDuino.h)
5+
6+
Copyright (c) 2016 Jorge Garza <[email protected]>
7+
8+
This library is free software; you can redistribute it and/or
9+
modify it under the terms of the GNU Lesser General Public
10+
License as published by the Free Software Foundation; either
11+
version 2.1 of the License, or (at your option) any later version.
12+
13+
This library is distributed in the hope that it will be useful,
14+
but WITHOUT ANY WARRANTY; without even the implied warranty of
15+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
16+
Lesser General Public License for more details.
17+
18+
You should have received a copy of the GNU Lesser General Public
19+
License along with this library; if not, write to the Free Software
20+
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
21+
*/
22+
23+
#ifndef Arduino_h
24+
#define Arduino_h
25+
26+
#include <stdio.h>
27+
#include <string.h>
28+
#include <stdint.h>
29+
#include <stdlib.h>
30+
#include <time.h>
31+
#include <string>
32+
#include "Core.h"
33+
#include "Serial.h"
34+
#include "Console.h"
35+
36+
extern void setup(void);
37+
extern void loop(void);
38+
39+
#endif

0 commit comments

Comments
 (0)