From ef8e979fe534a67e5e155526ce6b62e6d7f8aa5d Mon Sep 17 00:00:00 2001 From: Physiix <11295985-Physiix@users.noreply.gitlab.com> Date: Mon, 18 Apr 2022 22:30:31 +0200 Subject: [PATCH] convert MQTT_Reader06.ino to PlatformIO project --- src/MQTT_Reader/.gitignore | 5 ++ src/MQTT_Reader/.vscode/extensions.json | 10 ++++ src/MQTT_Reader/include/README | 39 ++++++++++++++++ src/MQTT_Reader/include/_allFunctions.hpp | 39 ++++++++++++++++ src/MQTT_Reader/lib/README | 46 +++++++++++++++++++ src/MQTT_Reader/platformio.ini | 23 ++++++++++ .../src/main.cpp} | 16 +++---- src/MQTT_Reader/test/README | 11 +++++ 8 files changed, 181 insertions(+), 8 deletions(-) create mode 100644 src/MQTT_Reader/.gitignore create mode 100644 src/MQTT_Reader/.vscode/extensions.json create mode 100644 src/MQTT_Reader/include/README create mode 100644 src/MQTT_Reader/include/_allFunctions.hpp create mode 100644 src/MQTT_Reader/lib/README create mode 100644 src/MQTT_Reader/platformio.ini rename src/{MQTT_Reader06.ino => MQTT_Reader/src/main.cpp} (99%) create mode 100644 src/MQTT_Reader/test/README diff --git a/src/MQTT_Reader/.gitignore b/src/MQTT_Reader/.gitignore new file mode 100644 index 0000000..89cc49c --- /dev/null +++ b/src/MQTT_Reader/.gitignore @@ -0,0 +1,5 @@ +.pio +.vscode/.browse.c_cpp.db* +.vscode/c_cpp_properties.json +.vscode/launch.json +.vscode/ipch diff --git a/src/MQTT_Reader/.vscode/extensions.json b/src/MQTT_Reader/.vscode/extensions.json new file mode 100644 index 0000000..080e70d --- /dev/null +++ b/src/MQTT_Reader/.vscode/extensions.json @@ -0,0 +1,10 @@ +{ + // See http://go.microsoft.com/fwlink/?LinkId=827846 + // for the documentation about the extensions.json format + "recommendations": [ + "platformio.platformio-ide" + ], + "unwantedRecommendations": [ + "ms-vscode.cpptools-extension-pack" + ] +} diff --git a/src/MQTT_Reader/include/README b/src/MQTT_Reader/include/README new file mode 100644 index 0000000..194dcd4 --- /dev/null +++ b/src/MQTT_Reader/include/README @@ -0,0 +1,39 @@ + +This directory is intended for project header files. + +A header file is a file containing C declarations and macro definitions +to be shared between several project source files. You request the use of a +header file in your project source file (C, C++, etc) located in `src` folder +by including it, with the C preprocessing directive `#include'. + +```src/main.c + +#include "header.h" + +int main (void) +{ + ... +} +``` + +Including a header file produces the same results as copying the header file +into each source file that needs it. Such copying would be time-consuming +and error-prone. With a header file, the related declarations appear +in only one place. If they need to be changed, they can be changed in one +place, and programs that include the header file will automatically use the +new version when next recompiled. The header file eliminates the labor of +finding and changing all the copies as well as the risk that a failure to +find one copy will result in inconsistencies within a program. + +In C, the usual convention is to give header files names that end with `.h'. +It is most portable to use only letters, digits, dashes, and underscores in +header file names, and at most one dot. + +Read more about using header files in official GCC documentation: + +* Include Syntax +* Include Operation +* Once-Only Headers +* Computed Includes + +https://gcc.gnu.org/onlinedocs/cpp/Header-Files.html diff --git a/src/MQTT_Reader/include/_allFunctions.hpp b/src/MQTT_Reader/include/_allFunctions.hpp new file mode 100644 index 0000000..c61eb8b --- /dev/null +++ b/src/MQTT_Reader/include/_allFunctions.hpp @@ -0,0 +1,39 @@ +#ifndef __ALLFUNCTIONS__H__ +#define __ALLFUNCTIONS__H__ + +#include "Arduino.h" + + +// //Forward declarations to make PlatformIO happy +void setupAP(void); +void setupMQTT(void); +void StatusToDisplay(int item); +void handleRootAP(); +void handleRootMQTT(); +void handleNotFoundAP(); +void handleSubmit(); +void connect(); +void readConfig (void); +void callback(char* topic, byte* payload, unsigned int length); +void handleRFID(void); +void write_to_Memory(String s,String p,String i, String g, byte w, byte r, byte f); +void write_EEPROM(String x,int pos); +void MessageToDisplay(int ID, String clearText, String addnText); +boolean APDUtrancieve(String in); +boolean setAuthKey(String Sdata); +void LastMessageDisplay(void); +void popRFIDerror(void); +boolean RequestMifare(void); +boolean RequestAuthUltralightC(void); +void byte2charArray(byte *in, char *out, int len_in); +boolean HandleDESFire(void); +void sendUID(char *UID, char *KeyOld, char *KeyNew); +void char2byteArray(String in, byte *out, int len_in); +void dump_byte_array(byte *buffer, byte bufferSize); +String printHex(byte *buffer, byte bufferSize); +void rol(byte *data, int len); +byte char2byte(char *s); +void display2lines(String str1, String str2); +void display2linesRAW(String str1, String str2); + +#endif \ No newline at end of file diff --git a/src/MQTT_Reader/lib/README b/src/MQTT_Reader/lib/README new file mode 100644 index 0000000..6debab1 --- /dev/null +++ b/src/MQTT_Reader/lib/README @@ -0,0 +1,46 @@ + +This directory is intended for project specific (private) libraries. +PlatformIO will compile them to static libraries and link into executable file. + +The source code of each library should be placed in a an own separate directory +("lib/your_library_name/[here are source files]"). + +For example, see a structure of the following two libraries `Foo` and `Bar`: + +|--lib +| | +| |--Bar +| | |--docs +| | |--examples +| | |--src +| | |- Bar.c +| | |- Bar.h +| | |- library.json (optional, custom build options, etc) https://docs.platformio.org/page/librarymanager/config.html +| | +| |--Foo +| | |- Foo.c +| | |- Foo.h +| | +| |- README --> THIS FILE +| +|- platformio.ini +|--src + |- main.c + +and a contents of `src/main.c`: +``` +#include +#include + +int main (void) +{ + ... +} + +``` + +PlatformIO Library Dependency Finder will find automatically dependent +libraries scanning project source files. + +More information about PlatformIO Library Dependency Finder +- https://docs.platformio.org/page/librarymanager/ldf.html diff --git a/src/MQTT_Reader/platformio.ini b/src/MQTT_Reader/platformio.ini new file mode 100644 index 0000000..1a13b5d --- /dev/null +++ b/src/MQTT_Reader/platformio.ini @@ -0,0 +1,23 @@ +; PlatformIO Project Configuration File +; +; Build options: build flags, source filter +; Upload options: custom upload port, speed and extra flags +; Library options: dependencies, extra library storages +; Advanced options: extra scripting +; +; Please visit documentation for the other options and examples +; https://docs.platformio.org/page/projectconf.html + +[env:esp12e] +platform = espressif8266 +board = esp12e +framework = arduino +monitor_speed = 115200 +lib_deps = + uipethernet/UIPEthernet@^2.0.11 + knolleary/PubSubClient@^2.8 + miguelbalboa/MFRC522@^1.4.10 + thingpulse/ESP8266 and ESP32 OLED driver for SSD1306 displays@^4.3.0 + bblanchon/ArduinoJson@^6.19.4 + https://github.com/Octoate/ArduinoDES.git + \ No newline at end of file diff --git a/src/MQTT_Reader06.ino b/src/MQTT_Reader/src/main.cpp similarity index 99% rename from src/MQTT_Reader06.ino rename to src/MQTT_Reader/src/main.cpp index 9068f58..571bd56 100644 --- a/src/MQTT_Reader06.ino +++ b/src/MQTT_Reader/src/main.cpp @@ -1,4 +1,3 @@ - /* ESP8266 RFID Reader - MQTT with OLED display for WiFi and Enthernet @@ -37,6 +36,7 @@ show text messages. */ +#include #ifdef ESP32 #include // ESP32 @@ -275,7 +275,7 @@ const char INDEX_HTML[] = SSD1306Wire display(0x3c, 4, 5); // ESP8266 SSD1306Wire display(0x3c, SDA, SCL); #endif - +#include "_allFunctions.hpp" void setup(void){ @@ -327,11 +327,11 @@ void setup(void){ int value=800; if(Old_PCB){ - if(digitalRead(BUTTON_PIN)==LOW) - value=0; + if(digitalRead(BUTTON_PIN)==LOW) + value=0; } else{ - value = analogRead(A0); + value = analogRead(A0); } Serial.print("value: "); @@ -416,7 +416,7 @@ void setupMQTT(void){ Serial.println("Up and running!"); /* Generate the Mifare Keys (key A and B) - * Standard key is FFFFFFFFFFFFh for unformatted RFID tokens + * Standard key is FFFFFFFFFFFFh for unformatted RFID tokens * Special key can be configured and will be loaded from EEPROM (To-Do) */ @@ -563,7 +563,7 @@ void write_to_Memory(String s,String p,String i, String g, byte w, byte r, byte //Daten in den EEPROM schreiben void write_EEPROM(String x,int pos){ - for(int n=pos;n