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
fcee9d6d
Commit
fcee9d6d
authored
3 years ago
by
Eric Duminil
Browse files
Options
Download
Email Patches
Plain Diff
Starting to parse Lora config
parent
39e7a31b
master
develop
experimental/example_for_iotwebconf
senseair_s8
v0.3.0
archive/experimental/save_lora_session
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
ampel-firmware/web_config.cpp
+5
-2
ampel-firmware/web_config.cpp
ampel-firmware/web_config.h
+3
-0
ampel-firmware/web_config.h
with
8 additions
and
2 deletions
+8
-2
ampel-firmware/web_config.cpp
+
5
-
2
View file @
fcee9d6d
...
@@ -154,8 +154,8 @@ namespace web_config {
...
@@ -154,8 +154,8 @@ namespace web_config {
"70B3D5..."
).
build
();
"70B3D5..."
).
build
();
TextTParameter
<
17
>
appEUIParam
=
TextTParameter
<
17
>
appEUIParam
=
Builder
<
TextTParameter
<
17
>>
(
"app_eui"
).
label
(
"App EUI"
).
defaultValue
(
"00EA07..."
).
build
();
Builder
<
TextTParameter
<
17
>>
(
"app_eui"
).
label
(
"App EUI"
).
defaultValue
(
"00EA07..."
).
build
();
TextTParameter
<
3
2
>
appKeyParam
=
TextTParameter
<
3
3
>
appKeyParam
=
Builder
<
TextTParameter
<
3
2
>>
(
"app_key"
).
label
(
"App key"
).
defaultValue
(
"81CCFE..."
).
build
();
Builder
<
TextTParameter
<
3
3
>>
(
"app_key"
).
label
(
"App key"
).
defaultValue
(
"81CCFE..."
).
build
();
//TODO: Save LoRa session to hidden parameter after first OTAA successful login
//TODO: Save LoRa session to hidden parameter after first OTAA successful login
#endif
#endif
...
@@ -345,5 +345,8 @@ namespace config {
...
@@ -345,5 +345,8 @@ namespace config {
bool
is_lorawan_active
()
{
bool
is_lorawan_active
()
{
return
web_config
::
loraParams
.
isActive
();
return
web_config
::
loraParams
.
isActive
();
}
}
char
*
lorawan_device_eui
=
web_config
::
deviceEUIParam
.
value
();
char
*
lorawan_app_key
=
web_config
::
appKeyParam
.
value
();
char
*
lorawan_app_eui
=
web_config
::
appEUIParam
.
value
();
#endif
#endif
}
}
This diff is collapsed.
Click to expand it.
ampel-firmware/web_config.h
+
3
-
0
View file @
fcee9d6d
...
@@ -54,6 +54,9 @@ namespace config {
...
@@ -54,6 +54,9 @@ namespace config {
// LORAWAN
// LORAWAN
#if defined(ESP32)
#if defined(ESP32)
bool
is_lorawan_active
();
// also defined for ESP8266, and set to false
bool
is_lorawan_active
();
// also defined for ESP8266, and set to false
extern
char
*
lorawan_device_eui
;
extern
char
*
lorawan_app_key
;
extern
char
*
lorawan_app_eui
;
#endif
#endif
// Transmission rate
// Transmission rate
...
...
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