getParams();
+
+ // std::string paramAll = "all";
+ std::string valueAll;
+
+ // Status code is 200 OK by default.
+ res->setHeader("Content-Type", "application/x-protobuf");
+ res->setHeader("Access-Control-Allow-Origin", "*");
+ res->setHeader("Access-Control-Allow-Methods", "PUT, GET");
+ res->setHeader("X-Protobuf-Schema", "https://raw.githubusercontent.com/meshtastic/Meshtastic-protobufs/master/mesh.proto");
+
+ uint8_t txBuf[MAX_STREAM_BUF_SIZE];
+ uint32_t len = 1;
+
+ if (params->getQueryParameter("all", valueAll)) {
+
+ // If all is ture, return all the buffers we have available
+ // to us at this point in time.
+ if (valueAll == "true") {
+ while (len) {
+ len = webAPI.getFromRadio(txBuf);
+ res->write(txBuf, len);
+ }
+
+ // Otherwise, just return one protobuf
+ } else {
+ len = webAPI.getFromRadio(txBuf);
+ res->write(txBuf, len);
+ }
+
+ // the param "all" was not spcified. Return just one protobuf
+ } else {
+ len = webAPI.getFromRadio(txBuf);
+ res->write(txBuf, len);
+ }
+
+ DEBUG_MSG("--------------- webAPI handleAPIv1FromRadio, len %d\n", len);
+}
+
+void handleAPIv1ToRadio(HTTPRequest *req, HTTPResponse *res)
+{
+ DEBUG_MSG("+++++++++++++++ webAPI handleAPIv1ToRadio\n");
+
+ /*
+ For documentation, see:
+ https://github.com/meshtastic/Meshtastic-device/wiki/HTTP-REST-API-discussion
+ https://github.com/meshtastic/Meshtastic-device/blob/master/docs/software/device-api.md
+
+ Example:
+ http://10.10.30.198/api/v1/toradio
+ */
+
+ // Status code is 200 OK by default.
+
+ res->setHeader("Content-Type", "application/x-protobuf");
+ res->setHeader("Access-Control-Allow-Headers", "Content-Type");
+ res->setHeader("Access-Control-Allow-Origin", "*");
+ res->setHeader("Access-Control-Allow-Methods", "PUT, OPTIONS");
+ res->setHeader("X-Protobuf-Schema", "https://raw.githubusercontent.com/meshtastic/Meshtastic-protobufs/master/mesh.proto");
+
+ if (req->getMethod() == "OPTIONS") {
+ res->setStatusCode(204); // Success with no content
+ res->print("");
+ return;
+ }
+
+ byte buffer[MAX_TO_FROM_RADIO_SIZE];
+ size_t s = req->readBytes(buffer, MAX_TO_FROM_RADIO_SIZE);
+
+ DEBUG_MSG("Received %d bytes from PUT request\n", s);
+ webAPI.handleToRadio(buffer, s);
+
+ res->write(buffer, s);
+ DEBUG_MSG("--------------- webAPI handleAPIv1ToRadio\n");
+}
+
void handleStaticPost(HTTPRequest *req, HTTPResponse *res)
{
// Assume POST request. Contains submitted data.
@@ -816,10 +924,10 @@ void handleFormUpload(HTTPRequest *req, HTTPResponse *res)
return;
}
- //if (readLength) {
- file.write(buf, readLength);
- fileLength += readLength;
- DEBUG_MSG("File Length %i\n", fileLength);
+ // if (readLength) {
+ file.write(buf, readLength);
+ fileLength += readLength;
+ DEBUG_MSG("File Length %i\n", fileLength);
//}
}
// enableLoopWDT();
@@ -876,97 +984,6 @@ void handleHotspot(HTTPRequest *req, HTTPResponse *res)
res->println("\n");
}
-void handleAPIv1FromRadio(HTTPRequest *req, HTTPResponse *res)
-{
-
- DEBUG_MSG("+++++++++++++++ webAPI handleAPIv1FromRadio\n");
-
- /*
- For documentation, see:
- https://github.com/meshtastic/Meshtastic-device/wiki/HTTP-REST-API-discussion
- https://github.com/meshtastic/Meshtastic-device/blob/master/docs/software/device-api.md
-
- Example:
- http://10.10.30.198/api/v1/fromradio
- */
-
- // Get access to the parameters
- ResourceParameters *params = req->getParams();
-
- // std::string paramAll = "all";
- std::string valueAll;
-
- // Status code is 200 OK by default.
- res->setHeader("Content-Type", "application/x-protobuf");
- res->setHeader("Access-Control-Allow-Origin", "*");
- res->setHeader("Access-Control-Allow-Methods", "PUT, GET");
- res->setHeader("X-Protobuf-Schema", "https://raw.githubusercontent.com/meshtastic/Meshtastic-protobufs/master/mesh.proto");
-
- uint8_t txBuf[MAX_STREAM_BUF_SIZE];
- uint32_t len = 1;
-
- if (params->getQueryParameter("all", valueAll)) {
-
- // If all is ture, return all the buffers we have available
- // to us at this point in time.
- if (valueAll == "true") {
- while (len) {
- len = webAPI.getFromRadio(txBuf);
- res->write(txBuf, len);
- }
-
- // Otherwise, just return one protobuf
- } else {
- len = webAPI.getFromRadio(txBuf);
- res->write(txBuf, len);
- }
-
- // the param "all" was not spcified. Return just one protobuf
- } else {
- len = webAPI.getFromRadio(txBuf);
- res->write(txBuf, len);
- }
-
- DEBUG_MSG("--------------- webAPI handleAPIv1FromRadio, len %d\n", len);
-}
-
-void handleAPIv1ToRadio(HTTPRequest *req, HTTPResponse *res)
-{
- DEBUG_MSG("+++++++++++++++ webAPI handleAPIv1ToRadio\n");
-
- /*
- For documentation, see:
- https://github.com/meshtastic/Meshtastic-device/wiki/HTTP-REST-API-discussion
- https://github.com/meshtastic/Meshtastic-device/blob/master/docs/software/device-api.md
-
- Example:
- http://10.10.30.198/api/v1/toradio
- */
-
- // Status code is 200 OK by default.
-
- res->setHeader("Content-Type", "application/x-protobuf");
- res->setHeader("Access-Control-Allow-Headers", "Content-Type");
- res->setHeader("Access-Control-Allow-Origin", "*");
- res->setHeader("Access-Control-Allow-Methods", "PUT, OPTIONS");
- res->setHeader("X-Protobuf-Schema", "https://raw.githubusercontent.com/meshtastic/Meshtastic-protobufs/master/mesh.proto");
-
- if (req->getMethod() == "OPTIONS") {
- res->setStatusCode(204); // Success with no content
- res->print("");
- return;
- }
-
- byte buffer[MAX_TO_FROM_RADIO_SIZE];
- size_t s = req->readBytes(buffer, MAX_TO_FROM_RADIO_SIZE);
-
- DEBUG_MSG("Received %d bytes from PUT request\n", s);
- webAPI.handleToRadio(buffer, s);
-
- res->write(buffer, s);
- DEBUG_MSG("--------------- webAPI handleAPIv1ToRadio\n");
-}
-
/*
To convert text to c strings:
@@ -996,7 +1013,8 @@ void handleRoot(HTTPRequest *req, HTTPResponse *res)
res->printf("\n");
res->printf("You have gotten this error because the filesystem for the web server has not been loaded.
\n");
res->printf("Please review the 'Common Problems' section of the web interface documentation.
\n");
+ "href=https://github.com/meshtastic/Meshtastic-device/wiki/"
+ "How-to-use-the-Meshtastic-Web-Interface-over-WiFi>web interface documentation.\n");
return;
}
@@ -1092,13 +1110,13 @@ void handleReport(HTTPRequest *req, HTTPResponse *res)
res->println("\"airtime\": {");
- uint16_t *logArray;
+ uint32_t *logArray;
res->print("\"tx_log\": [");
logArray = airtimeReport(TX_LOG);
for (int i = 0; i < getPeriodsToLog(); i++) {
- uint16_t tmp;
+ uint32_t tmp;
tmp = *(logArray + i);
res->printf("%d", tmp);
if (i != getPeriodsToLog() - 1) {
@@ -1111,7 +1129,7 @@ void handleReport(HTTPRequest *req, HTTPResponse *res)
logArray = airtimeReport(RX_LOG);
for (int i = 0; i < getPeriodsToLog(); i++) {
- uint16_t tmp;
+ uint32_t tmp;
tmp = *(logArray + i);
res->printf("%d", tmp);
if (i != getPeriodsToLog() - 1) {
@@ -1124,7 +1142,7 @@ void handleReport(HTTPRequest *req, HTTPResponse *res)
logArray = airtimeReport(RX_ALL_LOG);
for (int i = 0; i < getPeriodsToLog(); i++) {
- uint16_t tmp;
+ uint32_t tmp;
tmp = *(logArray + i);
res->printf("%d", tmp);
if (i != getPeriodsToLog() - 1) {
@@ -1151,7 +1169,14 @@ void handleReport(HTTPRequest *req, HTTPResponse *res)
res->println("},");
- res->println("\"test\": 123");
+ res->println("\"power\": {");
+#define BoolToString(x) ((x)?"true":"false")
+ res->printf("\"battery_percent\": %u,\n", powerStatus->getBatteryChargePercent());
+ res->printf("\"battery_voltage_mv\": %u,\n", powerStatus->getBatteryVoltageMv());
+ res->printf("\"has_battery\": %s,\n", BoolToString(powerStatus->getHasBattery()));
+ res->printf("\"has_usb\": %s,\n", BoolToString(powerStatus->getHasUSB()));
+ res->printf("\"is_charging\": %s\n", BoolToString(powerStatus->getIsCharging()));
+ res->println("}");
res->println("},");
@@ -1209,14 +1234,3 @@ void handleFavicon(HTTPRequest *req, HTTPResponse *res)
// Write data from header file
res->write(FAVICON_DATA, FAVICON_LENGTH);
}
-
-void replaceAll(std::string &str, const std::string &from, const std::string &to)
-{
- if (from.empty())
- return;
- size_t start_pos = 0;
- while ((start_pos = str.find(from, start_pos)) != std::string::npos) {
- str.replace(start_pos, from.length(), to);
- start_pos += to.length(); // In case 'to' contains 'from', like replacing 'x' with 'yx'
- }
-}
diff --git a/src/mesh/http/WebServer.h b/src/mesh/http/WebServer.h
new file mode 100644
index 000000000..b01d59605
--- /dev/null
+++ b/src/mesh/http/WebServer.h
@@ -0,0 +1,47 @@
+#pragma once
+
+#include "PhoneAPI.h"
+#include "concurrency/OSThread.h"
+#include
+#include
+
+void initWebServer();
+void createSSLCert();
+
+void handleNotFound();
+
+void handleWebResponse();
+
+
+//void handleHotspot();
+
+//void handleStyleCSS();
+//void handleRoot();
+
+
+// Interface to the PhoneAPI to access the protobufs with messages
+class HttpAPI : public PhoneAPI
+{
+
+ public:
+ // Nothing here yet
+
+ private:
+ // Nothing here yet
+
+ protected:
+ // Nothing here yet
+};
+
+class WebServerThread : private concurrency::OSThread
+{
+
+ public:
+ WebServerThread();
+
+ protected:
+
+ virtual int32_t runOnce();
+};
+
+extern WebServerThread *webServerThread;
diff --git a/src/meshwifi/meshwifi.cpp b/src/mesh/http/WiFiAPClient.cpp
similarity index 99%
rename from src/meshwifi/meshwifi.cpp
rename to src/mesh/http/WiFiAPClient.cpp
index 5ae83f87b..3ecd7235d 100644
--- a/src/meshwifi/meshwifi.cpp
+++ b/src/mesh/http/WiFiAPClient.cpp
@@ -1,9 +1,9 @@
-#include "meshwifi.h"
+#include "mesh/http/WiFiAPClient.h"
#include "NodeDB.h"
-#include "mesh/wifi/WiFiServerAPI.h"
#include "configuration.h"
#include "main.h"
-#include "meshwifi/meshhttp.h"
+#include "mesh/http/WebServer.h"
+#include "mesh/wifi/WiFiServerAPI.h"
#include "target_specific.h"
#include
#include
diff --git a/src/meshwifi/meshwifi.h b/src/mesh/http/WiFiAPClient.h
similarity index 100%
rename from src/meshwifi/meshwifi.h
rename to src/mesh/http/WiFiAPClient.h
diff --git a/src/meshwifi/meshhttp.h b/src/meshwifi/meshhttp.h
deleted file mode 100644
index b7a84475e..000000000
--- a/src/meshwifi/meshhttp.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#pragma once
-
-#include "PhoneAPI.h"
-#include
-#include
-
-void initWebServer();
-void createSSLCert();
-
-void handleNotFound();
-
-void handleWebResponse();
-
-void handleJSONChatHistory();
-
-void notifyWebUI();
-
-void handleHotspot();
-
-void handleStyleCSS();
-void handleRoot();
-void handleScriptsScriptJS();
-void handleJSONChatHistoryDummy();
-
-void replaceAll(std::string& str, const std::string& from, const std::string& to);
-
-class HttpAPI : public PhoneAPI
-{
-
- public:
- // Nothing here yet
-
- private:
- // Nothing here yet
-
- protected:
- // Nothing here yet
-};
\ No newline at end of file
diff --git a/src/nimble/BluetoothUtil.cpp b/src/nimble/BluetoothUtil.cpp
index daba69372..f5f1f77ec 100644
--- a/src/nimble/BluetoothUtil.cpp
+++ b/src/nimble/BluetoothUtil.cpp
@@ -7,13 +7,16 @@
#include "esp_bt.h"
#include "host/util/util.h"
#include "main.h"
-#include "meshwifi/meshwifi.h"
#include "nimble/NimbleDefs.h"
#include "services/gap/ble_svc_gap.h"
#include "services/gatt/ble_svc_gatt.h"
#include
#include
+#ifndef NO_ESP32
+#include "mesh/http/WiFiAPClient.h"
+#endif
+
static bool pinShowing;
static uint32_t doublepressed;
@@ -545,7 +548,9 @@ void setBluetoothEnable(bool on)
if (firstTime) {
firstTime = 0;
} else {
- initWifi(0);
+#ifndef NO_ESP32
+ initWifi(0);
+#endif
}
} else {
@@ -557,7 +562,9 @@ void setBluetoothEnable(bool on)
*/
// shutdown wifi
+#ifndef NO_ESP32
deinitWifi();
+#endif
// We have to totally teardown our bluetooth objects to prevent leaks
deinitBLE();
diff --git a/src/nrf52/wifi-stubs.cpp b/src/nrf52/wifi-stubs.cpp
index 1c1009862..6051e195c 100644
--- a/src/nrf52/wifi-stubs.cpp
+++ b/src/nrf52/wifi-stubs.cpp
@@ -1,5 +1,9 @@
-#include "meshwifi/meshhttp.h"
-#include "meshwifi/meshwifi.h"
+//#include "mesh/wifi/WebServer.h"
+#include "configuration.h"
+
+#ifndef NO_ESP32
+
+//#include "mesh/wifi/WiFiAPClient.h"
void initWifi(bool forceSoftAP) {}
@@ -10,7 +14,4 @@ bool isWifiAvailable()
return false;
}
-void handleWebResponse() {}
-
-/// Perform idle loop processing required by the wifi layer
-void loopWifi() {}
\ No newline at end of file
+#endif
diff --git a/src/plugins/Plugins.cpp b/src/plugins/Plugins.cpp
index 7a43c45ff..eee8280c5 100644
--- a/src/plugins/Plugins.cpp
+++ b/src/plugins/Plugins.cpp
@@ -1,6 +1,7 @@
#include "plugins/NodeInfoPlugin.h"
#include "plugins/PositionPlugin.h"
#include "plugins/ReplyPlugin.h"
+#include "plugins/SerialPlugin.h"
#include "plugins/RemoteHardwarePlugin.h"
#include "plugins/TextMessagePlugin.h"
@@ -17,4 +18,5 @@ void setupPlugins() {
new RemoteHardwarePlugin();
new ReplyPlugin();
+ new SerialPlugin(); // Maintained by MC Hamster (Jm Casler) jm@casler.org
}
\ No newline at end of file
diff --git a/src/plugins/SerialPlugin.cpp b/src/plugins/SerialPlugin.cpp
new file mode 100644
index 000000000..82c8baf83
--- /dev/null
+++ b/src/plugins/SerialPlugin.cpp
@@ -0,0 +1,178 @@
+#include "SerialPlugin.h"
+#include "MeshService.h"
+#include "NodeDB.h"
+#include "RTC.h"
+#include "Router.h"
+#include "configuration.h"
+#include
+
+#include
+
+/*
+ SerialPlugin
+ An overly simplistic interface to send messages over the mesh network by sending strings
+ over a serial port.
+
+ Originally designed for lora32 v1.0
+ Manufacture Info: http://www.lilygo.cn/prod_view.aspx?TypeId=50003&Id=1133&FId=t3:50003:3
+ Pin Mapping: http://ae01.alicdn.com/kf/HTB1fLBcxkSWBuNjSszdq6zeSpXaJ.jpg
+
+ This will probably and most likely work on other esp32 devices, given possible change the RX/TX
+ selection.
+
+ Need help with this plugin? Post your question on the Meshtastic Discourse:
+ https://meshtastic.discourse.group
+
+ Basic Usage:
+
+ 1) Enable the plugin by setting SERIALPLUGIN_ENABLED to 1.
+ 2) Set the pins (RXD2 / TXD2) for your preferred RX and TX GPIO pins.
+ 3) Set SERIALPLUGIN_TIMEOUT to the amount of time to wait before we consider
+ your packet as "done".
+ 4) (Optional) In SerialPlugin.h set the port to PortNum_TEXT_MESSAGE_APP if you want to
+ send messages to/from the general text message channel.
+ 5) Connect to your device over the serial interface at 38400 8N1.
+ 6) Send a packet up to 240 bytes in length. This will get relayed over the mesh network.
+ 7) (Optional) Set SERIALPLUGIN_ECHO to 1 and any message you send out will be echoed back
+ to your device.
+
+ TODO (in this order):
+ * Add check for esp32 and only build code sections for esp32.
+ * Once protobufs regenerated with the new port, update SerialPlugin.h
+ * Ensure this works on a tbeam
+ * Define a verbose RX mode to report on mesh and packet infomration.
+ - This won't happen any time soon.
+
+ KNOWN PROBLEMS
+ * Until the plugin is initilized by the startup sequence, the TX pin is in a floating
+ state. Device connected to that pin may see this as "noise".
+ * This will not work on the NRF or Linux target.
+
+
+*/
+
+#define RXD2 16
+#define TXD2 17
+#define SERIALPLUGIN_RX_BUFFER 128
+#define SERIALPLUGIN_STRING_MAX Constants_DATA_PAYLOAD_LEN
+#define SERIALPLUGIN_TIMEOUT 250
+#define SERIALPLUGIN_BAUD 38400
+#define SERIALPLUGIN_ENABLED 0
+#define SERIALPLUGIN_ECHO 0
+#define SERIALPLUGIN_ACK 0
+
+SerialPlugin *serialPlugin;
+SerialPluginRadio *serialPluginRadio;
+
+SerialPlugin::SerialPlugin() : concurrency::OSThread("SerialPlugin") {}
+
+char serialStringChar[Constants_DATA_PAYLOAD_LEN];
+
+int32_t SerialPlugin::runOnce()
+{
+#ifdef NO_ESP32
+
+#if SERIALPLUGIN_ENABLED == 1
+
+ if (firstTime) {
+
+ // Interface with the serial peripheral from in here.
+ DEBUG_MSG("Initilizing serial peripheral interface\n");
+
+ Serial2.begin(SERIALPLUGIN_BAUD, SERIAL_8N1, RXD2, TXD2);
+ Serial2.setTimeout(SERIALPLUGIN_TIMEOUT); // Number of MS to wait to set the timeout for the string.
+ Serial2.setRxBufferSize(SERIALPLUGIN_RX_BUFFER);
+
+ serialPluginRadio = new SerialPluginRadio();
+
+ firstTime = 0;
+
+ } else {
+ String serialString;
+
+ while (Serial2.available()) {
+ serialString = Serial2.readString();
+ serialString.toCharArray(serialStringChar, Constants_DATA_PAYLOAD_LEN);
+
+ serialPluginRadio->sendPayload();
+
+ DEBUG_MSG("Received: %s\n", serialStringChar);
+ }
+ }
+
+ return (10);
+#else
+ DEBUG_MSG("Serial Plugin Disabled\n");
+
+ return (INT32_MAX);
+#endif
+
+#endif
+}
+
+MeshPacket *SerialPluginRadio::allocReply()
+{
+
+ auto reply = allocDataPacket(); // Allocate a packet for sending
+
+ return reply;
+}
+
+void SerialPluginRadio::sendPayload(NodeNum dest, bool wantReplies)
+{
+ MeshPacket *p = allocReply();
+ p->to = dest;
+ p->decoded.want_response = wantReplies;
+
+ p->want_ack = SERIALPLUGIN_ACK;
+
+ p->decoded.data.payload.size = strlen(serialStringChar); // You must specify how many bytes are in the reply
+ memcpy(p->decoded.data.payload.bytes, serialStringChar, p->decoded.data.payload.size);
+
+ service.sendToMesh(p);
+}
+
+bool SerialPluginRadio::handleReceived(const MeshPacket &mp)
+{
+
+#ifdef NO_ESP32
+
+#if SERIALPLUGIN_ENABLED == 1
+
+ auto &p = mp.decoded.data;
+ // DEBUG_MSG("Received text msg self=0x%0x, from=0x%0x, to=0x%0x, id=%d, msg=%.*s\n", nodeDB.getNodeNum(),
+ // mp.from, mp.to, mp.id, p.payload.size, p.payload.bytes);
+
+ if (mp.from == nodeDB.getNodeNum()) {
+
+ /*
+ * If SERIALPLUGIN_ECHO is true, then echo the packets that are sent out back to the TX
+ * of the serial interface.
+ */
+ if (SERIALPLUGIN_ECHO) {
+
+ // For some reason, we get the packet back twice when we send out of the radio.
+ // TODO: need to find out why.
+ if (lastRxID != mp.id) {
+ lastRxID = mp.id;
+ // DEBUG_MSG("* * Message came this device\n");
+ // Serial2.println("* * Message came this device");
+ Serial2.printf("%s", p.payload.bytes);
+ }
+ }
+
+ } else {
+ // DEBUG_MSG("* * Message came from the mesh\n");
+ // Serial2.println("* * Message came from the mesh");
+ Serial2.printf("%s", p.payload.bytes);
+ }
+
+#else
+ DEBUG_MSG("Serial Plugin Disabled\n");
+
+#endif
+
+#endif
+
+ return true; // Let others look at this message also if they want
+}
diff --git a/src/plugins/SerialPlugin.h b/src/plugins/SerialPlugin.h
new file mode 100644
index 000000000..c6d79f3eb
--- /dev/null
+++ b/src/plugins/SerialPlugin.h
@@ -0,0 +1,54 @@
+#pragma once
+
+#include "SinglePortPlugin.h"
+#include "concurrency/OSThread.h"
+#include "configuration.h"
+#include
+#include
+
+class SerialPlugin : private concurrency::OSThread
+{
+ bool firstTime = 1;
+
+ public:
+ SerialPlugin();
+
+ protected:
+ virtual int32_t runOnce();
+};
+
+extern SerialPlugin *serialPlugin;
+
+/*
+ * Radio interface for SerialPlugin
+ *
+ */
+class SerialPluginRadio : public SinglePortPlugin
+{
+ uint32_t lastRxID;
+
+ public:
+ /*
+ TODO: Switch this to PortNum_SERIAL_APP once the change is able to be merged back here
+ from the main code.
+ */
+
+ SerialPluginRadio() : SinglePortPlugin("SerialPluginRadio", PortNum_TEXT_MESSAGE_APP) {}
+ // SerialPluginRadio() : SinglePortPlugin("SerialPluginRadio", PortNum_SERIAL_APP) {}
+
+ /**
+ * Send our payload into the mesh
+ */
+ void sendPayload(NodeNum dest = NODENUM_BROADCAST, bool wantReplies = false);
+
+ protected:
+ virtual MeshPacket *allocReply();
+
+ /** Called to handle a particular incoming message
+
+ @return true if you've guaranteed you've handled this message and no other handlers should be considered for it
+ */
+ virtual bool handleReceived(const MeshPacket &mp);
+};
+
+extern SerialPluginRadio *serialPluginRadio;
\ No newline at end of file