Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
co2ampel
ampel-firmware
Commits
d0c32222
Commit
d0c32222
authored
Feb 12, 2022
by
Eric Duminil
Browse files
Notes
parent
bb2a7027
Pipeline
#5798
passed with stage
in 2 minutes and 36 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
ampel-firmware/ntp.cpp
View file @
d0c32222
...
...
@@ -19,7 +19,7 @@ namespace ntp {
Serial
.
print
(
"NTP - Trying to connect to : "
);
Serial
.
println
(
config
::
ntp_server
);
timeClient
.
begin
();
sensor_console
::
defineIntCommand
(
"set_time"
,
ntp
::
setLocalTime
,
F
(
"1618829570 (Sets time to the given UNIX time)"
));
sensor_console
::
defineIntCommand
(
"set_time"
,
ntp
::
setLocalTime
,
F
(
"1618829570 (Sets time to the given UNIX time)"
));
//TODO: Define even without internet
}
void
update
()
{
...
...
ampel-firmware/web_config.h
View file @
d0c32222
#ifndef AMPEL_WEB_CONFIG_H_
#define AMPEL_WEB_CONFIG_H_
#define STRING_LEN 64
#define STRING_LEN 64
//TODO: Shorter?
#if defined(ESP8266)
# include <ESP8266WebServer.h>
...
...
@@ -32,7 +32,7 @@ namespace config {
extern
bool
&
daylight_saving_time
;
// [true / false]
//CSV
bool
csv_active
();
bool
csv_active
();
//TODO: Find better names?
extern
uint16_t
&
csv_interval
;
// [s]
// MQTT
...
...
@@ -56,7 +56,6 @@ namespace web_config {
void
setWifiConnectionCallback
(
void
(
*
success_function
)());
void
setWifiFailCallback
(
void
(
*
fail_function
)());
void
update
();
//TODO: Add saveConfig(), for e.g. after custom setters. Or simply reset after each configchange?
#if defined(ESP8266)
extern
ESP8266WebServer
http
;
...
...
ampel-firmware/web_server.cpp
View file @
d0c32222
...
...
@@ -11,9 +11,6 @@
#include
"mqtt.h"
#include
"lorawan.h"
#include
<IotWebConf.h>
#include
<IotWebConfUsing.h>
// This loads aliases for easier class names.
#include
<IotWebConfTParameter.h>
#if defined(ESP8266)
# include <ESP8266WebServer.h>
#elif defined(ESP32)
...
...
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