Compare commits
22 Commits
b5279b167a
...
v1.4.6
Author | SHA1 | Date | |
---|---|---|---|
190e952ec4 | |||
89620a7f00 | |||
536950eeb3 | |||
43719aac41 | |||
16d0079f7a | |||
48b9bf7076 | |||
b6bd4cb9ad | |||
e89bb1d547 | |||
f25789d703 | |||
|
65d8cd675f | ||
9dfe75ffa2 | |||
68cdd8ab40 | |||
1069781931 | |||
eada54eff2 | |||
48301ade36 | |||
76e0b20393 | |||
a765b39896 | |||
d68f6c4a89 | |||
1702e2396e | |||
af23b07df1 | |||
dd7ba3bf5d | |||
a818dcd3c0 |
55
CHANGELOG.md
55
CHANGELOG.md
@@ -1,5 +1,60 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## [1.4.6] - 2025-03-26
|
||||||
|
### Changed
|
||||||
|
- update platformio.ini for version v1.4.6
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
- handle potential undefined value for tray_info_idx in handleSpoolIn function, by @tugsi
|
||||||
|
|
||||||
|
|
||||||
|
## [1.4.5] - 2025-03-25
|
||||||
|
### Changed
|
||||||
|
- update platformio.ini for version v1.4.5
|
||||||
|
- Merge branch 'testing'
|
||||||
|
- remove unused request_topic subscription and reduce MQTT task stack size
|
||||||
|
- Merge pull request #26 from tugsi/main
|
||||||
|
- rename report_topic to topic and update MQTT subscription logic, switched publish topic to request
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
- increase MQTT buffer size and adjust task stack size
|
||||||
|
- Fix BufferSize for larger JSONs from X-Series
|
||||||
|
|
||||||
|
|
||||||
|
## [1.4.4] - 2025-03-23
|
||||||
|
### Added
|
||||||
|
- add error handling for missing vendor IDs in filament data
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
- update platformio.ini for version v1.4.4
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
- adjust weight threshold for tare check to allow negative values
|
||||||
|
|
||||||
|
|
||||||
|
## [1.4.3] - 2025-03-23
|
||||||
|
### Changed
|
||||||
|
- update platformio.ini for version v1.4.3
|
||||||
|
|
||||||
|
|
||||||
|
## [1.4.2] - 2025-03-23
|
||||||
|
### Added
|
||||||
|
- add WiFi connection check and restart Bambu if not connected
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
- update platformio.ini for version v1.4.2
|
||||||
|
- increase stack size for BambuMqtt task
|
||||||
|
- update Discord Link
|
||||||
|
- update Discord Link
|
||||||
|
- remove commented-out subscription topic in MQTT setup
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
- use unique client ID for MQTT connection to avoid conflicts
|
||||||
|
- reload page after firmware update completion
|
||||||
|
- increase WiFi connection timeout from 5 to 10 seconds
|
||||||
|
- ensure valid URL format and remove trailing slash in setupWebserver
|
||||||
|
|
||||||
|
|
||||||
## [1.4.1] - 2025-03-10
|
## [1.4.1] - 2025-03-10
|
||||||
### Added
|
### Added
|
||||||
- added new .step, now with correct individual parts
|
- added new .step, now with correct individual parts
|
||||||
|
@@ -490,7 +490,7 @@ function handleSpoolIn(amsId, trayId) {
|
|||||||
nozzle_temp_max: parseInt(maxTemp),
|
nozzle_temp_max: parseInt(maxTemp),
|
||||||
type: selectedSpool.filament.material,
|
type: selectedSpool.filament.material,
|
||||||
brand: selectedSpool.filament.vendor.name,
|
brand: selectedSpool.filament.vendor.name,
|
||||||
tray_info_idx: selectedSpool.filament.extra.bambu_idx.replace(/['"]+/g, '').trim(),
|
tray_info_idx: selectedSpool.filament.extra.bambu_idx?.replace(/['"]+/g, '').trim() || '',
|
||||||
cali_idx: "-1" // Default-Wert setzen
|
cali_idx: "-1" // Default-Wert setzen
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@@ -147,6 +147,13 @@ function updateFilamentDropdown(selectedSmId = null) {
|
|||||||
|
|
||||||
if (vendorId) {
|
if (vendorId) {
|
||||||
const filteredFilaments = spoolsData.filter(spool => {
|
const filteredFilaments = spoolsData.filter(spool => {
|
||||||
|
if (!spool?.filament?.vendor?.id) {
|
||||||
|
console.log('Problem aufgetreten bei: ', spool?.filament?.vendor);
|
||||||
|
console.log('Problematische Spulen:',
|
||||||
|
spoolsData.filter(spool => !spool?.filament?.vendor?.id));
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
const hasValidNfcId = spool.extra &&
|
const hasValidNfcId = spool.extra &&
|
||||||
spool.extra.nfc_id &&
|
spool.extra.nfc_id &&
|
||||||
spool.extra.nfc_id !== '""' &&
|
spool.extra.nfc_id !== '""' &&
|
||||||
@@ -240,18 +247,6 @@ async function fetchSpoolData() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
// Exportiere Funktionen
|
|
||||||
window.getSpoolData = () => spoolsData;
|
|
||||||
window.reloadSpoolData = initSpoolman;
|
|
||||||
window.populateVendorDropdown = populateVendorDropdown;
|
|
||||||
window.updateFilamentDropdown = updateFilamentDropdown;
|
|
||||||
window.toggleFilamentDropdown = () => {
|
|
||||||
const content = document.getElementById("filament-dropdown-content");
|
|
||||||
content.classList.toggle("show");
|
|
||||||
};
|
|
||||||
*/
|
|
||||||
|
|
||||||
// Event Listener
|
// Event Listener
|
||||||
document.addEventListener('DOMContentLoaded', () => {
|
document.addEventListener('DOMContentLoaded', () => {
|
||||||
initSpoolman();
|
initSpoolman();
|
||||||
|
@@ -129,6 +129,7 @@
|
|||||||
if (data.status === 'success' || lastReceivedProgress >= 98) {
|
if (data.status === 'success' || lastReceivedProgress >= 98) {
|
||||||
clearTimeout(wsReconnectTimer);
|
clearTimeout(wsReconnectTimer);
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
|
window.location.reload(true);
|
||||||
window.location.href = '/';
|
window.location.href = '/';
|
||||||
}, 30000);
|
}, 30000);
|
||||||
}
|
}
|
||||||
@@ -148,6 +149,7 @@
|
|||||||
status.style.display = 'block';
|
status.style.display = 'block';
|
||||||
clearTimeout(wsReconnectTimer);
|
clearTimeout(wsReconnectTimer);
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
|
window.location.reload(true);
|
||||||
window.location.href = '/';
|
window.location.href = '/';
|
||||||
}, 30000);
|
}, 30000);
|
||||||
} else {
|
} else {
|
||||||
|
@@ -9,7 +9,7 @@
|
|||||||
; https://docs.platformio.org/page/projectconf.html
|
; https://docs.platformio.org/page/projectconf.html
|
||||||
|
|
||||||
[common]
|
[common]
|
||||||
version = "1.4.1"
|
version = "1.4.6"
|
||||||
to_old_version = "1.4.0"
|
to_old_version = "1.4.0"
|
||||||
|
|
||||||
##
|
##
|
||||||
|
@@ -17,7 +17,7 @@ PubSubClient client(sslClient);
|
|||||||
|
|
||||||
TaskHandle_t BambuMqttTask;
|
TaskHandle_t BambuMqttTask;
|
||||||
|
|
||||||
String report_topic = "";
|
String topic = "";
|
||||||
//String request_topic = "";
|
//String request_topic = "";
|
||||||
const char* bambu_username = "bblp";
|
const char* bambu_username = "bblp";
|
||||||
const char* bambu_ip = nullptr;
|
const char* bambu_ip = nullptr;
|
||||||
@@ -91,7 +91,7 @@ bool loadBambuCredentials() {
|
|||||||
bambu_accesscode = g_bambu_accesscode.c_str();
|
bambu_accesscode = g_bambu_accesscode.c_str();
|
||||||
bambu_serialnr = g_bambu_serialnr.c_str();
|
bambu_serialnr = g_bambu_serialnr.c_str();
|
||||||
|
|
||||||
report_topic = "device/" + String(bambu_serialnr) + "/report";
|
topic = "device/" + String(bambu_serialnr);
|
||||||
//request_topic = "device/" + String(bambu_serialnr) + "/request";
|
//request_topic = "device/" + String(bambu_serialnr) + "/request";
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@@ -199,7 +199,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(report_topic.c_str(), payload.c_str()))
|
if (client.publish((String(topic) + "/request").c_str(), payload.c_str()))
|
||||||
{
|
{
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@@ -553,10 +553,11 @@ void reconnect() {
|
|||||||
oledShowTopRow();
|
oledShowTopRow();
|
||||||
|
|
||||||
// Attempt to connect
|
// Attempt to connect
|
||||||
if (client.connect(bambu_serialnr, bambu_username, bambu_accesscode)) {
|
String clientId = String(bambu_serialnr) + "_" + String(random(0, 100));
|
||||||
|
if (client.connect(clientId.c_str(), bambu_username, bambu_accesscode)) {
|
||||||
Serial.println("MQTT re/connected");
|
Serial.println("MQTT re/connected");
|
||||||
|
|
||||||
client.subscribe(report_topic.c_str());
|
client.subscribe((String(topic) + "/report").c_str());
|
||||||
bambu_connected = true;
|
bambu_connected = true;
|
||||||
oledShowTopRow();
|
oledShowTopRow();
|
||||||
} else {
|
} else {
|
||||||
@@ -619,12 +620,12 @@ bool setupMqtt() {
|
|||||||
|
|
||||||
// Verbinden mit dem MQTT-Server
|
// Verbinden mit dem MQTT-Server
|
||||||
bool connected = true;
|
bool connected = true;
|
||||||
if (client.connect(bambu_serialnr, bambu_username, bambu_accesscode))
|
String clientId = String(bambu_serialnr) + "_" + String(random(0, 100));
|
||||||
|
if (client.connect(clientId.c_str(), bambu_username, bambu_accesscode))
|
||||||
{
|
{
|
||||||
client.setCallback(mqtt_callback);
|
client.setCallback(mqtt_callback);
|
||||||
client.setBufferSize(5120);
|
client.setBufferSize(15488);
|
||||||
client.subscribe(report_topic.c_str());
|
client.subscribe((String(topic) + "/report").c_str());
|
||||||
//client.subscribe(request_topic.c_str());
|
|
||||||
Serial.println("MQTT-Client initialisiert");
|
Serial.println("MQTT-Client initialisiert");
|
||||||
|
|
||||||
oledShowMessage("Bambu Connected");
|
oledShowMessage("Bambu Connected");
|
||||||
@@ -634,7 +635,7 @@ bool setupMqtt() {
|
|||||||
xTaskCreatePinnedToCore(
|
xTaskCreatePinnedToCore(
|
||||||
mqtt_loop, /* Function to implement the task */
|
mqtt_loop, /* Function to implement the task */
|
||||||
"BambuMqtt", /* Name of the task */
|
"BambuMqtt", /* Name of the task */
|
||||||
10240, /* Stack size in words */
|
8192, /* Stack size in words */
|
||||||
NULL, /* Task input parameter */
|
NULL, /* Task input parameter */
|
||||||
mqttTaskPrio, /* Priority of the task */
|
mqttTaskPrio, /* Priority of the task */
|
||||||
&BambuMqttTask, /* Task handle. */
|
&BambuMqttTask, /* Task handle. */
|
||||||
|
@@ -159,7 +159,7 @@ void loop() {
|
|||||||
lastWeightReadTime = currentMillis;
|
lastWeightReadTime = currentMillis;
|
||||||
|
|
||||||
// Prüfen ob die Waage korrekt genullt ist
|
// Prüfen ob die Waage korrekt genullt ist
|
||||||
if ((weight > 0 && weight < 5) || weight < 0)
|
if ((weight > 0 && weight < 5) || weight < -1)
|
||||||
{
|
{
|
||||||
if(scaleTareCounter < 5)
|
if(scaleTareCounter < 5)
|
||||||
{
|
{
|
||||||
|
@@ -59,7 +59,7 @@ void initWiFi() {
|
|||||||
if(wm_nonblocking) wm.setConfigPortalBlocking(false);
|
if(wm_nonblocking) wm.setConfigPortalBlocking(false);
|
||||||
//wm.setConfigPortalTimeout(320); // Portal nach 5min schließen
|
//wm.setConfigPortalTimeout(320); // Portal nach 5min schließen
|
||||||
wm.setWiFiAutoReconnect(true);
|
wm.setWiFiAutoReconnect(true);
|
||||||
wm.setConnectTimeout(5);
|
wm.setConnectTimeout(10);
|
||||||
|
|
||||||
oledShowTopRow();
|
oledShowTopRow();
|
||||||
oledShowMessage("WiFi Setup");
|
oledShowMessage("WiFi Setup");
|
||||||
|
Reference in New Issue
Block a user