network is now a component

2023-09-20 08:51:31 +02:00
parent 936d2b9647
commit baf1936824
9 changed files with 340 additions and 414 deletions
@@ -0,0 +1,164 @@
+/**
+ * @file network.cpp
+ * @author Alexander Klein (alex@kleiax.de)
+ * @brief 
+ * @version 0.1
+ * @date 2023-09-18
+ * 
+ * @copyright Copyright (c) 2023
+ * 
+ */
+
+#include "network.h"
+
+Network::Network(const char *ssid, const char *passphrase) {
+    if (!WiFi.mode(WIFI_AP_STA))
+        std::cout << "Network::connectWiFi failed WiFi.mode" << std::endl;
+
+    this->init(ssid, passphrase);
+}
+
+Network::Network(const char *ssid, const char *passphrase, NetworkAdresses adresses) {
+    if (!WiFi.mode(WIFI_AP_STA))
+        std::cout << "Network::connectWiFi failed WiFi.mode" << std::endl;
+
+    if (!WiFi.config(this->adresses.localIP,
+                     this->adresses.gateway,
+                     this->adresses.subnet,
+                     this->adresses.dnsServer)) 
+    {
+        std::cout << "STA Failed to configure" << std::endl;
+    }
+
+    this->init(ssid, passphrase);
+}
+
+Network::~Network() {
+    if (this->mqttClient)
+        delete mqttClient;
+}
+
+bool Network::activateEspNow(recieveCallbackPtr reci, sendCallbackPtr send) {
+    if (esp_now_init() != ESP_OK) {
+        std::cout << "Network::activateEspNow - Error initializing ESP-NOW" << std::endl;
+        return false;
+    }
+
+    esp_now_register_send_cb(send);
+
+    memcpy(this->peerInfo.peer_addr, this->broadcastAddress, 6);
+    this->peerInfo.channel = 0;  
+    this->peerInfo.encrypt = false;
+
+    if (esp_now_add_peer(&peerInfo) != ESP_OK) {
+        std::cout << "Network::connectEspNow - Failed to add peer" << std::endl;
+        return false;
+    }
+
+    esp_now_register_recv_cb(reci);
+    return true;
+}
+
+bool Network::activateMqtt(const char *user, const char *passphrase) {
+    this->mqttUser = user;
+    this->mqttPassphrase = passphrase;
+
+    this->mqttClient = new PubSubClient(this->wifiClient);
+    this->mqttClient->setServer(this->adresses.mqttServer, this->adresses.mqttPort);
+    this->mqttClient->setSocketTimeout(1);
+
+    if (this->wifiConnected)
+        return this->connectMqtt();
+    return false;
+}
+
+void Network::printIPs() {
+    std::cout << std::endl;
+    if (!this->wifiConnected) {
+        std::cout << "WiFi is not connected." << std::endl;
+        return;
+    }
+    std::cout << "WiFi is connected to" << std::endl;
+    std::cout << "IP address: " << std::endl;
+    std::cout << this->adresses.localIP << std::endl;
+    std::cout << "WiFi MAC Address: " << WiFi.macAddress() << std::endl << std::endl;
+}
+
+uint8_t Network::getCurrentChannel() {
+    uint8_t channel;
+    wifi_second_chan_t secondChannel;
+    if (esp_wifi_get_channel(&channel, &secondChannel) != ESP_OK) {
+        std::cout << "Network::getCurrentChannel - Error!" << std::endl;
+        return -1;
+    }
+    
+    return channel;
+}
+
+void Network::runAsChild() {
+    if (!this->initSucessful)
+        return;
+
+    this->checkWifi();
+
+    if (this->wifiConnected && this->mqttClient)
+        this->checkMqtt();
+}
+
+void Network::init(const char *ssid, const char *passphrase) {
+    // Connect to Wi-Fi network with SSID and password
+    std::cout << "Connecting to " << ssid << std::endl;
+    WiFi.begin(ssid, passphrase);
+    uint8_t timeout = Network::wifiConnectTimeout;
+    while (WiFi.status() != WL_CONNECTED) {
+        delay(Network::wifiConnectLoopTime);
+        std::cout << "." << std::flush;
+        timeout--;
+        if (timeout == 0) {
+            std::cout << std::endl;
+            std::cout << "WiFi NOT connected." << std::endl;
+            return;
+        }
+    }
+
+    this->wifiConnected = true;
+    this->printIPs();
+}
+
+void Network::checkWifi() {
+    if ((WiFi.status() != WL_CONNECTED) 
+        && (millis() - this->lastWifiRecoonectAttemp >= Network::wifiReconnectDelay))
+    {
+        std::cout << "Reconnecting to WiFi..." << std::endl;
+        WiFi.disconnect();
+        this->wifiConnected = WiFi.reconnect();
+        this->lastWifiRecoonectAttemp = millis();
+    }
+}
+
+void Network::checkMqtt() {
+    if (!this->mqttClient->connected()
+        && millis() - this->lastMqttReconnectAttemp > Network::mqttReconnectDelay) 
+    {
+        this->mqttConnected = this->connectMqtt();
+        this->lastMqttReconnectAttemp = millis();
+    }
+
+    if (this->mqttConnected)
+        this->mqttClient->loop();
+}
+
+bool Network::connectMqtt() {
+    String clientId = "ESP32Rover-";
+    clientId += String(random(0xffff), HEX);
+
+    if (this->mqttUser) {
+        if (this->mqttClient->connect(clientId.c_str(), this->mqttUser, this->mqttPassphrase))
+            this->mqttClient->publish("Rover/Info", "Connected to Mqtt-Broker");
+    } else {
+        if (this->mqttClient->connect(clientId.c_str()))
+            this->mqttClient->publish("Rover/Info", "Connected to Mqtt-Broker");
+    }
+    
+    return this->mqttClient->connected();
+}
@@ -0,0 +1,85 @@
+/**
+ * @file network.h
+ * @author Alexander Klein (alex@kleiax.de)
+ * @brief 
+ * @version 0.1
+ * @date 2023-09-18
+ * 
+ * @copyright Copyright (c) 2023
+ * 
+ */
+
+#ifndef NETWORK_H
+#define NETWORK_H
+
+#include "component.h"
+
+#include <iostream>
+#include <WiFi.h>
+#include <PubSubClient.h>
+#include <esp_now.h>
+#include <esp_wifi.h>
+
+typedef void (*recieveCallbackPtr) (const uint8_t * mac, const uint8_t *incomingData, int len); 
+typedef void (*sendCallbackPtr) (const uint8_t *mac_addr, esp_now_send_status_t status);
+
+struct NetworkAdresses {
+    IPAddress localIP;
+    IPAddress gateway;
+    IPAddress subnet;
+    IPAddress dnsServer;
+    IPAddress mqttServer;
+    uint16_t mqttPort = 1883;
+};
+
+class Network : public Component {
+    public:
+        Network(const char *ssid, const char *passphrase);
+        Network(const char *ssid, const char *passphrase, NetworkAdresses adresses);
+
+        ~Network();
+
+        bool activateEspNow(recieveCallbackPtr reci, sendCallbackPtr send);
+        bool activateMqtt(const char *user = nullptr, const char *passphrase = nullptr);
+
+        void printIPs();
+
+        bool isWifiConnected() const { return this->wifiConnected; }
+        bool isMqttConnected() const { return this->mqttConnected; }
+        const uint8_t* getBroadcastAddress() const { return this->broadcastAddress; }
+        PubSubClient* getMqttClient() const { return this->mqttClient; }
+
+        static uint8_t getCurrentChannel();
+        
+    private:
+        void run() override {};
+        void runAsChild() override;
+        void init(const char *ssid, const char *passphrase);
+        void checkWifi();
+        void checkMqtt();
+        bool connectMqtt();
+
+        NetworkAdresses adresses;
+        WiFiClient wifiClient;
+        PubSubClient* mqttClient = nullptr;
+        esp_now_peer_info_t peerInfo;
+
+        bool initSucessful = false;
+        bool wifiConnected = false;
+        bool mqttConnected = false;
+
+        const char *mqttUser;
+        const char *mqttPassphrase;
+
+        uint8_t broadcastAddress[6] = {0xC8, 0xC9, 0xA3, 0xC8, 0x57, 0x10};
+        uint32_t lastWifiRecoonectAttemp = 0;
+        uint32_t lastMqttReconnectAttemp = 0;
+
+        static constexpr uint8_t wifiConnectTimeout = 20;
+        static constexpr uint16_t wifiConnectLoopTime = 500;
+        static constexpr uint16_t wifiReconnectDelay = 5000;
+        static constexpr uint16_t mqttReconnectDelay = 2500;
+
+};
+
+#endif //NETWORK_H
@@ -171,10 +171,14 @@ void SensorData::setOutputStatusPrintPVTdata(bool status) {
 }

 void SensorData::run() {
-    this->realCompass->read();
-    this->realAzimuth = this->realCompass->getAzimuth();
+    if (this->realCompass) {
+        this->realCompass->read();
+        this->realAzimuth = this->realCompass->getAzimuth();
+    }

-    if (this->gyroskop->dmpGetCurrentFIFOPacket(this->gyroBuffer)) {
+    if (this->gyroskop
+        && this->gyroskop->dmpGetCurrentFIFOPacket(this->gyroBuffer)) 
+    {
        this->gyroskop->dmpGetQuaternion(&this->quaternion, this->gyroBuffer);
        this->gyroskop->dmpGetGravity(&this->gravity, &this->quaternion);
        this->gyroskop->dmpGetYawPitchRoll(this->yawPitchRoll, &this->quaternion, &this->gravity);
@@ -182,11 +186,15 @@ void SensorData::run() {
 }

 void SensorData::runAsChild() {
-    this->gnss->checkUblox();
-    this->gnss->checkCallbacks();
+    if (this->gnss) {
+        this->gnss->checkUblox();
+        this->gnss->checkCallbacks();
+    }

-    if (SensorData::newData)
+    if (SensorData::newData) {
        SensorData::newData = false;
+        // TODO: Update data
+    }
 }

 void SensorData::initGnss() {