Skip to content

Commit

Permalink
Add config provider
Browse files Browse the repository at this point in the history
  • Loading branch information
amalabey committed Dec 6, 2020
1 parent 03a822c commit 7bb69af
Show file tree
Hide file tree
Showing 5 changed files with 65 additions and 21 deletions.
6 changes: 6 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"files.associations": {
"cstddef": "cpp",
"limits": "cpp"
}
}
21 changes: 21 additions & 0 deletions include/Configuration.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
#ifndef ARDUINO_H
#define ARDUINO_H
#include <Arduino.h>
#endif

struct Settings_t
{
char* wifiSsid;
char* wifiPassword;
char* hostName;
char* tenantId;
char* userName;
char* password;
char* clientId;
};

class Configuration
{
public:
Settings_t getSettings();
};
1 change: 1 addition & 0 deletions lib/CumulocityClient
Submodule CumulocityClient added at 2d3906
19 changes: 19 additions & 0 deletions src/Configuration.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
#ifndef CONFIGURATION_H
#define CONFIGURATION_H
#include "Configuration.h"
#endif

#include "Credentials.h"

Settings_t Configuration::getSettings()
{
Settings_t settings;
settings.wifiSsid = (char*)WIFI_SSID;
settings.wifiPassword = (char*)WIFI_PWD;
settings.hostName = (char*)C8Y_HOST;
settings.tenantId = (char*)C8Y_TENANT;
settings.userName = (char*)C8Y_USERNAME;
settings.password = (char*)C8Y_PASSWORD;
settings.clientId = (char*)C8Y_CLIENTID;
return settings;
}
39 changes: 18 additions & 21 deletions src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,22 @@
#endif
#include "Credentials.h"

const char *ssid = WIFI_SSID;
const char *wifiPassword = WIFI_PWD;
char *host = C8Y_HOST;
char *username = C8Y_USERNAME;
char *c8yPassword = C8Y_PASSWORD;
char *tenant = C8Y_TENANT;
char *clientId = C8Y_CLIENTID;
const char* root_ca = ROOT_CA;

WiFiClientSecure wifiClient;
CumulocityClient c8yClient(wifiClient, clientId);
#ifndef CONFIGURATION_H
#define CONFIGURATION_H
#include "Configuration.h"
#endif

WiFiClientSecure _wifiClient = WiFiClientSecure();
CumulocityClient _client = CumulocityClient(_wifiClient, "00000000");

void setup()
{

Serial.begin(115200);

wifiClient.setCACert(root_ca);
WiFi.begin(ssid, wifiPassword);
Configuration _config;
Settings_t settings = _config.getSettings();

WiFi.begin(settings.wifiSsid, settings.wifiPassword);

Serial.print("Connecting to WiFi");
while (WiFi.status() != WL_CONNECTED)
Expand All @@ -34,19 +31,19 @@ void setup()
}
Serial.println("connected to wifi");

c8yClient.connect(host, 8883, tenant, username, c8yPassword);

c8yClient.registerDevice(clientId, "c8y_esp32");
_client.setDeviceId(settings.clientId);
_client.connect(settings.hostName, 8883, settings.tenantId, settings.userName, settings.password);
_client.registerDevice(settings.clientId, "c8y_esp32");
}

void loop()
{
delay(1000);
c8yClient.loop();
c8yClient.createMeasurement("Temperature", "T", "20.5", "*C");
_client.loop();
_client.createMeasurement("Temperature", "T", "20.5", "*C");

int8_t rssi = WiFi.RSSI();
char rssiStr[10];
sprintf(rssiStr, "%d", rssi);
c8yClient.createMeasurement("SignalStrength", "T", rssiStr, "*m");
_client.createMeasurement("SignalStrength", "T", rssiStr, "*m");
}

0 comments on commit 7bb69af

Please sign in to comment.