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

Changes configuration storage of spoolman and bambu values

Browse Source 
Change that moves configuration values of spoolman and bambu credentials to use NVS storage. Also fixes some typos and missing translation.
This commit is contained in:
Jan Philipp Ecker
2025-07-27 17:33:09 +02:00
parent 3bb6c1caf5
commit cb5d8ac10a
11 changed files with 158 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.gitignore vendored Normal file
View File

@@ -0,0 +1,5 @@
.pio
.vscode/.browse.c_cpp.db*
.vscode/c_cpp_properties.json
.vscode/launch.json
.vscode/ipch

16
html/spoolman.html
View File

@@ -146,20 +146,20 @@
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body">
<h5 class="card-title">Set URL/IP to your Spoolman-Instanz</h5> <h5 class="card-title">Set URL/IP to your Spoolman instance</h5>
<input type="text" id="spoolmanUrl" placeholder="http://ip-or-url-of-your-spoolman-instanz:port"> <input type="text" id="spoolmanUrl" onkeydown="if(event.keyCode == 13) document.getElementById('btnSaveSpoolmanUrl').click()" placeholder="http://ip-or-url-of-your-spoolman-instance:port">
<h5 class="card-title">If you want to enable sending Spool to Spoolman Octoprint Plugin:</h5> <h5 class="card-title">If you want to enable sending the spool to the Spoolman Octoprint plugin:</h5>
<p> <p>
<input type="checkbox" id="spoolmanOctoEnabled" {{spoolmanOctoEnabled}} onchange="toggleOctoFields()"> Send to Octo-Plugin <input type="checkbox" id="spoolmanOctoEnabled" {{spoolmanOctoEnabled}} onchange="toggleOctoFields()"> Send to Octo-Plugin
</p> </p>
<div id="octoFields" style="display: none;"> <div id="octoFields" style="display: none;">
<p> <p>
<input type="text" id="spoolmanOctoUrl" placeholder="http://ip-or-url-of-your-octoprint-instanz:port" value="{{spoolmanOctoUrl}}"> <input type="text" id="spoolmanOctoUrl" placeholder="http://ip-or-url-of-your-octoprint-instance:port" value="{{spoolmanOctoUrl}}">
<input type="text" id="spoolmanOctoToken" placeholder="Your Octoprint Token" value="{{spoolmanOctoToken}}"> <input type="text" id="spoolmanOctoToken" placeholder="Your Octoprint Token" value="{{spoolmanOctoToken}}">
</p> </p>
</div> </div>
<button onclick="checkSpoolmanInstance()">Save Spoolman URL</button> <button id="btnSaveSpoolmanUrl" onclick="checkSpoolmanInstance()">Save Spoolman URL</button>
<p id="statusMessage"></p> <p id="statusMessage"></p>
</div> </div>
</div> </div>
@@ -169,16 +169,16 @@
<h5 class="card-title">Bambu Lab Printer Credentials</h5> <h5 class="card-title">Bambu Lab Printer Credentials</h5>
<div class="bambu-settings"> <div class="bambu-settings">
<div class="input-group"> <div class="input-group">
<label for="bambuIp">Bambu Drucker IP-Adresse:</label> <label for="bambuIp">Bambu Printer IP Address:</label>
<input type="text" id="bambuIp" placeholder="192.168.1.xxx" value="{{bambuIp}}"> <input type="text" id="bambuIp" placeholder="192.168.1.xxx" value="{{bambuIp}}">
</div> </div>
<div class="input-group"> <div class="input-group">
<label for="bambuSerial">Drucker Seriennummer:</label> <label for="bambuSerial">Printer Serial Number:</label>
<input type="text" id="bambuSerial" placeholder="BBLXXXXXXXX" value="{{bambuSerial}}"> <input type="text" id="bambuSerial" placeholder="BBLXXXXXXXX" value="{{bambuSerial}}">
</div> </div>
<div class="input-group"> <div class="input-group">
<label for="bambuCode">Access Code:</label> <label for="bambuCode">Access Code:</label>
<input type="text" id="bambuCode" placeholder="Access Code vom Drucker" value="{{bambuCode}}"> <input type="text" id="bambuCode" placeholder="Access Code of the printer" value="{{bambuCode}}">
</div> </div>
<hr> <hr>
<p>If activated, FilaMan will automatically update the next filled tray with the last scanned and weighed spool.</p> <p>If activated, FilaMan will automatically update the next filled tray with the last scanned and weighed spool.</p>

