File tree Expand file tree Collapse file tree 4 files changed +6
-3
lines changed Expand file tree Collapse file tree 4 files changed +6
-3
lines changed Original file line number Diff line number Diff line change 1010 var target_firmware = "" ;
1111 </ script >
1212 < script >
13- var web_ui_version = "2.1b47 " ;
13+ var web_ui_version = "2.1b48 " ;
1414 </ script >
1515 < script >
1616 var direct_sd = false ;
Original file line number Diff line number Diff line change @@ -151,6 +151,9 @@ function startSocket() {
151151 if ( ( bytes [ i ] == 10 ) || ( bytes [ i ] == 13 ) ) {
152152 wsmsg += msg ;
153153 Monitor_output_Update ( wsmsg ) ;
154+ //msg = wsmsg.replace("\n", "");
155+ //wsmsg = msg.replace("\r", "");
156+ //console.log(wsmsg);
154157 if ( ( target_firmware == "grbl-embedded" ) || ( target_firmware == "marlin-embedded" ) ) process_socket_response ( msg ) ;
155158 wsmsg = "" ;
156159 msg = "" ;
Original file line number Diff line number Diff line change @@ -127,7 +127,7 @@ function get_Temperatures() {
127127}
128128
129129function process_Temperatures ( response ) {
130- Monitor_output_Update ( response ) ;
130+ if ( target_firmware != "marlin-embedded" ) Monitor_output_Update ( response ) ;
131131 var regex_temp = / ( B | T ( \d * ) ) : \s * ( [ + ] ? [ 0 - 9 ] * \. ? [ 0 - 9 ] + ) ? ( \/ ) ( [ + ] ? [ 0 - 9 ] * \. ? [ 0 - 9 ] + ) ? / gi;
132132 var result ;
133133 var timedata = new Date ( ) . getTime ( ) ;
@@ -224,4 +224,4 @@ function temperature_heatSet(target) {
224224 command += " " + target ;
225225 }
226226 SendPrinterCommand ( command , true , get_Temperatures ) ;
227- }
227+ }
You can’t perform that action at this time.
0 commit comments