mirror of
https://github.com/suchmememanyskill/CYD-Klipper.git
synced 2026-03-21 05:33:24 +00:00
Fix arduinojson compile
This commit is contained in:
@@ -25,7 +25,7 @@ void BambuPrinter::parse_state(JsonDocument& in)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
auto print = in["print"];
|
JsonObject print = in["print"];
|
||||||
|
|
||||||
if (print.containsKey("print_error"))
|
if (print.containsKey("print_error"))
|
||||||
{
|
{
|
||||||
@@ -176,7 +176,7 @@ void BambuPrinter::parse_state(JsonDocument& in)
|
|||||||
|
|
||||||
if (print.containsKey("lights_report"))
|
if (print.containsKey("lights_report"))
|
||||||
{
|
{
|
||||||
for (auto lights : print["lights_report"].as<JsonArray>())
|
for (JsonObject lights : print["lights_report"].as<JsonArray>())
|
||||||
{
|
{
|
||||||
if (lights.containsKey("node") && lights.containsKey("mode"))
|
if (lights.containsKey("node") && lights.containsKey("mode"))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ int KlipperPrinter::parse_slicer_time_estimate(JsonDocument &in)
|
|||||||
|
|
||||||
void KlipperPrinter::parse_state(JsonDocument &in)
|
void KlipperPrinter::parse_state(JsonDocument &in)
|
||||||
{
|
{
|
||||||
auto status = in["result"]["status"];
|
JsonObject status = in["result"]["status"];
|
||||||
|
|
||||||
if (status.containsKey("webhooks"))
|
if (status.containsKey("webhooks"))
|
||||||
{
|
{
|
||||||
@@ -185,7 +185,7 @@ void KlipperPrinter::parse_state(JsonDocument &in)
|
|||||||
|
|
||||||
void KlipperPrinter::parse_state_min(JsonDocument &in, PrinterDataMinimal* data)
|
void KlipperPrinter::parse_state_min(JsonDocument &in, PrinterDataMinimal* data)
|
||||||
{
|
{
|
||||||
auto status = in["result"]["status"];
|
JsonObject status = in["result"]["status"];
|
||||||
|
|
||||||
if (status.containsKey("webhooks"))
|
if (status.containsKey("webhooks"))
|
||||||
{
|
{
|
||||||
@@ -230,7 +230,7 @@ void KlipperPrinter::parse_state_min(JsonDocument &in, PrinterDataMinimal* data)
|
|||||||
|
|
||||||
Macros KlipperPrinter::parse_macros(JsonDocument &in)
|
Macros KlipperPrinter::parse_macros(JsonDocument &in)
|
||||||
{
|
{
|
||||||
auto result = in["result"].as<JsonObject>();
|
JsonObject result = in["result"];
|
||||||
Macros macros = {0};
|
Macros macros = {0};
|
||||||
macros.macros = (char **)malloc(sizeof(char *) * 32);
|
macros.macros = (char **)malloc(sizeof(char *) * 32);
|
||||||
macros.count = 0;
|
macros.count = 0;
|
||||||
@@ -259,7 +259,7 @@ Macros KlipperPrinter::parse_macros(JsonDocument &in)
|
|||||||
|
|
||||||
int KlipperPrinter::parse_macros_count(JsonDocument &in)
|
int KlipperPrinter::parse_macros_count(JsonDocument &in)
|
||||||
{
|
{
|
||||||
auto result = in["result"].as<JsonObject>();
|
JsonObject result = in["result"];
|
||||||
|
|
||||||
int count = 0;
|
int count = 0;
|
||||||
|
|
||||||
@@ -278,13 +278,13 @@ int KlipperPrinter::parse_macros_count(JsonDocument &in)
|
|||||||
PowerDevices KlipperPrinter::parse_power_devices(JsonDocument &in)
|
PowerDevices KlipperPrinter::parse_power_devices(JsonDocument &in)
|
||||||
{
|
{
|
||||||
PowerDevices power_devices = {0};
|
PowerDevices power_devices = {0};
|
||||||
auto result = in["result"]["devices"].as<JsonArray>();
|
JsonArray result = in["result"]["devices"];
|
||||||
power_devices.power_devices = (char **)malloc(sizeof(char *) * 16);
|
power_devices.power_devices = (char **)malloc(sizeof(char *) * 16);
|
||||||
power_devices.power_states = (bool *)malloc(sizeof(bool) * 16);
|
power_devices.power_states = (bool *)malloc(sizeof(bool) * 16);
|
||||||
power_devices.count = 0;
|
power_devices.count = 0;
|
||||||
power_devices.success = true;
|
power_devices.success = true;
|
||||||
|
|
||||||
for (auto i : result)
|
for (JsonObject i : result)
|
||||||
{
|
{
|
||||||
const char *device_name = i["device"];
|
const char *device_name = i["device"];
|
||||||
const char *device_state = i["status"];
|
const char *device_state = i["status"];
|
||||||
@@ -299,10 +299,10 @@ PowerDevices KlipperPrinter::parse_power_devices(JsonDocument &in)
|
|||||||
|
|
||||||
int KlipperPrinter::parse_power_devices_count(JsonDocument &in)
|
int KlipperPrinter::parse_power_devices_count(JsonDocument &in)
|
||||||
{
|
{
|
||||||
auto result = in["result"]["devices"].as<JsonArray>();
|
JsonArray result = in["result"]["devices"];
|
||||||
int count = 0;
|
int count = 0;
|
||||||
|
|
||||||
for (auto i : result)
|
for (JsonObject i : result)
|
||||||
{
|
{
|
||||||
count++;
|
count++;
|
||||||
}
|
}
|
||||||
@@ -312,9 +312,9 @@ int KlipperPrinter::parse_power_devices_count(JsonDocument &in)
|
|||||||
|
|
||||||
void KlipperPrinter::parse_file_list(JsonDocument &in, std::list<KlipperFileSystemFile> &files, int fetch_limit)
|
void KlipperPrinter::parse_file_list(JsonDocument &in, std::list<KlipperFileSystemFile> &files, int fetch_limit)
|
||||||
{
|
{
|
||||||
auto result = in["result"].as<JsonArray>();
|
JsonArray result = in["result"];
|
||||||
|
|
||||||
for (auto file : result)
|
for (JsonObject file : result)
|
||||||
{
|
{
|
||||||
KlipperFileSystemFile f = {0};
|
KlipperFileSystemFile f = {0};
|
||||||
const char *path = file["path"];
|
const char *path = file["path"];
|
||||||
@@ -360,9 +360,9 @@ void KlipperPrinter::parse_file_list(JsonDocument &in, std::list<KlipperFileSyst
|
|||||||
|
|
||||||
char *KlipperPrinter::parse_thumbnails(JsonDocument &in)
|
char *KlipperPrinter::parse_thumbnails(JsonDocument &in)
|
||||||
{
|
{
|
||||||
auto result = in["result"].as<JsonArray>();
|
JsonArray result = in["result"];
|
||||||
const char *chosen_thumb = NULL;
|
const char *chosen_thumb = NULL;
|
||||||
for (auto file : result)
|
for (JsonObject file : result)
|
||||||
{
|
{
|
||||||
int width = file["width"];
|
int width = file["width"];
|
||||||
int height = file["height"];
|
int height = file["height"];
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
|
|
||||||
PrinterState OctoPrinter::parse_printer_state(JsonDocument& in)
|
PrinterState OctoPrinter::parse_printer_state(JsonDocument& in)
|
||||||
{
|
{
|
||||||
auto flags = in["state"]["flags"];
|
JsonObject flags = in["state"]["flags"];
|
||||||
bool cancelling = flags["cancelling"];
|
bool cancelling = flags["cancelling"];
|
||||||
bool closedOrError = flags["closedOrError"];
|
bool closedOrError = flags["closedOrError"];
|
||||||
bool error = flags["error"];
|
bool error = flags["error"];
|
||||||
@@ -35,7 +35,7 @@ PrinterState OctoPrinter::parse_printer_state(JsonDocument& in)
|
|||||||
|
|
||||||
void OctoPrinter::parse_printer_status(JsonDocument& in)
|
void OctoPrinter::parse_printer_status(JsonDocument& in)
|
||||||
{
|
{
|
||||||
auto text = in["state"]["text"];
|
const char* text = in["state"]["text"];
|
||||||
printer_data.state = parse_printer_state(in);
|
printer_data.state = parse_printer_state(in);
|
||||||
|
|
||||||
if (printer_data.state == PrinterState::PrinterStateError)
|
if (printer_data.state == PrinterState::PrinterStateError)
|
||||||
@@ -47,7 +47,7 @@ void OctoPrinter::parse_printer_status(JsonDocument& in)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
auto temperature = in["temperature"];
|
JsonObject temperature = in["temperature"];
|
||||||
|
|
||||||
if (temperature.containsKey("bed"))
|
if (temperature.containsKey("bed"))
|
||||||
{
|
{
|
||||||
@@ -67,7 +67,7 @@ void OctoPrinter::parse_printer_status(JsonDocument& in)
|
|||||||
|
|
||||||
void OctoPrinter::parse_job_state(JsonDocument& in)
|
void OctoPrinter::parse_job_state(JsonDocument& in)
|
||||||
{
|
{
|
||||||
auto job = in["job"];
|
JsonObject job = in["job"];
|
||||||
|
|
||||||
if (job.containsKey("file"))
|
if (job.containsKey("file"))
|
||||||
{
|
{
|
||||||
@@ -80,12 +80,12 @@ void OctoPrinter::parse_job_state(JsonDocument& in)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (job.containsKey("filament") && job["filament"] != NULL && job["filament"].containsKey("tool0"))
|
if (job.containsKey("filament") && job["filament"].as<JsonObject>() != NULL && job["filament"].containsKey("tool0"))
|
||||||
{
|
{
|
||||||
printer_data.filament_used_mm = job["filament"]["tool0"]["length"];
|
printer_data.filament_used_mm = job["filament"]["tool0"]["length"];
|
||||||
}
|
}
|
||||||
|
|
||||||
auto progress = in["progress"];
|
JsonObject progress = in["progress"];
|
||||||
float completion = progress["completion"];
|
float completion = progress["completion"];
|
||||||
printer_data.print_progress = completion / 100;
|
printer_data.print_progress = completion / 100;
|
||||||
printer_data.elapsed_time_s = progress["printTime"];
|
printer_data.elapsed_time_s = progress["printTime"];
|
||||||
@@ -116,9 +116,9 @@ void OctoPrinter::parse_error(JsonDocument& in)
|
|||||||
|
|
||||||
void OctoPrinter::parse_file_list(JsonDocument &in, std::list<OctoFileSystemFile> &files, int fetch_limit)
|
void OctoPrinter::parse_file_list(JsonDocument &in, std::list<OctoFileSystemFile> &files, int fetch_limit)
|
||||||
{
|
{
|
||||||
auto result = in["files"].as<JsonArray>();
|
JsonArray result = in["files"];
|
||||||
|
|
||||||
for (auto file : result)
|
for (JsonObject file : result)
|
||||||
{
|
{
|
||||||
const char *path = file["path"];
|
const char *path = file["path"];
|
||||||
if (strcmp("local", file["origin"]))
|
if (strcmp("local", file["origin"]))
|
||||||
|
|||||||
Reference in New Issue
Block a user