diff --git a/postman/platformio.ini b/postman/platformio.ini index 212ab50..c141c6c 100644 --- a/postman/platformio.ini +++ b/postman/platformio.ini @@ -24,7 +24,6 @@ default_envs = d1_mini_pro [env] framework = arduino -upload_speed = 460800 upload_port = /dev/ttyUSB0 lib_deps = 5825 ; Vector @@ -35,11 +34,11 @@ platform = espressif8266 board = nodemcuv2 lib_deps = ${env.lib_deps} +upload_speed = 921600 ; 9600, 19200, 38400, 57600, 115200, 230400, 460800, 921600 [env:d1_mini_pro] platform = espressif8266 board = d1_mini_pro -upload_speed = 460800 -; 9600, 19200, 38400, 57600, 115200, 230400, 460800, 921600 lib_deps = ${env.lib_deps} +upload_speed = 460800 ; 9600, 19200, 38400, 57600, 115200, 230400, 460800, 921600 diff --git a/postman/src/main.cpp b/postman/src/main.cpp index 8c6012c..a364f69 100644 --- a/postman/src/main.cpp +++ b/postman/src/main.cpp @@ -244,6 +244,7 @@ void setup() { // 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 Serial.println(); diff --git a/taak/platformio.ini b/taak/platformio.ini index d3fc094..c141c6c 100644 --- a/taak/platformio.ini +++ b/taak/platformio.ini @@ -1,38 +1,44 @@ +; < NOTE > + +; to enable verbose output add option --> +; $ platformio run --verbose + +; to make this permanent for the proj. --> +; $ platformio settings set force_verbose Yes + +; then confirm the change --> +; $ platformio settings get + + +; // pio v 4.0 'Build options' +; - build_type +; - build_flags +; - src_build_flags +; - build_unflags +; - src_filter +; - targets + + [platformio] -default_envs = nodemcuv2 +default_envs = d1_mini_pro [env] framework = arduino -upload_speed = 921600 -upload_port = - /dev/ttyUSB0 - /dev/tty.SLAB_USBtoUART +upload_port = /dev/ttyUSB0 lib_deps = - SPI - Wire - 64 ; ArduinoJson - 1269 ; Painless Mesh + 5825 ; Vector + 721 ; TaskScheduler [env:nodemcuv2] platform = espressif8266 board = nodemcuv2 lib_deps = ${env.lib_deps} - ESP8266WiFi - Servo(esp8266) - -[env:huzzah] -platform = espressif8266 -board = huzzah -lib_deps = - ${env.lib_deps} - ESP8266WiFi - Servo(esp8266) +upload_speed = 921600 ; 9600, 19200, 38400, 57600, 115200, 230400, 460800, 921600 [env:d1_mini_pro] platform = espressif8266 board = d1_mini_pro lib_deps = - ${env.lib_deps} - ESP8266WiFi -upload_speed = 460800 + ${env.lib_deps} +upload_speed = 460800 ; 9600, 19200, 38400, 57600, 115200, 230400, 460800, 921600 diff --git a/taak/src/main.cpp b/taak/src/main.cpp index c3f2dd5..f42b910 100644 --- a/taak/src/main.cpp +++ b/taak/src/main.cpp @@ -1,44 +1,67 @@ // -// wirelessly connected cloud (Wireless Mesh Networking) -// MIDI-like -// spacial -// sampler keyboard +// wirelessly connected cloud (based on ESP-NOW, a kind of LPWAN?) // // -// Forest all/around @ MMCA, Seoul +// Conversation about the ROOT @ SEMA warehouses, Seoul // // -// 2020 10 14 +// 2021 02 15 // +// (part-1) esp8266 : 'postman' (the esp-now network nodes) +// +// this module will be an esp-now node in a group. +// like, a bird in a group of birds. +// +// esp-now @ esp8266 DO support broadcast address (FF:FF:FF:FF:FF:FF) +// w/ NONOS-SDK of espressif +// and you can enable that w/ Platformio, applying some special build flags. +// --> https://github.com/esp8266/Arduino/issues/6174#issuecomment-509115454 +// (yet, w/ Arduino, this is not available yet.) +// +// so, at first, we will simply/stably go w/o broadcasting. +// and, if broadcast is really needed we can activate (@Platformio) +// + + +// we want to first osc -> esp-now +// then, esp-now based taak +// then, let is save a value in EEPROM (object with memory) +// no broadcast for now. if needed we can achieve that too. + + //===================== // +// 'HAVE_CLIENT' +// --> i have a client. enable the client task. +// +// 'SERIAL_SWAP' +// --> UART pin swapped. +// you want this, when you want a bi-directional comm. to external client boards (e.g. teensy). +// // 'DISABLE_AP' -// --> disabling AP is for teensy audio samplers. -// they need this to reduce noise from AP beacon signals. -// but, then they cannot build-up net. by themselves. -// we need who can do AP.. -// ==> TODO! just prepare some 'dummy' postmans around. w/ AP activated. -// -// 'DISABLE_I2C_REQ' -// --> a quirk.. due to bi-directional I2C hardship. -// ideally, we want to make this sampler node also speak. -// but, I2C doesn't work. maybe middleware bug.. we later want to change to diff. proto. -// for example, UART or so. -// ==> BEWARE! yet, still we need to take off this.. for 'osc' node. -// -// 'SET_ROOT' -// 'SET_CONTAINSROOT' -// --> for the network stability -// declare 1 root node and branches(constricted to 'contains the root') -// to improve the stability of the net +// --> (questioning)... // //==================== //===================== -#define SET_CONTAINSROOT +// +// (1) standalone +#if 1 +// (2) osc client (the ROOT) +#elif 0 +#define SERIAL_SWAP +#define HAVE_CLIENT +// (3) sampler client +#elif 0 +#define SERIAL_SWAP +#define HAVE_CLIENT +#define DISABLE_AP +// +#endif +// //==================== //======================== @@ -57,114 +80,56 @@ //======================= //======================== -#define MESH_SSID "forest-all/around" -#define MESH_PASSWORD "cc*vvvv/kkk" -#define MESH_PORT 5555 -#define MESH_CHANNEL 5 -#define LONELY_TO_DIE (1000) -//======================= - // -// LED status indication -// phase 0 -// - LED => steady on -// - booted. and running. no connection. scanning. -// phase 1 -// - LED => slow blinking (syncronized) -// - + connected. -// -#if defined(ARDUINO_ESP8266_NODEMCU) // nodemcuv2 -#define LED_PIN 2 -#elif defined(ARDUINO_ESP8266_WEMOS_D1MINIPRO) // d1_mini_pro -#define LED_PIN 2 -#elif defined(ARDUINO_ESP8266_ESP12) // huzzah -#define LED_PIN 2 -#elif defined(ARDUINO_FEATHER_ESP32) // featheresp32 -#define LED_PIN 13 -#elif defined(ARDUINO_NodeMCU_32S) // nodemcu-32s -#define LED_PIN 2 -#endif #define LED_PERIOD (1111) #define LED_ONTIME (1) +#define LED_GAPTIME (222) +// +#define WIFI_CHANNEL 5 +// +// 'MONITORING_SERIAL' +// +// --> sometimes, the 'Serial' is in use (for example, 'osc' node) +// then, use 'Serial1' - D4/GPIO2/TDX1 @ nodemcu (this is TX only.) +// +// --> otherwise, MONITORING_SERIAL == Serial. +// +#if defined(SERIAL_SWAP) +#define MONITORING_SERIAL (Serial1) +#else +#define MONITORING_SERIAL (Serial) +#endif +// +//======================= + +//======================== +#if defined(ARDUINO_FEATHER_ESP32) // featheresp32 +#define LED_PIN 13 +#else +#define LED_PIN 2 +#endif +//======================= //arduino #include -//i2c -#include +//post #include "../../post.h" -//painlessmesh -#include -painlessMesh mesh; +//addresses +#include +Vector
members; +Address __members[MEMBER_COUNT_MAX]; //<-- the storage array of 'members' -//scheduler +//espnow +#include +#include + +//task +#include Scheduler runner; -//task #0 : connection indicator -bool onFlag = false; -bool isConnected = false; -//prototypes -void taskStatusBlink_steadyOn(); -void taskStatusBlink_slowblink_insync(); -void taskStatusBlink_steadyOff(); -//the task -Task statusblinks(0, 1, &taskStatusBlink_steadyOn); // at start, steady on. default == disabled. ==> setup() will enable. -// when disconnected, and trying, steadyon. -void taskStatusBlink_steadyOn() { - onFlag = true; -} -// when connected, blink per 1s. sync-ed. (== default configuration) -void taskStatusBlink_slowblink_insync() { - // toggler - onFlag = !onFlag; - // on-time - statusblinks.delay(LED_ONTIME); - // re-enable & sync. - if (statusblinks.isLastIteration()) { - statusblinks.setIterations(2); //refill iteration counts - statusblinks.enableDelayed(LED_PERIOD - (mesh.getNodeTime() % (LED_PERIOD*1000))/1000); //re-enable with sync-ed delay - } -} -// when connected, steadyoff. (== alternative configuration) -void taskStatusBlink_steadyOff() { - onFlag = false; -} - -//task #1 : happy or lonely -// --> automatic reset after some time of 'loneliness (disconnected from any node)' -void nothappyalone() { - static bool isConnected_prev = false; - static unsigned long lonely_time_start = 0; - // oh.. i m lost the signal(==connection) - if (isConnected_prev != isConnected && isConnected == false) { - lonely_time_start = millis(); - Serial.println("oh.. i m lost!"); - } - // .... how long we've been lonely? - if (isConnected == false) { - if (millis() - lonely_time_start > LONELY_TO_DIE) { - // okay. i m fed up. bye the world. - Serial.println("okay. i m fed up. bye the world."); - Serial.println(); -#if defined(ESP8266) - ESP.reset(); -#elif defined(ESP32) - ESP.restart(); - // esp32 doesn't support 'reset()' yet... - // (restart() is framework-supported, reset() is more forced hardware-reset-action) -#else -#error unknown esp. -#endif - } - } - // - isConnected_prev = isConnected; -} -// Task nothappyalone_task(1000, TASK_FOREVER, ¬happyalone, &runner, true); // by default, ENABLED. -Task nothappyalone_task(100, TASK_FOREVER, ¬happyalone); // by default, ENABLED. - -// my tasks +//-*-*-*-*-*-*-*-*-*-*-*-*- void taak_on() { Serial.println("taak_on!"); digitalWrite(D6, HIGH); @@ -176,41 +141,107 @@ void taak_off() { digitalWrite(D6, LOW); } Task taak_off_task(0, TASK_ONCE, &taak_off); +//*-*-*-*-*-*-*-*-*-*-*-*-* -// mesh callbacks -void receivedCallback(uint32_t from, String & msg) { // REQUIRED - Serial.print("got msg.: "); - Serial.println(msg); - //parse now. +//task #0 : blink led +extern Task blink_task; +void blink() { + // + static int count = 0; + count++; + // + switch (count % 4) { + case 0: + digitalWrite(LED_PIN, LOW); // first ON + blink_task.delay(LED_ONTIME); + break; + case 1: + digitalWrite(LED_PIN, HIGH); // first OFF + blink_task.delay(LED_GAPTIME); + break; + case 2: + digitalWrite(LED_PIN, LOW); // second ON + blink_task.delay(LED_ONTIME); + break; + case 3: + digitalWrite(LED_PIN, HIGH); // second OFF + blink_task.delay(LED_PERIOD - 2* LED_ONTIME - LED_GAPTIME); + break; + } +} +Task blink_task(0, TASK_FOREVER, &blink, &runner, true); // -> ENABLED, at start-up. - //parse letter string. +//task #1 : regular post collection +#if defined(HAVE_CLIENT) +void collect_post() { + // + //postman (serial comm.) + static bool insync = false; + if (insync == false) { + while (Serial.available() > 0) { + // search the last byte + char last = Serial.read(); + // expectable last of the messages + if (last == ']' || last == '}') { + insync = true; + } + } + } else { + // + if (Serial.available() > 0) { + // + char type = Serial.peek(); + // + if (type == '[') { + //expecting a Note message. + uint8_t frm_size = sizeof(Note) + 2; + // + if (Serial.available() >= frm_size) { + // + uint8_t frm[frm_size]; + // + Serial.readBytes(frm, frm_size); + char first = frm[0]; + char last = frm[frm_size - 1]; + if (first == '[' && last == ']') { + // + //good. ==> ok, post it. + // + //pseudo-broadcast using addressbook! + // + for (uint32_t i = 0; i < members.size(); i++) { + esp_now_send(members[i].mac, frm, frm_size); + // + MONITORING_SERIAL.write(frm, frm_size); + MONITORING_SERIAL.print(" ==(esp_now_send)==> "); + // + MONITORING_SERIAL.print(members[i].mac[0], HEX); + for (int j = 1; j < 6; j++) { + MONITORING_SERIAL.print(":"); + MONITORING_SERIAL.print(members[i].mac[j], HEX); + } + MONITORING_SERIAL.print(" ==> " + members[i].name); + // + } + // + } else { + insync = false; //error! + } + } + } + } + } +} +Task collect_post_task(1, TASK_FOREVER, &collect_post, &runner, true); // by default, ENABLED +#endif - // letter frame ( '[' + 30 bytes + ']' ) - // : [123456789012345678901234567890] - - // 'MIDI' letter frame - // : [123456789012345678901234567890] - // : [KKKVVVG.......................] - // : KKK - Key - // .substring(1, 4); - // : VVV - Velocity (volume/amp.) - // .substring(4, 7); - // : G - Gate (note on/off) - // .substring(7, 8); - - String str_key = msg.substring(1, 4); - String str_velocity = msg.substring(4, 7); - String str_gate = msg.substring(7, 8); - - int key = str_key.toInt(); - int velocity = str_velocity.toInt(); // 0 ~ 127 - int gate = str_gate.toInt(); - - //is it for me, the gastank? - if (key == ID_KEY) { +// on 'Note' +void onNoteHandler(Note & n) { + //is it for me? + if (n.pitch == ID_KEY) { //taak_on && taak_off - if (velocity == 0) { - if (gate == 1) { + if (n.velocity == 0) { + if (n.onoff == 1) { taak_on_task.restartDelayed(10); } else { taak_off_task.restartDelayed(10); @@ -219,141 +250,146 @@ void receivedCallback(uint32_t from, String & msg) { // REQUIRED //taak_hit else { taak_on_task.restartDelayed(10); - taak_off_task.restartDelayed(10 + velocity * 2); + taak_off_task.restartDelayed(10 + n.velocity * 2); } } } -void changedConnectionCallback() { - Serial.println(mesh.getNodeList().size()); - // check status -> modify status LED - if (mesh.getNodeList().size() > 0) { - // (still) connected. - onFlag = false; //reset flag stat. - statusblinks.set(LED_PERIOD, 2, &taskStatusBlink_slowblink_insync); - // statusblinks.set(0, 1, &taskStatusBlink_steadyOff); - statusblinks.enable(); - Serial.println("connected!"); + +// on 'receive' +void onDataReceive(uint8_t * mac, uint8_t *incomingData, uint8_t len) { + + // +#if defined(HAVE_CLIENT) + Serial.write(incomingData, len); // we share it w/ the client. +#endif + + // on 'Note' + if (incomingData[0] == '[' && incomingData[len - 1] == ']' && len == (sizeof(Note) + 2)) { + Note note; + memcpy((uint8_t *) ¬e, incomingData + 1, sizeof(Note)); // - isConnected = true; - runner.addTask(nothappyalone_task); - nothappyalone_task.enable(); - } - else { - // disconnected!! - statusblinks.set(0, 1, &taskStatusBlink_steadyOn); - statusblinks.enable(); + MONITORING_SERIAL.println(note.to_string()); + // + onNoteHandler(note); // - isConnected = false; } - // let I2C device know - ///// - Serial.println("hi. client, we ve got a change in the net."); -} -void newConnectionCallback(uint32_t nodeId) { - Serial.println(mesh.getNodeList().size()); - Serial.println("newConnectionCallback."); - changedConnectionCallback(); } +// on 'sent' +void onDataSent(uint8_t *mac_addr, uint8_t sendStatus) { + if (sendStatus != 0) MONITORING_SERIAL.println("Delivery failed!"); +} + +// void setup() { + //led pinMode(LED_PIN, OUTPUT); - //mesh + //serial + Serial.begin(115200); + 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 + Serial.println(); + Serial.println(); + Serial.println("\"hi, i m your postman.\""); + Serial.println("-"); + Serial.println("- * info >>>"); +#if defined(ID_KEY) + Serial.println("- identity (key): " + String(ID_KEY)); +#endif + Serial.println("- mac address: " + WiFi.macAddress()); + Serial.println("- wifi channel: " + String(WIFI_CHANNEL)); + Serial.println("-"); + Serial.println("- * conf >>>"); +#if defined(HAVE_CLIENT) + Serial.println("- ======== 'HAVE_CLIENT' ========"); +#endif +#if defined(SERIAL_SWAP) + Serial.println("- ======== 'SERIAL_SWAP' ========"); +#endif +#if defined(DISABLE_AP) + Serial.println("- ======== 'DISABLE_AP' ========"); +#endif + Serial.println("-"); + Serial.println("- * addresses >>>"); + for (uint32_t i = 0; i < members.size(); i++) { + Serial.print("- #" + String(i) + " : "); + Serial.print(members[i].mac[0], HEX); + for (int j = 1; j < 6; j++) { + Serial.print(":"); + Serial.print(members[i].mac[j], HEX); + } + Serial.print(" ==> " + members[i].name); + Serial.println(); + } + Serial.println("-"); + Serial.println("\".-.-.-. :)\""); + Serial.println(); + + //wifi WiFiMode_t node_type = WIFI_AP_STA; #if defined(DISABLE_AP) system_phy_set_max_tpw(0); node_type = WIFI_STA; #endif - // mesh.setDebugMsgTypes(ERROR | DEBUG | CONNECTION); - mesh.setDebugMsgTypes( ERROR | STARTUP ); - mesh.init(MESH_SSID, MESH_PASSWORD, &runner, MESH_PORT, node_type, MESH_CHANNEL); + WiFi.mode(node_type); - // - // void init(String ssid, String password, Scheduler *baseScheduler, uint16_t port = 5555, WiFiMode_t connectMode = WIFI_AP_STA, uint8_t channel = 1, uint8_t hidden = 0, uint8_t maxconn = MAX_CONN); - // void init(String ssid, String password, uint16_t port = 5555, WiFiMode_t connectMode = WIFI_AP_STA, uint8_t channel = 1, uint8_t hidden = 0, uint8_t maxconn = MAX_CONN); - // - -#if defined(SET_ROOT) - mesh.setRoot(true); -#endif -#if defined(SET_CONTAINSROOT) - mesh.setContainsRoot(true); -#endif - //callbacks - mesh.onReceive(&receivedCallback); - mesh.onNewConnection(&newConnectionCallback); - mesh.onChangedConnections(&changedConnectionCallback); - Serial.println(mesh.getNodeList().size()); - - //tasks - runner.addTask(statusblinks); - statusblinks.enable(); - - //serial - Serial.begin(115200); - delay(100); - Serial.println("hi, postman ready."); -#if defined(DISABLE_AP) - Serial.println("!NOTE!: we are in the WIFI_STA mode!"); -#endif - - //understanding what is 'the nodeId' ==> last 4 bytes of 'softAPmacAddress' - // uint32_t nodeId = tcp::encodeNodeId(MAC); - Serial.print("nodeId (dec) : "); - Serial.println(mesh.getNodeId(), DEC); - Serial.print("nodeId (hex) : "); - Serial.println(mesh.getNodeId(), HEX); - uint8_t MAC[] = {0, 0, 0, 0, 0, 0}; - if (WiFi.softAPmacAddress(MAC) == 0) { - Serial.println("init(): WiFi.softAPmacAddress(MAC) failed."); + //esp-now + if (esp_now_init() != 0) { + Serial.println("Error initializing ESP-NOW"); + return; + } + esp_now_set_self_role(ESP_NOW_ROLE_COMBO); + esp_now_register_send_cb(onDataSent); + esp_now_register_recv_cb(onDataReceive); + for (uint32_t i = 0; i < members.size(); i++) { + esp_now_add_peer(members[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) + // - https://www.espressif.com/sites/default/files/documentation/2c-esp8266_non_os_sdk_api_reference_en.pdf + // + // "Channel does not affect any function, but only stores the channel information + // for the application layer. The value is defined by the application layer. For + // example, 0 means that the channel is not defined; 1 ~ 14 mean valid + // channels; all the rest values can be assigned functions that are specified + // by the application layer." + // - https://www.espressif.com/sites/default/files/documentation/esp-now_user_guide_en.pdf } - Serial.print("MAC : "); - Serial.print(MAC[0], HEX); Serial.print(", "); - Serial.print(MAC[1], HEX); Serial.print(", "); - Serial.print(MAC[2], HEX); Serial.print(", "); - Serial.print(MAC[3], HEX); Serial.print(", "); - Serial.print(MAC[4], HEX); Serial.print(", "); - Serial.println(MAC[5], HEX); - // for instance, +#if defined(SERIAL_SWAP) + Serial.println("- ======== 'SERIAL_SWAP' ========"); + // a proper say goodbye. + Serial.println("\"bye, i will do 'swap' in 1 second. find me on alternative pins!\""); + Serial.println("\" hint: osc wiring ==> esp8266(serial.swap) <-> teensy(serial3)\""); + Serial.println("-"); + Serial.println("\".-.-.-. :)\""); + delay(1000); // flush out unsent serial messages. - // a huzzah board - // nodeId (dec) : 3256120530 - // nodeId (hex) : C21474D2 - // MAC : BE, DD, C2, 14, 74, D2 + // moving... + Serial.swap(); // use RXD2/TXD2 pins, afterwards. + delay(100); // wait re-initialization of the 'Serial' +#endif - // a esp8266 board (node mcu) - // nodeId (dec) : 758581767 - // nodeId (hex) : 2D370A07 - // MAC : B6, E6, 2D, 37, A, 7 - - //introduction - Serial.print("my ID Key --> "); - Serial.println(ID_KEY); - - //i2c master - Wire.begin(); - - //random seed - randomSeed(analogRead(0)); - - //taak + //pinmode pinMode(D6, OUTPUT); //tasks runner.addTask(taak_on_task); runner.addTask(taak_off_task); - - taak_off_task.restartDelayed(500); } void loop() { + // runner.execute(); - mesh.update(); -#if defined(ESP32) - digitalWrite(LED_PIN, onFlag); // value == true is ON. -#else - digitalWrite(LED_PIN, !onFlag); // value == false is ON. so onFlag == true is ON. (pull-up) -#endif + // } diff --git a/taak/src/taaks.h b/taak/src/taaks.h deleted file mode 100644 index 1b1dc09..0000000 --- a/taak/src/taaks.h +++ /dev/null @@ -1,10 +0,0 @@ -//======================== -#define TAAK_A_KEY 150 //solenoid -#define TAAK_E_KEY 151 //valve -#define TAAK_I_KEY 152 -#define TAAK_O_KEY 153 -#define TAAK_U_KEY 154 -#define TAAK_W_KEY 155 -#define TAAK_Y_KEY 156 -#define TAAK_N_KEY 157 -//=======================