Compare commits

...
6 Commits
Author SHA1 Message Date
Manuel Weiser 87a0403735 docs: update platformio.ini for version v3.2.6 2026-03-13 14:01:42 +01:00
Manuel Weiser 97a2ecca41 Merge branch 'devel' 2026-03-13 14:00:43 +01:00
Manuel Weiser fe768cf631 feat: enhance JSON optimization by converting spool_id to sm_id and improve write task handling 2026-03-13 13:51:21 +01:00
Manuel Weiser 60af915c9f docs: update platformio.ini for version v3.2.5 2026-03-09 19:25:41 +01:00
Manuel Weiser 4d318bf4ec fix: change weight parameter type to int16_t in oledShowWeight function 2026-03-09 19:25:01 +01:00
Manuel Weiser 9311162463 Add multilingual support with language selection and translation strings
- Introduced language management with English and German translations.
- Added language settings to NVS for persistent storage.
- Updated display functions to use translated strings for various messages.
- Implemented API endpoints for language retrieval and setting.
- Refactored existing text strings in the codebase to utilize the new translation system.
2026-03-09 19:18:59 +01:00
14 changed files with 543 additions and 78 deletions

No files matched your search

+35
View File
@@ -57,6 +57,18 @@
<button id="registerBtn" class="fm-btn fm-btn-primary">Register Device</button>
<div id="statusMessage" style="margin-top: 1.5rem;"></div>
</div>
<div class="fm-card">
<h2>General Settings</h2>
<div class="fm-form-group" style="margin-top: 1rem;">
<label class="fm-label" for="languageSelect">Display Language</label>
<select id="languageSelect" class="fm-input">
<option value="en">English</option>
<option value="de">Deutsch</option>
</select>
</div>
</div>
</main>
</div>
@@ -70,6 +82,29 @@
})
.catch(error => console.error('Error fetching version:', error));
// Language setting
fetch('/api/language')
.then(response => response.json())
.then(data => {
document.getElementById('languageSelect').value = data.lang;
})
.catch(error => console.error('Error fetching language:', error));
document.getElementById('languageSelect').addEventListener('change', function() {
fetch('/api/language', {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ lang: this.value })
})
.then(response => response.json())
.then(data => {
if (data.success) {
console.log('Language saved');
}
})
.catch(error => console.error('Error saving language:', error));
});
document.getElementById('registerBtn').addEventListener('click', () => {
const url = document.getElementById('filamanUrl').value;
const code = document.getElementById('deviceCode').value;
+1 -1
View File
@@ -9,7 +9,7 @@
; https://docs.platformio.org/page/projectconf.html
[common]
version = "3.2.4"
version = "3.2.6"
to_old_version = "3.0.9"
##
+2 -1
View File
@@ -9,6 +9,7 @@
#include "config.h"
#include <WiFi.h>
#include "display.h"
#include "lang.h"
volatile filamanApiStateType filamanApiState = API_IDLE;
bool filamanConnected = false;
@@ -132,7 +133,7 @@ bool sendWeight(int spoolId, String tagUuid, float measuredWeight) {
return true;
}
else {
oledShowProgressBar(1, 1, "Failure", "API Error");
oledShowProgressBar(1, 1, tr(STR_FAILURE), tr(STR_API_ERROR));
oledSetPriority(DISPLAY_PRIORITY_WARNING, 2000);
vTaskDelay(pdMS_TO_TICKS(2000));
oledClearPriority();
+3
View File
@@ -11,6 +11,9 @@
#define NVS_NAMESPACE_SCALE "scale"
#define NVS_KEY_CALIBRATION "cal_value"
#define NVS_KEY_AUTOTARE "auto_tare"
#define NVS_NAMESPACE_SETTINGS "settings"
#define NVS_KEY_LANGUAGE "language"
#define SCALE_DEFAULT_CALIBRATION_VALUE 430.0f;
#define OLED_RESET -1 // Reset pin # (or -1 if sharing Arduino reset pin)
+5 -4
View File
@@ -4,6 +4,7 @@
#include "icons.h"
#include "main.h"
#include <cstring>
#include "lang.h"
Adafruit_SSD1306 display(SCREEN_WIDTH, SCREEN_HEIGHT, &Wire, OLED_RESET);
@@ -56,7 +57,7 @@ void setupDisplay() {
oledShowTopRow();
oledShowProgressBar(0, 7, DISPLAY_BOOT_TEXT, "Display init");
oledShowProgressBar(0, 7, DISPLAY_BOOT_TEXT, tr(STR_DISPLAY_INIT));
}
void oledclearline() {
@@ -269,7 +270,7 @@ void oledShowProgressBar(const uint8_t step, const uint8_t numSteps, const char*
display.display();
}
void oledShowWeight(uint16_t weight) {
void oledShowWeight(int16_t weight) {
// Display Gewicht
oledcleardata();
display.setTextSize(3);
@@ -282,8 +283,8 @@ void oledShowWeight(uint16_t weight) {
void oledShowRemainingWeight(uint16_t remainingWeight) {
oledcleardata();
display.setTextSize(1);
display.setCursor(oled_center_h("Weight sent, rest:"), OLED_DATA_START + 4);
display.print("Weight sent, rest:");
display.setCursor(oled_center_h(tr(STR_WEIGHT_SENT_REST)), OLED_DATA_START + 4);
display.print(tr(STR_WEIGHT_SENT_REST));
display.setTextSize(3);
String weightStr = String(remainingWeight) + " g";
+1 -1
View File
@@ -32,7 +32,7 @@ int oled_center_v(const String &text);
void oledShowProgressBar(const uint8_t step, const uint8_t numSteps, const char* largeText, const char* statusMessage);
void oledShowWeight(uint16_t weight);
void oledShowWeight(int16_t weight);
void oledShowRemainingWeight(uint16_t remainingWeight);
void oledDisplayText(const String &message, uint8_t size = 2);
void oledShowConnectionError(const char* error, const String& ip);
+258
View File
@@ -0,0 +1,258 @@
#include "lang.h"
#include "config.h"
#include <Preferences.h>
Lang currentLang = LANG_EN;
// =====================================================================
// English strings
// =====================================================================
static const char EN_DISPLAY_INIT[] = "Display init";
static const char EN_WIFI_INIT[] = "WiFi init";
static const char EN_WEBSERVER_INIT[] = "Webserver init";
static const char EN_NFC_INIT[] = "NFC init";
static const char EN_SEARCHING_SCALE[] = "Searching scale";
static const char EN_TARE_SCALE[] = "TARE Scale";
static const char EN_SCALE_NOT_CAL[] = "Scale not calibrated";
static const char EN_SCALE_CAL[] = "Scale Cal.";
static const char EN_EMPTY_SCALE[] = "Empty Scale";
static const char EN_PLACE_WEIGHT[] = "Place the weight";
static const char EN_REMOVE_WEIGHT[] = "Remove weight";
static const char EN_COMPLETED[] = "Completed";
static const char EN_CAL_ERROR[] = "Calibration error";
static const char EN_HX711_NOT_FOUND[] = "HX711 not found";
static const char EN_READING[] = "Reading";
static const char EN_DECODING_DATA[] = "Decoding data";
static const char EN_SPOOL_TAG[] = "Spool Tag";
static const char EN_WEIGHING[] = "Weighing...";
static const char EN_WEIGHT_STABLE[] = "Weight stable";
static const char EN_SENDING[] = "Sending...";
static const char EN_TAG_WRITTEN[] = "Tag written";
static const char EN_WRITING[] = "Writing";
static const char EN_WRITE_TAG[] = "Write Tag";
static const char EN_DONE[] = "Done!";
static const char EN_PLACE_TAG_NOW[] = "Place tag now";
static const char EN_DETECTING_TAG[] = "Detecting tag";
static const char EN_KNOWN_SPOOL[] = "Known Spool";
static const char EN_QUICK_MODE[] = "Quick mode";
static const char EN_LOCATION[] = "Location";
static const char EN_LOCATION_SET[] = "Location set";
static const char EN_SCAN_SPOOL_FIRST[] = "Scan spool first";
static const char EN_WAIT_FMT[] = "Wait... %ds";
static const char EN_NOT_REGISTERED[] = "Not Registered";
static const char EN_API_CONN_LOST[] = "API Connection Lost";
static const char EN_API_ERROR[] = "API Error";
static const char EN_API_OFFLINE[] = "API offline";
static const char EN_WEIGHT_SENT_REST[] = "Weight sent, rest:";
static const char EN_FAILURE[] = "Failure";
static const char EN_FAILURE_EXCL[] = "Failure!";
static const char EN_UNKNOWN_TAG[] = "Unknown tag";
static const char EN_UNKNOWN_TAG_TYPE[] = "Unknown tag type";
static const char EN_NO_TAG_FOUND[] = "No tag found";
static const char EN_NFC_BUSY[] = "NFC busy!";
static const char EN_TAG_READ_ERROR[] = "Tag read error";
static const char EN_TAG_TOO_SMALL[] = "Tag too small for data";
static const char EN_NFC_RESET_FAIL[] = "NFC Reset failed";
static const char EN_TAG_LOST_RESET[] = "Tag lost after reset";
static const char EN_NFC_STILL_BROKEN[] = "NFC still broken";
static const char EN_TAG_DEFECT[] = "Tag/Interface defect";
static const char EN_TEST_READ_ERROR[] = "Test page read error";
static const char EN_TAG_REMOVED[] = "Tag removed";
static const char EN_TAG_WRITE_PROT[] = "Tag write protected?";
static const char EN_TEST_VERIFY_FAIL[] = "Test verify failed";
static const char EN_NDEF_INIT_FAIL[] = "NDEF init failed";
static const char EN_NFC_UNSTABLE[] = "NFC Interface unstable";
static const char EN_MEMORY_ERROR[] = "Memory error";
static const char EN_NO_RFID_BOARD[] = "No RFID Board found";
static const char EN_WIFI_CONFIG[] = "WiFi Config Mode";
static const char EN_WIFI_NOT_CONN[] = "WiFi not connected Check Portal";
static const char EN_WIFI_RECONN[] = "WiFi reconnecting";
static const char EN_UPDATE[] = "Update";
static const char EN_DOWNLOAD[] = "Download";
// =====================================================================
// German strings
// =====================================================================
static const char DE_DISPLAY_INIT[] = "Display init";
static const char DE_WIFI_INIT[] = "WiFi init";
static const char DE_WEBSERVER_INIT[] = "Webserver init";
static const char DE_NFC_INIT[] = "NFC init";
static const char DE_SEARCHING_SCALE[] = "Suche Waage";
static const char DE_TARE_SCALE[] = "Waage tarieren";
static const char DE_SCALE_NOT_CAL[] = "Waage nicht kalibriert";
static const char DE_SCALE_CAL[] = "Kalibrieren";
static const char DE_EMPTY_SCALE[] = "Waage leeren";
static const char DE_PLACE_WEIGHT[] = "Gewicht auflegen";
static const char DE_REMOVE_WEIGHT[] = "Gewicht entfernen";
static const char DE_COMPLETED[] = "Abgeschlossen";
static const char DE_CAL_ERROR[] = "Kalibrierungsfehler";
static const char DE_HX711_NOT_FOUND[] = "HX711 nicht gefunden";
static const char DE_READING[] = "Lesen";
static const char DE_DECODING_DATA[] = "Daten dekodieren";
static const char DE_SPOOL_TAG[] = "Spulen-Tag";
static const char DE_WEIGHING[] = "Wiegen...";
static const char DE_WEIGHT_STABLE[] = "Gewicht stabil";
static const char DE_SENDING[] = "Senden...";
static const char DE_TAG_WRITTEN[] = "Tag beschrieben";
static const char DE_WRITING[] = "Schreiben";
static const char DE_WRITE_TAG[] = "Tag schreiben";
static const char DE_DONE[] = "Fertig!";
static const char DE_PLACE_TAG_NOW[] = "Tag jetzt auflegen";
static const char DE_DETECTING_TAG[] = "Tag erkennen";
static const char DE_KNOWN_SPOOL[] = "Bekannte Spule";
static const char DE_QUICK_MODE[] = "Schnellmodus";
static const char DE_LOCATION[] = "Standort";
static const char DE_LOCATION_SET[] = "Standort gesetzt";
static const char DE_SCAN_SPOOL_FIRST[] = "Zuerst Spule scannen";
static const char DE_WAIT_FMT[] = "Warte... %ds";
static const char DE_NOT_REGISTERED[] = "Nicht registriert";
static const char DE_API_CONN_LOST[] = "API-Verbindung weg";
static const char DE_API_ERROR[] = "API-Fehler";
static const char DE_API_OFFLINE[] = "API offline";
static const char DE_WEIGHT_SENT_REST[] = "Gesendet, Rest:";
static const char DE_FAILURE[] = "Fehler";
static const char DE_FAILURE_EXCL[] = "Fehler!";
static const char DE_UNKNOWN_TAG[] = "Unbekannter Tag";
static const char DE_UNKNOWN_TAG_TYPE[] = "Unbekannter Tagtyp";
static const char DE_NO_TAG_FOUND[] = "Kein Tag gefunden";
static const char DE_NFC_BUSY[] = "NFC belegt!";
static const char DE_TAG_READ_ERROR[] = "Tag-Lesefehler";
static const char DE_TAG_TOO_SMALL[] = "Tag zu klein";
static const char DE_NFC_RESET_FAIL[] = "NFC-Reset fehlgeschl.";
static const char DE_TAG_LOST_RESET[] = "Tag nach Reset weg";
static const char DE_NFC_STILL_BROKEN[] = "NFC immer noch defekt";
static const char DE_TAG_DEFECT[] = "Tag/Interface defekt";
static const char DE_TEST_READ_ERROR[] = "Testseite Lesefehler";
static const char DE_TAG_REMOVED[] = "Tag entfernt";
static const char DE_TAG_WRITE_PROT[] = "Tag schreibgeschuetzt";
static const char DE_TEST_VERIFY_FAIL[] = "Test fehlgeschlagen";
static const char DE_NDEF_INIT_FAIL[] = "NDEF-Init Fehler";
static const char DE_NFC_UNSTABLE[] = "NFC instabil";
static const char DE_MEMORY_ERROR[] = "Speicherfehler";
static const char DE_NO_RFID_BOARD[] = "Kein RFID-Board";
static const char DE_WIFI_CONFIG[] = "WiFi Konfig-Modus";
static const char DE_WIFI_NOT_CONN[] = "WiFi nicht verbunden Portal pruefen";
static const char DE_WIFI_RECONN[] = "WiFi Neuverbindung";
static const char DE_UPDATE[] = "Update";
static const char DE_DOWNLOAD[] = "Download";
// =====================================================================
// String table: [StringID][Lang]
// =====================================================================
static const char* const stringTable[STR_COUNT][LANG_COUNT] = {
// Boot / Init
{ EN_DISPLAY_INIT, DE_DISPLAY_INIT },
{ EN_WIFI_INIT, DE_WIFI_INIT },
{ EN_WEBSERVER_INIT, DE_WEBSERVER_INIT },
{ EN_NFC_INIT, DE_NFC_INIT },
{ EN_SEARCHING_SCALE, DE_SEARCHING_SCALE },
// Scale
{ EN_TARE_SCALE, DE_TARE_SCALE },
{ EN_SCALE_NOT_CAL, DE_SCALE_NOT_CAL },
{ EN_SCALE_CAL, DE_SCALE_CAL },
{ EN_EMPTY_SCALE, DE_EMPTY_SCALE },
{ EN_PLACE_WEIGHT, DE_PLACE_WEIGHT },
{ EN_REMOVE_WEIGHT, DE_REMOVE_WEIGHT },
{ EN_COMPLETED, DE_COMPLETED },
{ EN_CAL_ERROR, DE_CAL_ERROR },
{ EN_HX711_NOT_FOUND, DE_HX711_NOT_FOUND },
// NFC / Spool
{ EN_READING, DE_READING },
{ EN_DECODING_DATA, DE_DECODING_DATA },
{ EN_SPOOL_TAG, DE_SPOOL_TAG },
{ EN_WEIGHING, DE_WEIGHING },
{ EN_WEIGHT_STABLE, DE_WEIGHT_STABLE },
{ EN_SENDING, DE_SENDING },
{ EN_TAG_WRITTEN, DE_TAG_WRITTEN },
{ EN_WRITING, DE_WRITING },
{ EN_WRITE_TAG, DE_WRITE_TAG },
{ EN_DONE, DE_DONE },
{ EN_PLACE_TAG_NOW, DE_PLACE_TAG_NOW },
{ EN_DETECTING_TAG, DE_DETECTING_TAG },
{ EN_KNOWN_SPOOL, DE_KNOWN_SPOOL },
{ EN_QUICK_MODE, DE_QUICK_MODE },
{ EN_LOCATION, DE_LOCATION },
{ EN_LOCATION_SET, DE_LOCATION_SET },
{ EN_SCAN_SPOOL_FIRST, DE_SCAN_SPOOL_FIRST },
{ EN_WAIT_FMT, DE_WAIT_FMT },
// Connection / API
{ EN_NOT_REGISTERED, DE_NOT_REGISTERED },
{ EN_API_CONN_LOST, DE_API_CONN_LOST },
{ EN_API_ERROR, DE_API_ERROR },
{ EN_API_OFFLINE, DE_API_OFFLINE },
{ EN_WEIGHT_SENT_REST, DE_WEIGHT_SENT_REST },
// Errors
{ EN_FAILURE, DE_FAILURE },
{ EN_FAILURE_EXCL, DE_FAILURE_EXCL },
{ EN_UNKNOWN_TAG, DE_UNKNOWN_TAG },
{ EN_UNKNOWN_TAG_TYPE, DE_UNKNOWN_TAG_TYPE },
{ EN_NO_TAG_FOUND, DE_NO_TAG_FOUND },
{ EN_NFC_BUSY, DE_NFC_BUSY },
{ EN_TAG_READ_ERROR, DE_TAG_READ_ERROR },
{ EN_TAG_TOO_SMALL, DE_TAG_TOO_SMALL },
{ EN_NFC_RESET_FAIL, DE_NFC_RESET_FAIL },
{ EN_TAG_LOST_RESET, DE_TAG_LOST_RESET },
{ EN_NFC_STILL_BROKEN, DE_NFC_STILL_BROKEN },
{ EN_TAG_DEFECT, DE_TAG_DEFECT },
{ EN_TEST_READ_ERROR, DE_TEST_READ_ERROR },
{ EN_TAG_REMOVED, DE_TAG_REMOVED },
{ EN_TAG_WRITE_PROT, DE_TAG_WRITE_PROT },
{ EN_TEST_VERIFY_FAIL, DE_TEST_VERIFY_FAIL },
{ EN_NDEF_INIT_FAIL, DE_NDEF_INIT_FAIL },
{ EN_NFC_UNSTABLE, DE_NFC_UNSTABLE },
{ EN_MEMORY_ERROR, DE_MEMORY_ERROR },
{ EN_NO_RFID_BOARD, DE_NO_RFID_BOARD },
// WiFi
{ EN_WIFI_CONFIG, DE_WIFI_CONFIG },
{ EN_WIFI_NOT_CONN, DE_WIFI_NOT_CONN },
{ EN_WIFI_RECONN, DE_WIFI_RECONN },
// OTA
{ EN_UPDATE, DE_UPDATE },
{ EN_DOWNLOAD, DE_DOWNLOAD },
};
const char* tr(StringID id) {
if (id >= STR_COUNT) return "???";
return stringTable[id][currentLang];
}
void loadLanguage() {
Preferences preferences;
preferences.begin(NVS_NAMESPACE_SETTINGS, true);
currentLang = (Lang)preferences.getUChar(NVS_KEY_LANGUAGE, LANG_EN);
if (currentLang >= LANG_COUNT) currentLang = LANG_EN;
preferences.end();
Serial.printf("Language loaded: %s\n", getLangCode());
}
void saveLanguage(Lang lang) {
if (lang >= LANG_COUNT) return;
currentLang = lang;
Preferences preferences;
preferences.begin(NVS_NAMESPACE_SETTINGS, false);
preferences.putUChar(NVS_KEY_LANGUAGE, (uint8_t)lang);
preferences.end();
Serial.printf("Language saved: %s\n", getLangCode());
}
const char* getLangCode() {
return (currentLang == LANG_DE) ? "de" : "en";
}
+109
View File
@@ -0,0 +1,109 @@
#ifndef LANG_H
#define LANG_H
#include <Arduino.h>
// Supported languages
enum Lang : uint8_t {
LANG_EN = 0,
LANG_DE = 1,
LANG_COUNT
};
// String IDs for all translatable display texts
enum StringID : uint8_t {
// Boot / Init
STR_DISPLAY_INIT,
STR_WIFI_INIT,
STR_WEBSERVER_INIT,
STR_NFC_INIT,
STR_SEARCHING_SCALE,
// Scale
STR_TARE_SCALE,
STR_SCALE_NOT_CALIBRATED,
STR_SCALE_CAL,
STR_EMPTY_SCALE,
STR_PLACE_WEIGHT,
STR_REMOVE_WEIGHT,
STR_COMPLETED,
STR_CALIBRATION_ERROR,
STR_HX711_NOT_FOUND,
// NFC / Spool
STR_READING,
STR_DECODING_DATA,
STR_SPOOL_TAG,
STR_WEIGHING,
STR_WEIGHT_STABLE,
STR_SENDING,
STR_TAG_WRITTEN,
STR_WRITING,
STR_WRITE_TAG,
STR_DONE,
STR_PLACE_TAG_NOW,
STR_DETECTING_TAG,
STR_KNOWN_SPOOL,
STR_QUICK_MODE,
STR_LOCATION,
STR_LOCATION_SET,
STR_SCAN_SPOOL_FIRST,
STR_WAIT_FMT, // format string: "Wait... %ds" / "Warte... %ds"
// Connection / API
STR_NOT_REGISTERED,
STR_API_CONN_LOST,
STR_API_ERROR,
STR_API_OFFLINE,
STR_WEIGHT_SENT_REST,
// Errors
STR_FAILURE,
STR_FAILURE_EXCL,
STR_UNKNOWN_TAG,
STR_UNKNOWN_TAG_TYPE,
STR_NO_TAG_FOUND,
STR_NFC_BUSY,
STR_TAG_READ_ERROR,
STR_TAG_TOO_SMALL,
STR_NFC_RESET_FAILED,
STR_TAG_LOST_RESET,
STR_NFC_STILL_BROKEN,
STR_TAG_DEFECT,
STR_TEST_READ_ERROR,
STR_TAG_REMOVED,
STR_TAG_WRITE_PROT,
STR_TEST_VERIFY_FAIL,
STR_NDEF_INIT_FAILED,
STR_NFC_UNSTABLE,
STR_MEMORY_ERROR,
STR_NO_RFID_BOARD,
// WiFi
STR_WIFI_CONFIG_MODE,
STR_WIFI_NOT_CONNECTED,
STR_WIFI_RECONNECTING,
// OTA
STR_UPDATE,
STR_DOWNLOAD,
STR_COUNT // must be last
};
// Current language (default: English)
extern Lang currentLang;
// Get translated string by ID
const char* tr(StringID id);
// Load language setting from NVS
void loadLanguage();
// Save language setting to NVS
void saveLanguage(Lang lang);
// Get current language as string ("en" or "de")
const char* getLangCode();
#endif
+12 -8
View File
@@ -13,6 +13,7 @@
#include "scale.h"
#include "esp_task_wdt.h"
#include "commonFS.h"
#include "lang.h"
bool mainTaskWasPaused = 0;
uint8_t scaleTareCounter = 0;
@@ -32,6 +33,9 @@ void setup() {
// Initialize SPIFFS
initializeFileSystem();
// Load language setting from NVS (before display init)
loadLanguage();
// Start Display
setupDisplay();
@@ -108,11 +112,11 @@ void loop() {
// Handle connection errors (not registered or not connected)
if (intervalElapsed(currentMillis, lastConnErrorShowTime, connErrorShowInterval)) {
if (!filamanRegistered && oledCanUpdate(DISPLAY_PRIORITY_WARNING)) {
oledShowConnectionError("Not Registered", WiFi.localIP().toString());
oledShowConnectionError(tr(STR_NOT_REGISTERED), WiFi.localIP().toString());
oledSetPriority(DISPLAY_PRIORITY_WARNING, 3000);
mainTaskWasPaused = true;
} else if (!filamanConnected && oledCanUpdate(DISPLAY_PRIORITY_WARNING)) {
oledShowConnectionError("API Connection Lost", WiFi.localIP().toString());
oledShowConnectionError(tr(STR_API_CONN_LOST), WiFi.localIP().toString());
oledSetPriority(DISPLAY_PRIORITY_WARNING, 3000);
mainTaskWasPaused = true;
}
@@ -150,7 +154,7 @@ void loop() {
{
// Do not show the warning if the calibratin process is onging
if(!scaleCalibrationActive){
oledDisplayText("Scale not calibrated");
oledDisplayText(tr(STR_SCALE_NOT_CALIBRATED));
vTaskDelay(pdMS_TO_TICKS(1000));
}
}
@@ -164,7 +168,7 @@ void loop() {
int16_t displayWeight = getFilteredDisplayWeight();
if (mainTaskWasPaused || (weight != lastWeight && (nfcReaderState == NFC_IDLE || tagProcessed)))
{
(displayWeight < 2) ? ((displayWeight < -2) ? oledDisplayText("!! -0") : oledShowWeight(0)) : oledShowWeight(displayWeight);
oledShowWeight((abs(displayWeight) < 2) ? 0 : displayWeight);
oledSetPriority(DISPLAY_PRIORITY_STATUS, 0); // Weight can always be overwritten
}
mainTaskWasPaused = false;
@@ -186,7 +190,7 @@ void loop() {
weightCounterToApi++;
// Show stable weight feedback when approaching send threshold
if (weightCounterToApi == 3 && nfcReaderState == NFC_READ_SUCCESS && !tagProcessed && weightSend == 0) {
oledShowProgressBar(2, 4, "Spool Tag", "Weight stable");
oledShowProgressBar(2, 4, tr(STR_SPOOL_TAG), tr(STR_WEIGHT_STABLE));
oledSetPriority(DISPLAY_PRIORITY_INFO, 1000);
}
}
@@ -194,7 +198,7 @@ void loop() {
{
// Show visual feedback when tag is present and weight is unstable
if (weightCounterToApi > 0 && nfcReaderState == NFC_READ_SUCCESS && !tagProcessed && weightSend == 0) {
oledShowProgressBar(1, 4, "Spool Tag", "Weighing...");
oledShowProgressBar(1, 4, tr(STR_SPOOL_TAG), tr(STR_WEIGHING));
oledSetPriority(DISPLAY_PRIORITY_INFO, 1000);
}
weightCounterToApi = 0;
@@ -221,7 +225,7 @@ void loop() {
weightSend = 1;
// Feedback to user
oledShowProgressBar(3, 4, "Spool Tag", "Sending...");
oledShowProgressBar(3, 4, tr(STR_SPOOL_TAG), tr(STR_SENDING));
oledSetPriority(DISPLAY_PRIORITY_ACTION, 2000);
}
@@ -238,7 +242,7 @@ void loop() {
Serial.println("Weight queued for FilaMan after spool tag write");
// Feedback to user
oledShowProgressBar(3, 4, "Tag written", "Sending...");
oledShowProgressBar(3, 4, tr(STR_TAG_WRITTEN), tr(STR_SENDING));
oledSetPriority(DISPLAY_PRIORITY_ACTION, 2000);
} else {
// Location tag written - no weight to send
+66 -47
View File
@@ -8,6 +8,7 @@
#include "esp_task_wdt.h"
#include "scale.h"
#include "main.h"
#include "lang.h"
//Adafruit_PN532 nfc(PN532_SCK, PN532_MISO, PN532_MOSI, PN532_SS);
Adafruit_PN532 nfc(PN532_IRQ, PN532_RESET);
@@ -498,7 +499,7 @@ uint8_t ntag2xx_WriteNDEF(const char *payload) {
Serial.println("!!!!!!!!!!!!!!!!!!!!!!!!");
Serial.println();
oledDisplayText("Tag zu klein für Payload");
oledDisplayText(tr(STR_TAG_TOO_SMALL));
oledSetPriority(DISPLAY_PRIORITY_WARNING, 3000);
vTaskDelay(pdMS_TO_TICKS(3000));
oledClearPriority();
@@ -542,7 +543,7 @@ uint8_t ntag2xx_WriteNDEF(const char *payload) {
Serial.println("✓ PN532 Kommunikation wiederhergestellt");
} else {
Serial.println("❌ PN532 Kommunikation fehlgeschlagen");
oledDisplayText("NFC Reset failed");
oledDisplayText(tr(STR_NFC_RESET_FAILED));
oledSetPriority(DISPLAY_PRIORITY_WARNING, 3000);
vTaskDelay(pdMS_TO_TICKS(3000));
oledClearPriority();
@@ -578,7 +579,7 @@ uint8_t ntag2xx_WriteNDEF(const char *payload) {
if (!tagRedetected) {
Serial.println("❌ Tag konnte nach Reset nicht wiedererkannt werden");
oledDisplayText("Tag lost after reset");
oledDisplayText(tr(STR_TAG_LOST_RESET));
oledSetPriority(DISPLAY_PRIORITY_WARNING, 3000);
vTaskDelay(pdMS_TO_TICKS(3000));
oledClearPriority();
@@ -598,7 +599,7 @@ uint8_t ntag2xx_WriteNDEF(const char *payload) {
if (!ccReadable) {
Serial.println("❌ NFC-Interface funktioniert nach Reset immer noch nicht");
oledDisplayText("NFC still broken");
oledDisplayText(tr(STR_NFC_STILL_BROKEN));
oledSetPriority(DISPLAY_PRIORITY_WARNING, 3000);
vTaskDelay(pdMS_TO_TICKS(3000));
oledClearPriority();
@@ -653,7 +654,7 @@ uint8_t ntag2xx_WriteNDEF(const char *payload) {
if (!basicPagesReadable) {
Serial.println("❌ KRITISCHER FEHLER: Grundlegende NDEF-Seiten nicht lesbar!");
Serial.println("Tag oder Interface ist defekt");
oledDisplayText("Tag/Interface defect");
oledDisplayText(tr(STR_TAG_DEFECT));
oledSetPriority(DISPLAY_PRIORITY_WARNING, 3000);
vTaskDelay(pdMS_TO_TICKS(3000));
oledClearPriority();
@@ -676,7 +677,7 @@ uint8_t ntag2xx_WriteNDEF(const char *payload) {
// First, read original content of test page
if (!nfc.ntag2xx_ReadPage(10, originalPage)) {
Serial.println("FEHLER: Kann Testseite nicht lesen für Backup");
oledDisplayText("Test page read error");
oledDisplayText(tr(STR_TEST_READ_ERROR));
oledSetPriority(DISPLAY_PRIORITY_WARNING, 3000);
vTaskDelay(pdMS_TO_TICKS(3000));
oledClearPriority();
@@ -709,12 +710,12 @@ uint8_t ntag2xx_WriteNDEF(const char *payload) {
if (!tagStillPresent) {
Serial.println("URSACHE: Tag wurde während Schreibtest entfernt!");
oledDisplayText("Tag removed");
oledDisplayText(tr(STR_TAG_REMOVED));
oledSetPriority(DISPLAY_PRIORITY_WARNING, 3000);
} else {
Serial.println("URSACHE: Tag ist vorhanden aber nicht beschreibbar");
Serial.println("Möglicherweise: Schreibschutz, Defekt, oder Interface-Problem");
oledDisplayText("Tag write protected?");
oledDisplayText(tr(STR_TAG_WRITE_PROT));
oledSetPriority(DISPLAY_PRIORITY_WARNING, 3000);
}
Serial.println("==========================================");
@@ -731,7 +732,7 @@ uint8_t ntag2xx_WriteNDEF(const char *payload) {
if (!nfc.ntag2xx_ReadPage(10, readBack)) {
Serial.println("FEHLER: Kann Testdaten nicht zurücklesen!");
oledDisplayText("Test verify failed");
oledDisplayText(tr(STR_TEST_VERIFY_FAIL));
oledSetPriority(DISPLAY_PRIORITY_WARNING, 3000);
vTaskDelay(pdMS_TO_TICKS(3000));
oledClearPriority();
@@ -778,7 +779,7 @@ uint8_t ntag2xx_WriteNDEF(const char *payload) {
Serial.println("=== SCHRITT 4: NDEF-INITIALISIERUNG ===");
if (!initializeNdefStructure()) {
Serial.println("FEHLER: Konnte NDEF-Struktur nicht initialisieren!");
oledDisplayText("NDEF init failed");
oledDisplayText(tr(STR_NDEF_INIT_FAILED));
oledSetPriority(DISPLAY_PRIORITY_WARNING, 2000);
vTaskDelay(pdMS_TO_TICKS(2000));
oledClearPriority();
@@ -836,7 +837,7 @@ uint8_t ntag2xx_WriteNDEF(const char *payload) {
if (!interfaceStable) {
Serial.println("FEHLER: NFC-Interface ist nicht stabil genug für Schreibvorgang");
oledDisplayText("NFC Interface unstable");
oledDisplayText(tr(STR_NFC_UNSTABLE));
oledSetPriority(DISPLAY_PRIORITY_WARNING, 3000);
vTaskDelay(pdMS_TO_TICKS(3000));
oledClearPriority();
@@ -851,7 +852,7 @@ uint8_t ntag2xx_WriteNDEF(const char *payload) {
uint8_t* tlvData = (uint8_t*) malloc(totalTlvSize);
if (tlvData == NULL) {
Serial.println("Fehler: Nicht genug Speicher für TLV-Daten vorhanden.");
oledDisplayText("Memory error");
oledDisplayText(tr(STR_MEMORY_ERROR));
oledSetPriority(DISPLAY_PRIORITY_WARNING, 2000);
vTaskDelay(pdMS_TO_TICKS(2000));
oledClearPriority();
@@ -1122,7 +1123,7 @@ uint8_t ntag2xx_WriteNDEF(const char *payload) {
}
bool decodeNdefAndReturnJson(const byte* encodedMessage, String uidString) {
oledShowProgressBar(1, 4, "Reading", "Decoding data");
oledShowProgressBar(1, 4, tr(STR_READING), tr(STR_DECODING_DATA));
oledSetPriority(DISPLAY_PRIORITY_ACTION, 1500);
// Debug: Print first 32 bytes of the raw data
@@ -1316,7 +1317,7 @@ bool decodeNdefAndReturnJson(const byte* encodedMessage, String uidString) {
Serial.println("JSON-Dokument erfolgreich verarbeitet");
if (doc["sm_id"].is<String>() && doc["sm_id"] != "" && doc["sm_id"] != "0")
{
oledShowProgressBar(2, 4, "Spool Tag", "Weighing");
oledShowProgressBar(2, 4, tr(STR_SPOOL_TAG), tr(STR_WEIGHING));
oledSetPriority(DISPLAY_PRIORITY_ACTION, 2000);
activeSpoolId = doc["sm_id"].as<String>();
lastSpoolId = activeSpoolId;
@@ -1326,30 +1327,38 @@ bool decodeNdefAndReturnJson(const byte* encodedMessage, String uidString) {
{
Serial.println("Location Tag found!");
int locId = doc["location_id"].as<int>();
int sId = lastSpoolId.toInt();
sendLocationAsync(sId, "", locId, "");
// Display feedback - location was set
oledShowProgressBar(1, 1, "Location", "Standort gesetzt");
oledSetPriority(DISPLAY_PRIORITY_ACTION, 3000);
// Clear lastSpoolId to prevent accidental re-assignment
lastSpoolId = "";
// Check if a spool was scanned before
if (lastSpoolId.length() == 0 || lastSpoolId == "0") {
Serial.println("No spool scanned before location tag - showing warning");
oledShowProgressBar(1, 1, tr(STR_LOCATION), tr(STR_SCAN_SPOOL_FIRST));
oledSetPriority(DISPLAY_PRIORITY_WARNING, 3000);
} else {
int sId = lastSpoolId.toInt();
sendLocationAsync(sId, "", locId, "");
// Display feedback - location was set
oledShowProgressBar(1, 1, tr(STR_LOCATION), tr(STR_LOCATION_SET));
oledSetPriority(DISPLAY_PRIORITY_ACTION, 3000);
// Clear lastSpoolId to prevent accidental re-assignment
lastSpoolId = "";
Serial.println("Location set - lastSpoolId cleared to prevent re-assignment");
}
// Mark as processed so main.cpp doesn't try to send weight
tagProcessed = true;
activeSpoolId = "";
Serial.println("Location set - lastSpoolId cleared to prevent re-assignment");
}
else
{
Serial.println("Unbekannter Tag-Inhalt.");
activeSpoolId = "";
oledShowProgressBar(1, 1, "Failure", "Unknown tag");
oledShowProgressBar(1, 1, tr(STR_FAILURE), tr(STR_UNKNOWN_TAG));
oledSetPriority(DISPLAY_PRIORITY_WARNING, 2000);
}
} else {
oledShowProgressBar(4, 4, "Failure!", "API offline");
oledShowProgressBar(4, 4, tr(STR_FAILURE_EXCL), tr(STR_API_OFFLINE));
oledSetPriority(DISPLAY_PRIORITY_WARNING, 2000);
}
}
@@ -1559,7 +1568,7 @@ bool quickSpoolIdCheck(String uidString) {
Serial.println("⚠ FAST-PATH: Could not read complete JSON, web interface may show limited data");
}
oledShowProgressBar(2, 4, "Known Spool", "Quick mode");
oledShowProgressBar(2, 4, tr(STR_KNOWN_SPOOL), tr(STR_QUICK_MODE));
oledSetPriority(DISPLAY_PRIORITY_ACTION, 1500);
Serial.println("✓ FAST-PATH SUCCESS: Known spool processed quickly");
return true;
@@ -1615,7 +1624,7 @@ bool quickSpoolIdCheck(String uidString) {
Serial.println("⚠ FAST-PATH: Could not read complete JSON, web interface may show limited data");
}
oledShowProgressBar(2, 4, "Known Spool", "Quick mode");
oledShowProgressBar(2, 4, tr(STR_KNOWN_SPOOL), tr(STR_QUICK_MODE));
oledSetPriority(DISPLAY_PRIORITY_ACTION, 1500);
Serial.println("✓ FAST-PATH SUCCESS: Known spool processed quickly");
return true;
@@ -1663,7 +1672,9 @@ void writeJsonToTag(void *parameter) {
vTaskDelay(pdMS_TO_TICKS(100));
// Show initial waiting message with countdown
oledShowProgressBar(0, 30, "Write Tag", "Warte... 30s");
char _waitBuf[20];
snprintf(_waitBuf, sizeof(_waitBuf), tr(STR_WAIT_FMT), 30);
oledShowProgressBar(0, 30, tr(STR_WRITE_TAG), _waitBuf);
oledSetPriority(DISPLAY_PRIORITY_ACTION, 1500);
// Wait up to 30 seconds for tag
@@ -1685,8 +1696,8 @@ void writeJsonToTag(void *parameter) {
if (remainingSeconds != lastSecondsShown) {
lastSecondsShown = remainingSeconds;
char countdownText[20];
snprintf(countdownText, sizeof(countdownText), "Warte... %ds", remainingSeconds);
oledShowProgressBar(elapsed / 1000, 30, "Write Tag", countdownText);
snprintf(countdownText, sizeof(countdownText), tr(STR_WAIT_FMT), remainingSeconds);
oledShowProgressBar(elapsed / 1000, 30, tr(STR_WRITE_TAG), countdownText);
oledSetPriority(DISPLAY_PRIORITY_ACTION, 1500);
}
@@ -1715,7 +1726,7 @@ void writeJsonToTag(void *parameter) {
// If so, skip writing and just send success with weight to API
if (uidLength != 7) {
Serial.println("Bambu Lab tag detected during write - skipping write, sending result with weight");
oledShowProgressBar(1, 1, "Write Tag", "Done!");
oledShowProgressBar(1, 1, tr(STR_WRITE_TAG), tr(STR_DONE));
oledSetPriority(DISPLAY_PRIORITY_ACTION, 2000);
// Send success to API with tag_uuid and current weight
@@ -1731,7 +1742,7 @@ void writeJsonToTag(void *parameter) {
vTaskDelete(NULL);
}
oledShowProgressBar(1, 3, "Write Tag", "Writing");
oledShowProgressBar(1, 3, tr(STR_WRITE_TAG), tr(STR_WRITING));
oledSetPriority(DISPLAY_PRIORITY_ACTION, 2000);
// Schreibe die NDEF-Message auf den Tag
@@ -1745,9 +1756,9 @@ void writeJsonToTag(void *parameter) {
// aktualisieren der Website wenn sich der Status ändert
sendNfcData();
if(params->tagType){
oledShowProgressBar(1, 1, "Write Tag", "Done!");
oledShowProgressBar(1, 1, tr(STR_WRITE_TAG), tr(STR_DONE));
}else{
oledShowProgressBar(1, 1, "Write Tag", "Done!");
oledShowProgressBar(1, 1, tr(STR_WRITE_TAG), tr(STR_DONE));
}
oledSetPriority(DISPLAY_PRIORITY_ACTION, 3000);
@@ -1848,7 +1859,7 @@ void writeJsonToTag(void *parameter) {
else
{
Serial.println("Fehler: Kein Tag zu schreiben gefunden.");
oledShowProgressBar(1, 1, "Failure!", "No tag found");
oledShowProgressBar(1, 1, tr(STR_FAILURE_EXCL), tr(STR_NO_TAG_FOUND));
oledSetPriority(DISPLAY_PRIORITY_WARNING, 2000);
vTaskDelay(pdMS_TO_TICKS(2000));
oledClearPriority();
@@ -1889,19 +1900,27 @@ String optimizeJsonForFastPath(const char* payload) {
JsonDocument optimizedDoc;
// Always add sm_id first (even if it's "0" for brand filaments)
if (inputDoc["sm_id"].is<String>()) {
// Also convert spool_id to sm_id if present (backend may send either)
if (inputDoc["sm_id"].is<String>() && inputDoc["sm_id"].as<String>() != "0" && inputDoc["sm_id"].as<String>() != "") {
optimizedDoc["sm_id"] = inputDoc["sm_id"].as<String>();
Serial.print("Optimizing JSON: sm_id found = ");
Serial.println(inputDoc["sm_id"].as<String>());
} else if (inputDoc["spool_id"].is<int>() && inputDoc["spool_id"].as<int>() > 0) {
optimizedDoc["sm_id"] = String(inputDoc["spool_id"].as<int>());
Serial.print("Optimizing JSON: Converted spool_id to sm_id = ");
Serial.println(inputDoc["spool_id"].as<int>());
} else if (inputDoc["spool_id"].is<String>() && inputDoc["spool_id"].as<String>() != "0" && inputDoc["spool_id"].as<String>() != "") {
optimizedDoc["sm_id"] = inputDoc["spool_id"].as<String>();
Serial.print("Optimizing JSON: Converted spool_id (string) to sm_id = ");
Serial.println(inputDoc["spool_id"].as<String>());
} else {
optimizedDoc["sm_id"] = "0"; // Default for brand filaments
Serial.println("Optimizing JSON: No sm_id found, setting to '0'");
Serial.println("Optimizing JSON: No sm_id or spool_id found, setting sm_id to '0'");
}
// Add all other keys in original order
for (JsonPair kv : inputDoc.as<JsonObject>()) {
String key = kv.key().c_str();
if (key != "sm_id") { // Skip sm_id as it's already added first
if (key != "sm_id" && key != "spool_id") {
optimizedDoc[key] = kv.value();
}
}
@@ -1944,7 +1963,7 @@ void startWriteJsonToTag(const bool isSpoolTag, const char* payload, int spoolId
nfcWriteInProgress = true; // Lock immediately to prevent race conditions
Serial.println("startWriteJsonToTag: Starting task, lock acquired.");
oledShowProgressBar(0, 1, "Write Tag", "Place tag now");
oledShowProgressBar(0, 1, tr(STR_WRITE_TAG), tr(STR_PLACE_TAG_NOW));
oledSetPriority(DISPLAY_PRIORITY_ACTION, 2000);
// Erstelle die Task
BaseType_t result = xTaskCreatePinnedToCore(
@@ -1965,7 +1984,7 @@ void startWriteJsonToTag(const bool isSpoolTag, const char* payload, int spoolId
}
}else{
Serial.printf("startWriteJsonToTag: State mismatch (State: %d)\n", nfcReaderState);
oledShowProgressBar(0, 1, "FAILURE", "NFC busy!");
oledShowProgressBar(0, 1, tr(STR_FAILURE), tr(STR_NFC_BUSY));
oledSetPriority(DISPLAY_PRIORITY_WARNING, 2000);
free(parameters->payload);
delete parameters;
@@ -2037,7 +2056,7 @@ void scanRfidTask(void * parameter) {
nfcReaderState = NFC_READING;
pauseMainTask = 1;
oledShowProgressBar(0, 4, "Reading", "Detecting tag");
oledShowProgressBar(0, 4, tr(STR_READING), tr(STR_DETECTING_TAG));
oledSetPriority(DISPLAY_PRIORITY_ACTION, 1500);
// Stabilization time for reliable tag communication
@@ -2109,7 +2128,7 @@ void scanRfidTask(void * parameter) {
if (!decodeNdefAndReturnJson(data, uidString))
{
oledShowProgressBar(1, 1, "Failure", "Unknown tag");
oledShowProgressBar(1, 1, tr(STR_FAILURE), tr(STR_UNKNOWN_TAG));
oledSetPriority(DISPLAY_PRIORITY_WARNING, 2000);
nfcReaderState = NFC_READ_ERROR;
}
@@ -2125,7 +2144,7 @@ void scanRfidTask(void * parameter) {
// NTAG reading failed, try reading as Bambu Lab tag
Serial.println("NTAG read failed, trying Bambu Lab tag...");
if (!detectBambuTag(uid, uidLength)) {
oledShowProgressBar(1, 1, "Failure", "Tag read error");
oledShowProgressBar(1, 1, tr(STR_FAILURE), tr(STR_TAG_READ_ERROR));
oledSetPriority(DISPLAY_PRIORITY_WARNING, 2000);
nfcReaderState = NFC_READ_ERROR;
activeSpoolId = "";
@@ -2139,7 +2158,7 @@ void scanRfidTask(void * parameter) {
Serial.println("Not a standard NTAG (UID length != 7), trying Bambu Lab tag...");
if (!detectBambuTag(uid, uidLength)) {
//TBD: Show error here?!
oledShowProgressBar(1, 1, "Failure", "Unkown tag type");
oledShowProgressBar(1, 1, tr(STR_FAILURE), tr(STR_UNKNOWN_TAG_TYPE));
oledSetPriority(DISPLAY_PRIORITY_WARNING, 2000);
Serial.println("This doesn't seem to be an NTAG2xx tag (UUID length != 7 bytes)!");
// Reset activeSpoolId when tag type is unknown to prevent autoSet
@@ -2205,14 +2224,14 @@ void scanRfidTask(void * parameter) {
void startNfc() {
nfcRequestMutex = xSemaphoreCreateMutex();
oledShowProgressBar(5, 7, DISPLAY_BOOT_TEXT, "NFC init");
oledShowProgressBar(5, 7, DISPLAY_BOOT_TEXT, tr(STR_NFC_INIT));
nfc.begin(); // Beginne Kommunikation mit RFID Leser
delay(1000);
unsigned long versiondata = nfc.getFirmwareVersion(); // Lese Versionsnummer der Firmware aus
if (! versiondata) { // Wenn keine Antwort kommt
Serial.println("Kann kein RFID Board finden !"); // Sende Text "Kann kein..." an seriellen Monitor
oledDisplayText("No RFID Board found");
oledDisplayText(tr(STR_NO_RFID_BOARD));
vTaskDelay(pdMS_TO_TICKS(2000));
}
else {
+2 -1
View File
@@ -3,6 +3,7 @@
#include <commonFS.h>
#include "scale.h"
#include "nfc.h"
#include "lang.h"
// Globale Variablen für Config Backups hinzufügen
@@ -178,7 +179,7 @@ void handleUpdate(AsyncWebServer &server) {
static int lastProgress = -1;
if (currentProgress != lastProgress && (currentProgress % 10 == 0 || final)) {
sendUpdateProgress(currentProgress, "uploading");
oledShowProgressBar(currentProgress, 100, "Update", "Download");
oledShowProgressBar(currentProgress, 100, tr(STR_UPDATE), tr(STR_DOWNLOAD));
vTaskDelay(pdMS_TO_TICKS(50));
lastProgress = currentProgress;
}
+9 -8
View File
@@ -7,6 +7,7 @@
#include "display.h"
#include "esp_task_wdt.h"
#include <Preferences.h>
#include "lang.h"
HX711 scale;
@@ -169,7 +170,7 @@ void scale_loop(void * parameter) {
if (scaleTareRequest == true || (autoTare && scale_tare_counter >= 20))
{
Serial.println("Re-Tare scale");
oledDisplayText("TARE Scale");
oledDisplayText(tr(STR_TARE_SCALE));
vTaskDelay(pdMS_TO_TICKS(1000));
scale.tare();
resetWeightFilter(); // Reset filter after manual tare
@@ -250,7 +251,7 @@ void start_scale(bool touchSensorConnected) {
scale.begin(LOADCELL_DOUT_PIN, LOADCELL_SCK_PIN);
oledShowProgressBar(6, 7, DISPLAY_BOOT_TEXT, "Serching scale");
oledShowProgressBar(6, 7, DISPLAY_BOOT_TEXT, tr(STR_SEARCHING_SCALE));
for (uint16_t i = 0; i < 3000; i++) {
yield();
vTaskDelay(pdMS_TO_TICKS(1));
@@ -303,7 +304,7 @@ uint8_t calibrate_scale() {
{
scale.set_scale();
oledShowProgressBar(0, 3, "Scale Cal.", "Empty Scale");
oledShowProgressBar(0, 3, tr(STR_SCALE_CAL), tr(STR_EMPTY_SCALE));
for (uint16_t i = 0; i < 5000; i++) {
yield();
@@ -315,7 +316,7 @@ uint8_t calibrate_scale() {
Serial.println("Tare done...");
Serial.print("Place a known weight on the scale...");
oledShowProgressBar(1, 3, "Scale Cal.", "Place the weight");
oledShowProgressBar(1, 3, tr(STR_SCALE_CAL), tr(STR_PLACE_WEIGHT));
for (uint16_t i = 0; i < 5000; i++) {
yield();
@@ -348,7 +349,7 @@ uint8_t calibrate_scale() {
Serial.print("Verified stored value: ");
Serial.println(verifyValue);
oledShowProgressBar(2, 3, "Scale Cal.", "Remove weight");
oledShowProgressBar(2, 3, tr(STR_SCALE_CAL), tr(STR_REMOVE_WEIGHT));
scale.set_scale(newCalibrationValue);
resetWeightFilter(); // Reset filter after calibration
@@ -358,7 +359,7 @@ uint8_t calibrate_scale() {
esp_task_wdt_reset();
}
oledShowProgressBar(3, 3, "Scale Cal.", "Completed");
oledShowProgressBar(3, 3, tr(STR_SCALE_CAL), tr(STR_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();
@@ -377,7 +378,7 @@ uint8_t calibrate_scale() {
{
Serial.println("Calibration value is invalid. Please recalibrate.");
oledShowProgressBar(3, 3, "Failure", "Calibration error");
oledShowProgressBar(3, 3, tr(STR_FAILURE), tr(STR_CALIBRATION_ERROR));
for (uint16_t i = 0; i < 50000; i++) {
yield();
@@ -391,7 +392,7 @@ uint8_t calibrate_scale() {
{
Serial.println("HX711 not found.");
oledDisplayText("HX711 not found");
oledDisplayText(tr(STR_HX711_NOT_FOUND));
for (uint16_t i = 0; i < 30000; i++) {
yield();
+35 -3
View File
@@ -11,6 +11,7 @@
#include "ota.h"
#include "config.h"
#include "debug.h"
#include "lang.h"
#ifndef VERSION
#define VERSION "1.2.0"
@@ -113,7 +114,7 @@ void sendNfcData() {
}
void setupWebserver(AsyncWebServer &server) {
oledShowProgressBar(2, 7, DISPLAY_BOOT_TEXT, "Webserver init");
oledShowProgressBar(2, 7, DISPLAY_BOOT_TEXT, tr(STR_WEBSERVER_INIT));
ws.onEvent(onWsEvent);
server.addHandler(&ws);
@@ -226,11 +227,14 @@ void setupWebserver(AsyncWebServer &server) {
String payloadString;
serializeJson(doc, payloadString);
bool hasSpoolId = !doc["spool_id"].isNull() || !doc["sm_id"].isNull();
int spoolId = doc["spool_id"] | 0;
if (spoolId == 0 && doc["sm_id"].is<String>()) {
spoolId = doc["sm_id"].as<String>().toInt();
}
int locationId = doc["location_id"] | 0;
// Start write task (fire and forget)
startWriteJsonToTag(!doc["spool_id"].isNull(), payloadString.c_str(), spoolId, locationId);
startWriteJsonToTag(hasSpoolId, payloadString.c_str(), spoolId, locationId);
// Respond immediately
request->send(200, "application/json", "{\"success\": true, \"message\": \"Schreibvorgang wurde gestartet. Bitte Tag bereit halten...\"}");
@@ -240,6 +244,34 @@ void setupWebserver(AsyncWebServer &server) {
request->send(200, "application/json", "{\"version\": \"" VERSION "\"}");
});
// Language API
server.on("/api/language", HTTP_GET, [](AsyncWebServerRequest *request){
JsonDocument doc;
doc["lang"] = getLangCode();
String response;
serializeJson(doc, response);
request->send(200, "application/json", response);
});
server.on("/api/language", HTTP_POST, [](AsyncWebServerRequest *request){}, NULL, [](AsyncWebServerRequest *request, uint8_t *data, size_t len, size_t index, size_t total){
JsonDocument doc;
DeserializationError error = deserializeJson(doc, (const uint8_t*)data, len);
if (error) {
request->send(400, "application/json", "{\"success\": false, \"error\": \"Invalid JSON\"}");
return;
}
String lang = doc["lang"] | "";
if (lang == "de") {
saveLanguage(LANG_DE);
} else if (lang == "en") {
saveLanguage(LANG_EN);
} else {
request->send(400, "application/json", "{\"success\": false, \"error\": \"Invalid language\"}");
return;
}
request->send(200, "application/json", "{\"success\": true}");
});
server.on("/reboot", HTTP_GET, [](AsyncWebServerRequest *request){
request->send(200, "text/plain", "Rebooting...");
delay(500);
+5 -4
View File
@@ -6,6 +6,7 @@
#include <DNSServer.h>
#include "display.h"
#include "config.h"
#include "lang.h"
WiFiManager wm;
bool wm_nonblocking = false;
@@ -31,7 +32,7 @@ void wifiSettings() {
void configModeCallback (WiFiManager *myWiFiManager) {
Serial.println("Entered config mode");
oledShowTopRow();
oledDisplayText("WiFi Config Mode");
oledDisplayText(tr(STR_WIFI_CONFIG_MODE));
}
void initWiFi() {
@@ -50,14 +51,14 @@ void initWiFi() {
wm.setWiFiAutoReconnect(true);
wm.setConnectTimeout(10);
oledShowProgressBar(1, 7, DISPLAY_BOOT_TEXT, "WiFi init");
oledShowProgressBar(1, 7, DISPLAY_BOOT_TEXT, tr(STR_WIFI_INIT));
//bool res = wm.autoConnect("FilaMan"); // anonymous ap
if(!wm.autoConnect("FilaMan")) {
Serial.println("Failed to connect or hit timeout");
// ESP.restart();
oledShowTopRow();
oledDisplayText("WiFi not connected Check Portal");
oledDisplayText(tr(STR_WIFI_NOT_CONNECTED));
}
else {
wifiOn = true;
@@ -78,7 +79,7 @@ void checkWiFiConnection() {
Serial.println("WiFi connection lost. LwIP is auto-reconnecting...");
wifiOn = false;
oledShowTopRow();
oledDisplayText("WiFi reconnecting");
oledDisplayText(tr(STR_WIFI_RECONNECTING));
}
wifiErrorCounter++;