@@ -167,15 +167,9 @@ function processTemperatures(buffer) {
167
167
parseFloat ( buffer . heaters [ index ] ) < 5
168
168
)
169
169
value = "error"
170
- else
171
- value = parseFloat ( buffer . heaters [ index ] )
172
- . toFixed ( 2 )
173
- . toString ( )
170
+ else value = parseFloat ( buffer . heaters [ index ] ) . toFixed ( 2 ) . toString ( )
174
171
if ( isNaN ( parseFloat ( buffer . active [ index ] ) ) ) value2 = "0.00"
175
- else
176
- value2 = parseFloat ( buffer . active [ index ] )
177
- . toFixed ( 2 )
178
- . toString ( )
172
+ else value2 = parseFloat ( buffer . active [ index ] ) . toFixed ( 2 ) . toString ( )
179
173
//FIXME - TODO
180
174
//how to detect chamber with M408?
181
175
if ( tool . startsWith ( "T" ) || tool . startsWith ( "B" ) ) {
@@ -204,18 +198,12 @@ function processTemperatures(buffer) {
204
198
var value2
205
199
if (
206
200
( isNaN ( parseFloat ( result [ 4 ] ) ) || parseFloat ( result [ 4 ] ) < 5 ) &&
207
- result [ 4 ] != "0.0"
201
+ parseInt ( result [ 4 ] ) != 0
208
202
)
209
203
value = "error"
210
- else
211
- value = parseFloat ( result [ 4 ] )
212
- . toFixed ( 2 )
213
- . toString ( )
204
+ else value = parseFloat ( result [ 4 ] ) . toFixed ( 2 ) . toString ( )
214
205
if ( isNaN ( parseFloat ( result [ 6 ] ) ) ) value2 = "0.00"
215
- else
216
- value2 = parseFloat ( result [ 6 ] )
217
- . toFixed ( 2 )
218
- . toString ( )
206
+ else value2 = parseFloat ( result [ 6 ] ) . toFixed ( 2 ) . toString ( )
219
207
if (
220
208
tool . startsWith ( "T" ) ||
221
209
tool . startsWith ( "B" ) ||
@@ -251,9 +239,16 @@ function processTemperatures(buffer) {
251
239
default :
252
240
break
253
241
}
242
+ console . log (
243
+ tool [ 0 ] ,
244
+ " " ,
245
+ esp3dSettings . serialprotocol ,
246
+ " " ,
247
+ value
248
+ )
254
249
if (
255
250
! (
256
- value == "0.00" &&
251
+ parseInt ( value ) == 0 &&
257
252
esp3dSettings . serialprotocol == "MKS"
258
253
)
259
254
)
@@ -263,7 +258,7 @@ function processTemperatures(buffer) {
263
258
target : value2 ,
264
259
} )
265
260
} else {
266
- console . log ( "no dispatch" )
261
+ console . log ( "no dispatch-------- " )
267
262
}
268
263
}
269
264
}
@@ -516,25 +511,25 @@ const TemperatureSlider = ({ id, type, index }) => {
516
511
typeof TC [ index ] . target != "undefined" ? TC [ index ] . target : "0.00"
517
512
}
518
513
519
- const onInputTemperatureSlider = e => {
514
+ const onInputTemperatureSlider = ( e ) => {
520
515
document . getElementById ( id + "_input" ) . value = e . target . value
521
516
currentTemperature [ type ] [ index ] = e . target . value
522
517
updateState ( e . target . value , id )
523
518
}
524
- const onInputTemperatureInput = e => {
519
+ const onInputTemperatureInput = ( e ) => {
525
520
document . getElementById ( id + "_slider" ) . value = e . target . value
526
521
currentTemperature [ type ] [ index ] = e . target . value
527
522
updateState ( e . target . value , id )
528
523
}
529
- const onSet = e => {
524
+ const onSet = ( e ) => {
530
525
setTemperature ( currentTemperature [ type ] [ index ] , type , index )
531
526
}
532
527
533
- const onStop = e => {
528
+ const onStop = ( e ) => {
534
529
setTemperature ( 0 , type , index )
535
530
}
536
531
537
- const onChange = e => {
532
+ const onChange = ( e ) => {
538
533
if ( e . target . value . length > 0 ) {
539
534
document . getElementById ( id + "_input" ) . value = e . target . value
540
535
currentTemperature [ type ] [ index ] = e . target . value
@@ -694,7 +689,7 @@ const TemperatureSlider = ({ id, type, index }) => {
694
689
const TemperaturesGraphs = ( { visible } ) => {
695
690
const { TT , TB , TC , TList } = useStoreon ( "TT" , "TB" , "TC" , "TList" )
696
691
if ( ! visible ) return null
697
- const exportcharts = e => {
692
+ const exportcharts = ( e ) => {
698
693
let data , file
699
694
let nb = 0
700
695
const filename = "esp3dcharts.csv"
@@ -781,13 +776,13 @@ const TemperaturesGraphs = ({ visible }) => {
781
776
a . download = filename
782
777
document . body . appendChild ( a )
783
778
a . click ( )
784
- setTimeout ( function ( ) {
779
+ setTimeout ( function ( ) {
785
780
document . body . removeChild ( a )
786
781
window . URL . revokeObjectURL ( url )
787
782
} , 0 )
788
783
}
789
784
}
790
- const clearcharts = e => {
785
+ const clearcharts = ( e ) => {
791
786
const { dispatch } = useStoreon ( )
792
787
dispatch ( "temperatures/clear" )
793
788
fillCharts ( true )
@@ -1110,18 +1105,18 @@ const TemperaturesPanel = () => {
1110
1105
if ( ! showTemperatures ) {
1111
1106
return null
1112
1107
}
1113
- const onClose = e => {
1108
+ const onClose = ( e ) => {
1114
1109
const { dispatch } = useStoreon ( )
1115
1110
dispatch ( "panel/showtemperatures" , false )
1116
1111
}
1117
- const onToogleView = e => {
1112
+ const onToogleView = ( e ) => {
1118
1113
graphsView = ! graphsView
1119
1114
showDialog ( { displayDialog : false , refreshPage : true } )
1120
1115
}
1121
1116
1122
1117
let panelClass = "order-" + index + " w-100 panelCard"
1123
1118
1124
- const onStopAll = e => {
1119
+ const onStopAll = ( e ) => {
1125
1120
if ( typeof currentTemperature [ "extruder" ] != "undefined" ) {
1126
1121
for ( let i = 0 ; i < currentTemperature [ "extruder" ] . length ; i ++ )
1127
1122
setTemperature ( 0 , "extruder" , i )
0 commit comments