From 96db25d775039f6c528ca74a8d439ce6e1a7d3cf Mon Sep 17 00:00:00 2001 From: Surion79 <102791900+Surion79@users.noreply.github.com> Date: Tue, 16 May 2023 14:57:11 +0200 Subject: [PATCH 1/5] added interface to new macro KNOMI_STATUS --- Firmware/src/main.cpp | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/Firmware/src/main.cpp b/Firmware/src/main.cpp index 14df600..f98a390 100644 --- a/Firmware/src/main.cpp +++ b/Firmware/src/main.cpp @@ -986,6 +986,8 @@ void loop() http.begin("http://"+klipper_ip+"/printer/objects/query?gcode_macro%20G28"); //获取home状态 }else if(httpswitch==4){ http.begin("http://"+klipper_ip+"/printer/objects/query?gcode_macro%20BED_MESH_CALIBRATE"); //获取levelling状态 + }else if(httpswitch==5){ + http.begin("http://"+klipper_ip+"/printer/objects/query?gcode_macro%20KNOMI_STATUS"); // independant for home and leveling }else{ } @@ -1103,6 +1105,29 @@ void loop() levelling_status = 0; } + httpswitch = 5; + }else if(httpswitch == 5){ // homing and leveling + + String nameStr10 = doc["result"]["status"]["gcode_macro KNOMI_STATUS"]["probing"].as(); + Serial.println(nameStr10); + String nameStr11 = doc["result"]["status"]["gcode_macro KNOMI_STATUS"]["homing"].as(); + Serial.println(nameStr11); + + if(nameStr10 == "true"){ + levelling_status = 1; + display_step = 13; //更快进入显示 + timer_contne = 0; + }else{ + levelling_status = 0; + } + if(nameStr11 == "true"){ + homing_status = 1; + display_step = 12; //更快进入显示 + timer_contne = 0; + }else{ + levelling_status = 0; + } + httpswitch = 1; }else{ From 21ecba7a38e948a3d872ad2a526b90ae8e471cae Mon Sep 17 00:00:00 2001 From: Surion79 <102791900+Surion79@users.noreply.github.com> Date: Tue, 16 May 2023 15:22:54 +0200 Subject: [PATCH 2/5] rename KNOMI_STATUS to _KNOMI_STATUS --- Firmware/src/main.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Firmware/src/main.cpp b/Firmware/src/main.cpp index f98a390..2af9218 100644 --- a/Firmware/src/main.cpp +++ b/Firmware/src/main.cpp @@ -987,7 +987,7 @@ void loop() }else if(httpswitch==4){ http.begin("http://"+klipper_ip+"/printer/objects/query?gcode_macro%20BED_MESH_CALIBRATE"); //获取levelling状态 }else if(httpswitch==5){ - http.begin("http://"+klipper_ip+"/printer/objects/query?gcode_macro%20KNOMI_STATUS"); // independant for home and leveling + http.begin("http://"+klipper_ip+"/printer/objects/query?gcode_macro%20_KNOMI_STATUS"); // independant for home and leveling }else{ } @@ -1108,9 +1108,9 @@ void loop() httpswitch = 5; }else if(httpswitch == 5){ // homing and leveling - String nameStr10 = doc["result"]["status"]["gcode_macro KNOMI_STATUS"]["probing"].as(); + String nameStr10 = doc["result"]["status"]["gcode_macro _KNOMI_STATUS"]["probing"].as(); Serial.println(nameStr10); - String nameStr11 = doc["result"]["status"]["gcode_macro KNOMI_STATUS"]["homing"].as(); + String nameStr11 = doc["result"]["status"]["gcode_macro _KNOMI_STATUS"]["homing"].as(); Serial.println(nameStr11); if(nameStr10 == "true"){ From 401f21b16b19cc58b4b82d31909e11a1423e9d4e Mon Sep 17 00:00:00 2001 From: Surion79 <102791900+Surion79@users.noreply.github.com> Date: Sat, 20 May 2023 00:26:27 +0200 Subject: [PATCH 3/5] fixed reset of homing_Status --- Firmware/src/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/src/main.cpp b/Firmware/src/main.cpp index 2af9218..c59e201 100644 --- a/Firmware/src/main.cpp +++ b/Firmware/src/main.cpp @@ -1125,7 +1125,7 @@ void loop() display_step = 12; //更快进入显示 timer_contne = 0; }else{ - levelling_status = 0; + homing_status = 0; } httpswitch = 1; From b3eb9f65972464d84ce097635f2efa574610a336 Mon Sep 17 00:00:00 2001 From: Surion79 <102791900+Surion79@users.noreply.github.com> Date: Sat, 20 May 2023 00:36:59 +0200 Subject: [PATCH 4/5] replaced old call with new one --- Firmware/src/main.cpp | 27 ++------------------------- 1 file changed, 2 insertions(+), 25 deletions(-) diff --git a/Firmware/src/main.cpp b/Firmware/src/main.cpp index c59e201..f6db7c0 100644 --- a/Firmware/src/main.cpp +++ b/Firmware/src/main.cpp @@ -1080,7 +1080,7 @@ void loop() httpswitch = 3; }else if(httpswitch == 3){ //home状态 - String nameStr8 = doc["result"]["status"]["gcode_macro G28"]["homing"].as(); + String nameStr8 = doc["result"]["status"]["gcode_macro _KNOMI_STATUS"]["homing"].as(); Serial.println(nameStr8); if(nameStr8 == "true"){ @@ -1094,7 +1094,7 @@ void loop() httpswitch = 4; }else if(httpswitch == 4){ //levelling状态 - String nameStr9 = doc["result"]["status"]["gcode_macro BED_MESH_CALIBRATE"]["probing"].as(); + String nameStr9 = doc["result"]["status"]["gcode_macro _KNOMI_STATUS"]["probing"].as(); Serial.println(nameStr9); if(nameStr9 == "true"){ @@ -1105,29 +1105,6 @@ void loop() levelling_status = 0; } - httpswitch = 5; - }else if(httpswitch == 5){ // homing and leveling - - String nameStr10 = doc["result"]["status"]["gcode_macro _KNOMI_STATUS"]["probing"].as(); - Serial.println(nameStr10); - String nameStr11 = doc["result"]["status"]["gcode_macro _KNOMI_STATUS"]["homing"].as(); - Serial.println(nameStr11); - - if(nameStr10 == "true"){ - levelling_status = 1; - display_step = 13; //更快进入显示 - timer_contne = 0; - }else{ - levelling_status = 0; - } - if(nameStr11 == "true"){ - homing_status = 1; - display_step = 12; //更快进入显示 - timer_contne = 0; - }else{ - homing_status = 0; - } - httpswitch = 1; }else{ From 829aba3ac2e983044c4639531a6f222d385ed361 Mon Sep 17 00:00:00 2001 From: Surion79 <102791900+Surion79@users.noreply.github.com> Date: Sat, 20 May 2023 23:43:49 +0200 Subject: [PATCH 5/5] fixed httpswitch --- Firmware/src/main.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Firmware/src/main.cpp b/Firmware/src/main.cpp index f6db7c0..371f9c4 100644 --- a/Firmware/src/main.cpp +++ b/Firmware/src/main.cpp @@ -983,11 +983,9 @@ void loop() }else if(httpswitch==2){ http.begin("http://"+klipper_ip+"/printer/objects/query?display_status"); //获取打印 }else if(httpswitch==3){ - http.begin("http://"+klipper_ip+"/printer/objects/query?gcode_macro%20G28"); //获取home状态 + http.begin("http://"+klipper_ip+"/printer/objects/query?gcode_macro%20_KNOMI_STATUS"); //获取home状态 }else if(httpswitch==4){ - http.begin("http://"+klipper_ip+"/printer/objects/query?gcode_macro%20BED_MESH_CALIBRATE"); //获取levelling状态 - }else if(httpswitch==5){ - http.begin("http://"+klipper_ip+"/printer/objects/query?gcode_macro%20_KNOMI_STATUS"); // independant for home and leveling + http.begin("http://"+klipper_ip+"/printer/objects/query?gcode_macro%20_KNOMI_STATUS"); //获取levelling状态 }else{ }