Skip to content

Commit 23bc8d3

Browse files
mp-semp-se
authored
Merge pull request #176 from mp-se/dev
Merge 1.4 into master
2 parents 5c3a751 + 622e42c commit 23bc8d3

Some content is hidden

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

56 files changed

+2845
-1651
lines changed

‎bin/firmware.bin

11.3 KB
Binary file not shown.

‎bin/firmware32.bin

18.1 KB
Binary file not shown.

‎bin/firmware32c3.bin

29.2 KB
Binary file not shown.

‎bin/firmware32c3v1.bin

29.2 KB
Binary file not shown.

‎bin/firmware32lite.bin

18.1 KB
Binary file not shown.

‎bin/firmware32s2.bin

14.7 KB
Binary file not shown.

‎bin/firmware32s3.bin

19 KB
Binary file not shown.

‎html/config.htm

+1,058-914
Large diffs are not rendered by default.

‎html/config.min.htm

+22-18
Large diffs are not rendered by default.

‎html/ws.htm

+95
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="utf-8">
5+
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
6+
<meta name="description" content="">
7+
<title>Gravitymon Serial Console</title>
8+
<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-rbsA2VBKQhggwzxH7pPCaAqO46MgnOM80zW1RWuH61DGLwZJEdK2Kadq2F9CUG65" crossorigin="anonymous">
9+
<style>
10+
.row-margin-10 { margin-top: 1.0em; }
11+
</style>
12+
</head>
13+
14+
<body class="py-4">
15+
16+
<!-- START MENU -->
17+
18+
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js" integrity="sha384-kenU1KFdBIe4zVF0s0G1M5b4hcpxyD9F7jL+jjXkk+Q2h455rYXK/7HAuoJl+0I4" crossorigin="anonymous"></script>
19+
20+
<!-- START BODY -->
21+
22+
<div class="container row-margin-10">
23+
24+
<div class="accordion row-margin-10" id="accordion">
25+
<div class="accordion-item">
26+
<h2 class="accordion-header" id="headingTest">
27+
<button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#collapseTest" aria-expanded="true" aria-controls="collapseTest">
28+
<b>Serial Log</b>
29+
</button>
30+
</h2>
31+
<div id="collapseTest" class="accordion-collapse collapse show" aria-labelledby="headingTest" data-bs-parent="#accordion">
32+
<div class="accordion-body">
33+
<div class="collapse row-margin-10 show" id="collapseLog">
34+
<div class="card card-body">
35+
<pre><code class="card-text" id="logContent" data-bs-toggle="tooltip" title="Shows the serial .">Connecting to websocket, please wait...</code></pre>
36+
</div>
37+
</div>
38+
</div>
39+
</div>
40+
</div>
41+
42+
</div>
43+
</div>
44+
45+
<script>
46+
let log = "";
47+
let maxLog = 50;
48+
49+
connectSocket();
50+
51+
function connectSocket() {
52+
console.log("Attempting to connect to websocket");
53+
socket = new WebSocket("ws://" + location.host + "/serialws");
54+
55+
socket.onopen = function(e) {
56+
log = log + "Websocket established\n";
57+
document.getElementById("logContent").innerHTML = log;
58+
};
59+
60+
socket.onmessage = function(event) {
61+
log = log + event.data;
62+
list = log.split("\n");
63+
64+
while(list.length > maxLog) {
65+
list.shift();
66+
}
67+
68+
log = list.join('\n');
69+
document.getElementById("logContent").innerHTML = log;
70+
};
71+
72+
socket.onclose = function(event) {
73+
if (event.wasClean) {
74+
console.log(`Connection closed cleanly, code=${event.code} reason=${event.reason}`);
75+
} else {
76+
console.log('Connection died');
77+
}
78+
79+
log = log + "Websocket closed/died\n";
80+
document.getElementById("logContent").innerHTML = log;
81+
setTimeout( function() { connectSocket(); }, 2000 );
82+
};
83+
84+
socket.onerror = function(error) {
85+
console.log(error);
86+
};
87+
}
88+
89+
</script>
90+
91+
<!-- START FOOTER -->
92+
93+
<div class="container themed-container bg-primary text-light row-margin-10">(C) Copyright 2023 Magnus Persson</div>
94+
</body>
95+
</html>

‎html/ws.min.htm

