feat: add printer model selection and handling in Bambu integration

This commit is contained in:
Manuel Weiser committed 2026-02-11 15:30:44 +01:00
1 parent 1b4701bf76
commit 6043835353
5 files changed
+134 -6

No files matched your search

+33 -1
View File
@@ -108,8 +108,9 @@
const code = document.getElementById('bambuCode').value;
const autoSend = document.getElementById('autoSend').checked;
const autoSendTime = document.getElementById('autoSendTime').value;
const printerModel = document.getElementById('printerModel').value;
fetch(`/api/bambu?bambu_ip=${encodeURIComponent(ip)}&bambu_serialnr=${encodeURIComponent(serial)}&bambu_accesscode=${encodeURIComponent(code)}&autoSend=${autoSend}&autoSendTime=${autoSendTime}`)
fetch(`/api/bambu?bambu_ip=${encodeURIComponent(ip)}&bambu_serialnr=${encodeURIComponent(serial)}&bambu_accesscode=${encodeURIComponent(code)}&autoSend=${autoSend}&autoSendTime=${autoSendTime}&printerModel=${encodeURIComponent(printerModel)}`)
.then(response => response.json())
.then(data => {
if (data.healthy) {
@@ -139,6 +140,19 @@
</script>
<script>
var spoolmanUrl = "{{spoolmanUrl}}";
var savedPrinterModel = "{{printerModel}}";
/**
* Sets the printer model dropdown to the saved value after page load
*/
document.addEventListener('DOMContentLoaded', function() {
if (savedPrinterModel && savedPrinterModel !== "Unknown") {
const select = document.getElementById('printerModel');
if (select) {
select.value = savedPrinterModel;
}
}
});
</script>
<div class="content">
@@ -180,6 +194,24 @@
<label for="bambuCode">Access Code:</label>
<input type="text" id="bambuCode" placeholder="Access Code of the printer" value="{{bambuCode}}">
</div>
<div class="input-group">
<label for="printerModel">Printer Model:</label>
<select id="printerModel" class="styled-select">
<option value="Unknown">-- Select Model --</option>
<option value="X1C">X1 Carbon (X1C)</option>
<option value="X1">X1</option>
<option value="X1E">X1E</option>
<option value="P1P">P1P</option>
<option value="P1S">P1S</option>
<option value="P2S">P2S</option>
<option value="A1">A1</option>
<option value="A1 Mini">A1 Mini</option>
<option value="H2D">H2D</option>
<option value="H2D Pro">H2D Pro</option>
<option value="H2C">H2C</option>
<option value="H2S">H2S</option>
</select>
</div>
<hr>
<p>If activated, FilaMan will automatically update the next filled tray with the last scanned and weighed spool.</p>
<div class="input-group" style="display: flex; margin-bottom: 0;">
+72 -2
View File
@@ -12,6 +12,68 @@
#include "display.h"
#include <Preferences.h>
/**
* Converts BambuPrinterModel enum to human-readable string
* @param model The printer model enum value
* @return Display name string for the printer model
*/
const char* printerModelToString(BambuPrinterModel model) {
switch (model) {
case MODEL_X1C: return "X1C";
case MODEL_X1: return "X1";
case MODEL_X1E: return "X1E";
case MODEL_P1P: return "P1P";
case MODEL_P1S: return "P1S";
case MODEL_P2S: return "P2S";
case MODEL_A1: return "A1";
case MODEL_A1_MINI: return "A1 Mini";
case MODEL_H2D: return "H2D";
case MODEL_H2D_PRO: return "H2D Pro";
case MODEL_H2C: return "H2C";
case MODEL_H2S: return "H2S";
default: return "Unknown";
}
}
/**
* Converts a string to the corresponding BambuPrinterModel enum
* @param modelStr The model string (e.g. "X1C", "A1 Mini")
* @return Matching BambuPrinterModel enum value
*/
BambuPrinterModel stringToPrinterModel(const String& modelStr) {
if (modelStr == "X1C") return MODEL_X1C;
if (modelStr == "X1") return MODEL_X1;
if (modelStr == "X1E") return MODEL_X1E;
if (modelStr == "P1P") return MODEL_P1P;
if (modelStr == "P1S") return MODEL_P1S;
if (modelStr == "P2S") return MODEL_P2S;
if (modelStr == "A1") return MODEL_A1;
if (modelStr == "A1 Mini") return MODEL_A1_MINI;
if (modelStr == "H2D") return MODEL_H2D;
if (modelStr == "H2D Pro") return MODEL_H2D_PRO;
if (modelStr == "H2C") return MODEL_H2C;
if (modelStr == "H2S") return MODEL_H2S;
return MODEL_UNKNOWN;
}
/**
* Checks if the given model belongs to the H2 series (dual nozzle / office printers)
* @param model The printer model to check
* @return true if H2D, H2D Pro, H2C, or H2S
*/
bool isH2Series(BambuPrinterModel model) {
return model == MODEL_H2D || model == MODEL_H2D_PRO || model == MODEL_H2C || model == MODEL_H2S;
}
/**
* Checks if the given model belongs to the A1 series
* @param model The printer model to check
* @return true if A1 or A1 Mini
*/
bool isA1Series(BambuPrinterModel model) {
return model == MODEL_A1 || model == MODEL_A1_MINI;
}
WiFiClient espClient;
SSLClient sslClient(&espClient);
PubSubClient client(sslClient);
@@ -43,6 +105,7 @@ bool removeBambuCredentials() {
preferences.remove(NVS_KEY_BAMBU_ACCESSCODE);
preferences.remove(NVS_KEY_BAMBU_AUTOSEND_ENABLE);
preferences.remove(NVS_KEY_BAMBU_AUTOSEND_TIME);
preferences.remove(NVS_KEY_BAMBU_PRINTER_MODEL);
preferences.end();
// Löschen der globalen Variablen
@@ -51,6 +114,7 @@ bool removeBambuCredentials() {
bambuCredentials.accesscode = "";
bambuCredentials.autosend_enable = false;
bambuCredentials.autosend_time = BAMBU_DEFAULT_AUTOSEND_TIME;
bambuCredentials.printer_model = MODEL_UNKNOWN;
autoSetToBambuSpoolId = 0;
ams_count = 0;
@@ -61,7 +125,7 @@ bool removeBambuCredentials() {
return true;
}
bool saveBambuCredentials(const String& ip, const String& serialnr, const String& accesscode, bool autoSend, const String& autoSendTime) {
bool saveBambuCredentials(const String& ip, const String& serialnr, const String& accesscode, bool autoSend, const String& autoSendTime, const String& printerModel) {
if (BambuMqttTask) {
vTaskDelete(BambuMqttTask);
BambuMqttTask = NULL;
@@ -72,6 +136,7 @@ bool saveBambuCredentials(const String& ip, const String& serialnr, const String
bambuCredentials.accesscode = accesscode.c_str();
bambuCredentials.autosend_enable = autoSend;
bambuCredentials.autosend_time = autoSendTime.toInt();
bambuCredentials.printer_model = stringToPrinterModel(printerModel);
Preferences preferences;
preferences.begin(NVS_NAMESPACE_BAMBU, false); // false = readwrite
@@ -80,6 +145,7 @@ bool saveBambuCredentials(const String& ip, const String& serialnr, const String
preferences.putString(NVS_KEY_BAMBU_ACCESSCODE, bambuCredentials.accesscode);
preferences.putBool(NVS_KEY_BAMBU_AUTOSEND_ENABLE, bambuCredentials.autosend_enable);
preferences.putInt(NVS_KEY_BAMBU_AUTOSEND_TIME, bambuCredentials.autosend_time);
preferences.putUChar(NVS_KEY_BAMBU_PRINTER_MODEL, (uint8_t)bambuCredentials.printer_model);
preferences.end();
vTaskDelay(100 / portTICK_PERIOD_MS);
@@ -96,6 +162,7 @@ bool loadBambuCredentials() {
String code = preferences.getString(NVS_KEY_BAMBU_ACCESSCODE, "");
bool autosendEnable = preferences.getBool(NVS_KEY_BAMBU_AUTOSEND_ENABLE, false);
int autosendTime = preferences.getInt(NVS_KEY_BAMBU_AUTOSEND_TIME, BAMBU_DEFAULT_AUTOSEND_TIME);
uint8_t printerModelVal = preferences.getUChar(NVS_KEY_BAMBU_PRINTER_MODEL, (uint8_t)MODEL_UNKNOWN);
preferences.end();
if(ip != ""){
@@ -104,6 +171,7 @@ bool loadBambuCredentials() {
bambuCredentials.accesscode = code.c_str();
bambuCredentials.autosend_enable = autosendEnable;
bambuCredentials.autosend_time = autosendTime;
bambuCredentials.printer_model = (BambuPrinterModel)printerModelVal;
Serial.println("credentials loaded loadCredentials!");
Serial.println(bambuCredentials.ip);
@@ -111,6 +179,7 @@ bool loadBambuCredentials() {
Serial.println(bambuCredentials.accesscode);
Serial.println(String(bambuCredentials.autosend_enable));
Serial.println(String(bambuCredentials.autosend_time));
Serial.println("Printer model: " + String(printerModelToString(bambuCredentials.printer_model)));
return true;
}
@@ -230,7 +299,7 @@ bool sendMqttMessage(const String& payload) {
}
bool setBambuSpool(String payload) {
Serial.println("Spool settings in");
Serial.println("Spool settings in (model: " + String(printerModelToString(bambuCredentials.printer_model)) + ")");
Serial.println(payload);
// Parse the JSON
@@ -632,6 +701,7 @@ bool setupMqtt() {
{
oledShowProgressBar(4, 7, DISPLAY_BOOT_TEXT, "Bambu init");
bambuDisabled = false;
Serial.println("Connecting to Bambu printer model: " + String(printerModelToString(bambuCredentials.printer_model)));
sslClient.setCACert(root_ca);
sslClient.setInsecure();
client.setServer(bambuCredentials.ip.c_str(), 8883);
+23 -1
View File
@@ -4,6 +4,23 @@
#include <Arduino.h>
#include <ArduinoJson.h>
// Supported Bambu Lab printer model identifiers
enum BambuPrinterModel : uint8_t {
MODEL_UNKNOWN = 0,
MODEL_X1C,
MODEL_X1,
MODEL_X1E,
MODEL_P1P,
MODEL_P1S,
MODEL_P2S,
MODEL_A1,
MODEL_A1_MINI,
MODEL_H2D,
MODEL_H2D_PRO,
MODEL_H2C,
MODEL_H2S
};
struct TrayData {
uint8_t id;
String tray_info_idx;
@@ -22,6 +39,7 @@ struct BambuCredentials {
String accesscode;
bool autosend_enable;
int autosend_time;
BambuPrinterModel printer_model;
};
#define MAX_AMS 17 // 16 normale AMS + 1 externe Spule
@@ -43,7 +61,11 @@ extern BambuCredentials bambuCredentials;
bool removeBambuCredentials();
bool loadBambuCredentials();
bool saveBambuCredentials(const String& bambu_ip, const String& bambu_serialnr, const String& bambu_accesscode, const bool autoSend, const String& autoSendTime);
bool saveBambuCredentials(const String& bambu_ip, const String& bambu_serialnr, const String& bambu_accesscode, const bool autoSend, const String& autoSendTime, const String& printerModel);
const char* printerModelToString(BambuPrinterModel model);
BambuPrinterModel stringToPrinterModel(const String& modelStr);
bool isH2Series(BambuPrinterModel model);
bool isA1Series(BambuPrinterModel model);
bool setupMqtt();
void mqtt_loop(void * parameter);
bool setBambuSpool(String payload);
+1
View File
@@ -17,6 +17,7 @@
#define NVS_KEY_BAMBU_SERIAL "bambuSerial"
#define NVS_KEY_BAMBU_AUTOSEND_ENABLE "autosendEnable"
#define NVS_KEY_BAMBU_AUTOSEND_TIME "autosendTime"
#define NVS_KEY_BAMBU_PRINTER_MODEL "printerModel"
#define NVS_NAMESPACE_SCALE "scale"
#define NVS_KEY_CALIBRATION "cal_value"
+5 -2
View File
@@ -280,6 +280,7 @@ void setupWebserver(AsyncWebServer &server) {
html.replace("{{bambuCode}}", bambuCredentials.accesscode ? bambuCredentials.accesscode : "");
html.replace("{{autoSendToBambu}}", bambuCredentials.autosend_enable ? "checked" : "");
html.replace("{{autoSendTime}}", (bambuCredentials.autosend_time != 0) ? String(bambuCredentials.autosend_time) : String(BAMBU_DEFAULT_AUTOSEND_TIME));
html.replace("{{printerModel}}", String(printerModelToString(bambuCredentials.printer_model)));
request->send(200, "text/html", html);
});
@@ -330,7 +331,7 @@ void setupWebserver(AsyncWebServer &server) {
return;
}
if (!request->hasParam("bambu_ip") || !request->hasParam("bambu_serialnr") || !request->hasParam("bambu_accesscode")) {
if (!request->hasParam("bambu_ip") || !request->hasParam("bambu_serialnr") || !request->hasParam("bambu_accesscode") || !request->hasParam("printerModel")) {
request->send(400, "application/json", "{\"success\": false, \"error\": \"Missing parameter\"}");
return;
}
@@ -340,18 +341,20 @@ void setupWebserver(AsyncWebServer &server) {
String bambu_accesscode = request->getParam("bambu_accesscode")->value();
bool autoSend = (request->getParam("autoSend")->value() == "true") ? true : false;
String autoSendTime = request->getParam("autoSendTime")->value();
String printerModel = request->getParam("printerModel")->value();
bambu_ip.trim();
bambu_serialnr.trim();
bambu_accesscode.trim();
autoSendTime.trim();
printerModel.trim();
if (bambu_ip.length() == 0 || bambu_serialnr.length() == 0 || bambu_accesscode.length() == 0) {
request->send(400, "application/json", "{\"success\": false, \"error\": \"Empty parameter\"}");
return;
}
bool success = saveBambuCredentials(bambu_ip, bambu_serialnr, bambu_accesscode, autoSend, autoSendTime);
bool success = saveBambuCredentials(bambu_ip, bambu_serialnr, bambu_accesscode, autoSend, autoSendTime, printerModel);
request->send(200, "application/json", "{\"healthy\": " + String(success ? "true" : "false") + "}");
});