doohoyi/forest-all-around
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

..

Browse source
This commit is contained in:
Dooho Yi 2021-02-17 14:09:57 +09:00
parent ad480b753b
commit 7fc7eb2719
1 changed files with 13 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
taak/src/main.cpp
View file

@ -113,13 +113,9 @@
//arduino //arduino
#include <Arduino.h> #include <Arduino.h>
//post //post & addresses
#include "../../post.h" #include "../../post.h"
AddressBook members;
//addresses
#include <Vector.h>
Vector<Address> members;
Address __members[MEMBER_COUNT_MAX]; //<-- the storage array of 'members'
//espnow //espnow
#include <ESP8266WiFi.h> #include <ESP8266WiFi.h>
@ -209,18 +205,18 @@ void collect_post() {
// //
//pseudo-broadcast using addressbook! //pseudo-broadcast using addressbook!
// //
for (uint32_t i = 0; i < members.size(); i++) { for (uint32_t i = 0; i < members.list.size(); i++) {
esp_now_send(members[i].mac, frm, frm_size); esp_now_send(members.list[i].mac, frm, frm_size);
// //
MONITORING_SERIAL.write(frm, frm_size); MONITORING_SERIAL.write(frm, frm_size);
MONITORING_SERIAL.print(" ==(esp_now_send)==> "); MONITORING_SERIAL.print(" ==(esp_now_send)==> ");
// //
MONITORING_SERIAL.print(members[i].mac[0], HEX); MONITORING_SERIAL.print(members.list[i].mac[0], HEX);
for (int j = 1; j < 6; j++) { for (int j = 1; j < 6; j++) {
MONITORING_SERIAL.print(":"); MONITORING_SERIAL.print(":");
MONITORING_SERIAL.print(members[i].mac[j], HEX); MONITORING_SERIAL.print(members.list[i].mac[j], HEX);
} }
MONITORING_SERIAL.print(" ==> " + members[i].name); MONITORING_SERIAL.print(" ==> " + members.list[i].name);
// //
} }
// //
@ -290,14 +286,6 @@ void setup() {
Serial.begin(115200); Serial.begin(115200);
delay(100); delay(100);
//members
members.setStorage(__members);
//
members.push_back(Address(0xF4, 0xCF, 0xA2, 0xED, 0xB7, 0x21, "Enchovy"));
members.push_back(Address(0xF4, 0xCF, 0xA2, 0xED, 0xB3, 0xC5, "Schpaarow"));
members.push_back(Address(0xF4, 0xCF, 0xA2, 0xED, 0xB4, 0x28, "Taak157"));
//info //info
Serial.println(); Serial.println();
Serial.println(); Serial.println();
@ -322,14 +310,14 @@ void setup() {
#endif #endif
Serial.println("-"); Serial.println("-");
Serial.println("- * addresses >>>"); Serial.println("- * addresses >>>");
for (uint32_t i = 0; i < members.size(); i++) { for (uint32_t i = 0; i < members.list.size(); i++) {
Serial.print("- #" + String(i) + " : "); Serial.print("- #" + String(i) + " : ");
Serial.print(members[i].mac[0], HEX); Serial.print(members.list[i].mac[0], HEX);
for (int j = 1; j < 6; j++) { for (int j = 1; j < 6; j++) {
Serial.print(":"); Serial.print(":");
Serial.print(members[i].mac[j], HEX); Serial.print(members.list[i].mac[j], HEX);
} }
Serial.print(" ==> " + members[i].name); Serial.print(" ==> " + members.list[i].name);
Serial.println(); Serial.println();
} }
Serial.println("-"); Serial.println("-");
@ -352,8 +340,8 @@ void setup() {
esp_now_set_self_role(ESP_NOW_ROLE_COMBO); esp_now_set_self_role(ESP_NOW_ROLE_COMBO);
esp_now_register_send_cb(onDataSent); esp_now_register_send_cb(onDataSent);
esp_now_register_recv_cb(onDataReceive); esp_now_register_recv_cb(onDataReceive);
for (uint32_t i = 0; i < members.size(); i++) { for (uint32_t i = 0; i < members.list.size(); i++) {
esp_now_add_peer(members[i].mac, ESP_NOW_ROLE_COMBO, 1, NULL, 0); // <-- '1' : "Channel does not affect any function" ... *.-a esp_now_add_peer(members.list[i].mac, ESP_NOW_ROLE_COMBO, 1, NULL, 0); // <-- '1' : "Channel does not affect any function" ... *.-a
// //
// int esp_now_add_peer(u8 *mac_addr, u8 role, u8 channel, u8 *key, u8 key_len) // int esp_now_add_peer(u8 *mac_addr, u8 role, u8 channel, u8 *key, u8 key_len)
// - https://www.espressif.com/sites/default/files/documentation/2c-esp8266_non_os_sdk_api_reference_en.pdf // - https://www.espressif.com/sites/default/files/documentation/2c-esp8266_non_os_sdk_api_reference_en.pdf