Compare commits
15 Commits
Author | SHA1 | Date | |
---|---|---|---|
190e952ec4 | |||
89620a7f00 | |||
536950eeb3 | |||
43719aac41 | |||
16d0079f7a | |||
48b9bf7076 | |||
b6bd4cb9ad | |||
e89bb1d547 | |||
f25789d703 | |||
65d8cd675f | |||
9dfe75ffa2 | |||
68cdd8ab40 | |||
1069781931 | |||
eada54eff2 | |||
48301ade36 |
32
CHANGELOG.md
32
CHANGELOG.md
@ -1,5 +1,37 @@
|
||||
# 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
|
||||
|
@ -490,7 +490,7 @@ function handleSpoolIn(amsId, trayId) {
|
||||
nozzle_temp_max: parseInt(maxTemp),
|
||||
type: selectedSpool.filament.material,
|
||||
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
|
||||
}
|
||||
};
|
||||
|
@ -147,6 +147,13 @@ function updateFilamentDropdown(selectedSmId = null) {
|
||||
|
||||
if (vendorId) {
|
||||
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 &&
|
||||
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
|
||||
document.addEventListener('DOMContentLoaded', () => {
|
||||
initSpoolman();
|
||||
|
@ -9,7 +9,7 @@
|
||||
; https://docs.platformio.org/page/projectconf.html
|
||||
|
||||
[common]
|
||||
version = "1.4.3"
|
||||
version = "1.4.6"
|
||||
to_old_version = "1.4.0"
|
||||
|
||||
##
|
||||
|
@ -17,7 +17,7 @@ PubSubClient client(sslClient);
|
||||
|
||||
TaskHandle_t BambuMqttTask;
|
||||
|
||||
String report_topic = "";
|
||||
String topic = "";
|
||||
//String request_topic = "";
|
||||
const char* bambu_username = "bblp";
|
||||
const char* bambu_ip = nullptr;
|
||||
@ -91,7 +91,7 @@ bool loadBambuCredentials() {
|
||||
bambu_accesscode = g_bambu_accesscode.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";
|
||||
return true;
|
||||
}
|
||||
@ -199,7 +199,7 @@ FilamentResult findFilamentIdx(String brand, String type) {
|
||||
bool sendMqttMessage(const String& payload) {
|
||||
Serial.println("Sending MQTT message");
|
||||
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;
|
||||
}
|
||||
@ -557,7 +557,7 @@ void reconnect() {
|
||||
if (client.connect(clientId.c_str(), bambu_username, bambu_accesscode)) {
|
||||
Serial.println("MQTT re/connected");
|
||||
|
||||
client.subscribe(report_topic.c_str());
|
||||
client.subscribe((String(topic) + "/report").c_str());
|
||||
bambu_connected = true;
|
||||
oledShowTopRow();
|
||||
} else {
|
||||
@ -624,9 +624,8 @@ bool setupMqtt() {
|
||||
if (client.connect(clientId.c_str(), bambu_username, bambu_accesscode))
|
||||
{
|
||||
client.setCallback(mqtt_callback);
|
||||
client.setBufferSize(5120);
|
||||
client.subscribe(report_topic.c_str());
|
||||
//client.subscribe(request_topic.c_str());
|
||||
client.setBufferSize(15488);
|
||||
client.subscribe((String(topic) + "/report").c_str());
|
||||
Serial.println("MQTT-Client initialisiert");
|
||||
|
||||
oledShowMessage("Bambu Connected");
|
||||
@ -636,7 +635,7 @@ bool setupMqtt() {
|
||||
xTaskCreatePinnedToCore(
|
||||
mqtt_loop, /* Function to implement the task */
|
||||
"BambuMqtt", /* Name of the task */
|
||||
10240, /* Stack size in words */
|
||||
8192, /* Stack size in words */
|
||||
NULL, /* Task input parameter */
|
||||
mqttTaskPrio, /* Priority of the task */
|
||||
&BambuMqttTask, /* Task handle. */
|
||||
|
@ -159,7 +159,7 @@ void loop() {
|
||||
lastWeightReadTime = currentMillis;
|
||||
|
||||
// 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)
|
||||
{
|
||||
|
Reference in New Issue
Block a user