Skip to content

Commit e15a505

Browse files
c-morleyc-morley
authored
Merge pull request #3483 from kworm83/7i95t_pncconf
Pncconf add Mesa 7i95t support
2 parents 07e637b + d64d6a1 commit e15a505

3 files changed

Lines changed: 46 additions & 4 deletions

File tree

‎src/emc/usr_intf/pncconf/pages.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -631,7 +631,7 @@ def on_combo_screentype_changed(self,w):
631631
self.w.touchy_info.hide()
632632
self.page_set_state('vcp', False)
633633
self.page_set_state('ubuttons', True)
634-
if self.d._arcvpin:
634+
if self.d._arcvpin != None:
635635
self.page_set_state('thcad', True)
636636
else:
637637
self.page_set_state('thcad', False)
@@ -1296,7 +1296,7 @@ def thcad_init(self):
12961296
def thcad_prepare(self):
12971297
self.d.help = "help-thcad.txt"
12981298
self.w.voltsbox.hide()
1299-
if self.d._arcvpin:
1299+
if self.d._arcvpin != None:
13001300
self.w.voltsbox.show()
13011301
self.w.voltsmodel.set_active(["2 (W1 down)", "2 (W1 up)", "5", "10", "300"].index(self.d.voltsmodel))
13021302
self.w.voltsfjumper.set_active(["1", "32", "64", "128"].index(self.d.voltsfjumper))

‎src/emc/usr_intf/pncconf/pncconf.py‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3709,7 +3709,7 @@ def on_general_pin_changed(self, widget, boardtype, boardnum, connector, channel
37093709
self.d._arcvpin = pin
37103710
elif self.d._arcvpin == pin:
37113711
self.d._arcvpin = None
3712-
if self.d._arcvpin and self.d.frontend == _PD._QTPLASMAC:
3712+
if self.d._arcvpin != None and self.d.frontend == _PD._QTPLASMAC:
37133713
self.p.page_set_state('thcad', True)
37143714
else:
37153715
self.p.page_set_state('thcad', False)
@@ -5636,7 +5636,10 @@ def make_name(bname,bnum):
56365636
return "%s."% (make_name(boardname,halboardnum)) + "outm.00.out-%02d"% (compnum)
56375637
elif ptype == _PD.INM0:
56385638
compnum -= 100
5639-
return "%s."% (make_name(boardname,halboardnum)) + "inm.00.input-%02d"% (compnum)
5639+
if boardname in ("7i95t"):
5640+
return "%s."% (make_name(boardname,halboardnum)) + "inmux.00.input-%02d"% (compnum)
5641+
else:
5642+
return "%s."% (make_name(boardname,halboardnum)) + "inm.00.input-%02d"% (compnum)
56405643
else:
56415644
compnum = int(pinnum)+(concount* num_of_pins )
56425645
return "%s."% (make_name(boardname,halboardnum)) + "gpio.%03d"% (compnum)

‎src/emc/usr_intf/pncconf/private_data.py‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1082,6 +1082,43 @@ def __init__(self,app,bin_dir,base_dir):
10821082
[S.STEPA,0],[S.STEPB,0],[S.GPIOI,0],[S.GPIOI,0],[S.GPIOI,0],[S.GPIOI,0],[S.STEPA,1],[S.STEPB,1],[S.GPIOI,0],[S.GPIOI,0],[S.GPIOI,0],[S.GPIOI,0],
10831083
[S.STEPA,2],[S.STEPB,2],[S.GPIOI,0],[S.GPIOI,0],[S.GPIOI,0],[S.GPIOI,0],[S.STEPA,3],[S.STEPB,3],[S.GPIOI,0],[S.GPIOI,0],[S.GPIOI,0],[S.GPIOI,0],],
10841084

