merge upstream changes

Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>
This commit is contained in:
SoftFever 2023-01-21 00:37:10 +08:00
parent 1bdedb1c47
commit 2492e5d39c
156 changed files with 33597 additions and 65667 deletions

View file

@ -35,12 +35,12 @@ namespace BBL {
#define BAMBU_NETWORK_ERR_GET_MODEL_PUBLISH_PAGE -26
#define BAMBU_NETWORK_ERR_GET_MODEL_MALL_HOME_PAGE -27
#define BAMBU_NETWORK_ERR_GET_USER_INFO -28
#define BAMBU_NETWORK_ERR_WRONG_IP_ADDRESS -29
#define BAMBU_NETWORK_LIBRARY "bambu_networking"
#define BAMBU_NETWORK_AGENT_NAME "bambu_network_agent"
#define BAMBU_NETWORK_AGENT_VERSION "01.04.01.01"
#define BAMBU_NETWORK_AGENT_VERSION "01.04.02.02"
//iot preset type strings
#define IOT_PRINTER_TYPE_STRING "printer"
@ -128,6 +128,7 @@ struct PrintParams {
/* access options */
std::string dev_ip;
bool use_ssl;
std::string username;
std::string password;