diff --git a/hardware/include/README b/hardware/include/README deleted file mode 100644 index 49819c0..0000000 --- a/hardware/include/README +++ /dev/null @@ -1,37 +0,0 @@ - -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 convention is to give header files names that end with `.h'. - -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/hardware/include/main.hpp b/hardware/include/main.hpp index c079e00..135801d 100644 --- a/hardware/include/main.hpp +++ b/hardware/include/main.hpp @@ -6,4 +6,7 @@ #include "test.hpp" #include "mqtt.hpp" -#define LED 2 \ No newline at end of file +#define LED 2 +#define SERVER_IP "192.168.1.178" +#define REST_PORT 80 +#define MQTT_PORT 1883 \ No newline at end of file diff --git a/hardware/include/mqtt.hpp b/hardware/include/mqtt.hpp index e69de29..0903615 100644 --- a/hardware/include/mqtt.hpp +++ b/hardware/include/mqtt.hpp @@ -0,0 +1,2 @@ +#include +#include \ No newline at end of file diff --git a/hardware/include/wifi.hpp b/hardware/include/wifi.hpp index cf7ed35..1d7a7f1 100644 --- a/hardware/include/wifi.hpp +++ b/hardware/include/wifi.hpp @@ -1,7 +1,7 @@ #include #include -#define SSID "iPhone de Jose" -#define PASSWORD "bombardeenlaus" +#define SSID "Redmi Note 14 Pro 5G" +#define PASSWORD "aitv5949" int setup_wifi(); \ No newline at end of file diff --git a/hardware/lib/README b/hardware/lib/README deleted file mode 100644 index 9379397..0000000 --- a/hardware/lib/README +++ /dev/null @@ -1,46 +0,0 @@ - -This directory is intended for project specific (private) libraries. -PlatformIO will compile them to static libraries and link into the executable file. - -The source code of each library should be placed in a separate directory -("lib/your_library_name/[Code]"). - -For example, see the structure of the following example libraries `Foo` and `Bar`: - -|--lib -| | -| |--Bar -| | |--docs -| | |--examples -| | |--src -| | |- Bar.c -| | |- Bar.h -| | |- library.json (optional. for 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 - -Example contents of `src/main.c` using Foo and Bar: -``` -#include -#include - -int main (void) -{ - ... -} - -``` - -The PlatformIO Library Dependency Finder will find automatically dependent -libraries by scanning project source files. - -More information about PlatformIO Library Dependency Finder -- https://docs.platformio.org/page/librarymanager/ldf.html diff --git a/hardware/src/mqtt.cpp b/hardware/src/mqtt.cpp index 131e5ea..c6a6c79 100644 --- a/hardware/src/mqtt.cpp +++ b/hardware/src/mqtt.cpp @@ -1 +1,61 @@ -#include "mqtt.hpp" \ No newline at end of file +#include "mqtt.hpp" + +// MQTT configuration +WiFiClient espClient; +PubSubClient client(espClient); + +void OnMqttReceived(char *topic, byte *payload, unsigned int length) +{ + Serial.print("Received on "); + Serial.print(topic); + Serial.print(": "); + + String content = ""; + + for (size_t i = 0; i < length; i++) { + content.concat((char)payload[i]); + } + + Serial.print(content); + Serial.println(); +} + +void InitMqtt(const char * MQTTServerAddress, uint16_t MQTTServerPort) +{ + client.setServer(MQTTServerAddress, MQTTServerPort); + client.setCallback(OnMqttReceived); +} + +// conecta o reconecta al MQTT +// consigue conectar -> suscribe a topic y publica un mensaje +// no -> espera 5 segundos +void ConnectMqtt(const char * MQTTClientName) +{ + Serial.print("Starting MQTT connection..."); + if (client.connect(MQTTClientName)) + { + client.subscribe("hello/world"); + client.publish("hello/world", "connected"); + } + else + { + Serial.print("Failed MQTT connection, rc="); + Serial.print(client.state()); + Serial.println(" try again in 5 seconds"); + + delay(5000); + } +} + +// gestiona la comunicación MQTT +// comprueba que el cliente está conectado +// no -> intenta reconectar +// si -> llama al MQTT loop +void HandleMqtt(const char * MQTTClientName) +{ + if (!client.connected()) + { + ConnectMqtt(MQTTClientName); + } + client.loop(); +} diff --git a/hardware/src/rest.cpp b/hardware/src/rest.cpp index f3b0775..bb9a35f 100644 --- a/hardware/src/rest.cpp +++ b/hardware/src/rest.cpp @@ -1 +1,2 @@ -#include "rest.hpp" \ No newline at end of file +#include "rest.hpp" + diff --git a/hardware/test/README b/hardware/test/README deleted file mode 100644 index 9b1e87b..0000000 --- a/hardware/test/README +++ /dev/null @@ -1,11 +0,0 @@ - -This directory is intended for PlatformIO Test Runner 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/en/latest/advanced/unit-testing/index.html