Skip to content
GitLab
Explore
Projects
Groups
Snippets
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
co2ampel
ampel-firmware
Commits
a5807d86
Commit
a5807d86
authored
4 years ago
by
Eric Duminil
Browse files
Options
Download
Email Patches
Plain Diff
Adding firmware version
parent
793734a6
master
develop
experimental/example_for_iotwebconf
senseair_s8
v0.3.0
v0.2.3
v0.2.2
v0.2.1
v0.2.0
v0.1.0
archive/refactor/src_structure
archive/experimental/simple
archive/experimental/save_lora_session
archive/experimental/ota
archive/experimental/binary_clock
archive/experimental/autoconnect
archive/dev/debugcalib
Pipeline
#3644
passed with stage
in 1 minute and 52 seconds
Changes
3
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
ampel-firmware/ampel-firmware.ino
+7
-4
ampel-firmware/ampel-firmware.ino
ampel-firmware/util.h
+1
-0
ampel-firmware/util.h
ampel-firmware/web_server.cpp
+2
-1
ampel-firmware/web_server.cpp
with
10 additions
and
5 deletions
+10
-5
ampel-firmware/ampel-firmware.ino
+
7
-
4
View file @
a5807d86
...
@@ -67,14 +67,17 @@ void setup() {
...
@@ -67,14 +67,17 @@ void setup() {
pinMode
(
0
,
INPUT
);
// Flash button (used for forced calibration)
pinMode
(
0
,
INPUT
);
// Flash button (used for forced calibration)
led_effects
::
setupRing
();
Serial
.
println
();
sensor
::
initialize
();
Serial
.
print
(
F
(
"Sensor ID: "
));
Serial
.
print
(
F
(
"Sensor ID: "
));
Serial
.
println
(
ampel
.
sensorId
);
Serial
.
println
(
ampel
.
sensorId
);
Serial
.
print
(
F
(
"Board : "
));
Serial
.
print
(
F
(
"Board : "
));
Serial
.
println
(
ampel
.
board
);
Serial
.
println
(
ampel
.
board
);
Serial
.
print
(
F
(
"Firmware : "
));
Serial
.
println
(
ampel
.
version
);
led_effects
::
setupRing
();
sensor
::
initialize
();
#ifdef AMPEL_CSV
#ifdef AMPEL_CSV
csv_writer
::
initialize
(
ampel
.
sensorId
);
csv_writer
::
initialize
(
ampel
.
sensorId
);
...
...
This diff is collapsed.
Click to expand it.
ampel-firmware/util.h
+
1
-
0
View file @
a5807d86
...
@@ -38,6 +38,7 @@ class Ampel {
...
@@ -38,6 +38,7 @@ class Ampel {
private:
private:
static
void
showFreeSpace
();
static
void
showFreeSpace
();
public:
public:
const
char
*
version
=
"v0.1.0"
;
// Update manually after significant changes.
const
char
*
board
;
const
char
*
board
;
const
char
*
sensorId
;
const
char
*
sensorId
;
uint32_t
max_loop_duration
;
uint32_t
max_loop_duration
;
...
...
This diff is collapsed.
Click to expand it.
ampel-firmware/web_server.cpp
+
2
-
1
View file @
a5807d86
...
@@ -115,6 +115,7 @@ namespace web_server {
...
@@ -115,6 +115,7 @@ namespace web_server {
"<tr><td>Largest heap block</td><td>%6d bytes</td></tr>
\n
"
"<tr><td>Largest heap block</td><td>%6d bytes</td></tr>
\n
"
"<tr><td>Max loop duration</td><td>%5d ms</td></tr>
\n
"
"<tr><td>Max loop duration</td><td>%5d ms</td></tr>
\n
"
"<tr><td>Board</td><td>%s</td></tr>
\n
"
"<tr><td>Board</td><td>%s</td></tr>
\n
"
"<tr><td>Ampel firmware</td><td>%s</td></tr>
\n
"
"<tr><td>Uptime</td><td>%2d d %4d h %02d min %02d s</td></tr>
\n
"
"<tr><td>Uptime</td><td>%2d d %4d h %02d min %02d s</td></tr>
\n
"
"</table>
\n
"
"</table>
\n
"
"<div id='log' class='pure-u-1 pure-u-md-1-2'></div>
\n
"
"<div id='log' class='pure-u-1 pure-u-md-1-2'></div>
\n
"
...
@@ -239,7 +240,7 @@ namespace web_server {
...
@@ -239,7 +240,7 @@ namespace web_server {
#endif
#endif
config
::
temperature_offset
,
config
::
auto_calibrate_sensor
?
"Yes"
:
"No"
,
ampel
.
sensorId
,
ampel
.
sensorId
,
config
::
temperature_offset
,
config
::
auto_calibrate_sensor
?
"Yes"
:
"No"
,
ampel
.
sensorId
,
ampel
.
sensorId
,
wifi
::
local_ip
,
wifi
::
local_ip
,
ESP
.
getFreeHeap
(),
esp_get_max_free_block_size
(),
ampel
.
max_loop_duration
,
wifi
::
local_ip
,
wifi
::
local_ip
,
ESP
.
getFreeHeap
(),
esp_get_max_free_block_size
(),
ampel
.
max_loop_duration
,
ampel
.
board
,
dd
,
hh
,
mm
,
ss
);
ampel
.
board
,
ampel
.
version
,
dd
,
hh
,
mm
,
ss
);
// Serial.print(F(" - Body size : "));
// Serial.print(F(" - Body size : "));
// Serial.print(strlen(content));
// Serial.print(strlen(content));
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Snippets