+42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="description" content=""><title>Gravitymon Serial Console</title><link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-rbsA2VBKQhggwzxH7pPCaAqO46MgnOM80zW1RWuH61DGLwZJEdK2Kadq2F9CUG65" crossorigin="anonymous"><style>.row-margin-10{margin-top:1em}</style></head><body class="py-4"><!-- START MENU --><script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js" integrity="sha384-kenU1KFdBIe4zVF0s0G1M5b4hcpxyD9F7jL+jjXkk+Q2h455rYXK/7HAuoJl+0I4" crossorigin="anonymous"></script><!-- START BODY --><div class="container row-margin-10"><div class="accordion row-margin-10" id="accordion"><div class="accordion-item"><h2 class="accordion-header" id="headingTest"><button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#collapseTest" aria-expanded="true" aria-controls="collapseTest"><b>Serial Log</b></button></h2><div id="collapseTest" class="accordion-collapse collapse show" aria-labelledby="headingTest" data-bs-parent="#accordion"><div class="accordion-body"><div class="collapse row-margin-10 show" id="collapseLog"><div class="card card-body"><pre><code class="card-text" id="logContent" data-bs-toggle="tooltip" title="Shows the serial .">Connecting to websocket, please wait...</code></pre></div></div></div></div></div></div></div><script>let log = "";
2+
let maxLog = 50;
3+
4+
connectSocket();
5+
6+
function connectSocket() {
7+
console.log("Attempting to connect to websocket");
8+
socket = new WebSocket("ws://" + location.host + "/serialws");
9+
10+
socket.onopen = function(e) {
11+
log = log + "Websocket established\n";
12+
document.getElementById("logContent").innerHTML = log;
13+
};
14+
15+
socket.onmessage = function(event) {
16+
log = log + event.data;
17+
list = log.split("\n");
18+
19+
while(list.length > maxLog) {
20+
list.shift();
21+
}
22+
23+
log = list.join('\n');
24+
document.getElementById("logContent").innerHTML = log;
25+
};
26+
27+
socket.onclose = function(event) {
28+
if (event.wasClean) {
29+
console.log(`Connection closed cleanly, code=${event.code} reason=${event.reason}`);
30+
} else {
31+
console.log('Connection died');
32+
}
33+
34+
log = log + "Websocket closed/died\n";
35+
document.getElementById("logContent").innerHTML = log;
36+
setTimeout( function() { connectSocket(); }, 2000 );
37+
};
38+
39+
socket.onerror = function(error) {
40+
console.log(error);
41+
};
42+
}</script><!-- START FOOTER --><div class="container themed-container bg-primary text-light row-margin-10">(C) Copyright 2023 Magnus Persson</div></body></html>

‎platformio.ini

+71-73
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ build_flags =
2525
-D BAUD=${common_env_data.monitor_speed}
2626
#-D SKIP_SLEEPMODE
2727
#-D FORCE_GRAVITY_MODE
28+
#-D COLLECT_PERFDATA
2829
-D ACTIVATE_OTA
2930
-D CFG_DISABLE_LOGGING # Turn off verbose/notice logging to reduce size and dont overload uart (applies to LOG_LEVEL6)
3031
-D GYRO_DISABLE_LOGGING
@@ -37,15 +38,13 @@ build_flags =
3738
-D MAIN_DISABLE_LOGGING
3839
-D USE_LITTLEFS=true
3940
-D CFG_APPVER="\"1.4.0\""
40-
-D CFG_GITREV=\""beta-2\""
41-
#!python script/git_rev.py
41+
#-D CFG_GITREV=\""beta-3\""
42+
!python script/git_rev.py
4243
lib_deps =
4344
# Using local copy of these libraries
4445
# https://github.com/mp-se/i2cdevlib.git#<document>
4546
# https://github.com/mp-se/OneWire
4647
# https://github.com/mp-se/Arduino-Temperature-Control-Library
47-
# https://github.com/khoih-prog/ESP_WiFiManager
48-
# https://github.com/khoih-prog/ESP_DoubleResetDetector
4948
https://github.com/mp-se/tinyexpr#v1.0.0
5049
https://github.com/mp-se/Arduino-Log#1.1.2
5150
https://github.com/mp-se/ArduinoJson#v6.21.3
@@ -67,6 +66,7 @@ html_files =
6766
html/index.min.htm
6867
html/test.min.htm
6968
html/backup.min.htm
69+
html/ws.min.htm
7070

7171
[env:gravity-release]
7272
upload_speed = ${common_env_data.upload_speed}
@@ -137,7 +137,6 @@ board_build.embed_txtfiles = ${common_env_data.html_files}
137137
[env:gravity32c3-release]
138138
framework = ${common_env_data.framework}
139139
platform = ${common_env_data.platform32}
140-
#platform = espressif32 @ 5.2.0 # revert to older version so wifi works better.
141140
upload_speed = ${common_env_data.upload_speed}
142141
monitor_speed = ${common_env_data.monitor_speed}
143142
extra_scripts = ${common_env_data.extra_scripts}
@@ -269,39 +268,39 @@ board_build.partitions = part32.csv
269268
board_build.filesystem = littlefs
270269
board_build.embed_txtfiles = ${common_env_data.html_files}
271270

