Merge branch '2.9'

Author: c-morley

docs/src/hal/general-ref.adoc

@@ -20,7 +20,7 @@ Typical pins definitions look like these examples:
 
 Occasionally, an abbreviated version of the name may be used, for example the second pin above could be simply called with _.output_ when it can be done without causing confusion.
 
-[[sec:hal-gr:namming-conventions]]
+[[sec:hal-gr:naming-conventions]]
 == HAL General Naming Conventions(((HAL General Naming Conventions)))
 
 Consistent naming conventions would make HAL much easier to use.

docs/src/hal/halmodule.adoc

@@ -273,7 +273,7 @@ Does the specified pin have a driving pin connected. +
 Returns True or False.
 
 ----
-h.in.pin_has_writer()
+hal.pin_has_writer('some-comp.pin-name')
 ----
 
 === get_name

src/emc/usr_intf/pncconf/pncconf.py

@@ -2140,10 +2140,10 @@ def init_mesa_options(self,boardnum):
             dbg('Looking for firmware data %s'%self.d["mesa%d_firmware"% boardnum])
             found = False
             search = 0
-            model = self.widgets["mesa%d_firmware"% boardnum].get_model()
-            for search,item in enumerate(model):
-                dbg('%d,%s'%(search,model[search][0]))
-                if model[search][0]  == self.d["mesa%d_firmware"% boardnum]:
+            combo_model = self.widgets["mesa%d_firmware"% boardnum].get_model()
+            for search,item in enumerate(combo_model):
+                dbg('%d,%s'%(search,combo_model[search][0]))
+                if combo_model[search][0]  == self.d["mesa%d_firmware"% boardnum]:
                     self.widgets["mesa%d_firmware"% boardnum].set_active(search)
                     found = True
                     dbg('found firmware # %d'% search)
@@ -2152,9 +2152,10 @@ def init_mesa_options(self,boardnum):
                 dbg('firmware not found')
                 cur_firm = self.d['mesa%d_currentfirmwaredata'% boardnum][_PD._FIRMWARE]
                 dbg('looking for: %s'% cur_firm )
+                combo = self.widgets["mesa%d_firmware"% boardnum]
                 #self.widgets["mesa%d_firmware"% boardnum].set_active(0)
                 self._p.MESA_FIRMWAREDATA.append(self.d['mesa%d_currentfirmwaredata'% boardnum])
-                model.append((cur_firm,))
+                combo.append_text(cur_firm)
                 self.init_mesa_options(boardnum)
                 return
             else: