Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
N
neOCampus-arduino
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
GIS-neOCampus
neOSensor
neOCampus-arduino
Commits
80f215b6
Commit
80f215b6
authored
2 years ago
by
thiebolt
Browse files
Options
Downloads
Patches
Plain Diff
update
parent
56dfa5b0
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
ChangeLog.txt
+2
-1
2 additions, 1 deletion
ChangeLog.txt
neosensor/libraries/neocampus/sensocampus.cpp
+16
-3
16 additions, 3 deletions
neosensor/libraries/neocampus/sensocampus.cpp
with
18 additions
and
4 deletions
ChangeLog.txt
+
2
−
1
View file @
80f215b6
...
@@ -5,7 +5,8 @@
...
@@ -5,7 +5,8 @@
# (c) neOCampus / F.Thiebolt Université Toulouse3, Laboratoire IRIT
# (c) neOCampus / F.Thiebolt Université Toulouse3, Laboratoire IRIT
=== Release 221225 / feature-NVSbackport (ESP32 NVS WiFiCredentials backport)
=== Release 221225 / backport-NVSnamespace
Note: temporary release only intended to neOSensors with FW <= 220815
Based on Release 220815 / esp32 2.0.4 (because later releases broke the SPIFFS partitioning)
Based on Release 220815 / esp32 2.0.4 (because later releases broke the SPIFFS partitioning)
- backport NVS namespace for WiFi credentials
- backport NVS namespace for WiFi credentials
...
...
This diff is collapsed.
Click to expand it.
neosensor/libraries/neocampus/sensocampus.cpp
+
16
−
3
View file @
80f215b6
...
@@ -10,10 +10,11 @@
...
@@ -10,10 +10,11 @@
* ---
* ---
* Notes:
* Notes:
* ---
* ---
* F.Thiebolt aug.20 removed EEPROM support
* F.Thiebolt may.23 add NVS support to save sensOCampus given credentials
* F.Thiebolt aug.20 removed EEPROM support
* added SPIFFS support to load/save config file
* added SPIFFS support to load/save config file
* Thiebolt F. Nov.19
migrate to Arduino Json 6
* Thiebolt F.
Nov.19 migrate to Arduino Json 6
* Thiebolt F. July 17
* Thiebolt F.
July 17
*
*
*/
*/
...
@@ -27,6 +28,14 @@
...
@@ -27,6 +28,14 @@
#include
"SPIFFS.h"
#include
"SPIFFS.h"
#endif
#endif
/* NVS namespace @ EPS32 */
#ifdef ESP32
#include
"Preferences.h"
// NVS storage (instead of the DEPRECATED eeprom)
#elif defined (ESP8266)
#warning "[esp8266] no NVS namespace available ... grab WiFi ssid/psk from last connection"
#endif
/* neOCampus related includes */
#include
"sensocampus.h"
#include
"sensocampus.h"
#include
"neocampus_utils.h"
#include
"neocampus_utils.h"
...
@@ -42,6 +51,10 @@
...
@@ -42,6 +51,10 @@
// note that config of various modules is NOT saved
// note that config of various modules is NOT saved
#define CONFIG_JSON_SIZE (JSON_OBJECT_SIZE(20)) // used to parse sensOCampus config FILE
#define CONFIG_JSON_SIZE (JSON_OBJECT_SIZE(20)) // used to parse sensOCampus config FILE
// NVS namespace for WiFi credentials
#define SENCO_NVS_NAMESPACE "sensOCampus" // 15 chars max.
#define SENSO_MQTT_LOGIN_KEY xxxxxxx
#define SENSO_MQTT_PASS_KEY yyyyyy
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment