mirror of
https://gitlab.com/fabinfra/fabhardware/fabreader.git
synced 2025-05-05 08:40:42 +02:00
convert MQTT_Reader06.ino to PlatformIO project
This commit is contained in:
parent
ee72c71e53
commit
ef8e979fe5
5
src/MQTT_Reader/.gitignore
vendored
Normal file
5
src/MQTT_Reader/.gitignore
vendored
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
.pio
|
||||||
|
.vscode/.browse.c_cpp.db*
|
||||||
|
.vscode/c_cpp_properties.json
|
||||||
|
.vscode/launch.json
|
||||||
|
.vscode/ipch
|
10
src/MQTT_Reader/.vscode/extensions.json
vendored
Normal file
10
src/MQTT_Reader/.vscode/extensions.json
vendored
Normal file
@ -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"
|
||||||
|
]
|
||||||
|
}
|
39
src/MQTT_Reader/include/README
Normal file
39
src/MQTT_Reader/include/README
Normal file
@ -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
|
39
src/MQTT_Reader/include/_allFunctions.hpp
Normal file
39
src/MQTT_Reader/include/_allFunctions.hpp
Normal file
@ -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
|
46
src/MQTT_Reader/lib/README
Normal file
46
src/MQTT_Reader/lib/README
Normal file
@ -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 <Foo.h>
|
||||||
|
#include <Bar.h>
|
||||||
|
|
||||||
|
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
|
23
src/MQTT_Reader/platformio.ini
Normal file
23
src/MQTT_Reader/platformio.ini
Normal file
@ -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
|
||||||
|
|
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
ESP8266 RFID Reader - MQTT with OLED display for WiFi and Enthernet
|
ESP8266 RFID Reader - MQTT with OLED display for WiFi and Enthernet
|
||||||
|
|
||||||
@ -37,6 +36,7 @@
|
|||||||
show text messages.
|
show text messages.
|
||||||
|
|
||||||
*/
|
*/
|
||||||
|
#include <Arduino.h>
|
||||||
|
|
||||||
#ifdef ESP32
|
#ifdef ESP32
|
||||||
#include <WiFi.h> // ESP32
|
#include <WiFi.h> // ESP32
|
||||||
@ -275,7 +275,7 @@ const char INDEX_HTML[] =
|
|||||||
SSD1306Wire display(0x3c, 4, 5); // ESP8266 SSD1306Wire display(0x3c, SDA, SCL);
|
SSD1306Wire display(0x3c, 4, 5); // ESP8266 SSD1306Wire display(0x3c, SDA, SCL);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#include "_allFunctions.hpp"
|
||||||
|
|
||||||
|
|
||||||
void setup(void){
|
void setup(void){
|
||||||
@ -327,11 +327,11 @@ void setup(void){
|
|||||||
|
|
||||||
int value=800;
|
int value=800;
|
||||||
if(Old_PCB){
|
if(Old_PCB){
|
||||||
if(digitalRead(BUTTON_PIN)==LOW)
|
if(digitalRead(BUTTON_PIN)==LOW)
|
||||||
value=0;
|
value=0;
|
||||||
}
|
}
|
||||||
else{
|
else{
|
||||||
value = analogRead(A0);
|
value = analogRead(A0);
|
||||||
}
|
}
|
||||||
|
|
||||||
Serial.print("value: ");
|
Serial.print("value: ");
|
||||||
@ -416,7 +416,7 @@ void setupMQTT(void){
|
|||||||
Serial.println("Up and running!");
|
Serial.println("Up and running!");
|
||||||
|
|
||||||
/* Generate the Mifare Keys (key A and B)
|
/* 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)
|
* 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
|
//Daten in den EEPROM schreiben
|
||||||
void write_EEPROM(String x,int pos){
|
void write_EEPROM(String x,int pos){
|
||||||
for(int n=pos;n<x.length()+pos;n++){
|
for(unsigned int n=pos;n<x.length()+pos;n++){
|
||||||
EEPROM.write(n,x[n-pos]);
|
EEPROM.write(n,x[n-pos]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1246,7 +1246,7 @@ void popRFIDerror(void){
|
|||||||
StatusToDisplay(ERROR_RFID); // show error
|
StatusToDisplay(ERROR_RFID); // show error
|
||||||
delay(2000);
|
delay(2000);
|
||||||
LastMessageDisplay(); // show last message displayed
|
LastMessageDisplay(); // show last message displayed
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Displays 2 lines of text in size 16
|
* Displays 2 lines of text in size 16
|
11
src/MQTT_Reader/test/README
Normal file
11
src/MQTT_Reader/test/README
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
|
||||||
|
This directory is intended for PlatformIO Unit Testing and project tests.
|
||||||
|
|
||||||
|
Unit Testing is a software testing method by which individual units of
|
||||||
|
source code, sets of one or more MCU program modules together with associated
|
||||||
|
control data, usage procedures, and operating procedures, are tested to
|
||||||
|
determine whether they are fit for use. Unit testing finds problems early
|
||||||
|
in the development cycle.
|
||||||
|
|
||||||
|
More information about PlatformIO Unit Testing:
|
||||||
|
- https://docs.platformio.org/page/plus/unit-testing.html
|
Loading…
x
Reference in New Issue
Block a user