1085+
# 7i95t ####################
1086+
['7i95t-Internal Data', '7i95', '7i95t_d', '7i95t', 'hm2_eth',
1087+
6,3, 0,0, 0,0, 0,0, 6,2, 1,2, [],0,0,0,0,0,0,0, 1, 30, 33, 200, [1, 2, 3, 4],
1088+
# TAB 1 TB3
1089+
[S.STEPA,0],[S.STEPB,0],[S.STEPA,1],[S.STEPB,1],
1090+
[S.STEPA,2],[S.STEPB,2],[S.STEPA,3],[S.STEPB,3],
1091+
# TAB 1 TB4
1092+
[S.STEPA,4],[S.STEPB,4],[S.STEPA,5],[S.STEPB,5],
1093+
[S.RXDATA0,0],[S.TXDATA0,0],[S.TXEN0,0],[S.RXDATA1,0],[S.TXDATA1,0],[S.TXEN1,0],
1094+
[S.NUSED,0],[S.NUSED,0],
1095+
[S.NUSED,0],[S.NUSED,0],[S.NUSED,0],[S.NUSED,0],
1096+
1097+
# TAB 2 TB1
1098+
[S.ENCA,0],[S.ENCB,0],[S.ENCI,0],[S.ENCA,1],[S.ENCB,1],[S.ENCI,1],
1099+
[S.ENCA,2],[S.ENCB,2],[S.ENCI,2],
1100+
# TAB 2 TB2
1101+
[S.ENCA,3],[S.ENCB,3],[S.ENCI,3],[S.ENCA,4],[S.ENCB,4],[S.ENCI,4],
1102+
[S.ENCA,5],[S.ENCB,5],[S.ENCI,5],
1103+
[S.NUSED,0],[S.NUSED,0],
1104+
[S.NUSED,0],[S.NUSED,0],[S.NUSED,0],[S.NUSED,0],
1105+
1106+
# TAB 3 TB5
1107+
[S.INM0, 116],[S.INM0, 117],[S.INM0, 118],[S.INM0, 119],
1108+
[S.INM0, 120],[S.INM0, 121],[S.INM0, 122],[S.INM0, 123],
1109+
[S.SSR0, 100],[S.SSR0, 101],[S.SSR0, 102],[S.SSR0, 103],[S.SSR0, 104],[S.SSR0, 105],
1110+
[S.NUSED,0],[S.NUSED,0],[S.NUSED,0],[S.NUSED,0],[S.NUSED,0],[S.NUSED,0],
1111+
[S.NUSED,0],[S.NUSED,0],[S.NUSED,0],[S.NUSED,0],
1112+
1113+
# TAB 4 TB6
1114+
[S.INM0, 100],[S.INM0, 101],[S.INM0, 102],[S.INM0, 103],[S.INM0, 104],[S.INM0, 105],
1115+
[S.INM0, 106],[S.INM0, 107],[S.INM0, 108],[S.INM0, 109],[S.INM0, 110],[S.INM0, 111],
1116+
[S.INM0, 112],[S.INM0, 113],[S.INM0, 114],[S.INM0, 115],
1117+
[S.NUSED,0],[S.NUSED,0],[S.NUSED,0],[S.NUSED,0],
1118+
[S.NUSED,0],[S.NUSED,0],[S.NUSED,0],[S.NUSED,0],
1119+
1120+
],
1121+
10851122
# 7i96 ####################
10861123
['7i96-Internal Data', '7i96', '7i96d', '7i96', 'hm2_eth',
10871124
1,3, 0,0, 0,3, 0,0, 5,2, 1,1, [],0,0,0,0,0,0,0, 1, 34, 33, 200, [1, 2, 3],
@@ -1380,6 +1417,7 @@ def __init__(self,app,bin_dir,base_dir):
13801417
["jvlsmd41", _("JVL-SMD41 or 42"), 500, 500, 2500, 2500],
13811418
["hobbycnc", _("Hobbycnc Pro Chopper"), 2000, 2000, 2000, 2000],
13821419
["keling", _("Keling 4030"), 5000, 5000, 20000, 20000],
1420+
["tb6600", _("TB6600"), 5000, 5000, 20000, 20000],
13831421
["dm860tv10", _("DM860T v1.0"), 5000, 5000, 5000, 5000],
13841422
["dm860tv30", _("DM860T v3.0"), 5000, 5000, 5000, 5000],
13851423
]
@@ -1402,6 +1440,7 @@ def __init__(self,app,bin_dir,base_dir):
14021440
'7i90':{'DRIVER':'hm2_7i90','PINS_PER_CONNECTOR':24,'TOTAL_CONNECTORS':3,'TAB_NUMS':[1,2,3],'TAB_NAMES':['P1','P2','P3']},
14031441
'7i92':{'DRIVER':'hm2_eth','PINS_PER_CONNECTOR':17,'TOTAL_CONNECTORS':2,'TAB_NUMS':[1,2],'TAB_NAMES':['P1','P2']},
14041442
'7i93':{'DRIVER':'hm2_eth','PINS_PER_CONNECTOR':24,'TOTAL_CONNECTORS':2,'TAB_NUMS':[1,2],'TAB_NAMES':['P1','P2']},
1443+
'7i95':{'DRIVER':'hm2_eth','PINS_PER_CONNECTOR':24,'TOTAL_CONNECTORS':4,'TAB_NUMS':[1,2,3,4],'TAB_NAMES':['TB3/TB4','TB1/TB2','TB5','TB6']},
14051444
'7i96':{'DRIVER':'hm2_eth','PINS_PER_CONNECTOR':17,'TOTAL_CONNECTORS':3,'TAB_NUMS':[1,2,3],'TAB_NAMES':['TB3','TB1/TB2','P1']},
14061445
'7i96s':{'DRIVER':'hm2_eth','PINS_PER_CONNECTOR':17,'TOTAL_CONNECTORS':3,'TAB_NUMS':[1,2,3],'TAB_NAMES':['TB3','TB1/TB2','P1']},
14071446
'7i98':{'DRIVER':'hm2_eth','PINS_PER_CONNECTOR':17,'TOTAL_CONNECTORS':3,'TAB_NUMS':[1,2,3],'TAB_NAMES':['P1','P2','P3']},

0 commit comments

Comments
 (0)