From c537a5b6144fc990c0655dc1c6769dcf12edf93a Mon Sep 17 00:00:00 2001
From: Zoe Pfister <zoe.pfister@student.uibk.ac.at>
Date: Wed, 31 Aug 2022 13:01:02 +0200
Subject: [PATCH] streamline class naming
---
client/client/lib/espnow/src/{espnow.cpp => ESPNow.cpp} | 2 +-
client/client/lib/espnow/src/{espnow.hpp => ESPNow.hpp} | 4 ++--
client/client/lib/espnow/src/Message.hpp | 4 ++--
client/client/lib/time/src/{time.hpp => Time.hpp} | 1 +
client/client/src/main.cpp | 2 +-
5 files changed, 7 insertions(+), 6 deletions(-)
rename client/client/lib/espnow/src/{espnow.cpp => ESPNow.cpp} (98%)
rename client/client/lib/espnow/src/{espnow.hpp => ESPNow.hpp} (93%)
rename client/client/lib/time/src/{time.hpp => Time.hpp} (90%)
diff --git a/client/client/lib/espnow/src/espnow.cpp b/client/client/lib/espnow/src/ESPNow.cpp
similarity index 98%
rename from client/client/lib/espnow/src/espnow.cpp
rename to client/client/lib/espnow/src/ESPNow.cpp
index 2d9aef4..e529306 100644
--- a/client/client/lib/espnow/src/espnow.cpp
+++ b/client/client/lib/espnow/src/ESPNow.cpp
@@ -1,4 +1,4 @@
-#include "espnow.hpp"
+#include "ESPNow.hpp"
uint8_t BROADCAST_MAC[] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
esp_now_peer_info_t hostInfo;
diff --git a/client/client/lib/espnow/src/espnow.hpp b/client/client/lib/espnow/src/ESPNow.hpp
similarity index 93%
rename from client/client/lib/espnow/src/espnow.hpp
rename to client/client/lib/espnow/src/ESPNow.hpp
index 26e90b8..1230290 100644
--- a/client/client/lib/espnow/src/espnow.hpp
+++ b/client/client/lib/espnow/src/ESPNow.hpp
@@ -2,12 +2,12 @@
#define _ESPNOW
#include "Message.hpp"
-#include "WiFi.h"
+#include "Time.hpp"
#include "ram_caching.hpp"
-#include "time.hpp"
#include <ClientDataPackage.hpp>
#include <ESP32Time.h>
#include <Preferences.h>
+#include <WiFi.h>
#include <esp_now.h>
typedef struct config {
diff --git a/client/client/lib/espnow/src/Message.hpp b/client/client/lib/espnow/src/Message.hpp
index 54099ac..ee00f7f 100644
--- a/client/client/lib/espnow/src/Message.hpp
+++ b/client/client/lib/espnow/src/Message.hpp
@@ -1,8 +1,8 @@
#pragma once
#include "ClientDataPackage.hpp"
-#include "espnow.hpp"
-#include "time.hpp"
+#include "ESPNow.hpp"
+#include "Time.hpp"
#include <Arduino.h>
#include <ESP32Time.h>
#include <esp_now.h>
diff --git a/client/client/lib/time/src/time.hpp b/client/client/lib/time/src/Time.hpp
similarity index 90%
rename from client/client/lib/time/src/time.hpp
rename to client/client/lib/time/src/Time.hpp
index 318bfda..93dfc96 100644
--- a/client/client/lib/time/src/time.hpp
+++ b/client/client/lib/time/src/Time.hpp
@@ -6,3 +6,4 @@ namespace esptime {
// internal linkage only
static ESP32Time rtc; // global variable for the RTC (i don't think this is good practice)
} // namespace esptime
+// namespace esptime
diff --git a/client/client/src/main.cpp b/client/client/src/main.cpp
index 22228f3..9c4ff79 100644
--- a/client/client/src/main.cpp
+++ b/client/client/src/main.cpp
@@ -1,4 +1,4 @@
-#include "espnow.hpp"
+#include "ESPNow.hpp"
#include "ram_caching.hpp"
#include <Arduino.h>
#include <ArduinoJson.h>
--
GitLab