47
src/api.cpp
View File

@@ -2,6 +2,7 @@
#include <HTTPClient.h> #include <HTTPClient.h>
#include <ArduinoJson.h> #include <ArduinoJson.h>
#include "commonFS.h" #include "commonFS.h"
#include <Preferences.h>
volatile spoolmanApiStateType spoolmanApiState = API_INIT; volatile spoolmanApiStateType spoolmanApiState = API_INIT;
//bool spoolman_connected = false; //bool spoolman_connected = false;
@@ -565,42 +566,36 @@ bool checkSpoolmanInstance(const String& url) {
return false; return false;
} }
bool saveSpoolmanUrl(const String& url, bool octoOn, const String& octoWh, const String& octoTk) { bool saveSpoolmanUrl(const String& url, bool octoOn, const String& octo_url, const String& octoTk) {
if (!checkSpoolmanInstance(url)) return false; Preferences preferences;
preferences.begin(NVS_NAMESPACE_API, false); // false = readwrite
preferences.putString(NVS_KEY_SPOOLMAN_URL, url);
preferences.putBool(NVS_KEY_OCTOPRINT_ENABLED, octoOn);
preferences.putString(NVS_KEY_OCTOPRINT_URL, octo_url);
preferences.putString(NVS_KEY_OCTOPRINT_TOKEN, octoTk);
preferences.end();
JsonDocument doc; //TBD: This could be handled nicer in the future
doc["url"] = url;
doc["octoEnabled"] = octoOn;
doc["octoUrl"] = octoWh;
doc["octoToken"] = octoTk;
Serial.print("Speichere Spoolman Data in Datei: ");
Serial.println(doc.as<String>());
if (!saveJsonValue("/spoolman_url.json", doc)) {
Serial.println("Fehler beim Speichern der Spoolman-URL.");
return false;
}
spoolmanUrl = url; spoolmanUrl = url;
octoEnabled = octoOn; octoEnabled = octoOn;
octoUrl = octoWh; octoUrl = octo_url;
octoToken = octoTk; octoToken = octoTk;
return true; return true;
} }
String loadSpoolmanUrl() { String loadSpoolmanUrl() {
JsonDocument doc; Preferences preferences;
if (loadJsonValue("/spoolman_url.json", doc) && doc["url"].is<String>()) { preferences.begin(NVS_NAMESPACE_API, true);
octoEnabled = (doc["octoEnabled"].is<bool>()) ? doc["octoEnabled"].as<bool>() : false; String spoolmanUrl = preferences.getString(NVS_KEY_SPOOLMAN_URL, "");
if (octoEnabled && doc["octoToken"].is<String>() && doc["octoUrl"].is<String>()) octoEnabled = preferences.getBool(NVS_KEY_OCTOPRINT_ENABLED, false);
{ if(octoEnabled)
octoUrl = doc["octoUrl"].as<String>(); {
octoToken = doc["octoToken"].as<String>(); octoUrl = preferences.getString(NVS_KEY_OCTOPRINT_URL, "");
} octoToken = preferences.getString(NVS_KEY_OCTOPRINT_TOKEN, "");
return doc["url"].as<String>();
} }
Serial.println("Keine gültige Spoolman-URL gefunden."); preferences.end();
return ""; return spoolmanUrl;
} }
bool initSpoolman() { bool initSpoolman() {

148
src/bambu.cpp
View File

@@ -10,6 +10,7 @@
#include "esp_task_wdt.h" #include "esp_task_wdt.h"
#include "config.h" #include "config.h"
#include "display.h" #include "display.h"
#include <Preferences.h>
WiFiClient espClient; WiFiClient espClient;
SSLClient sslClient(&espClient); SSLClient sslClient(&espClient);
@@ -17,22 +18,13 @@ PubSubClient client(sslClient);
TaskHandle_t BambuMqttTask; TaskHandle_t BambuMqttTask;
String topic = "";
//String request_topic = "";
const char* bambu_username = "bblp";
const char* bambu_ip = nullptr;
const char* bambu_accesscode = nullptr;
const char* bambu_serialnr = nullptr;
String g_bambu_ip = "";
String g_bambu_accesscode = "";
String g_bambu_serialnr = "";
bool bambuDisabled = false; bool bambuDisabled = false;
bool bambu_connected = false; bool bambu_connected = false;
bool autoSendToBambu = false;
int autoSetToBambuSpoolId = 0; int autoSetToBambuSpoolId = 0;
BambuCredentials bambuCredentials;
// Globale Variablen für AMS-Daten // Globale Variablen für AMS-Daten
int ams_count = 0; int ams_count = 0;
String amsJsonData; // Speichert das fertige JSON für WebSocket-Clients String amsJsonData; // Speichert das fertige JSON für WebSocket-Clients
@@ -43,18 +35,22 @@ bool removeBambuCredentials() {
vTaskDelete(BambuMqttTask); vTaskDelete(BambuMqttTask);
} }
if (!removeJsonValue("/bambu_credentials.json")) { Preferences preferences;
Serial.println("Fehler beim Löschen der Bambu-Credentials."); preferences.begin(NVS_NAMESPACE_BAMBU, false); // false = readwrite
return false; preferences.remove(NVS_KEY_BAMBU_IP);
} preferences.remove(NVS_KEY_BAMBU_SERIAL);
preferences.remove(NVS_KEY_BAMBU_ACCESSCODE);
preferences.remove(NVS_KEY_BAMBU_AUTOSEND_ENABLE);
preferences.remove(NVS_KEY_BAMBU_AUTOSEND_TIME);
preferences.end();
// Löschen der globalen Variablen // Löschen der globalen Variablen
g_bambu_ip = ""; bambuCredentials.ip = "";
g_bambu_accesscode = ""; bambuCredentials.serial = "";
g_bambu_serialnr = ""; bambuCredentials.accesscode = "";
bambu_ip = nullptr; bambuCredentials.autosend_enable = false;
bambu_accesscode = nullptr; bambuCredentials.autosend_time = BAMBU_DEFAULT_AUTOSEND_TIME;
bambu_serialnr = nullptr;
autoSendToBambu = false;
autoSetToBambuSpoolId = 0; autoSetToBambuSpoolId = 0;
ams_count = 0; ams_count = 0;
amsJsonData = ""; amsJsonData = "";
@@ -68,25 +64,21 @@ bool saveBambuCredentials(const String& ip, const String& serialnr, const String
if (BambuMqttTask) { if (BambuMqttTask) {
vTaskDelete(BambuMqttTask); vTaskDelete(BambuMqttTask);
} }
JsonDocument doc;
doc["bambu_ip"] = ip;
doc["bambu_accesscode"] = accesscode;
doc["bambu_serialnr"] = serialnr;
doc["autoSendToBambu"] = autoSend;
doc["autoSendTime"] = (autoSendTime != "") ? autoSendTime.toInt() : autoSetBambuAmsCounter;
if (!saveJsonValue("/bambu_credentials.json", doc)) { bambuCredentials.ip = ip.c_str();
Serial.println("Fehler beim Speichern der Bambu-Credentials."); bambuCredentials.serial = serialnr.c_str();
return false; bambuCredentials.accesscode = accesscode.c_str();
} bambuCredentials.autosend_enable = autoSend;
bambuCredentials.autosend_time = autoSendTime.toInt();
// Dynamische Speicherallokation für die globalen Pointer Preferences preferences;
bambu_ip = ip.c_str(); preferences.begin(NVS_NAMESPACE_BAMBU, false); // false = readwrite
bambu_accesscode = accesscode.c_str(); preferences.putString(NVS_KEY_BAMBU_IP, bambuCredentials.ip);
bambu_serialnr = serialnr.c_str(); preferences.putString(NVS_KEY_BAMBU_SERIAL, bambuCredentials.serial);
autoSendToBambu = autoSend; preferences.putString(NVS_KEY_BAMBU_ACCESSCODE, bambuCredentials.accesscode);
autoSetBambuAmsCounter = autoSendTime.toInt(); preferences.putBool(NVS_KEY_BAMBU_AUTOSEND_ENABLE, bambuCredentials.autosend_enable);
preferences.putInt(NVS_KEY_BAMBU_AUTOSEND_TIME, bambuCredentials.autosend_time);
preferences.end();
vTaskDelay(100 / portTICK_PERIOD_MS); vTaskDelay(100 / portTICK_PERIOD_MS);
if (!setupMqtt()) return false; if (!setupMqtt()) return false;
@@ -95,35 +87,36 @@ bool saveBambuCredentials(const String& ip, const String& serialnr, const String
} }
bool loadBambuCredentials() { bool loadBambuCredentials() {
JsonDocument doc; Preferences preferences;
if (loadJsonValue("/bambu_credentials.json", doc) && doc["bambu_ip"].is<String>()) { preferences.begin(NVS_NAMESPACE_BAMBU, true);
// Temporäre Strings für die Werte String ip = preferences.getString(NVS_KEY_BAMBU_IP, "");
String ip = doc["bambu_ip"].as<String>(); String serial = preferences.getString(NVS_KEY_BAMBU_SERIAL, "");
String code = doc["bambu_accesscode"].as<String>(); String code = preferences.getString(NVS_KEY_BAMBU_ACCESSCODE, "");
String serial = doc["bambu_serialnr"].as<String>(); bool autosendEnable = preferences.getBool(NVS_KEY_BAMBU_AUTOSEND_ENABLE, false);
int autosendTime = preferences.getInt(NVS_KEY_BAMBU_AUTOSEND_TIME, BAMBU_DEFAULT_AUTOSEND_TIME);
preferences.end();
g_bambu_ip = ip; if(ip != ""){
g_bambu_accesscode = code; bambuCredentials.ip = ip.c_str();
g_bambu_serialnr = serial; bambuCredentials.serial = serial.c_str();
bambuCredentials.accesscode = code.c_str();
bambuCredentials.autosend_enable = autosendEnable;
bambuCredentials.autosend_time = autosendTime;
if (doc["autoSendToBambu"].is<bool>()) autoSendToBambu = doc["autoSendToBambu"].as<bool>(); Serial.println("credentials loaded loadCredentials!");
if (doc["autoSendTime"].is<int>()) autoSetBambuAmsCounter = doc["autoSendTime"].as<int>(); Serial.println(bambuCredentials.ip);
Serial.println(bambuCredentials.serial);
Serial.println(bambuCredentials.accesscode);
Serial.println(String(bambuCredentials.autosend_enable));
Serial.println(String(bambuCredentials.autosend_time));
ip.trim();
code.trim();
serial.trim();
// Dynamische Speicherallokation für die globalen Pointer
bambu_ip = g_bambu_ip.c_str();
bambu_accesscode = g_bambu_accesscode.c_str();
bambu_serialnr = g_bambu_serialnr.c_str();
topic = "device/" + String(bambu_serialnr);
//request_topic = "device/" + String(bambu_serialnr) + "/request";
return true; return true;
} }
Serial.println("Keine gültigen Bambu-Credentials gefunden."); else
return false; {
Serial.println("Keine gültigen Bambu-Credentials gefunden.");
return false;
}
} }
struct FilamentResult { struct FilamentResult {
@@ -226,7 +219,7 @@ FilamentResult findFilamentIdx(String brand, String type) {
bool sendMqttMessage(const String& payload) { bool sendMqttMessage(const String& payload) {
Serial.println("Sending MQTT message"); Serial.println("Sending MQTT message");
Serial.println(payload); Serial.println(payload);
if (client.publish((String(topic) + "/request").c_str(), payload.c_str())) if (client.publish(("device/"+bambuCredentials.serial+"/request").c_str(), payload.c_str()))
{ {
return true; return true;
} }
@@ -499,7 +492,7 @@ void mqtt_callback(char* topic, byte* payload, unsigned int length) {
trayObj["cali_idx"].as<String>() != ams_data[storedIndex].trays[j].cali_idx) { trayObj["cali_idx"].as<String>() != ams_data[storedIndex].trays[j].cali_idx) {
hasChanges = true; hasChanges = true;
if (autoSendToBambu && autoSetToBambuSpoolId > 0 && hasChanges) if (bambuCredentials.autosend_enable && autoSetToBambuSpoolId > 0 && hasChanges)
{ {
autoSetSpool(autoSetToBambuSpoolId, ams_data[storedIndex].trays[j].id); autoSetSpool(autoSetToBambuSpoolId, ams_data[storedIndex].trays[j].id);
} }
@@ -523,7 +516,7 @@ void mqtt_callback(char* topic, byte* payload, unsigned int length) {
(vtTray["tray_type"].as<String>() != "" && vtTray["cali_idx"].as<String>() != ams_data[i].trays[0].cali_idx)) { (vtTray["tray_type"].as<String>() != "" && vtTray["cali_idx"].as<String>() != ams_data[i].trays[0].cali_idx)) {
hasChanges = true; hasChanges = true;
if (autoSendToBambu && autoSetToBambuSpoolId > 0 && hasChanges) if (bambuCredentials.autosend_enable && autoSetToBambuSpoolId > 0 && hasChanges)
{ {
autoSetSpool(autoSetToBambuSpoolId, 254); autoSetSpool(autoSetToBambuSpoolId, 254);
} }
@@ -580,11 +573,11 @@ void reconnect() {
oledShowTopRow(); oledShowTopRow();
// Attempt to connect // Attempt to connect
String clientId = String(bambu_serialnr) + "_" + String(random(0, 100)); String clientId = bambuCredentials.serial + "_" + String(random(0, 100));
if (client.connect(clientId.c_str(), bambu_username, bambu_accesscode)) { if (client.connect(clientId.c_str(), BAMBU_USERNAME, bambuCredentials.accesscode.c_str())) {
Serial.println("MQTT re/connected"); Serial.println("MQTT re/connected");
client.subscribe((String(topic) + "/report").c_str()); client.subscribe(("device/"+bambuCredentials.serial+"/report").c_str());
bambu_connected = true; bambu_connected = true;
oledShowTopRow(); oledShowTopRow();
} else { } else {
@@ -630,28 +623,23 @@ void mqtt_loop(void * parameter) {
bool setupMqtt() { bool setupMqtt() {
// Wenn Bambu Daten vorhanden // Wenn Bambu Daten vorhanden
bool success = loadBambuCredentials(); //bool success = loadBambuCredentials();
if (!success) { if (bambuCredentials.ip != "" && bambuCredentials.accesscode != "" && bambuCredentials.serial != "")
bambuDisabled = true;
return false;
}
if (success && bambu_ip != "" && bambu_accesscode != "" && bambu_serialnr != "")
{ {
bambuDisabled = false; bambuDisabled = false;
sslClient.setCACert(root_ca); sslClient.setCACert(root_ca);
sslClient.setInsecure(); sslClient.setInsecure();
client.setServer(bambu_ip, 8883); client.setServer(bambuCredentials.ip.c_str(), 8883);
// Verbinden mit dem MQTT-Server // Verbinden mit dem MQTT-Server
bool connected = true; bool connected = true;
String clientId = String(bambu_serialnr) + "_" + String(random(0, 100)); String clientId = String(bambuCredentials.serial) + "_" + String(random(0, 100));
if (client.connect(clientId.c_str(), bambu_username, bambu_accesscode)) if (client.connect(bambuCredentials.ip.c_str(), BAMBU_USERNAME, bambuCredentials.accesscode.c_str()))
{ {
client.setCallback(mqtt_callback); client.setCallback(mqtt_callback);
client.setBufferSize(15488); client.setBufferSize(15488);
client.subscribe((String(topic) + "/report").c_str()); client.subscribe(("device/"+bambuCredentials.serial+"/report").c_str());
Serial.println("MQTT-Client initialisiert"); Serial.println("MQTT-Client initialisiert");
oledShowMessage("Bambu Connected"); oledShowMessage("Bambu Connected");

11
src/bambu.h
View File

@@ -16,6 +16,14 @@ struct TrayData {
String cali_idx; String cali_idx;
}; };
struct BambuCredentials {
String ip;
String serial;
String accesscode;
bool autosend_enable;
int autosend_time;
};
#define MAX_AMS 17 // 16 normale AMS + 1 externe Spule #define MAX_AMS 17 // 16 normale AMS + 1 externe Spule
extern String amsJsonData; // Für die vorbereiteten JSON-Daten extern String amsJsonData; // Für die vorbereiteten JSON-Daten
@@ -28,9 +36,10 @@ extern bool bambu_connected;
extern int ams_count; extern int ams_count;
extern AMSData ams_data[MAX_AMS]; extern AMSData ams_data[MAX_AMS];
extern bool autoSendToBambu; //extern bool autoSendToBambu;
extern int autoSetToBambuSpoolId; extern int autoSetToBambuSpoolId;
extern bool bambuDisabled; extern bool bambuDisabled;
extern BambuCredentials bambuCredentials;
bool removeBambuCredentials(); bool removeBambuCredentials();
bool loadBambuCredentials(); bool loadBambuCredentials();

2
src/config.cpp
View File

@@ -46,8 +46,6 @@ const uint8_t webserverPort = 80;
const char* apiUrl = "/api/v1"; const char* apiUrl = "/api/v1";
// ***** API // ***** API
// ***** Bambu Auto Set Spool
uint8_t autoSetBambuAmsCounter = 60;
// ***** Bambu Auto Set Spool // ***** Bambu Auto Set Spool
// ***** Task Prios // ***** Task Prios

25
src/config.h
View File

@@ -3,6 +3,29 @@
#include <Arduino.h> #include <Arduino.h>
#define BAMBU_DEFAULT_AUTOSEND_TIME 60
#define NVS_NAMESPACE_API "api"
#define NVS_KEY_SPOOLMAN_URL "spoolmanUrl"
#define NVS_KEY_OCTOPRINT_ENABLED "octoEnabled"
#define NVS_KEY_OCTOPRINT_URL "octoUrl"
#define NVS_KEY_OCTOPRINT_TOKEN "octoToken"
#define NVS_NAMESPACE_BAMBU "bambu"
#define NVS_KEY_BAMBU_IP "bambuIp"
#define NVS_KEY_BAMBU_ACCESSCODE "bambuCode"
#define NVS_KEY_BAMBU_SERIAL "bambuSerial"
#define NVS_KEY_BAMBU_AUTOSEND_ENABLE "autosendEnable"
#define NVS_KEY_BAMBU_AUTOSEND_TIME "autosendTime"
#define NVS_NAMESPACE_SCALE "scale"
#define NVS_KEY_CALIBRATION "cal_value"
#define NVS_KEY_AUTOTARE "auto_tare"
#define BAMBU_USERNAME "bblp"
extern const uint8_t PN532_IRQ; extern const uint8_t PN532_IRQ;
extern const uint8_t PN532_RESET; extern const uint8_t PN532_RESET;
@@ -25,7 +48,7 @@ extern const uint8_t OLED_DATA_END;
extern const char* apiUrl; extern const char* apiUrl;
extern const uint8_t webserverPort; extern const uint8_t webserverPort;
extern uint8_t autoSetBambuAmsCounter;
extern const unsigned char wifi_on[]; extern const unsigned char wifi_on[];
extern const unsigned char wifi_off[]; extern const unsigned char wifi_off[];

8
src/main.cpp
View File

@@ -119,7 +119,7 @@ void loop() {
} }
// Wenn Bambu auto set Spool aktiv // Wenn Bambu auto set Spool aktiv
if (autoSendToBambu && autoSetToBambuSpoolId > 0) if (bambuCredentials.autosend_enable && autoSetToBambuSpoolId > 0)
{ {
if (!bambuDisabled && !bambu_connected) if (!bambuDisabled && !bambu_connected)
{ {
@@ -131,10 +131,10 @@ void loop() {
if (nfcReaderState == NFC_IDLE) if (nfcReaderState == NFC_IDLE)
{ {
lastAutoSetBambuAmsTime = currentMillis; lastAutoSetBambuAmsTime = currentMillis;
oledShowMessage("Auto Set " + String(autoSetBambuAmsCounter - autoAmsCounter) + "s"); oledShowMessage("Auto Set " + String(bambuCredentials.autosend_time - autoAmsCounter) + "s");
autoAmsCounter++; autoAmsCounter++;
if (autoAmsCounter >= autoSetBambuAmsCounter) if (autoAmsCounter >= bambuCredentials.autosend_time)
{ {
autoSetToBambuSpoolId = 0; autoSetToBambuSpoolId = 0;
autoAmsCounter = 0; autoAmsCounter = 0;
@@ -162,7 +162,7 @@ void loop() {
// Ausgabe der Waage auf Display // Ausgabe der Waage auf Display
if(pauseMainTask == 0) if(pauseMainTask == 0)
{ {
if (mainTaskWasPaused || (weight != lastWeight && nfcReaderState == NFC_IDLE && (!autoSendToBambu || autoSetToBambuSpoolId == 0))) if (mainTaskWasPaused || (weight != lastWeight && nfcReaderState == NFC_IDLE && (!bambuCredentials.autosend_enable || autoSetToBambuSpoolId == 0)))
{ {
(weight < 2) ? ((weight < -2) ? oledShowMessage("!! -0") : oledShowWeight(0)) : oledShowWeight(weight); (weight < 2) ? ((weight < -2) ? oledShowMessage("!! -0") : oledShowWeight(0)) : oledShowWeight(weight);
} }

3
src/nfc.cpp
View File

@@ -7,6 +7,7 @@
#include "api.h" #include "api.h"
#include "esp_task_wdt.h" #include "esp_task_wdt.h"
#include "scale.h" #include "scale.h"
#include "bambu.h"
//Adafruit_PN532 nfc(PN532_SCK, PN532_MISO, PN532_MOSI, PN532_SS); //Adafruit_PN532 nfc(PN532_SCK, PN532_MISO, PN532_MOSI, PN532_SS);
Adafruit_PN532 nfc(PN532_IRQ, PN532_RESET); Adafruit_PN532 nfc(PN532_IRQ, PN532_RESET);
@@ -447,7 +448,7 @@ void scanRfidTask(void * parameter) {
//uidString = ""; //uidString = "";
nfcJsonData = ""; nfcJsonData = "";
Serial.println("Tag entfernt"); Serial.println("Tag entfernt");
if (!autoSendToBambu) oledShowWeight(weight); if (!bambuCredentials.autosend_enable) oledShowWeight(weight);
} }
// aktualisieren der Website wenn sich der Status ändert // aktualisieren der Website wenn sich der Status ändert

16
src/scale.cpp
View File

@@ -18,11 +18,6 @@ uint8_t scale_tare_counter = 0;
bool scaleTareRequest = false; bool scaleTareRequest = false;
uint8_t pauseMainTask = 0; uint8_t pauseMainTask = 0;
uint8_t scaleCalibrated = 1; uint8_t scaleCalibrated = 1;
Preferences preferences;
const char* NVS_NAMESPACE = "scale";
const char* NVS_KEY_CALIBRATION = "cal_value";
const char* NVS_KEY_AUTOTARE = "auto_tare";
bool autoTare = true; bool autoTare = true;
// ##### Funktionen für Waage ##### // ##### Funktionen für Waage #####
@@ -32,7 +27,8 @@ uint8_t setAutoTare(bool autoTareValue) {
autoTare = autoTareValue; autoTare = autoTareValue;
// Speichern mit NVS // Speichern mit NVS
preferences.begin(NVS_NAMESPACE, false); // false = readwrite Preferences preferences;
preferences.begin(NVS_NAMESPACE_SCALE, false); // false = readwrite
preferences.putBool(NVS_KEY_AUTOTARE, autoTare); preferences.putBool(NVS_KEY_AUTOTARE, autoTare);
preferences.end(); preferences.end();
@@ -90,7 +86,8 @@ void start_scale(bool touchSensorConnected) {
float calibrationValue; float calibrationValue;
// NVS lesen // NVS lesen
preferences.begin(NVS_NAMESPACE, true); // true = readonly Preferences preferences;
preferences.begin(NVS_NAMESPACE_SCALE, true); // true = readonly
calibrationValue = preferences.getFloat(NVS_KEY_CALIBRATION, defaultScaleCalibrationValue); calibrationValue = preferences.getFloat(NVS_KEY_CALIBRATION, defaultScaleCalibrationValue);
// auto Tare // auto Tare
@@ -197,12 +194,13 @@ uint8_t calibrate_scale() {
Serial.println(newCalibrationValue); Serial.println(newCalibrationValue);
// Speichern mit NVS // Speichern mit NVS
preferences.begin(NVS_NAMESPACE, false); // false = readwrite Preferences preferences;
preferences.begin(NVS_NAMESPACE_SCALE, false); // false = readwrite
preferences.putFloat(NVS_KEY_CALIBRATION, newCalibrationValue); preferences.putFloat(NVS_KEY_CALIBRATION, newCalibrationValue);
preferences.end(); preferences.end();
// Verifizieren // Verifizieren
preferences.begin(NVS_NAMESPACE, true); preferences.begin(NVS_NAMESPACE_SCALE, true);
float verifyValue = preferences.getFloat(NVS_KEY_CALIBRATION, 0); float verifyValue = preferences.getFloat(NVS_KEY_CALIBRATION, 0);
preferences.end(); preferences.end();

34
src/website.cpp
View File

@@ -10,6 +10,7 @@
#include <Update.h> #include <Update.h>
#include "display.h" #include "display.h"
#include "ota.h" #include "ota.h"
#include "config.h"
#ifndef VERSION #ifndef VERSION
#define VERSION "1.1.0" #define VERSION "1.1.0"
@@ -195,6 +196,9 @@ void setupWebserver(AsyncWebServer &server) {
Serial.print("Geladene Spoolman-URL: "); Serial.print("Geladene Spoolman-URL: ");
Serial.println(spoolmanUrl); Serial.println(spoolmanUrl);
// Load Bamb credentials:
loadBambuCredentials();
// Route für about // Route für about
server.on("/about", HTTP_GET, [](AsyncWebServerRequest *request){ server.on("/about", HTTP_GET, [](AsyncWebServerRequest *request){
Serial.println("Anfrage für /about erhalten"); Serial.println("Anfrage für /about erhalten");
@@ -254,31 +258,11 @@ void setupWebserver(AsyncWebServer &server) {
html.replace("{{spoolmanOctoUrl}}", (octoUrl != "") ? octoUrl : ""); html.replace("{{spoolmanOctoUrl}}", (octoUrl != "") ? octoUrl : "");
html.replace("{{spoolmanOctoToken}}", (octoToken != "") ? octoToken : ""); html.replace("{{spoolmanOctoToken}}", (octoToken != "") ? octoToken : "");
JsonDocument doc; html.replace("{{bambuIp}}", bambuCredentials.ip);
if (loadJsonValue("/bambu_credentials.json", doc) && doc["bambu_ip"].is<String>()) html.replace("{{bambuSerial}}", bambuCredentials.serial);
{ html.replace("{{bambuCode}}", bambuCredentials.accesscode ? bambuCredentials.accesscode : "");
String bambuIp = doc["bambu_ip"].as<String>(); html.replace("{{autoSendToBambu}}", bambuCredentials.autosend_enable ? "checked" : "");
String bambuSerial = doc["bambu_serialnr"].as<String>(); html.replace("{{autoSendTime}}", (bambuCredentials.autosend_time != 0) ? String(bambuCredentials.autosend_time) : String(BAMBU_DEFAULT_AUTOSEND_TIME));
String bambuCode = doc["bambu_accesscode"].as<String>();
autoSendToBambu = doc["autoSendToBambu"].as<bool>();
bambuIp.trim();
bambuSerial.trim();
bambuCode.trim();
html.replace("{{bambuIp}}", bambuIp ? bambuIp : "");
html.replace("{{bambuSerial}}", bambuSerial ? bambuSerial : "");
html.replace("{{bambuCode}}", bambuCode ? bambuCode : "");
html.replace("{{autoSendToBambu}}", autoSendToBambu ? "checked" : "");
html.replace("{{autoSendTime}}", String(autoSetBambuAmsCounter));
}
else
{
html.replace("{{bambuIp}}", "");
html.replace("{{bambuSerial}}", "");
html.replace("{{bambuCode}}", "");
html.replace("{{autoSendToBambu}}", "");
html.replace("{{autoSendTime}}", String(autoSetBambuAmsCounter));
}
request->send(200, "text/html", html); request->send(200, "text/html", html);
}); });