first_commit
This commit is contained in:
5
ESP8266/MatrixLedsRGB/.gitignore
vendored
Normal file
5
ESP8266/MatrixLedsRGB/.gitignore
vendored
Normal file
@@ -0,0 +1,5 @@
|
||||
.pio
|
||||
.vscode/.browse.c_cpp.db*
|
||||
.vscode/c_cpp_properties.json
|
||||
.vscode/launch.json
|
||||
.vscode/ipch
|
||||
67
ESP8266/MatrixLedsRGB/.travis.yml
Normal file
67
ESP8266/MatrixLedsRGB/.travis.yml
Normal file
@@ -0,0 +1,67 @@
|
||||
# Continuous Integration (CI) is the practice, in software
|
||||
# engineering, of merging all developer working copies with a shared mainline
|
||||
# several times a day < https://docs.platformio.org/page/ci/index.html >
|
||||
#
|
||||
# Documentation:
|
||||
#
|
||||
# * Travis CI Embedded Builds with PlatformIO
|
||||
# < https://docs.travis-ci.com/user/integration/platformio/ >
|
||||
#
|
||||
# * PlatformIO integration with Travis CI
|
||||
# < https://docs.platformio.org/page/ci/travis.html >
|
||||
#
|
||||
# * User Guide for `platformio ci` command
|
||||
# < https://docs.platformio.org/page/userguide/cmd_ci.html >
|
||||
#
|
||||
#
|
||||
# Please choose one of the following templates (proposed below) and uncomment
|
||||
# it (remove "# " before each line) or use own configuration according to the
|
||||
# Travis CI documentation (see above).
|
||||
#
|
||||
|
||||
|
||||
#
|
||||
# Template #1: General project. Test it using existing `platformio.ini`.
|
||||
#
|
||||
|
||||
# language: python
|
||||
# python:
|
||||
# - "2.7"
|
||||
#
|
||||
# sudo: false
|
||||
# cache:
|
||||
# directories:
|
||||
# - "~/.platformio"
|
||||
#
|
||||
# install:
|
||||
# - pip install -U platformio
|
||||
# - platformio update
|
||||
#
|
||||
# script:
|
||||
# - platformio run
|
||||
|
||||
|
||||
#
|
||||
# Template #2: The project is intended to be used as a library with examples.
|
||||
#
|
||||
|
||||
# language: python
|
||||
# python:
|
||||
# - "2.7"
|
||||
#
|
||||
# sudo: false
|
||||
# cache:
|
||||
# directories:
|
||||
# - "~/.platformio"
|
||||
#
|
||||
# env:
|
||||
# - PLATFORMIO_CI_SRC=path/to/test/file.c
|
||||
# - PLATFORMIO_CI_SRC=examples/file.ino
|
||||
# - PLATFORMIO_CI_SRC=path/to/test/directory
|
||||
#
|
||||
# install:
|
||||
# - pip install -U platformio
|
||||
# - platformio update
|
||||
#
|
||||
# script:
|
||||
# - platformio ci --lib="." --board=ID_1 --board=ID_2 --board=ID_N
|
||||
7
ESP8266/MatrixLedsRGB/.vscode/extensions.json
vendored
Normal file
7
ESP8266/MatrixLedsRGB/.vscode/extensions.json
vendored
Normal file
@@ -0,0 +1,7 @@
|
||||
{
|
||||
// See http://go.microsoft.com/fwlink/?LinkId=827846
|
||||
// for the documentation about the extensions.json format
|
||||
"recommendations": [
|
||||
"platformio.platformio-ide"
|
||||
]
|
||||
}
|
||||
3
ESP8266/MatrixLedsRGB/.vscode/settings.json
vendored
Normal file
3
ESP8266/MatrixLedsRGB/.vscode/settings.json
vendored
Normal file
@@ -0,0 +1,3 @@
|
||||
{
|
||||
"cSpell.language": ",es"
|
||||
}
|
||||
39
ESP8266/MatrixLedsRGB/include/README
Normal file
39
ESP8266/MatrixLedsRGB/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
|
||||
46
ESP8266/MatrixLedsRGB/lib/README
Normal file
46
ESP8266/MatrixLedsRGB/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
|
||||
27
ESP8266/MatrixLedsRGB/platformio.ini
Normal file
27
ESP8266/MatrixLedsRGB/platformio.ini
Normal file
@@ -0,0 +1,27 @@
|
||||
; 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:nodemcuv2]
|
||||
platform = espressif8266
|
||||
board = nodemcuv2
|
||||
framework = arduino
|
||||
lib_deps =
|
||||
SPI
|
||||
Wire
|
||||
knolleary/PubSubClient@^2.8
|
||||
arduino-libraries/NTPClient@^3.1.0
|
||||
monitor_speed = 115200
|
||||
upload_speed = 256000
|
||||
monitor_filters = colorize
|
||||
upload_protocol = espota
|
||||
upload_port = 192.168.1.104
|
||||
upload_flags =
|
||||
--port=8266
|
||||
--auth=un260874
|
||||
111
ESP8266/MatrixLedsRGB/src/main.cpp
Normal file
111
ESP8266/MatrixLedsRGB/src/main.cpp
Normal file
@@ -0,0 +1,111 @@
|
||||
#include <Arduino.h>
|
||||
#include <ESP8266WiFi.h>
|
||||
|
||||
|
||||
#include <NTPClient.h>
|
||||
#include <WiFiUdp.h>
|
||||
//#include <TaskScheduler.h>
|
||||
|
||||
WiFiUDP ntpUDP;
|
||||
NTPClient timeClient(ntpUDP, "0.south-america.pool.ntp.org", -18000, 6000);
|
||||
|
||||
#include "matrix.hpp"
|
||||
#include "mqtt.hpp"
|
||||
#include "ota.hpp"
|
||||
|
||||
const char *ssid = "mdchaparror";
|
||||
const char *password = "un260874";
|
||||
long timeAnterior;
|
||||
long matrix_time;
|
||||
|
||||
|
||||
// void t1Callback();
|
||||
// void t2Callback();
|
||||
// void serialEvent();
|
||||
|
||||
// Task t1(120, TASK_FOREVER, &t1Callback);
|
||||
// Task t2(100, TASK_FOREVER, &t2Callback);
|
||||
|
||||
// Scheduler runner;
|
||||
|
||||
void setup()
|
||||
{
|
||||
Serial.begin(115200);
|
||||
WiFi.mode(WIFI_STA);
|
||||
WiFi.begin(ssid, password);
|
||||
while (WiFi.waitForConnectResult() != WL_CONNECTED)
|
||||
{
|
||||
delay(5000);
|
||||
ESP.restart();
|
||||
}
|
||||
Serial.println(WiFi.localIP());
|
||||
mensaje += WiFi.localIP().toString();
|
||||
|
||||
ota_init();
|
||||
mqtt_init();
|
||||
|
||||
timeClient.begin();
|
||||
matrix_init();
|
||||
|
||||
|
||||
// runner.init();
|
||||
// runner.addTask(t1);
|
||||
// runner.addTask(t2);
|
||||
// delay(1000);
|
||||
// t1.enable();
|
||||
// t2.enable();
|
||||
}
|
||||
// void loop()
|
||||
// {
|
||||
// runner.execute();
|
||||
// }
|
||||
|
||||
// void t1Callback()
|
||||
// {
|
||||
// ArduinoOTA.handle();
|
||||
// show_matrix();
|
||||
// }
|
||||
|
||||
// void t2Callback()
|
||||
// {
|
||||
|
||||
// if ((millis() - timeAnterior) > 1000)
|
||||
// {
|
||||
// timeAnterior = millis();
|
||||
// if (!client.connected())
|
||||
// {
|
||||
// reconnect();
|
||||
// }
|
||||
// timeClient.update(); //sincronizamos con el server NTP
|
||||
// hora = timeClient.getFormattedTime();
|
||||
// texto = mensaje + " " + hora;
|
||||
// longitud = longitud = texto.length() * 5 + 64;
|
||||
// }
|
||||
|
||||
// client.loop();
|
||||
// }
|
||||
|
||||
|
||||
void loop(){
|
||||
ArduinoOTA.handle();
|
||||
if((millis() - matrix_time) > 100){
|
||||
matrix_time = millis();
|
||||
show_matrix();
|
||||
}
|
||||
|
||||
|
||||
if ((millis() - timeAnterior) > 1000)
|
||||
{
|
||||
timeAnterior = millis();
|
||||
if (!client.connected())
|
||||
{
|
||||
reconnect();
|
||||
}
|
||||
timeClient.update(); //sincronizamos con el server NTP
|
||||
hora = timeClient.getFormattedTime();
|
||||
texto = mensaje + " " + hora;
|
||||
longitud = texto.length() * 5 + 64;
|
||||
}
|
||||
|
||||
client.loop();
|
||||
}
|
||||
46
ESP8266/MatrixLedsRGB/src/matrix.hpp
Normal file
46
ESP8266/MatrixLedsRGB/src/matrix.hpp
Normal file
@@ -0,0 +1,46 @@
|
||||
#include <Adafruit_GFX.h>
|
||||
#include <Adafruit_NeoMatrix.h>
|
||||
#include <Adafruit_NeoPixel.h>
|
||||
#define PIN D7 //DIN MATRIZ
|
||||
String texto = "Puerto Ota: ";
|
||||
String mensaje = "Puerto Ota: ";
|
||||
String hora = "00:00:00";
|
||||
int R = 255;
|
||||
int G = 0;
|
||||
int B = 0;
|
||||
|
||||
Adafruit_NeoMatrix matrix = Adafruit_NeoMatrix(32, 8, PIN,
|
||||
NEO_MATRIX_TOP + NEO_MATRIX_LEFT + NEO_MATRIX_COLUMNS + NEO_MATRIX_ZIGZAG,
|
||||
NEO_GRB + NEO_KHZ800);
|
||||
|
||||
int x = matrix.width();
|
||||
int longitud = 0;
|
||||
int pass = 0;
|
||||
|
||||
const uint16_t colors[] = {
|
||||
matrix.Color(255, 102, 0),
|
||||
matrix.Color(255, 204, 0),
|
||||
matrix.Color(128, 0, 128),
|
||||
matrix.Color(255, 0, 255)};
|
||||
|
||||
void matrix_init()
|
||||
{
|
||||
matrix.begin();
|
||||
matrix.setTextWrap(false);
|
||||
matrix.setBrightness(20);
|
||||
matrix.setTextColor(matrix.Color(R, G, B));
|
||||
}
|
||||
|
||||
void show_matrix()
|
||||
{
|
||||
matrix.fillScreen(0);
|
||||
matrix.setCursor(x, 1);
|
||||
matrix.print(texto);
|
||||
matrix.setTextColor(matrix.Color(R, G, B));
|
||||
if (--x < -1 * longitud)
|
||||
{
|
||||
x = matrix.width();
|
||||
|
||||
}
|
||||
matrix.show();
|
||||
}
|
||||
88
ESP8266/MatrixLedsRGB/src/mqtt.hpp
Normal file
88
ESP8266/MatrixLedsRGB/src/mqtt.hpp
Normal file
@@ -0,0 +1,88 @@
|
||||
#include <PubSubClient.h>
|
||||
// MQTT: ID, server IP, port, username and password
|
||||
const char *MQTT_CLIENT_ID = "matrix_client";
|
||||
const char *MQTT_SERVER_IP = "192.168.1.105";
|
||||
const uint16_t MQTT_SERVER_PORT = 1883;
|
||||
const char *MQTT_USER = "mdchaparror";
|
||||
const char *MQTT_PASSWORD = "un80187452";
|
||||
const char *MQTT_TOPIC_MENSAJE = "matrix/mensaje";
|
||||
const char *MQTT_TOPIC_RGB = "matrix/rgb";
|
||||
|
||||
|
||||
WiFiClient wifiClient;
|
||||
PubSubClient client(wifiClient);
|
||||
String getValue(String data, char separator, int index);
|
||||
|
||||
void callback(char *p_topic, byte *p_payload, unsigned int p_length)
|
||||
{
|
||||
// concat the payload into a string
|
||||
String payload;
|
||||
for (uint8_t i = 0; i < p_length; i++)
|
||||
{
|
||||
payload.concat((char)p_payload[i]);
|
||||
}
|
||||
|
||||
if (String(MQTT_TOPIC_MENSAJE).equals(p_topic))
|
||||
{
|
||||
mensaje = String(payload);
|
||||
texto = mensaje + " " + hora;
|
||||
x = matrix.width();
|
||||
longitud = texto.length() * 5 + 64;
|
||||
}
|
||||
if (String(MQTT_TOPIC_RGB).equals(p_topic))
|
||||
{
|
||||
String rgb = String(payload);
|
||||
R = getValue(rgb,',',0).toInt();
|
||||
G = getValue(rgb,',',1).toInt();
|
||||
B = getValue(rgb,',',2).toInt();
|
||||
texto = mensaje + " " + hora;
|
||||
x = matrix.width();
|
||||
longitud = texto.length() * 5 + 64;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
void reconnect()
|
||||
{
|
||||
while (!client.connected())
|
||||
{
|
||||
if (client.connect(MQTT_CLIENT_ID, MQTT_USER, MQTT_PASSWORD))
|
||||
{
|
||||
Serial.println("INFO: connected");
|
||||
client.subscribe(MQTT_TOPIC_MENSAJE);
|
||||
client.subscribe(MQTT_TOPIC_RGB);
|
||||
}
|
||||
else
|
||||
{
|
||||
Serial.print("ERROR: failed, rc=");
|
||||
Serial.print(client.state());
|
||||
Serial.println("DEBUG: try again in 5 seconds");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void mqtt_init()
|
||||
{
|
||||
client.setServer(MQTT_SERVER_IP, MQTT_SERVER_PORT);
|
||||
client.setCallback(callback);
|
||||
}
|
||||
|
||||
String getValue(String data, char separator, int index)
|
||||
{
|
||||
int found = 0;
|
||||
int strIndex[] = {0, -1};
|
||||
int maxIndex = data.length()-1;
|
||||
|
||||
for(int i=0; i<=maxIndex && found<=index; i++){
|
||||
if(data.charAt(i)==separator || i==maxIndex){
|
||||
found++;
|
||||
strIndex[0] = strIndex[1]+1;
|
||||
strIndex[1] = (i == maxIndex) ? i+1 : i;
|
||||
}
|
||||
}
|
||||
|
||||
return found>index ? data.substring(strIndex[0], strIndex[1]) : "";
|
||||
}
|
||||
10
ESP8266/MatrixLedsRGB/src/ota.hpp
Normal file
10
ESP8266/MatrixLedsRGB/src/ota.hpp
Normal file
@@ -0,0 +1,10 @@
|
||||
|
||||
#include <ArduinoOTA.h>
|
||||
|
||||
|
||||
void ota_init()
|
||||
{
|
||||
ArduinoOTA.setHostname("OtaMatrix");
|
||||
ArduinoOTA.setPassword((const char *)"un260874");
|
||||
ArduinoOTA.begin();
|
||||
}
|
||||
11
ESP8266/MatrixLedsRGB/test/README
Normal file
11
ESP8266/MatrixLedsRGB/test/README
Normal file
@@ -0,0 +1,11 @@
|
||||
|
||||
This directory is intended for PIO 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 PIO Unit Testing:
|
||||
- https://docs.platformio.org/page/plus/unit-testing.html
|
||||
Reference in New Issue
Block a user