2.6.3发布

applenana · Nov 12, 2024 · dade9a1 · dade9a1
1 parent 0c0ba7a
commit dade9a1
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 4 deletions.
diff --git a/Arduino/.pio/build/esp12e/.sconsign311.dblite b/Arduino/.pio/build/esp12e/.sconsign311.dblite
diff --git a/Arduino/.pio/build/esp12e/2.6.2-α.bin b/Arduino/.pio/build/esp12e/2.6.2-α.bin
diff --git a/Arduino/.pio/build/esp12e/2.6.3(增加进料重试).bin b/Arduino/.pio/build/esp12e/2.6.3(增加进料重试).bin
diff --git a/Arduino/.pio/build/esp12e/firmware.bin b/Arduino/.pio/build/esp12e/firmware.bin
diff --git a/Arduino/.pio/build/esp12e/firmware.elf b/Arduino/.pio/build/esp12e/firmware.elf
diff --git a/Arduino/.pio/build/esp12e/idedata.json b/Arduino/.pio/build/esp12e/idedata.json
diff --git a/Arduino/.pio/build/esp12e/src/main.cpp.o b/Arduino/.pio/build/esp12e/src/main.cpp.o
diff --git a/Arduino/src/main.cpp b/Arduino/src/main.cpp
@@ -24,7 +24,7 @@ String ha_mqtt_password;
 
 //-=-=-=-=-=-↓系统配置↓-=-=-=-=-=-=-=-=-=
 bool debug = false;
-String sw_version = "v2.6-beta";
+String sw_version = "v2.6.3";
 String bambu_mqtt_user = "bblp";
 String bambu_mqtt_id = "ams";
 String ha_mqtt_id = "ams";
@@ -72,6 +72,7 @@ bool sameTask;
 bool NeedLoad;
 bool CanPush = false;//用于等待另一通道回抽完毕
 long NeedStopTime = 0;//用于判断是否要发送停止信息
+bool isFisrtTimePull;
 String AmsStatus;
 //-=-=-=-=-=-=end
 
@@ -380,6 +381,8 @@ void bambuCallback(char* topic, byte* payload, unsigned int length) {
                             statePublish("退料超时,请手动操作并检查挤出机状态");
                         }
                     }
+
+                    isFisrtTimePull = true;
                 }else if (amsStatus == "0"){
                     statePublish("应该拔出耗材,但需要等待拔出结束");
                     leds.setPixelColor(2,leds.Color(0,0,0));
@@ -458,6 +461,7 @@ void bambuCallback(char* topic, byte* payload, unsigned int length) {
                             leds.show();
                         }
                     }
+                    bambuClient.publish(bambu_topic_publish.c_str(),bambu_resume.c_str());
                 }else if (amsStatus == "262" and hwSwitchState == "1"){
                     statePublish("送入成功,停止插入");
                     sv.pull();
@@ -1004,7 +1008,8 @@ void loop() {
             sv.pull();
             bambuClient.publish(bambu_topic_publish.c_str(),("{\"print\":{\"command\": \"APAMS|"+String(nextFilament)+"|CANPUSH\"}}").c_str());
             NeedStopTime = 0;
-        }else if(mc.getStopState() or sv.getState() == "拉"){
+            isFisrtTimePull = false;
+        }else if((mc.getStopState() or sv.getState() == "拉") and isFisrtTimePull){
             mc.backforward();
             sv.push();
         }
@@ -1113,4 +1118,4 @@ void loop() {
             }
         }
     }
-}
+}