272-
[env:cov-wokwi]
273-
platform = ${common_env_data.platform32}
274-
framework = arduino
275-
board = lolin_s2_mini
276-
upload_speed = ${common_env_data.upload_speed}
277-
monitor_speed = ${common_env_data.monitor_speed}
278-
build_unflags =
279-
${common_env_data.build_unflags}
280-
-D USE_LITTLEFS
281-
extra_scripts =
282-
script/merge_firmware.py
283-
pre:script/gcov_filter.py
284-
build_flags =
285-
#-D WOKWI # Used to bypass issues with the simulator...
286-
-lgcov
287-
-D ACTIVATE_GCOV
288-
-D ESP32S2
289-
-D ARDUINO_ESP32S2_DEV
290-
-D USER_SSID=\""Wokwi-GUEST\""
291-
-D USER_SSID_PWD=\""\""
292-
#-D USE_SERIAL_PINS
293-
-D LOG_LEVEL=6
294-
-D CORE_DEBUG_LEVEL=6
295-
${common_env_data.build_flags}
296-
lib_deps =
297-
${common_env_data.lib_deps}
298-
https://github.com/bxparks/AUnit#v1.7.1
299-
build_type = debug
300-
board_build.partitions = part32.csv
301-
board_build.filesystem = littlefs
302-
board_build.embed_txtfiles = ${common_env_data.html_files}
303-
build_src_filter = +<*> -<main.cpp> +<../test/tests*.cpp>
304-
gcov_files = calc.cpp helper.cpp gyro.cpp templating.cpp tempsensor.cpp
271+
; [env:cov-wokwi]
272+
; platform = ${common_env_data.platform32}
273+
; framework = arduino
274+
; board = lolin_s2_mini
275+
; upload_speed = ${common_env_data.upload_speed}
276+
; monitor_speed = ${common_env_data.monitor_speed}
277+
; build_unflags =
278+
; ${common_env_data.build_unflags}
279+
; -D USE_LITTLEFS
280+
; extra_scripts =
281+
; script/merge_firmware.py
282+
; #pre:script/gcov_filter.py
283+
; build_flags =
284+
; #-D WOKWI # Used to bypass issues with the simulator...
285+
; -lgcov
286+
; -D ACTIVATE_GCOV
287+
; -D ESP32S2
288+
; -D ARDUINO_ESP32S2_DEV
289+
; -D USER_SSID=\""Wokwi-GUEST\""
290+
; -D USER_SSID_PWD=\""\""
291+
; #-D USE_SERIAL_PINS
292+
; -D LOG_LEVEL=6
293+
; -D CORE_DEBUG_LEVEL=6
294+
; ${common_env_data.build_flags}
295+
; lib_deps =
296+
; ${common_env_data.lib_deps}
297+
; https://github.com/bxparks/AUnit#v1.7.1
298+
; build_type = debug
299+
; board_build.partitions = part32.csv
300+
; board_build.filesystem = littlefs
301+
; board_build.embed_txtfiles = ${common_env_data.html_files}
302+
; build_src_filter = +<*> -<main.cpp> +<../test/tests*.cpp>
303+
#gcov_files = disabled
305304

306305
; [env:cov-api-wokwi]
307306
; platform = ${common_env_data.platform32}
@@ -332,42 +331,41 @@ gcov_files = calc.cpp helper.cpp gyro.cpp templating.cpp tempsensor.cpp
332331
; board_build.filesystem = littlefs
333332
; board_build.embed_txtfiles = ${common_env_data.html_files}
334333

