Skip to content

Commit

Permalink
Merge pull request #18 from bcmcms/McMaster
Browse files Browse the repository at this point in the history
Updated list of testers to include all requested staff
  • Loading branch information
caleb-james-smith authored Jun 15, 2018
2 parents 6aa3bd6 + f97f1df commit 89cd7da
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions User-Interface.py
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ def lockoff (self,event=None):
self.info_nameLabel.pack(side=LEFT)

# Make and pack a listbox to pick which QIE card to talk to:
self.info_nameBox = OptionMenu(self.info_subTop_frame, self.nameChoiceVar, "Nesta Lenhert", "Chris Madrid", "Bryan Caraway", "Brooks McMaster", "Caleb Smith", "Danny \"HF\" Noonan")
self.info_nameBox = OptionMenu(self.info_subTop_frame, self.nameChoiceVar, "Bryan Caraway", "Grace Cummings", "Zach Eckert", "Loriza Hasa", "Frank Jensen", "Kamal Lamichhane", "Nesta Lenhert", "Chris Madrid", "Brooks McMaster", "Danny \"HF\" Noonan", "Joe Pastika", "Mark Saunders", "Sezen Sekmen", "Zach Shelton", "Caleb Smith", "Nadja Strobbe")
self.info_nameBox.pack(side=LEFT)
self.info_nameBox.configure(bg=self.topc,fg=self.fontc,activebackground=self.dimc,activeforeground=self.fontc)
self.info_nameBox["menu"].config(bg=self.topc,fg=self.fontc,activebackground=self.dimc,activeforeground=self.fontc)
Expand Down Expand Up @@ -1276,7 +1276,7 @@ def getUniqueIDPress(self):
#cooked_bus = self.serialNum(cooked_bus)
self.uniqueIDEntry.set(self.toHex(cooked_bus))
self.uniqueIDPass = self.uniqueIDEntry.get()
self.uniqueIDEntry.set("0x"+self.uniqueIDPass[4:(len(self.uniqueIDPass)-4)])
self.uniqueIDEntry.set("0x" + self.uniqueIDPass[2:10].upper() + "_0x" + self.uniqueIDPass[10:18].upper())

print "UniqueID: {0}".format(self.uniqueIDEntry.get())

Expand Down

0 comments on commit 89cd7da

Please sign in to comment.