Compare commits
11 Commits
Author | SHA1 | Date | |
---|---|---|---|
190e952ec4 | |||
89620a7f00 | |||
536950eeb3 | |||
43719aac41 | |||
16d0079f7a | |||
48b9bf7076 | |||
b6bd4cb9ad | |||
e89bb1d547 | |||
f25789d703 | |||
65d8cd675f | |||
9dfe75ffa2 |
21
CHANGELOG.md
21
CHANGELOG.md
@ -1,5 +1,26 @@
|
|||||||
# 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
|
## [1.4.4] - 2025-03-23
|
||||||
### Added
|
### Added
|
||||||
- add error handling for missing vendor IDs in filament data
|
- add error handling for missing vendor IDs in filament data
|
||||||
|
@ -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
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
; https://docs.platformio.org/page/projectconf.html
|
; https://docs.platformio.org/page/projectconf.html
|
||||||
|
|
||||||
[common]
|
[common]
|
||||||
version = "1.4.4"
|
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;
|
||||||
}
|
}
|
||||||
@ -557,7 +557,7 @@ void reconnect() {
|
|||||||
if (client.connect(clientId.c_str(), bambu_username, bambu_accesscode)) {
|
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 {
|
||||||
@ -624,9 +624,8 @@ bool setupMqtt() {
|
|||||||
if (client.connect(clientId.c_str(), bambu_username, bambu_accesscode))
|
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");
|
||||||
@ -636,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. */
|
||||||
|
Reference in New Issue
Block a user