Compare commits
7 Commits
v1.5.12-be
...
v2.0.0-bet
Author | SHA1 | Date | |
---|---|---|---|
fcd637cc30 | |||
587485d0de | |||
e0cc99e993 | |||
d9a8388ac7 | |||
cb77112976 | |||
1c0ddb52ba | |||
17f03e9472 |
17
CHANGELOG.md
17
CHANGELOG.md
@@ -1,5 +1,22 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## [2.0.0-beta1] - 2025-08-29
|
||||||
|
### Changed
|
||||||
|
- update platformio.ini for beta version v2.0.0-beta1
|
||||||
|
- update version to 2.0.0 in platformio.ini
|
||||||
|
|
||||||
|
|
||||||
|
## [1.5.12-beta18] - 2025-08-29
|
||||||
|
### Added
|
||||||
|
- add display delay for vendor, filament, and spool creation processes
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
- update platformio.ini for beta version v1.5.12-beta18
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
- replace progress bar with message display for remaining weight in sendToApi function
|
||||||
|
|
||||||
|
|
||||||
## [1.5.12-beta17] - 2025-08-29
|
## [1.5.12-beta17] - 2025-08-29
|
||||||
### Added
|
### Added
|
||||||
- add progress bar updates for vendor and filament creation processes
|
- add progress bar updates for vendor and filament creation processes
|
||||||
|
@@ -9,8 +9,8 @@
|
|||||||
; https://docs.platformio.org/page/projectconf.html
|
; https://docs.platformio.org/page/projectconf.html
|
||||||
|
|
||||||
[common]
|
[common]
|
||||||
version = "1.5.12-beta17"
|
version = "2.0.0-beta1"
|
||||||
to_old_version = "1.5.0"
|
to_old_version = "2.0.0"
|
||||||
|
|
||||||
##
|
##
|
||||||
[env:esp32dev]
|
[env:esp32dev]
|
||||||
|
17
src/api.cpp
17
src/api.cpp
@@ -158,7 +158,8 @@ void sendToApi(void *parameter) {
|
|||||||
//oledShowMessage("Remaining: " + String(remaining_weight) + "g");
|
//oledShowMessage("Remaining: " + String(remaining_weight) + "g");
|
||||||
if(!octoEnabled){
|
if(!octoEnabled){
|
||||||
// TBD: Do not use Strings...
|
// TBD: Do not use Strings...
|
||||||
oledShowProgressBar(1, 1, "Spool Tag", ("Done: " + String(remainingWeight) + " g remain").c_str());
|
//oledShowProgressBar(1, 1, "Spool Tag", ("Done: " + String(remainingWeight) + " g remain").c_str());
|
||||||
|
oledShowMessage("Remaining: " + String(remainingWeight) + "g");
|
||||||
remainingWeight = 0;
|
remainingWeight = 0;
|
||||||
}else{
|
}else{
|
||||||
// ocoto is enabled, trigger octo update
|
// ocoto is enabled, trigger octo update
|
||||||
@@ -173,7 +174,8 @@ void sendToApi(void *parameter) {
|
|||||||
break;
|
break;
|
||||||
case API_REQUEST_OCTO_SPOOL_UPDATE:
|
case API_REQUEST_OCTO_SPOOL_UPDATE:
|
||||||
// TBD: Do not use Strings...
|
// TBD: Do not use Strings...
|
||||||
oledShowProgressBar(5, 5, "Spool Tag", ("Done: " + String(remainingWeight) + " g remain").c_str());
|
//oledShowProgressBar(5, 5, "Spool Tag", ("Done: " + String(remainingWeight) + " g remain").c_str());
|
||||||
|
oledShowMessage("Remaining: " + String(remainingWeight) + "g");
|
||||||
remainingWeight = 0;
|
remainingWeight = 0;
|
||||||
break;
|
break;
|
||||||
case API_REQUEST_VENDOR_CREATE:
|
case API_REQUEST_VENDOR_CREATE:
|
||||||
@@ -654,6 +656,9 @@ uint16_t createVendor(String vendor) {
|
|||||||
|
|
||||||
vendorDoc.clear();
|
vendorDoc.clear();
|
||||||
|
|
||||||
|
// Delay for Display Bar
|
||||||
|
vTaskDelay(1000 / portTICK_PERIOD_MS);
|
||||||
|
|
||||||
// Wait for task completion and return the created vendor ID
|
// Wait for task completion and return the created vendor ID
|
||||||
// Note: createdVendorId will be set by sendToApi when response is received
|
// Note: createdVendorId will be set by sendToApi when response is received
|
||||||
while(createdVendorId == 65535) {
|
while(createdVendorId == 65535) {
|
||||||
@@ -806,6 +811,9 @@ uint16_t createFilament(uint16_t vendorId, const JsonDocument& payload) {
|
|||||||
|
|
||||||
filamentDoc.clear();
|
filamentDoc.clear();
|
||||||
|
|
||||||
|
// Delay for Display Bar
|
||||||
|
vTaskDelay(1000 / portTICK_PERIOD_MS);
|
||||||
|
|
||||||
// Wait for task completion and return the created filament ID
|
// Wait for task completion and return the created filament ID
|
||||||
// Note: createdFilamentId will be set by sendToApi when response is received
|
// Note: createdFilamentId will be set by sendToApi when response is received
|
||||||
while(createdFilamentId == 65535) {
|
while(createdFilamentId == 65535) {
|
||||||
@@ -948,7 +956,10 @@ uint16_t createSpool(uint16_t vendorId, uint16_t filamentId, JsonDocument& paylo
|
|||||||
optimizedPayload.clear();
|
optimizedPayload.clear();
|
||||||
|
|
||||||
nfcReaderState = NFC_IDLE;
|
nfcReaderState = NFC_IDLE;
|
||||||
vTaskDelay(50 / portTICK_PERIOD_MS);
|
|
||||||
|
// Delay for Display Bar
|
||||||
|
vTaskDelay(1000 / portTICK_PERIOD_MS);
|
||||||
|
|
||||||
startWriteJsonToTag(true, payloadString.c_str());
|
startWriteJsonToTag(true, payloadString.c_str());
|
||||||
|
|
||||||
return createdSpoolId;
|
return createdSpoolId;
|
||||||
|
@@ -48,9 +48,6 @@ void scale_loop(void * parameter) {
|
|||||||
Serial.println("Scale Loop started");
|
Serial.println("Scale Loop started");
|
||||||
Serial.println("++++++++++++++++++++++++++++++");
|
Serial.println("++++++++++++++++++++++++++++++");
|
||||||
|
|
||||||
vTaskDelay(pdMS_TO_TICKS(500));
|
|
||||||
scale_tare_counter = 10; // damit beim Starten der Waage automatisch getart wird
|
|
||||||
|
|
||||||
for(;;) {
|
for(;;) {
|
||||||
if (scale.is_ready())
|
if (scale.is_ready())
|
||||||
{
|
{
|
||||||
@@ -120,12 +117,13 @@ void start_scale(bool touchSensorConnected) {
|
|||||||
esp_task_wdt_reset();
|
esp_task_wdt_reset();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (scale.wait_ready_timeout(1000))
|
while(!scale.is_ready()) {
|
||||||
{
|
vTaskDelay(pdMS_TO_TICKS(5000));
|
||||||
scale.set_scale(calibrationValue); // this value is obtained by calibrating the scale with known weights; see the README for details
|
|
||||||
//scale.tare();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
scale.set_scale(calibrationValue); // this value is obtained by calibrating the scale with known weights; see the README for details
|
||||||
|
scale.tare();
|
||||||
|
|
||||||
// Display Gewicht
|
// Display Gewicht
|
||||||
oledShowWeight(0);
|
oledShowWeight(0);
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user