updated and fixed charts
This commit is contained in:
@@ -52,7 +52,7 @@ void setup()
|
||||
IPAddress gateway(10, 11, 12, 1);
|
||||
IPAddress subnet(255, 255, 255, 0);
|
||||
WiFi.softAPConfig(local_IP, gateway, subnet);
|
||||
WiFi.setTxPower(WIFI_POWER_5dBm); // reduce wifi power
|
||||
WiFi.setTxPower(WIFI_POWER_13dBm); // reduce wifi power
|
||||
if (WiFi.softAP(WIFI_SSID, WIFI_PASSWORD))
|
||||
{
|
||||
LOG_INFO("WiFi AP Mode Started");
|
||||
@@ -184,7 +184,7 @@ void loop()
|
||||
.rt_queue = nullptr,
|
||||
.dev = dev};
|
||||
|
||||
auto task_A = rtIgnitionTask(taskA_params, 4096, 256, CORE_1, fs_mutex);
|
||||
auto task_A = rtIgnitionTask(taskA_params, 4096, 256, CORE_0, fs_mutex);
|
||||
delay(50);
|
||||
auto task_B = rtIgnitionTask(taskB_params, 4096, 256, CORE_1, fs_mutex);
|
||||
|
||||
@@ -211,34 +211,38 @@ void loop()
|
||||
led.setStatus(RGBled::LedStatus::OK);
|
||||
|
||||
AstroWebServer webPage(80, LittleFS); // Initialize webserver and Websocket
|
||||
|
||||
task_A.onMessage([&webPage](ignitionBoxStatusFiltered sts){
|
||||
ArduinoJson::JsonDocument doc;
|
||||
doc["box_a"] = sts.toJson();
|
||||
doc["box_b"] = ArduinoJson::JsonDocument();
|
||||
webPage.sendWsData(doc.as<String>());
|
||||
ArduinoJson::JsonDocument json_data;
|
||||
bool data_a, data_b;
|
||||
task_A.onMessage([&webPage, &json_data, &data_a](ignitionBoxStatusFiltered sts){
|
||||
json_data["box_a"] = sts.toJson();
|
||||
data_a = true;
|
||||
});
|
||||
|
||||
task_B.onMessage([&webPage](ignitionBoxStatusFiltered sts){
|
||||
ArduinoJson::JsonDocument doc;
|
||||
doc["box_a"] = ArduinoJson::JsonDocument();
|
||||
doc["box_b"] = sts.toJson();
|
||||
webPage.sendWsData(doc.as<String>());
|
||||
task_B.onMessage([&webPage, &json_data, &data_b](ignitionBoxStatusFiltered sts){
|
||||
json_data["box_b"] = sts.toJson();
|
||||
data_b = true;
|
||||
});
|
||||
|
||||
task_A.enableSave(true, "ignitionA_test.csv");
|
||||
task_B.enableSave(true, "ignitionB_test.csv");
|
||||
// task_A.enableSave(true, "ignitionA_test.csv");
|
||||
// task_B.enableSave(true, "ignitionB_test.csv");
|
||||
|
||||
uint32_t last_loop = millis();
|
||||
uint32_t monitor_loop = millis();
|
||||
uint32_t data_loop = monitor_loop;
|
||||
//////////////// INNER LOOP /////////////////////
|
||||
while (running)
|
||||
{
|
||||
if ((millis() - last_loop) > 2000)
|
||||
uint32_t this_loop = millis();
|
||||
if (this_loop - monitor_loop > 2000)
|
||||
{
|
||||
clearScreen();
|
||||
printRunningTasksMod(Serial);
|
||||
delay(100);
|
||||
last_loop = millis();
|
||||
monitor_loop = millis();
|
||||
}
|
||||
if ((data_a && data_b) || (this_loop - data_loop > 500)) {
|
||||
webPage.sendWsData(json_data.as<String>());
|
||||
json_data.clear();
|
||||
data_a = data_b = false;
|
||||
data_loop = millis();
|
||||
}
|
||||
} //////////////// INNER LOOP /////////////////////
|
||||
|
||||
|
||||
Reference in New Issue
Block a user