335-
[env:cov-esp32]
336-
framework = ${common_env_data.framework}
337-
platform = ${common_env_data.platform32}
338-
upload_speed = ${common_env_data.upload_speed}
339-
monitor_speed = ${common_env_data.monitor_speed}
340-
extra_scripts =
341-
${common_env_data.extra_scripts}
342-
#script/merge_firmware.py
343-
pre:script/gcov_filter.py
344-
build_unflags =
345-
${common_env_data.build_unflags}
346-
build_flags =
347-
-Wl,-Map,output.map
348-
${common_env_data.build_flags}
349-
-D ACTIVATE_GCOV
350-
-D ESP32S2
351-
-D ARDUINO_ESP32S2_DEV
352-
#-D ESP32C3
353-
#-D ARDUINO_ESP32C3_DEV
354-
#-D USER_SSID=\""Wokwi-GUEST\""
355-
#-D USER_SSID_PWD=\""\""
356-
-D LOG_LEVEL=4
357-
-D CORE_DEBUG_LEVEL=2
358-
-DUSE_SERIAL_PINS # Use the TX/RX pins for the serial port
359-
lib_deps =
360-
${common_env_data.lib_deps}
361-
#${common_env_data.lib_deps32}
362-
lib_ignore =
363-
#board = lolin_c3_mini
364-
board = lolin_s2_mini
365-
build_type = debug
366-
board_build.partitions = part32.csv
367-
board_build.filesystem = littlefs
368-
board_build.embed_txtfiles = ${common_env_data.html_files}
334+
; [env:cov-esp32]
335+
; framework = ${common_env_data.framework}
336+
; platform = ${common_env_data.platform32}
337+
; upload_speed = ${common_env_data.upload_speed}
338+
; monitor_speed = ${common_env_data.monitor_speed}
339+
; extra_scripts =
340+
; ${common_env_data.extra_scripts}
341+
; #script/merge_firmware.py
342+
; #pre:script/gcov_filter.py
343+
; build_unflags =
344+
; ${common_env_data.build_unflags}
345+
; build_flags =
346+
; -Wl,-Map,output.map
347+
; ${common_env_data.build_flags}
348+
; -D ACTIVATE_GCOV
349+
; -D ESP32S2
350+
; -D ARDUINO_ESP32S2_DEV
351+
; #-D ESP32C3
352+
; #-D ARDUINO_ESP32C3_DEV
353+
; #-D USER_SSID=\""Wokwi-GUEST\""
354+
; #-D USER_SSID_PWD=\""\""
355+
; -D LOG_LEVEL=4
356+
; -D CORE_DEBUG_LEVEL=2
357+
; -DUSE_SERIAL_PINS # Use the TX/RX pins for the serial port
358+
; lib_deps =
359+
; ${common_env_data.lib_deps}
360+
; #${common_env_data.lib_deps32}
361+
; lib_ignore =
362+
; board = lolin_s2_mini
363+
; build_type = debug
364+
; board_build.partitions = part32.csv
365+
; board_build.filesystem = littlefs
366+
; board_build.embed_txtfiles = ${common_env_data.html_files}
369367
#board_build.flash_mode = dio
370-
gcov_files = disable
368+
#gcov_files = disable
371369
#gcov_files = webserver.cpp gyro.cpp main.cpp
372370
#gcov_files = webserver.cpp
373371
#gcov_files = main.cpp

‎requirements.txt

-1
This file was deleted.

‎src/battery.cpp

+57
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
/*
2+
MIT License
3+
4+
Copyright (c) 2021-2023 Magnus
5+
6+
Permission is hereby granted, free of charge, to any person obtaining a copy
7+
of this software and associated documentation files (the "Software"), to deal
8+
in the Software without restriction, including without limitation the rights
9+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10+
copies of the Software, and to permit persons to whom the Software is
11+
furnished to do so, subject to the following conditions:
12+
13+
The above copyright notice and this permission notice shall be included in all
14+
copies or substantial portions of the Software.
15+
16+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
22+
SOFTWARE.
23+
*/
24+
#include <battery.hpp>
25+
#include <config.hpp>
26+
#include <helper.hpp>
27+
28+
BatteryVoltage::BatteryVoltage() {
29+
#if defined(ESP8266)
30+
pinMode(PIN_VOLT, INPUT);
31+
#else
32+
pinMode(PIN_VOLT, INPUT_PULLDOWN);
33+
#endif
34+
}
35+
36+
void BatteryVoltage::read() {
37+
// The analog pin can only handle 3.3V maximum voltage so we need to reduce
38+
// the voltage (from max 5V)
39+
float factor = myConfig.getVoltageFactor(); // Default value is 1.63
40+
int v = analogRead(PIN_VOLT);
41+
42+
// An ESP8266 has a ADC range of 0-1023 and a maximum voltage of 3.3V
43+
// An ESP32 has an ADC range of 0-4095 and a maximum voltage of 3.3V
44+
45+
#if defined(ESP8266)
46+
_batteryLevel = ((3.3 / 1023) * v) * factor;
47+
#else // defined (ESP32)
48+
_batteryLevel = ((3.3 / 4095) * v) * factor;
49+
#endif
50+
#if LOG_LEVEL == 6 && !defined(HELPER_DISABLE_LOGGING)
51+
Log.verbose(
52+
F("BATT: Reading voltage level. Factor=%F Value=%d, Voltage=%F." CR),
53+
factor, v, _batteryLevel);
54+
#endif
55+
}
56+
57+
// EOF

0 commit comments

Comments
 (0)