3D-Druck/Filaman
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 139 Wiki Activity

Reworks graphics of tag reading and some api fixes

Browse Source 
Reworks the graphics of the NFC-Tag reading process of spool and location tags. Introduces progress bar for reading process. Also first re-work of the spoolman availability (not fixed completly yet). Also fixes an issue where the API request to spoolman and octoprint was sent in parallel. This now happens sequentially to reduce heap load.
This commit is contained in:
Jan Philipp Ecker
2025-08-03 16:51:09 +02:00
parent 6b6aec07b3
commit afef544c66
8 changed files with 147 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/scale.cpp
View File

@@ -162,7 +162,7 @@ uint8_t calibrate_scale() {
{
scale.set_scale();
oledShowMessage("Step 1 empty Scale");
oledShowProgressBar(0, 3, "Scale Cal.", "Empty Scale");
for (uint16_t i = 0; i < 5000; i++) {
yield();
@@ -174,7 +174,7 @@ uint8_t calibrate_scale() {
Serial.println("Tare done...");
Serial.print("Place a known weight on the scale...");
oledShowMessage("Step 2 Place the weight");
oledShowProgressBar(1, 3, "Scale Cal.", "Place the weight");
for (uint16_t i = 0; i < 5000; i++) {
yield();
@@ -207,9 +207,7 @@ uint8_t calibrate_scale() {
Serial.print("Verified stored value: ");
Serial.println(verifyValue);
Serial.println("End calibration, remove weight");
oledShowMessage("Remove weight");
oledShowProgressBar(2, 3, "Scale Cal.", "Remove weight");
scale.set_scale(newCalibrationValue);
for (uint16_t i = 0; i < 2000; i++) {
@@ -218,7 +216,7 @@ uint8_t calibrate_scale() {
esp_task_wdt_reset();
}
oledShowMessage("Scale calibrated");
oledShowProgressBar(3, 3, "Scale Cal.", "Completed");
// For some reason it is not possible to re-tare the scale here, it will result in a wdt timeout. Instead let the scale loop do the taring
//scale.tare();
@@ -232,21 +230,18 @@ uint8_t calibrate_scale() {
returnState = 1;
}
else
{
{
Serial.println("Calibration value is invalid. Please recalibrate.");
Serial.println("Calibration value is invalid. Please recalibrate.");
oledShowMessage("Calibration ERROR Try again");
oledShowMessage("Calibration ERROR Try again");
for (uint16_t i = 0; i < 50000; i++) {
yield();
vTaskDelay(pdMS_TO_TICKS(1));
esp_task_wdt_reset();
}
returnState = 0;
for (uint16_t i = 0; i < 50000; i++) {
yield();
vTaskDelay(pdMS_TO_TICKS(1));
esp_task_wdt_reset();
}
returnState = 0;
}
}
else