mgillespie/TinyMqtt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tinymqtt-tests fix prompt bug

Browse Source
This commit is contained in:
Francois BIOT
2023-02-23 23:56:22 +01:00
parent 7e1586c0b5
commit f9c8dca1e5
1 changed files with 229 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

101
examples/tinymqtt-test/tinymqtt-test.ino
View File

@@ -26,8 +26,8 @@ auto save_cursor = TinyConsole::save_cursor;
auto restore_cursor = TinyConsole::restore_cursor;
auto erase_to_end = TinyConsole::erase_to_end;
const char* ssid = "";
const char* password = "";
const char *ssid = "Freebox-786A2F";
const char *password = "usurpavi8dalum64lumine?";
void onCommand(const string &command);
void eval(string &cmd);
@@ -44,8 +44,7 @@ struct free_broker
const std::map<string, free_broker> list =
{
{"mqtthq", {"public.mqtthq.com", 8083, "publish/subscribe"}},
{ "hivemq", { "broker.hivemq.com", 1883, "" }}
};
{"hivemq", {"broker.hivemq.com", 1883, ""}}};
/** Very complex example
* Console allowing to make any kind of test,
@@ -89,7 +88,8 @@ void setup()
delay(500);
Console.cls();
Console << endl << endl;
Console << endl
<< endl;
Console << yellow
<< "***************************************************************" << endl;
Console << "* Welcome to the TinyMqtt console" << endl;
@@ -100,7 +100,8 @@ void setup()
if (strlen(ssid) == 0)
Console << red << "* ERROR: You must modify ssid/password in order" << endl
<< " to be able to connect to your Wifi network." << endl;
Console << endl << white;
Console << endl
<< white;
Console << "Connecting to '" << ssid << "' ";
@@ -110,9 +111,13 @@ void setup()
WiFi.begin(ssid, password);
while (WiFi.status() != WL_CONNECTED)
{ Console << '-'; delay(500); }
{
Console << '-';
delay(500);
}
Console << endl << "Connected to " << ssid << "IP address: " << WiFi.localIP() << endl;
Console << endl
<< "Connected to " << ssid << "IP address: " << WiFi.localIP() << endl;
const char *name = "tinytest";
Console << "Starting MDNS, name= " << name;
@@ -121,12 +126,14 @@ void setup()
else
Console << " ok." << endl;
MqttBroker *broker = new MqttBroker(1883);
broker->begin();
brokers["broker"] = broker;
if (Console.isTerm()) onCommand("every 333 view");
if (Console.isTerm())
onCommand("every 333 view");
Console.prompt();
}
string getword(string &str, const char *if_empty = nullptr, char sep = ' ');
@@ -138,8 +145,10 @@ int getint(string& str, const int if_empty=0)
if (sword[0] and isdigit(sword[0]))
{
int ret = atoi(sword.c_str());
while(isdigit(sword[0]) or sword[0]==' ') sword.erase(0,1);
if (sword.length()) str = sword+' '+str;
while (isdigit(sword[0]) or sword[0] == ' ')
sword.erase(0, 1);
if (sword.length())
str = sword + ' ' + str;
return ret;
}
str = str2;
@@ -149,7 +158,8 @@ int getint(string& str, const int if_empty=0)
string getword(string &str, const char *if_empty /*=nullptr*/, char sep /*=' '*/)
{
char quote = (str[0] == '"' or str[0] == '\'' ? str[0] : 0);
if (quote) str.erase(0,1);
if (quote)
str.erase(0, 1);
string sword;
while (str.length() and (str[0] != sep or quote))
{
@@ -161,8 +171,10 @@ string getword(string& str, const char* if_empty/*=nullptr*/, char sep/*=' '*/)
sword += str[0];
str.erase(0, 1);
}
while(str[0]==sep) str.erase(0,1);
if (if_empty and sword.length()==0) return if_empty;
while (str[0] == sep)
str.erase(0, 1);
if (if_empty and sword.length() == 0)
return if_empty;
if (quote == false and sword.length() >= 4 and sword.substr(0, 3) == "rnd")
{
sword.erase(0, 3);
@@ -175,7 +187,8 @@ string getword(string& str, const char* if_empty/*=nullptr*/, char sep/*=' '*/)
{
sword.erase(0, 1);
to = getint(sword);
if (sword[0]!=')') Console << "Missing ')'" << endl;
if (sword[0] != ')')
Console << "Missing ')'" << endl;
}
else
{
@@ -189,15 +202,18 @@ string getword(string& str, const char* if_empty/*=nullptr*/, char sep/*=' '*/)
Console << "Missing '('" << endl;
}
}
while(str[0]==' ') str.erase(0,1);
while (str[0] == ' ')
str.erase(0, 1);
return sword;
}
bool isaddr(string s)
{
if (s.length()==0 or s.length()>3) return false;
if (s.length() == 0 or s.length() > 3)
return false;
for (char c : s)
if (c<'0' or c>'9') return false;
if (c < '0' or c > '9')
return false;
return true;
}
@@ -226,7 +242,8 @@ string getip(string& str, const char* if_empty=nullptr, char sep=' ')
}
for (string s : build)
{
if (addr.length()) addr += '.';
if (addr.length())
addr += '.';
addr += s;
}
Console << "connect address: " << addr << endl;
@@ -239,20 +256,22 @@ std::set<string> commands = {
"broker", "blink", "client", "connect",
"create", "delete", "debug", "help", "interval",
"list", "ls", "ip", "off", "on", "set",
"publish", "reset", "subscribe", "unsubscribe", "view", "echo", "every"
};
"publish", "reset", "subscribe", "unsubscribe", "view", "echo", "every"};
void convertToCommand(string &search)
{
while(search[0]==' ') search.erase(0,1);
if (search.length()==0) return;
while (search[0] == ' ')
search.erase(0, 1);
if (search.length() == 0)
return;
string matches;
int count = 0;
for (string cmd : commands)
{
if (cmd.substr(0, search.length()) == search)
{
if (count) matches +=", ";
if (count)
matches += ", ";
count++;
matches += cmd;
}
@@ -296,7 +315,6 @@ void replaceVars(string& cmd)
}
cmd.erase(0, cmd.find_first_not_of(' '));
cmd.erase(cmd.find_last_not_of(' ') + 1);
}
bool compare(string s, const char *cmd)
@@ -304,8 +322,10 @@ bool compare(string s, const char* cmd)
uint8_t p = 0;
while (s[p++] == *cmd++)
{
if (*cmd==0 or s[p]==0) return true;
if (s[p]==' ') return true;
if (*cmd == 0 or s[p] == 0)
return true;
if (s[p] == ' ')
return true;
}
return false;
}
@@ -348,10 +368,10 @@ void onCommand(const string& command)
{
Console << endl;
string cmd = command;
if (cmd.substr(0,3)!="set") replaceVars(cmd);
if (cmd.substr(0, 3) != "set")
replaceVars(cmd);
eval(cmd);
Console << endl;
Console.prompt();
}
void clientConnect(MqttClient *client, string &cmd)
@@ -407,9 +427,11 @@ void eval(string& cmd)
}
s = getword(cmd);
if (s.length()) convertToCommand(s);
if (s.length())
convertToCommand(s);
if (s.length() == 0)
{}
{
}
else if (compare(s, "debug"))
{
#if TINY_MQTT_DEBUG
@@ -446,7 +468,8 @@ void eval(string& cmd)
{
for (auto it : clients)
{
if (it.second != client) continue;
if (it.second != client)
continue;
Console << "deleted" << endl;
delete (it.second);
clients.erase(it.first);
@@ -458,7 +481,8 @@ void eval(string& cmd)
{
for (auto it : brokers)
{
if (broker != it.second) continue;
if (broker != it.second)
continue;
Console << "deleted" << endl;
delete (it.second);
brokers.erase(it.first);
@@ -678,7 +702,8 @@ void eval(string& cmd)
if (s == "" or brokers.find(s) != brokers.end() or list.find(s) != list.end())
{
MqttBroker *broker = nullptr;
if (s.length()) broker = brokers[s];
if (s.length())
broker = brokers[s];
MqttClient *client = new MqttClient(broker, id);
clients[id] = client;
client->setCallback(onPublish);
@@ -791,7 +816,8 @@ void eval(string& cmd)
}
else
{
while(s[0]==' ') s.erase(0,1);
while (s[0] == ' ')
s.erase(0, 1);
if (s.length())
Console << "Unknown command (" << s.c_str() << ")" << endl;
}
@@ -812,7 +838,8 @@ void loop()
for (auto &every : everies)
{
if (not every.active) continue;
if (not every.active)
continue;
if (every.ms && every.cmd.length() && ms > every.next)
{
string cmd(every.cmd);