diff --git a/resources/profiles/Snapmaker/machine/Snapmaker U1 (0.2 nozzle).json b/resources/profiles/Snapmaker/machine/Snapmaker U1 (0.2 nozzle).json index 978de4eadfc..7663d34be3d 100644 --- a/resources/profiles/Snapmaker/machine/Snapmaker U1 (0.2 nozzle).json +++ b/resources/profiles/Snapmaker/machine/Snapmaker U1 (0.2 nozzle).json @@ -48,7 +48,7 @@ "20", "12" ], - "machine_start_gcode": ";===== date: 20260128 =====================\\n\\nPRINT_START\\nDEFECT_DETECTION_START\\nSET_PRINT_STATS_INFO TOTAL_LAYER={total_layer_count} CURRENT_LAYER=0\\nTIMELAPSE_START\\nM140 S{bed_temperature_initial_layer_single}\\nM104 T{initial_extruder} S140\\nM204 S10000\\n{if chamber_cooling_mode==0}\\n; 保温\\nSET_PURIFIER_MODE MODE=3 DESIRE_TEMP=45 FAN_SPEED=0.6 DELAY_OFF=180\\n{elsif chamber_cooling_mode==2}\\n; 强冷\\nSET_PURIFIER_MODE MODE=1 DESIRE_TEMP=42 ALARM_TEMP=45 FAN_SPEED=0.6 DELAY_OFF=0\\n{else}\\n; 弱冷\\nSET_PURIFIER_MODE MODE=3 DESIRE_TEMP=0 FAN_SPEED=0.6 DELAY_OFF=180\t\t\\n{endif}\\nG28 X Y\\nDEFECT_DETECT_NOODLE_FIRST\\n;===== 床面异物检测 ========\\nT{initial_extruder}\\nG90\\nDEFECT_DETECTION_DETECT_BED\\n;===== 取放头检测 =================\\nSM_PRINT_CHECK_SWITCH_EXTRUDER\\n\\n;===== 自动进料 & 挤出流量 & 预挤出 ======================\\nSM_PRINT_EXTRUDER_PREHEAT EXTRUDER=1 TEMP=140\\nSM_PRINT_AUTO_FEED EXTRUDER=0\\nSM_PRINT_FLOW_CALIBRATE EXTRUDER=0\\nSM_PRINT_EXTRUDER_PREHEAT EXTRUDER=2 TEMP=140\\nSM_PRINT_AUTO_FEED EXTRUDER=1\\nSM_PRINT_FLOW_CALIBRATE EXTRUDER=1\\nSM_PRINT_EXTRUDER_PREHEAT EXTRUDER=3 TEMP=140\\nSM_PRINT_AUTO_FEED EXTRUDER=2\\nSM_PRINT_FLOW_CALIBRATE EXTRUDER=2\\nSM_PRINT_AUTO_FEED EXTRUDER=3\\nSM_PRINT_FLOW_CALIBRATE EXTRUDER=3\\nM104 S0 T0 A0\\nM104 S0 T1 A0\\nM104 S0 T2 A0\\nM104 S0 T3 A0\\nM104 T{initial_extruder} S{nozzle_temperature[initial_extruder] - 90}\\n\\n;===== 粗回零 =================\\nT{initial_extruder}\\nM106 S255\\nM106 P2 S0\\nMOVE_TO_DISCARD_FILAMENT_POSITION\\nM109 T{initial_extruder} S{nozzle_temperature[initial_extruder] - 90}\\nROUGHLY_CLEAN_NOZZLE_WITH_DISCARD\\nMOVE_TO_XY_IDLE_POSITION_EXTRUDER\\nG28 Z I140 J140\\n\\n;===== 检测钢板 =================\\nDETECT_BED_PLATE\\n\\n;===== 深度清洁喷嘴 =================\\nG90\\nG0 Z5 F10000\\nMOVE_TO_DISCARD_FILAMENT_POSITION\\nM109 S{nozzle_temperature[initial_extruder] - 50}\\nROUGHLY_CLEAN_NOZZLE\\nMOVE_TO_XY_IDLE_POSITION_EXTRUDER\\nFINELY_CLEAN_NOZZLE_STAGE_1\\nM104 S{nozzle_temperature[initial_extruder] - 90}\\nG0 Z5 F10000\\nMOVE_TO_DISCARD_FILAMENT_POSITION\\nROUGHLY_CLEAN_NOZZLE\\nMOVE_TO_XY_IDLE_POSITION_EXTRUDER\\nFINELY_CLEAN_NOZZLE_STAGE_2\\n\\n;===== 精回零 =================\\nM106 S255\\nM109 S{nozzle_temperature[initial_extruder] - 90}\\nM190 S{bed_temperature_initial_layer_single}\\nM107 P2\\nG90\\nG0 Z5 F10000\\nWAIT_CHAMBER_TEMP TIMEOUT=180\\n{if curr_bed_type==\\\"High Temp Plate\\\"} \\nG28 Z Z_OFFSET -0.07 \\n{elsif curr_bed_type==\\\"Graphic Effect Plate\\\"} \\nG28 Z Z_OFFSET -0.07 \\n{else} \\nG28 Z \\n{endif} \\n\\n\\n;===== 热床调平 =================\\n{if curr_bed_type==\\\"High Temp Plate\\\"} \\nBED_MESH_CALIBRATE PROBE_COUNT=11,11 Z_OFFSET=-0.07 \\n{elsif curr_bed_type==\\\"Graphic Effect Plate\\\"} \\nBED_MESH_CALIBRATE PROBE_COUNT=11,11 Z_OFFSET=-0.07 \\n{else} \\nBED_MESH_CALIBRATE PROBE_COUNT=11,11 \\n{endif} \\n\\n\\n;===== 画起始线 =================\\nG90\\nG1 Z1.5\\nG0 X85 Y1 Z2 F18000\\nM109 S{nozzle_temperature_initial_layer[initial_extruder]}\\nG1 Z0.2\\nM83\\nG1 X185 E15 F360\\nG1 Z1.5\\n\\nG90\\nM106 S0", + "machine_start_gcode": ";===== date: 20260128 =====================\\n\\nPRINT_START\\nDEFECT_DETECTION_START\\nSET_PRINT_STATS_INFO TOTAL_LAYER={total_layer_count} CURRENT_LAYER=0\\nTIMELAPSE_START\\nM140 S{bed_temperature_initial_layer_single}\\nM104 T{initial_extruder} S140\\nM204 S10000\\n{if chamber_cooling_mode==0}\\n; 保温\\nSET_PURIFIER_MODE MODE=3 DESIRE_TEMP=45 FAN_SPEED=0.6 DELAY_OFF=600\\n{elsif chamber_cooling_mode==2}\\n; 强冷\\nSET_PURIFIER_MODE MODE=1 DESIRE_TEMP=42 ALARM_TEMP=45 FAN_SPEED=0.6 DELAY_OFF=0\\n{else}\\n; 弱冷\\nSET_PURIFIER_MODE MODE=3 DESIRE_TEMP=0 FAN_SPEED=0.6 DELAY_OFF=600\t\t\\n{endif}\\nG28 X Y\\nDEFECT_DETECT_NOODLE_FIRST\\n;===== 床面异物检测 ========\\nT{initial_extruder}\\nG90\\nDEFECT_DETECTION_DETECT_BED\\n;===== 取放头检测 =================\\nSM_PRINT_CHECK_SWITCH_EXTRUDER\\n\\n;===== 自动进料 & 挤出流量 & 预挤出 ======================\\nSM_PRINT_EXTRUDER_PREHEAT EXTRUDER=1 TEMP=140\\nSM_PRINT_AUTO_FEED EXTRUDER=0\\nSM_PRINT_FLOW_CALIBRATE EXTRUDER=0\\nSM_PRINT_EXTRUDER_PREHEAT EXTRUDER=2 TEMP=140\\nSM_PRINT_AUTO_FEED EXTRUDER=1\\nSM_PRINT_FLOW_CALIBRATE EXTRUDER=1\\nSM_PRINT_EXTRUDER_PREHEAT EXTRUDER=3 TEMP=140\\nSM_PRINT_AUTO_FEED EXTRUDER=2\\nSM_PRINT_FLOW_CALIBRATE EXTRUDER=2\\nSM_PRINT_AUTO_FEED EXTRUDER=3\\nSM_PRINT_FLOW_CALIBRATE EXTRUDER=3\\nM104 S0 T0 A0\\nM104 S0 T1 A0\\nM104 S0 T2 A0\\nM104 S0 T3 A0\\nM104 T{initial_extruder} S{nozzle_temperature[initial_extruder] - 90}\\n\\n;===== 粗回零 =================\\nT{initial_extruder}\\nM106 S255\\nM106 P2 S0\\nMOVE_TO_DISCARD_FILAMENT_POSITION\\nM109 T{initial_extruder} S{nozzle_temperature[initial_extruder] - 90}\\nROUGHLY_CLEAN_NOZZLE_WITH_DISCARD\\nMOVE_TO_XY_IDLE_POSITION_EXTRUDER\\nG28 Z I140 J140\\n\\n;===== 检测钢板 =================\\nDETECT_BED_PLATE\\n\\n;===== 深度清洁喷嘴 =================\\nG90\\nG0 Z5 F10000\\nMOVE_TO_DISCARD_FILAMENT_POSITION\\nM109 S{nozzle_temperature[initial_extruder] - 50}\\nROUGHLY_CLEAN_NOZZLE\\nMOVE_TO_XY_IDLE_POSITION_EXTRUDER\\nFINELY_CLEAN_NOZZLE_STAGE_1\\nM104 S{nozzle_temperature[initial_extruder] - 90}\\nG0 Z5 F10000\\nMOVE_TO_DISCARD_FILAMENT_POSITION\\nROUGHLY_CLEAN_NOZZLE\\nMOVE_TO_XY_IDLE_POSITION_EXTRUDER\\nFINELY_CLEAN_NOZZLE_STAGE_2\\n\\n;===== 精回零 =================\\nM106 S255\\nM109 S{nozzle_temperature[initial_extruder] - 90}\\nM190 S{bed_temperature_initial_layer_single}\\nM107 P2\\nG90\\nG0 Z5 F10000\\nWAIT_CHAMBER_TEMP TIMEOUT=180\\n{if curr_bed_type==\\\"High Temp Plate\\\"} \\nG28 Z Z_OFFSET -0.07 \\n{elsif curr_bed_type==\\\"Graphic Effect Plate\\\"} \\nG28 Z Z_OFFSET -0.07 \\n{else} \\nG28 Z \\n{endif} \\n\\n\\n;===== 热床调平 =================\\n{if curr_bed_type==\\\"High Temp Plate\\\"} \\nBED_MESH_CALIBRATE PROBE_COUNT=11,11 Z_OFFSET=-0.07 \\n{elsif curr_bed_type==\\\"Graphic Effect Plate\\\"} \\nBED_MESH_CALIBRATE PROBE_COUNT=11,11 Z_OFFSET=-0.07 \\n{else} \\nBED_MESH_CALIBRATE PROBE_COUNT=11,11 \\n{endif} \\n\\n\\n;===== 画起始线 =================\\nG90\\nG1 Z1.5\\nG0 X85 Y1 Z2 F18000\\nM109 S{nozzle_temperature_initial_layer[initial_extruder]}\\nG1 Z0.2\\nM83\\nG1 X185 E15 F360\\nG1 Z1.5\\n\\nG90\\nM106 S0", "machine_tool_change_time": "5", "max_layer_height": [ "0.14", diff --git a/resources/profiles/Snapmaker/machine/Snapmaker U1 (0.4 nozzle).json b/resources/profiles/Snapmaker/machine/Snapmaker U1 (0.4 nozzle).json index 07d714dcf4d..44303996552 100644 --- a/resources/profiles/Snapmaker/machine/Snapmaker U1 (0.4 nozzle).json +++ b/resources/profiles/Snapmaker/machine/Snapmaker U1 (0.4 nozzle).json @@ -48,7 +48,7 @@ "20", "12" ], - "machine_start_gcode": ";===== date: 20260128 =====================\\n\\nPRINT_START\\nDEFECT_DETECTION_START\\nSET_PRINT_STATS_INFO TOTAL_LAYER={total_layer_count} CURRENT_LAYER=0\\nTIMELAPSE_START\\nM140 S{bed_temperature_initial_layer_single}\\nM104 T{initial_extruder} S140\\nM204 S10000\\n{if chamber_cooling_mode==0}\\n; 保温\\nSET_PURIFIER_MODE MODE=3 DESIRE_TEMP=45 FAN_SPEED=0.6 DELAY_OFF=180\\n{elsif chamber_cooling_mode==2}\\n; 强冷\\nSET_PURIFIER_MODE MODE=1 DESIRE_TEMP=42 ALARM_TEMP=45 FAN_SPEED=0.6 DELAY_OFF=0\\n{else}\\n; 弱冷\\nSET_PURIFIER_MODE MODE=3 DESIRE_TEMP=0 FAN_SPEED=0.6 DELAY_OFF=180\t\t\\n{endif}\\nG28 X Y\\nDEFECT_DETECT_NOODLE_FIRST\\n;===== 床面异物检测 ========\\nT{initial_extruder}\\nG90\\nDEFECT_DETECTION_DETECT_BED\\n;===== 取放头检测 =================\\nSM_PRINT_CHECK_SWITCH_EXTRUDER\\n\\n;===== 自动进料 & 挤出流量 & 预挤出 ======================\\nSM_PRINT_EXTRUDER_PREHEAT EXTRUDER=1 TEMP=140\\nSM_PRINT_AUTO_FEED EXTRUDER=0\\nSM_PRINT_FLOW_CALIBRATE EXTRUDER=0\\nSM_PRINT_EXTRUDER_PREHEAT EXTRUDER=2 TEMP=140\\nSM_PRINT_AUTO_FEED EXTRUDER=1\\nSM_PRINT_FLOW_CALIBRATE EXTRUDER=1\\nSM_PRINT_EXTRUDER_PREHEAT EXTRUDER=3 TEMP=140\\nSM_PRINT_AUTO_FEED EXTRUDER=2\\nSM_PRINT_FLOW_CALIBRATE EXTRUDER=2\\nSM_PRINT_AUTO_FEED EXTRUDER=3\\nSM_PRINT_FLOW_CALIBRATE EXTRUDER=3\\nM104 S0 T0 A0\\nM104 S0 T1 A0\\nM104 S0 T2 A0\\nM104 S0 T3 A0\\nM104 T{initial_extruder} S{nozzle_temperature[initial_extruder] - 90}\\n\\n;===== 粗回零 =================\\nT{initial_extruder}\\nM106 S255\\nM106 P2 S0\\nMOVE_TO_DISCARD_FILAMENT_POSITION\\nM109 T{initial_extruder} S{nozzle_temperature[initial_extruder] - 90}\\nROUGHLY_CLEAN_NOZZLE_WITH_DISCARD\\nMOVE_TO_XY_IDLE_POSITION_EXTRUDER\\nG28 Z I140 J140\\n\\n;===== 检测钢板 =================\\nDETECT_BED_PLATE\\n\\n;===== 深度清洁喷嘴 =================\\nG90\\nG0 Z5 F10000\\nMOVE_TO_DISCARD_FILAMENT_POSITION\\nM109 S{nozzle_temperature[initial_extruder] - 50}\\nROUGHLY_CLEAN_NOZZLE\\nMOVE_TO_XY_IDLE_POSITION_EXTRUDER\\nFINELY_CLEAN_NOZZLE_STAGE_1\\nM104 S{nozzle_temperature[initial_extruder] - 90}\\nG0 Z5 F10000\\nMOVE_TO_DISCARD_FILAMENT_POSITION\\nROUGHLY_CLEAN_NOZZLE\\nMOVE_TO_XY_IDLE_POSITION_EXTRUDER\\nFINELY_CLEAN_NOZZLE_STAGE_2\\n\\n;===== 精回零 =================\\nM106 S255\\nM109 S{nozzle_temperature[initial_extruder] - 90}\\nM190 S{bed_temperature_initial_layer_single}\\nM107 P2\\nG90\\nG0 Z5 F10000\\nWAIT_CHAMBER_TEMP TIMEOUT=180\\n{if curr_bed_type==\\\"High Temp Plate\\\"} \\nG28 Z Z_OFFSET -0.07 \\n{elsif curr_bed_type==\\\"Graphic Effect Plate\\\"} \\nG28 Z Z_OFFSET -0.07 \\n{else} \\nG28 Z \\n{endif} \\n\\n\\n;===== 热床调平 =================\\n{if curr_bed_type==\\\"High Temp Plate\\\"} \\nBED_MESH_CALIBRATE PROBE_COUNT=11,11 Z_OFFSET=-0.07 \\n{elsif curr_bed_type==\\\"Graphic Effect Plate\\\"} \\nBED_MESH_CALIBRATE PROBE_COUNT=11,11 Z_OFFSET=-0.07 \\n{else} \\nBED_MESH_CALIBRATE PROBE_COUNT=11,11 \\n{endif} \\n\\n\\n;===== 画起始线 =================\\nG90\\nG1 Z1.5\\nG0 X85 Y1 Z2 F18000\\nM109 S{nozzle_temperature_initial_layer[initial_extruder]}\\nG1 Z0.2\\nM83\\nG1 X185 E15 F360\\nG1 Z1.5\\n\\nG90\\nM106 S0", + "machine_start_gcode": ";===== date: 20260128 =====================\\n\\nPRINT_START\\nDEFECT_DETECTION_START\\nSET_PRINT_STATS_INFO TOTAL_LAYER={total_layer_count} CURRENT_LAYER=0\\nTIMELAPSE_START\\nM140 S{bed_temperature_initial_layer_single}\\nM104 T{initial_extruder} S140\\nM204 S10000\\n{if chamber_cooling_mode==0}\\n; 保温\\nSET_PURIFIER_MODE MODE=3 DESIRE_TEMP=45 FAN_SPEED=0.6 DELAY_OFF=600\\n{elsif chamber_cooling_mode==2}\\n; 强冷\\nSET_PURIFIER_MODE MODE=1 DESIRE_TEMP=42 ALARM_TEMP=45 FAN_SPEED=0.6 DELAY_OFF=0\\n{else}\\n; 弱冷\\nSET_PURIFIER_MODE MODE=3 DESIRE_TEMP=0 FAN_SPEED=0.6 DELAY_OFF=600\t\t\\n{endif}\\nG28 X Y\\nDEFECT_DETECT_NOODLE_FIRST\\n;===== 床面异物检测 ========\\nT{initial_extruder}\\nG90\\nDEFECT_DETECTION_DETECT_BED\\n;===== 取放头检测 =================\\nSM_PRINT_CHECK_SWITCH_EXTRUDER\\n\\n;===== 自动进料 & 挤出流量 & 预挤出 ======================\\nSM_PRINT_EXTRUDER_PREHEAT EXTRUDER=1 TEMP=140\\nSM_PRINT_AUTO_FEED EXTRUDER=0\\nSM_PRINT_FLOW_CALIBRATE EXTRUDER=0\\nSM_PRINT_EXTRUDER_PREHEAT EXTRUDER=2 TEMP=140\\nSM_PRINT_AUTO_FEED EXTRUDER=1\\nSM_PRINT_FLOW_CALIBRATE EXTRUDER=1\\nSM_PRINT_EXTRUDER_PREHEAT EXTRUDER=3 TEMP=140\\nSM_PRINT_AUTO_FEED EXTRUDER=2\\nSM_PRINT_FLOW_CALIBRATE EXTRUDER=2\\nSM_PRINT_AUTO_FEED EXTRUDER=3\\nSM_PRINT_FLOW_CALIBRATE EXTRUDER=3\\nM104 S0 T0 A0\\nM104 S0 T1 A0\\nM104 S0 T2 A0\\nM104 S0 T3 A0\\nM104 T{initial_extruder} S{nozzle_temperature[initial_extruder] - 90}\\n\\n;===== 粗回零 =================\\nT{initial_extruder}\\nM106 S255\\nM106 P2 S0\\nMOVE_TO_DISCARD_FILAMENT_POSITION\\nM109 T{initial_extruder} S{nozzle_temperature[initial_extruder] - 90}\\nROUGHLY_CLEAN_NOZZLE_WITH_DISCARD\\nMOVE_TO_XY_IDLE_POSITION_EXTRUDER\\nG28 Z I140 J140\\n\\n;===== 检测钢板 =================\\nDETECT_BED_PLATE\\n\\n;===== 深度清洁喷嘴 =================\\nG90\\nG0 Z5 F10000\\nMOVE_TO_DISCARD_FILAMENT_POSITION\\nM109 S{nozzle_temperature[initial_extruder] - 50}\\nROUGHLY_CLEAN_NOZZLE\\nMOVE_TO_XY_IDLE_POSITION_EXTRUDER\\nFINELY_CLEAN_NOZZLE_STAGE_1\\nM104 S{nozzle_temperature[initial_extruder] - 90}\\nG0 Z5 F10000\\nMOVE_TO_DISCARD_FILAMENT_POSITION\\nROUGHLY_CLEAN_NOZZLE\\nMOVE_TO_XY_IDLE_POSITION_EXTRUDER\\nFINELY_CLEAN_NOZZLE_STAGE_2\\n\\n;===== 精回零 =================\\nM106 S255\\nM109 S{nozzle_temperature[initial_extruder] - 90}\\nM190 S{bed_temperature_initial_layer_single}\\nM107 P2\\nG90\\nG0 Z5 F10000\\nWAIT_CHAMBER_TEMP TIMEOUT=180\\n{if curr_bed_type==\\\"High Temp Plate\\\"} \\nG28 Z Z_OFFSET -0.07 \\n{elsif curr_bed_type==\\\"Graphic Effect Plate\\\"} \\nG28 Z Z_OFFSET -0.07 \\n{else} \\nG28 Z \\n{endif} \\n\\n\\n;===== 热床调平 =================\\n{if curr_bed_type==\\\"High Temp Plate\\\"} \\nBED_MESH_CALIBRATE PROBE_COUNT=11,11 Z_OFFSET=-0.07 \\n{elsif curr_bed_type==\\\"Graphic Effect Plate\\\"} \\nBED_MESH_CALIBRATE PROBE_COUNT=11,11 Z_OFFSET=-0.07 \\n{else} \\nBED_MESH_CALIBRATE PROBE_COUNT=11,11 \\n{endif} \\n\\n\\n;===== 画起始线 =================\\nG90\\nG1 Z1.5\\nG0 X85 Y1 Z2 F18000\\nM109 S{nozzle_temperature_initial_layer[initial_extruder]}\\nG1 Z0.2\\nM83\\nG1 X185 E15 F360\\nG1 Z1.5\\n\\nG90\\nM106 S0", "machine_tool_change_time": "5", "max_layer_height": [ "0.32", diff --git a/resources/profiles/Snapmaker/machine/Snapmaker U1 (0.6 nozzle).json b/resources/profiles/Snapmaker/machine/Snapmaker U1 (0.6 nozzle).json index 92d5c57ec84..83c35a06631 100644 --- a/resources/profiles/Snapmaker/machine/Snapmaker U1 (0.6 nozzle).json +++ b/resources/profiles/Snapmaker/machine/Snapmaker U1 (0.6 nozzle).json @@ -48,7 +48,7 @@ "20", "12" ], - "machine_start_gcode": ";===== date: 20260128 =====================\\n\\nPRINT_START\\nDEFECT_DETECTION_START\\nSET_PRINT_STATS_INFO TOTAL_LAYER={total_layer_count} CURRENT_LAYER=0\\nTIMELAPSE_START\\nM140 S{bed_temperature_initial_layer_single}\\nM104 T{initial_extruder} S140\\nM204 S10000\\n{if chamber_cooling_mode==0}\\n; 保温\\nSET_PURIFIER_MODE MODE=3 DESIRE_TEMP=45 FAN_SPEED=0.6 DELAY_OFF=180\\n{elsif chamber_cooling_mode==2}\\n; 强冷\\nSET_PURIFIER_MODE MODE=1 DESIRE_TEMP=42 ALARM_TEMP=45 FAN_SPEED=0.6 DELAY_OFF=0\\n{else}\\n; 弱冷\\nSET_PURIFIER_MODE MODE=3 DESIRE_TEMP=0 FAN_SPEED=0.6 DELAY_OFF=180\t\t\\n{endif}\\nG28 X Y\\nDEFECT_DETECT_NOODLE_FIRST\\n;===== 床面异物检测 ========\\nT{initial_extruder}\\nG90\\nDEFECT_DETECTION_DETECT_BED\\n;===== 取放头检测 =================\\nSM_PRINT_CHECK_SWITCH_EXTRUDER\\n\\n;===== 自动进料 & 挤出流量 & 预挤出 ======================\\nSM_PRINT_EXTRUDER_PREHEAT EXTRUDER=1 TEMP=140\\nSM_PRINT_AUTO_FEED EXTRUDER=0\\nSM_PRINT_FLOW_CALIBRATE EXTRUDER=0\\nSM_PRINT_EXTRUDER_PREHEAT EXTRUDER=2 TEMP=140\\nSM_PRINT_AUTO_FEED EXTRUDER=1\\nSM_PRINT_FLOW_CALIBRATE EXTRUDER=1\\nSM_PRINT_EXTRUDER_PREHEAT EXTRUDER=3 TEMP=140\\nSM_PRINT_AUTO_FEED EXTRUDER=2\\nSM_PRINT_FLOW_CALIBRATE EXTRUDER=2\\nSM_PRINT_AUTO_FEED EXTRUDER=3\\nSM_PRINT_FLOW_CALIBRATE EXTRUDER=3\\nM104 S0 T0 A0\\nM104 S0 T1 A0\\nM104 S0 T2 A0\\nM104 S0 T3 A0\\nM104 T{initial_extruder} S{nozzle_temperature[initial_extruder] - 90}\\n\\n;===== 粗回零 =================\\nT{initial_extruder}\\nM106 S255\\nM106 P2 S0\\nMOVE_TO_DISCARD_FILAMENT_POSITION\\nM109 T{initial_extruder} S{nozzle_temperature[initial_extruder] - 90}\\nROUGHLY_CLEAN_NOZZLE_WITH_DISCARD\\nMOVE_TO_XY_IDLE_POSITION_EXTRUDER\\nG28 Z I140 J140\\n\\n;===== 检测钢板 =================\\nDETECT_BED_PLATE\\n\\n;===== 深度清洁喷嘴 =================\\nG90\\nG0 Z5 F10000\\nMOVE_TO_DISCARD_FILAMENT_POSITION\\nM109 S{nozzle_temperature[initial_extruder] - 50}\\nROUGHLY_CLEAN_NOZZLE\\nMOVE_TO_XY_IDLE_POSITION_EXTRUDER\\nFINELY_CLEAN_NOZZLE_STAGE_1\\nM104 S{nozzle_temperature[initial_extruder] - 90}\\nG0 Z5 F10000\\nMOVE_TO_DISCARD_FILAMENT_POSITION\\nROUGHLY_CLEAN_NOZZLE\\nMOVE_TO_XY_IDLE_POSITION_EXTRUDER\\nFINELY_CLEAN_NOZZLE_STAGE_2\\n\\n;===== 精回零 =================\\nM106 S255\\nM109 S{nozzle_temperature[initial_extruder] - 90}\\nM190 S{bed_temperature_initial_layer_single}\\nM107 P2\\nG90\\nG0 Z5 F10000\\nWAIT_CHAMBER_TEMP TIMEOUT=180\\n{if curr_bed_type==\\\"High Temp Plate\\\"} \\nG28 Z Z_OFFSET -0.07 \\n{elsif curr_bed_type==\\\"Graphic Effect Plate\\\"} \\nG28 Z Z_OFFSET -0.07 \\n{else} \\nG28 Z \\n{endif} \\n\\n\\n;===== 热床调平 =================\\n{if curr_bed_type==\\\"High Temp Plate\\\"} \\nBED_MESH_CALIBRATE PROBE_COUNT=11,11 Z_OFFSET=-0.07 \\n{elsif curr_bed_type==\\\"Graphic Effect Plate\\\"} \\nBED_MESH_CALIBRATE PROBE_COUNT=11,11 Z_OFFSET=-0.07 \\n{else} \\nBED_MESH_CALIBRATE PROBE_COUNT=11,11 \\n{endif} \\n\\n\\n;===== 画起始线 =================\\nG90\\nG1 Z1.5\\nG0 X85 Y1 Z2 F18000\\nM109 S{nozzle_temperature_initial_layer[initial_extruder]}\\nG1 Z0.2\\nM83\\nG1 X185 E15 F360\\nG1 Z1.5\\n\\nG90\\nM106 S0", + "machine_start_gcode": ";===== date: 20260128 =====================\\n\\nPRINT_START\\nDEFECT_DETECTION_START\\nSET_PRINT_STATS_INFO TOTAL_LAYER={total_layer_count} CURRENT_LAYER=0\\nTIMELAPSE_START\\nM140 S{bed_temperature_initial_layer_single}\\nM104 T{initial_extruder} S140\\nM204 S10000\\n{if chamber_cooling_mode==0}\\n; 保温\\nSET_PURIFIER_MODE MODE=3 DESIRE_TEMP=45 FAN_SPEED=0.6 DELAY_OFF=600\\n{elsif chamber_cooling_mode==2}\\n; 强冷\\nSET_PURIFIER_MODE MODE=1 DESIRE_TEMP=42 ALARM_TEMP=45 FAN_SPEED=0.6 DELAY_OFF=0\\n{else}\\n; 弱冷\\nSET_PURIFIER_MODE MODE=3 DESIRE_TEMP=0 FAN_SPEED=0.6 DELAY_OFF=600\t\t\\n{endif}\\nG28 X Y\\nDEFECT_DETECT_NOODLE_FIRST\\n;===== 床面异物检测 ========\\nT{initial_extruder}\\nG90\\nDEFECT_DETECTION_DETECT_BED\\n;===== 取放头检测 =================\\nSM_PRINT_CHECK_SWITCH_EXTRUDER\\n\\n;===== 自动进料 & 挤出流量 & 预挤出 ======================\\nSM_PRINT_EXTRUDER_PREHEAT EXTRUDER=1 TEMP=140\\nSM_PRINT_AUTO_FEED EXTRUDER=0\\nSM_PRINT_FLOW_CALIBRATE EXTRUDER=0\\nSM_PRINT_EXTRUDER_PREHEAT EXTRUDER=2 TEMP=140\\nSM_PRINT_AUTO_FEED EXTRUDER=1\\nSM_PRINT_FLOW_CALIBRATE EXTRUDER=1\\nSM_PRINT_EXTRUDER_PREHEAT EXTRUDER=3 TEMP=140\\nSM_PRINT_AUTO_FEED EXTRUDER=2\\nSM_PRINT_FLOW_CALIBRATE EXTRUDER=2\\nSM_PRINT_AUTO_FEED EXTRUDER=3\\nSM_PRINT_FLOW_CALIBRATE EXTRUDER=3\\nM104 S0 T0 A0\\nM104 S0 T1 A0\\nM104 S0 T2 A0\\nM104 S0 T3 A0\\nM104 T{initial_extruder} S{nozzle_temperature[initial_extruder] - 90}\\n\\n;===== 粗回零 =================\\nT{initial_extruder}\\nM106 S255\\nM106 P2 S0\\nMOVE_TO_DISCARD_FILAMENT_POSITION\\nM109 T{initial_extruder} S{nozzle_temperature[initial_extruder] - 90}\\nROUGHLY_CLEAN_NOZZLE_WITH_DISCARD\\nMOVE_TO_XY_IDLE_POSITION_EXTRUDER\\nG28 Z I140 J140\\n\\n;===== 检测钢板 =================\\nDETECT_BED_PLATE\\n\\n;===== 深度清洁喷嘴 =================\\nG90\\nG0 Z5 F10000\\nMOVE_TO_DISCARD_FILAMENT_POSITION\\nM109 S{nozzle_temperature[initial_extruder] - 50}\\nROUGHLY_CLEAN_NOZZLE\\nMOVE_TO_XY_IDLE_POSITION_EXTRUDER\\nFINELY_CLEAN_NOZZLE_STAGE_1\\nM104 S{nozzle_temperature[initial_extruder] - 90}\\nG0 Z5 F10000\\nMOVE_TO_DISCARD_FILAMENT_POSITION\\nROUGHLY_CLEAN_NOZZLE\\nMOVE_TO_XY_IDLE_POSITION_EXTRUDER\\nFINELY_CLEAN_NOZZLE_STAGE_2\\n\\n;===== 精回零 =================\\nM106 S255\\nM109 S{nozzle_temperature[initial_extruder] - 90}\\nM190 S{bed_temperature_initial_layer_single}\\nM107 P2\\nG90\\nG0 Z5 F10000\\nWAIT_CHAMBER_TEMP TIMEOUT=180\\n{if curr_bed_type==\\\"High Temp Plate\\\"} \\nG28 Z Z_OFFSET -0.07 \\n{elsif curr_bed_type==\\\"Graphic Effect Plate\\\"} \\nG28 Z Z_OFFSET -0.07 \\n{else} \\nG28 Z \\n{endif} \\n\\n\\n;===== 热床调平 =================\\n{if curr_bed_type==\\\"High Temp Plate\\\"} \\nBED_MESH_CALIBRATE PROBE_COUNT=11,11 Z_OFFSET=-0.07 \\n{elsif curr_bed_type==\\\"Graphic Effect Plate\\\"} \\nBED_MESH_CALIBRATE PROBE_COUNT=11,11 Z_OFFSET=-0.07 \\n{else} \\nBED_MESH_CALIBRATE PROBE_COUNT=11,11 \\n{endif} \\n\\n\\n;===== 画起始线 =================\\nG90\\nG1 Z1.5\\nG0 X85 Y1 Z2 F18000\\nM109 S{nozzle_temperature_initial_layer[initial_extruder]}\\nG1 Z0.2\\nM83\\nG1 X185 E15 F360\\nG1 Z1.5\\n\\nG90\\nM106 S0", "machine_tool_change_time": "5", "max_layer_height": [ "0.42", diff --git a/resources/profiles/Snapmaker/machine/Snapmaker U1 (0.8 nozzle).json b/resources/profiles/Snapmaker/machine/Snapmaker U1 (0.8 nozzle).json index b4d30a1b4cc..c6f05feec84 100644 --- a/resources/profiles/Snapmaker/machine/Snapmaker U1 (0.8 nozzle).json +++ b/resources/profiles/Snapmaker/machine/Snapmaker U1 (0.8 nozzle).json @@ -48,7 +48,7 @@ "20", "12" ], - "machine_start_gcode": ";===== date: 20260128 =====================\\n\\nPRINT_START\\nDEFECT_DETECTION_START\\nSET_PRINT_STATS_INFO TOTAL_LAYER={total_layer_count} CURRENT_LAYER=0\\nTIMELAPSE_START\\nM140 S{bed_temperature_initial_layer_single}\\nM104 T{initial_extruder} S140\\nM204 S10000\\n{if chamber_cooling_mode==0}\\n; 保温\\nSET_PURIFIER_MODE MODE=3 DESIRE_TEMP=45 FAN_SPEED=0.6 DELAY_OFF=180\\n{elsif chamber_cooling_mode==2}\\n; 强冷\\nSET_PURIFIER_MODE MODE=1 DESIRE_TEMP=42 ALARM_TEMP=45 FAN_SPEED=0.6 DELAY_OFF=0\\n{else}\\n; 弱冷\\nSET_PURIFIER_MODE MODE=3 DESIRE_TEMP=0 FAN_SPEED=0.6 DELAY_OFF=180\t\t\\n{endif}\\nG28 X Y\\nDEFECT_DETECT_NOODLE_FIRST\\n;===== 床面异物检测 ========\\nT{initial_extruder}\\nG90\\nDEFECT_DETECTION_DETECT_BED\\n;===== 取放头检测 =================\\nSM_PRINT_CHECK_SWITCH_EXTRUDER\\n\\n;===== 自动进料 & 挤出流量 & 预挤出 ======================\\nSM_PRINT_EXTRUDER_PREHEAT EXTRUDER=1 TEMP=140\\nSM_PRINT_AUTO_FEED EXTRUDER=0\\nSM_PRINT_FLOW_CALIBRATE EXTRUDER=0\\nSM_PRINT_EXTRUDER_PREHEAT EXTRUDER=2 TEMP=140\\nSM_PRINT_AUTO_FEED EXTRUDER=1\\nSM_PRINT_FLOW_CALIBRATE EXTRUDER=1\\nSM_PRINT_EXTRUDER_PREHEAT EXTRUDER=3 TEMP=140\\nSM_PRINT_AUTO_FEED EXTRUDER=2\\nSM_PRINT_FLOW_CALIBRATE EXTRUDER=2\\nSM_PRINT_AUTO_FEED EXTRUDER=3\\nSM_PRINT_FLOW_CALIBRATE EXTRUDER=3\\nM104 S0 T0 A0\\nM104 S0 T1 A0\\nM104 S0 T2 A0\\nM104 S0 T3 A0\\nM104 T{initial_extruder} S{nozzle_temperature[initial_extruder] - 90}\\n\\n;===== 粗回零 =================\\nT{initial_extruder}\\nM106 S255\\nM106 P2 S0\\nMOVE_TO_DISCARD_FILAMENT_POSITION\\nM109 T{initial_extruder} S{nozzle_temperature[initial_extruder] - 90}\\nROUGHLY_CLEAN_NOZZLE_WITH_DISCARD\\nMOVE_TO_XY_IDLE_POSITION_EXTRUDER\\nG28 Z I140 J140\\n\\n;===== 检测钢板 =================\\nDETECT_BED_PLATE\\n\\n;===== 深度清洁喷嘴 =================\\nG90\\nG0 Z5 F10000\\nMOVE_TO_DISCARD_FILAMENT_POSITION\\nM109 S{nozzle_temperature[initial_extruder] - 50}\\nROUGHLY_CLEAN_NOZZLE\\nMOVE_TO_XY_IDLE_POSITION_EXTRUDER\\nFINELY_CLEAN_NOZZLE_STAGE_1\\nM104 S{nozzle_temperature[initial_extruder] - 90}\\nG0 Z5 F10000\\nMOVE_TO_DISCARD_FILAMENT_POSITION\\nROUGHLY_CLEAN_NOZZLE\\nMOVE_TO_XY_IDLE_POSITION_EXTRUDER\\nFINELY_CLEAN_NOZZLE_STAGE_2\\n\\n;===== 精回零 =================\\nM106 S255\\nM109 S{nozzle_temperature[initial_extruder] - 90}\\nM190 S{bed_temperature_initial_layer_single}\\nM107 P2\\nG90\\nG0 Z5 F10000\\nWAIT_CHAMBER_TEMP TIMEOUT=180\\n{if curr_bed_type==\\\"High Temp Plate\\\"} \\nG28 Z Z_OFFSET -0.07 \\n{elsif curr_bed_type==\\\"Graphic Effect Plate\\\"} \\nG28 Z Z_OFFSET -0.07 \\n{else} \\nG28 Z \\n{endif} \\n\\n\\n;===== 热床调平 =================\\n{if curr_bed_type==\\\"High Temp Plate\\\"} \\nBED_MESH_CALIBRATE PROBE_COUNT=11,11 Z_OFFSET=-0.07 \\n{elsif curr_bed_type==\\\"Graphic Effect Plate\\\"} \\nBED_MESH_CALIBRATE PROBE_COUNT=11,11 Z_OFFSET=-0.07 \\n{else} \\nBED_MESH_CALIBRATE PROBE_COUNT=11,11 \\n{endif} \\n\\n\\n;===== 画起始线 =================\\nG90\\nG1 Z1.5\\nG0 X85 Y1 Z2 F18000\\nM109 S{nozzle_temperature_initial_layer[initial_extruder]}\\nG1 Z0.2\\nM83\\nG1 X185 E15 F360\\nG1 Z1.5\\n\\nG90\\nM106 S0", + "machine_start_gcode": ";===== date: 20260128 =====================\\n\\nPRINT_START\\nDEFECT_DETECTION_START\\nSET_PRINT_STATS_INFO TOTAL_LAYER={total_layer_count} CURRENT_LAYER=0\\nTIMELAPSE_START\\nM140 S{bed_temperature_initial_layer_single}\\nM104 T{initial_extruder} S140\\nM204 S10000\\n{if chamber_cooling_mode==0}\\n; 保温\\nSET_PURIFIER_MODE MODE=3 DESIRE_TEMP=45 FAN_SPEED=0.6 DELAY_OFF=600\\n{elsif chamber_cooling_mode==2}\\n; 强冷\\nSET_PURIFIER_MODE MODE=1 DESIRE_TEMP=42 ALARM_TEMP=45 FAN_SPEED=0.6 DELAY_OFF=0\\n{else}\\n; 弱冷\\nSET_PURIFIER_MODE MODE=3 DESIRE_TEMP=0 FAN_SPEED=0.6 DELAY_OFF=600\t\t\\n{endif}\\nG28 X Y\\nDEFECT_DETECT_NOODLE_FIRST\\n;===== 床面异物检测 ========\\nT{initial_extruder}\\nG90\\nDEFECT_DETECTION_DETECT_BED\\n;===== 取放头检测 =================\\nSM_PRINT_CHECK_SWITCH_EXTRUDER\\n\\n;===== 自动进料 & 挤出流量 & 预挤出 ======================\\nSM_PRINT_EXTRUDER_PREHEAT EXTRUDER=1 TEMP=140\\nSM_PRINT_AUTO_FEED EXTRUDER=0\\nSM_PRINT_FLOW_CALIBRATE EXTRUDER=0\\nSM_PRINT_EXTRUDER_PREHEAT EXTRUDER=2 TEMP=140\\nSM_PRINT_AUTO_FEED EXTRUDER=1\\nSM_PRINT_FLOW_CALIBRATE EXTRUDER=1\\nSM_PRINT_EXTRUDER_PREHEAT EXTRUDER=3 TEMP=140\\nSM_PRINT_AUTO_FEED EXTRUDER=2\\nSM_PRINT_FLOW_CALIBRATE EXTRUDER=2\\nSM_PRINT_AUTO_FEED EXTRUDER=3\\nSM_PRINT_FLOW_CALIBRATE EXTRUDER=3\\nM104 S0 T0 A0\\nM104 S0 T1 A0\\nM104 S0 T2 A0\\nM104 S0 T3 A0\\nM104 T{initial_extruder} S{nozzle_temperature[initial_extruder] - 90}\\n\\n;===== 粗回零 =================\\nT{initial_extruder}\\nM106 S255\\nM106 P2 S0\\nMOVE_TO_DISCARD_FILAMENT_POSITION\\nM109 T{initial_extruder} S{nozzle_temperature[initial_extruder] - 90}\\nROUGHLY_CLEAN_NOZZLE_WITH_DISCARD\\nMOVE_TO_XY_IDLE_POSITION_EXTRUDER\\nG28 Z I140 J140\\n\\n;===== 检测钢板 =================\\nDETECT_BED_PLATE\\n\\n;===== 深度清洁喷嘴 =================\\nG90\\nG0 Z5 F10000\\nMOVE_TO_DISCARD_FILAMENT_POSITION\\nM109 S{nozzle_temperature[initial_extruder] - 50}\\nROUGHLY_CLEAN_NOZZLE\\nMOVE_TO_XY_IDLE_POSITION_EXTRUDER\\nFINELY_CLEAN_NOZZLE_STAGE_1\\nM104 S{nozzle_temperature[initial_extruder] - 90}\\nG0 Z5 F10000\\nMOVE_TO_DISCARD_FILAMENT_POSITION\\nROUGHLY_CLEAN_NOZZLE\\nMOVE_TO_XY_IDLE_POSITION_EXTRUDER\\nFINELY_CLEAN_NOZZLE_STAGE_2\\n\\n;===== 精回零 =================\\nM106 S255\\nM109 S{nozzle_temperature[initial_extruder] - 90}\\nM190 S{bed_temperature_initial_layer_single}\\nM107 P2\\nG90\\nG0 Z5 F10000\\nWAIT_CHAMBER_TEMP TIMEOUT=180\\n{if curr_bed_type==\\\"High Temp Plate\\\"} \\nG28 Z Z_OFFSET -0.07 \\n{elsif curr_bed_type==\\\"Graphic Effect Plate\\\"} \\nG28 Z Z_OFFSET -0.07 \\n{else} \\nG28 Z \\n{endif} \\n\\n\\n;===== 热床调平 =================\\n{if curr_bed_type==\\\"High Temp Plate\\\"} \\nBED_MESH_CALIBRATE PROBE_COUNT=11,11 Z_OFFSET=-0.07 \\n{elsif curr_bed_type==\\\"Graphic Effect Plate\\\"} \\nBED_MESH_CALIBRATE PROBE_COUNT=11,11 Z_OFFSET=-0.07 \\n{else} \\nBED_MESH_CALIBRATE PROBE_COUNT=11,11 \\n{endif} \\n\\n\\n;===== 画起始线 =================\\nG90\\nG1 Z1.5\\nG0 X85 Y1 Z2 F18000\\nM109 S{nozzle_temperature_initial_layer[initial_extruder]}\\nG1 Z0.2\\nM83\\nG1 X185 E15 F360\\nG1 Z1.5\\n\\nG90\\nM106 S0", "machine_tool_change_time": "5", "max_layer_height": [ "0.56", diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index e59593251c8..fc339ab8db3 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -1082,11 +1082,17 @@ void GUI_App::post_init() BOOST_LOG_TRIVIAL(warning) << __FUNCTION__ << "Found glcontext not ready, postpone the init"; } //#endif - if (is_editor()) - mainframe->select_tab(size_t(0)); - if (app_config->get("default_page") == "1") - mainframe->select_tab(size_t(1)); mainframe->Thaw(); + // Defer the final tab selection to after pending events are + // processed. During GL init, the PAGE_CHANGED handler posts + // EVT_GLVIEWTOOLBAR_3D which would undo a synchronous + // select_tab(0) and switch back to the Prepare tab. + CallAfter([this] { + if (is_editor() && app_config->get("default_page") != "1") + mainframe->select_tab(size_t(0)); + else if (app_config->get("default_page") == "1") + mainframe->select_tab(size_t(1)); + }); plater_->trigger_restore_project(1); BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ", end load_gl_resources"; } @@ -1136,6 +1142,7 @@ void GUI_App::post_init() // Neither wxShowEvent nor wxWindowCreateEvent work reliably. if (this->preset_updater) { // G-Code Viewer does not initialize preset_updater. CallAfter([this] { + try { bool cw_showed = this->config_wizard_startup(); SSWCP_MqttAgent_Instance::m_dialog = new WebPresetDialog(this); @@ -1147,7 +1154,13 @@ void GUI_App::post_init() this->preset_updater->sync(http_url, language, network_ver, sys_preset ? preset_bundle : nullptr); this->preset_updater->sync_web_async(true); this->check_new_version_sf(false, false); - + } catch (const std::exception& e) { + BOOST_LOG_TRIVIAL(error) << "CallAfter config wizard exception: " << e.what(); + flush_logs(); + } catch (...) { + BOOST_LOG_TRIVIAL(error) << "CallAfter config wizard unknown exception"; + flush_logs(); + } }); } @@ -6840,7 +6853,16 @@ bool GUI_App::run_wizard(ConfigWizard::RunReason reason, ConfigWizard::StartPage start_page == ConfigWizard::SP_PRINTERS ? GuideFrame::BBL_MODELS_ONLY : GuideFrame::BBL_MODELS; wizard.SetStartPage(page); - bool res = wizard.run(); + bool res = false; + try { + res = wizard.run(); + } catch (const std::exception& e) { + BOOST_LOG_TRIVIAL(error) << "run_wizard exception: " << e.what(); + flush_logs(); + } catch (...) { + BOOST_LOG_TRIVIAL(error) << "run_wizard unknown exception"; + flush_logs(); + } if (res) { load_current_presets(); @@ -7089,20 +7111,28 @@ void GUI_App::user_login_notify(const json& res) bool GUI_App::config_wizard_startup() { auto isAgree = wxGetApp().app_config->get("app", PRIVACY_POLICY_FLAGS); - user_update_privacy_notify(isAgree == "true"); + user_update_privacy_notify(isAgree == "true"); BOOST_LOG_TRIVIAL(warning) << "config_wizard_startup changed the privacy policy with: " << (isAgree); - if (!m_app_conf_exists || preset_bundle->printers.only_default_printers()) { - BOOST_LOG_TRIVIAL(info) << "run wizard..."; - run_wizard(ConfigWizard::RR_DATA_EMPTY); - BOOST_LOG_TRIVIAL(info) << "finished run wizard"; + try { + if (!m_app_conf_exists || preset_bundle->printers.only_default_printers()) { + BOOST_LOG_TRIVIAL(info) << "run wizard..."; + run_wizard(ConfigWizard::RR_DATA_EMPTY); + BOOST_LOG_TRIVIAL(info) << "finished run wizard"; - return true; - } + return true; + } - if (isAgree.empty()) - { - run_wizard(ConfigWizard::RR_DATA_EMPTY); // Compatible with older versions - return true; + if (isAgree.empty()) + { + run_wizard(ConfigWizard::RR_DATA_EMPTY); // Compatible with older versions + return true; + } + } catch (const std::exception& e) { + BOOST_LOG_TRIVIAL(error) << "config_wizard_startup exception: " << e.what(); + flush_logs(); + } catch (...) { + BOOST_LOG_TRIVIAL(error) << "config_wizard_startup unknown exception"; + flush_logs(); } return false; diff --git a/src/slic3r/GUI/ReleaseNote.cpp b/src/slic3r/GUI/ReleaseNote.cpp index 5015d4dad2c..c0b6fc6bd05 100644 --- a/src/slic3r/GUI/ReleaseNote.cpp +++ b/src/slic3r/GUI/ReleaseNote.cpp @@ -301,9 +301,10 @@ UpdateVersionDialog::UpdateVersionDialog(wxWindow *parent) fs::path ph(data_dir()); ph /= "resources/tooltip/releasenote.html"; if (!fs::exists(ph)) { - ph = resources_dir(); - ph /= "tooltip/releasenote.html"; + ph = fs::path(resources_dir()) / "tooltip/releasenote.html"; } + // Make absolute to get proper "C:/..." prefix for file:// URL + ph = fs::absolute(ph); auto url = ph.string(); std::replace(url.begin(), url.end(), '\\', '/'); url = "file:///" + url; @@ -459,7 +460,7 @@ void UpdateVersionDialog::OnError(wxWebViewEvent& event) case wxWEBVIEW_NAV_ERR_USER_CANCELLED: e = "wxWEBVIEW_NAV_ERR_USER_CANCELLED"; break; case wxWEBVIEW_NAV_ERR_OTHER: e = "wxWEBVIEW_NAV_ERR_OTHER"; break; } - BOOST_LOG_TRIVIAL(fatal) << __FUNCTION__<< boost::format(":UpdateVersionDialog error loading page %1% %2% %3% %4%") % event.GetURL() % event.GetTarget() %e %event.GetString(); + BOOST_LOG_TRIVIAL(error) << __FUNCTION__<< boost::format(":UpdateVersionDialog error loading page %1% %2% %3% %4%") % event.GetURL() % event.GetTarget() %e %event.GetString(); event.Skip(); } diff --git a/src/slic3r/GUI/WebGuideDialog.cpp b/src/slic3r/GUI/WebGuideDialog.cpp index 10b000e8135..785f16ee6c0 100644 --- a/src/slic3r/GUI/WebGuideDialog.cpp +++ b/src/slic3r/GUI/WebGuideDialog.cpp @@ -610,8 +610,7 @@ void GuideFrame::OnError(wxWebViewEvent& event) case wxWEBVIEW_NAV_ERR_OTHER: e = "wxWEBVIEW_NAV_ERR_OTHER"; break; } - BOOST_LOG_TRIVIAL(fatal) << __FUNCTION__<< boost::format(":GuideFrame error loading page %1% %2% %3% %4%") % event.GetURL() % event.GetTarget() %e % event.GetString(); - + BOOST_LOG_TRIVIAL(error) << __FUNCTION__<< boost::format(":GuideFrame error loading page %1% %2% %3% %4%") % event.GetURL() % event.GetTarget() %e % event.GetString(); } void GuideFrame::OnScriptResponseMessage(wxCommandEvent &WXUNUSED(evt)) diff --git a/src/slic3r/GUI/WebViewDialog.cpp b/src/slic3r/GUI/WebViewDialog.cpp index 9cb30f5438e..b6bbe6786b5 100644 --- a/src/slic3r/GUI/WebViewDialog.cpp +++ b/src/slic3r/GUI/WebViewDialog.cpp @@ -37,7 +37,7 @@ namespace GUI { WebViewPanel::WebViewPanel(wxWindow *parent) : wxPanel(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize) { - wxString url = wxString::FromUTF8(LOCALHOST_URL + std::to_string(wxGetApp().get_page_http_port()) + "/web/flutter_web/index.html?path=1"); + wxString url = wxString::FromUTF8(LOCALHOST_URL + std::to_string(wxGetApp().get_page_http_port()) + "/web/flutter_web/index.html?path=0"); // wxString url = wxString::Format("file://%s/web/homepage/index.html?path=homepage.html", from_u8(resources_dir())); // wxString url = wxString("http://127.0.0.1:") + wxString(std::to_string(PAGE_HTTP_PORT)) + wxString("/web/flutter_web/index.html?path=1"); url = wxGetApp().get_international_url(url);