qtplasmac: material files naming consistency

Author: phillc54

share/qtvcp/screens/qtplasmac/qtplasmac_handler.py

@@ -4278,38 +4278,40 @@ def material_reload_pin_changed(self, halpin):
     def material_temp_pin_changed(self, halpin):
         if halpin:
             t_name = 'Temporary {}'.format(halpin)
-            t_item = 0
+            k_width, p_height, p_delay, pj_height, pj_delay, c_height, \
+            c_speed, c_amps, c_volts, pause, g_press, c_mode, t_item = \
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
             with open(self.tmpMaterialFileGCode, 'r') as f_in:
                 for line in f_in:
-                    if line.startswith('name'):
+                    if line.startswith('NAME'):
                         t_name = line.split('=')[1].strip()
-                    if line.startswith('kerf_width'):
+                    if line.startswith('KERF_WIDTH'):
                         k_width = float(line.split('=')[1].strip())
-                    elif line.startswith('pierce_height'):
+                    elif line.startswith('PIERCE_HEIGHT'):
                         p_height = float(line.split('=')[1].strip())
-                    elif line.startswith('pierce_delay'):
+                    elif line.startswith('PIERCE_DELAY'):
                         p_delay = float(line.split('=')[1].strip())
-                    elif line.startswith('puddle_jump_height'):
+                    elif line.startswith('PUDDLE_JUMP_HEIGHT'):
                         pj_height = float(line.split('=')[1].strip())
-                    elif line.startswith('puddle_jump_delay'):
+                    elif line.startswith('PUDDLE_JUMP_DELAY'):
                         pj_delay = float(line.split('=')[1].strip())
-                    elif line.startswith('cut_height'):
+                    elif line.startswith('CUT_HEIGHT'):
                         c_height = float(line.split('=')[1].strip())
-                    elif line.startswith('cut_speed'):
+                    elif line.startswith('CUT_SPEED'):
                         c_speed = float(line.split('=')[1].strip())
-                    elif line.startswith('cut_amps'):
+                    elif line.startswith('CUT_AMPS'):
                         c_amps = float(line.split('=')[1].strip())
-                    elif line.startswith('cut_volts'):
+                    elif line.startswith('CUT_VOLTS'):
                         c_volts = float(line.split('=')[1].strip())
-                    elif line.startswith('pause_at_end'):
+                    elif line.startswith('PAUSE_AT_END'):
                         pause = float(line.split('=')[1].strip())
-                    elif line.startswith('gas_pressure'):
+                    elif line.startswith('GAS_PRESSURE'):
                         g_press = float(line.split('=')[1].strip())
-                    elif line.startswith('cut_mode'):
+                    elif line.startswith('CUT_MODE'):
                         c_mode = float(line.split('=')[1].strip())
             self.write_materials(halpin, t_name, k_width, p_height, \
                                  p_delay, pj_height, pj_delay, c_height, c_speed, \
-                                 c_amps, c_volts, pause, g_press, c_mode, 0)
+                                 c_amps, c_volts, pause, g_press, c_mode, t_item)
             self.display_materials()
             self.change_material(0)
             self.w.materials_box.setCurrentIndex(0)

share/qtvcp/screens/qtplasmac/versions.html

@@ -30,6 +30,11 @@ <h2>QtPlasmaC Version History</h2>
 </table>
 <br>
 <!--- ****** ADD NEXT VERSION BELOW THIS LINE ****** --->
+<br><b><u>v1.229.227 2022 Aug 17</u></b>
+<ul style="margin:0;">
+  <li>material files naming consistency</li>
+</ul>
+
 <br><b><u>v1.229.226 2022 Aug 16</u></b>
 <ul style="margin:0;">
   <li>simple housekeeping</li>

src/emc/usr_intf/qtplasmac/qtplasmac_gcode.py

@@ -586,20 +586,20 @@ def write_temporary_material(data):
             else:
                 fWrite.write('#plasmac temporary material file\n')
                 fWrite.write('\nnumber={}\n'.format(tmpMatNum))
-            fWrite.write('name={}\n'.format(tmpMatNam))
-            fWrite.write('kerf_width={}\n'.format(data[3]))
-            fWrite.write('thc_enable={}\n'.format(data[4]))
-            fWrite.write('pierce_height={}\n'.format(data[5]))
-            fWrite.write('pierce_delay={}\n'.format(data[6]))
-            fWrite.write('puddle_jump_height={}\n'.format(data[7]))
-            fWrite.write('puddle_jump_delay={}\n'.format(data[8]))
-            fWrite.write('cut_height={}\n'.format(data[9]))
-            fWrite.write('cut_speed={}\n'.format(data[10]))
-            fWrite.write('cut_amps={}\n'.format(data[11]))
-            fWrite.write('cut_volts={}\n'.format(data[12]))
-            fWrite.write('pause_at_end={}\n'.format(data[13]))
-            fWrite.write('gas_pressure={}\n'.format(data[14]))
-            fWrite.write('cut_mode={}\n'.format(data[15]))
+            fWrite.write('NAME={}\n'.format(tmpMatNam))
+            fWrite.write('KERF_WIDTH={}\n'.format(data[3]))
+            fWrite.write('THC_ENABLE={}\n'.format(data[4]))
+            fWrite.write('PIERCE_HEIGHT={}\n'.format(data[5]))
+            fWrite.write('PIERCE_DELAY={}\n'.format(data[6]))
+            fWrite.write('PUDDLE_JUMP_HEIGHT={}\n'.format(data[7]))
+            fWrite.write('PUDDLE_JUMP_DELAY={}\n'.format(data[8]))
+            fWrite.write('CUT_HEIGHT={}\n'.format(data[9]))
+            fWrite.write('CUT_SPEED={}\n'.format(data[10]))
+            fWrite.write('CUT_AMPS={}\n'.format(data[11]))
+            fWrite.write('CUT_VOLTS={}\n'.format(data[12]))
+            fWrite.write('PAUSE_AT_END={}\n'.format(data[13]))
+            fWrite.write('GAS_PRESSURE={}\n'.format(data[14]))
+            fWrite.write('CUT_MODE={}\n'.format(data[15]))
             fWrite.write('\n')
     except:
         codeError = True