fix Desktop bugs

Author: JasonWong08

pyUI/SkillComposer.py

@@ -1133,13 +1133,14 @@ def popImport(self):
     def changeColor(self,i):
         colorTuple = askcolor(title="Tkinter Color Chooser")
         logger.debug(f"colorTuple: {colorTuple}")
+        self.topEye.focus_force()  # the eye color edit window gets focus
         if (colorTuple[0] is not None) and (colorTuple[1] is not None):
             colors = list(colorTuple[0])
             self.colorHex = colorTuple[1]
-    #        for c in range(3):
-    #            colors[c] //= 2    #it's not always returning interger.
-    #        colors = list(map(lambda x:int(x//2),colors)) #colors have to be integer
-    #        printH('RGB: ',colors)
+            # for c in range(3):
+            #     colors[c] //= 2    #it's not always returning interger.
+            colors = list(map(lambda x: int(x), colors))  # colors have to be integer
+            logger.debug(f"RGB: {colors}")
             if self.colorBinderValue.get():
                 self.activeEye = 0
                 self.eyeColors[0]=colors
@@ -1192,10 +1193,10 @@ def popEyeColor(self):
         width = dia*2 + gap + 2*crd[0]
         self.eyeColors = [[0,0,0],[0,0,0],[0,0,0]]
         self.activeEye = 0
-        topEye = Toplevel(self.window)
-        topEye.title('Eye Color Setter')
-        topEye.geometry(str(width)+'x170+400+200')
-        face = Frame(topEye)
+        self.topEye = Toplevel(self.window)
+        self.topEye.title('Eye Color Setter')
+        self.topEye.geometry(str(width)+'x170+400+200')
+        face = Frame(self.topEye)
         face.grid(row = 0,column = 0)
         self.canvasFace = Canvas(face,height=120)
         self.canvasFace.grid(row = 0,column = 0, columnspan = 2)
@@ -1223,7 +1224,8 @@ def popEyeColor(self):
         for e in range(len(effectDictionary)):
             Button(btnsEff,text=txt(list(effectDictionary.keys())[e]),width = wValue,command = lambda eff=list(effectDictionary.values())[e]:self.changeEffect(eff)).grid(row = 0,column = e)
         Button(btnsEff,text=txt('Meow'),width = wValue,command = lambda :send(ports, ['u', 0])).grid(row = 0,column = 3)
-
+        self.topEye.focus_force()  # the eye color edit window gets focus
+        self.topEye.mainloop()
 
     def playThread(self):
         self.playStop = False

pyUI/UI.py

@@ -120,6 +120,8 @@ def changeModel(self, modelName):
         model = copy.deepcopy(modelName)
         self.modelLabel.configure(text=model)
         print(model)
+        if model == "Bittle X":
+            self.defaultBdVer = "BiBoard_V0_2"
 
     def changeLan(self, l):
         global language

pyUI/release/2.0/Bittle/BiBoard_V0_1/OpenCatEsp32Standard_Voice.ino.bin

@@ -41,7 +41,7 @@
 :100280006E697469616C697A652074686520636160
 :100290006D65726121004D5520696E697469616CEC
 :1002A000697A656420617420307835300052656168
-:1002B000647921004E5F3234303132330042697448
+:1002B000647921004E5F3234303230370042697445
 :1002C000746C65000A2A205374617274202A0054E9
 :1002D000007363726800636B007065650070750081
 :1002E0006869007374720073697400747200776BCC
@@ -51,7 +51,7 @@
 :10032000656E6E6973007461626C652074656E6ED3
 :100330006973004F56462120576F6E2774207361F2
 :100340007665210061626F72746564007361766521
-:1003500064004E5F32343031323300426974746C61
+:1003500064004E5F32343032303700426974746C5E
 :1003600065004C6F7720706F7765723A0000761DDC
 :10037000353011241FBECFEFD8E0DEBFCDBF12E075
 :10038000A0E0B1E0EAE4F1E702C005900D92AC30E4

pyUI/release/2.0/Bittle/BiBoard_V0_2/OpenCatEsp32Standard_Voice.ino.bin

@@ -18,16 +18,16 @@
 :1001100000000000000000000000000000000000DF
 :10012000240027002A0000000000230026002900E8
 :10013000536572766F3A00536B696C6C005461734F
-:100140006B5100526561647921004E5F3234303169
-:10015000323300426974746C65000A2A205374615A
+:100140006B5100526561647921004E5F3234303268
+:10015000303700426974746C65000A2A2053746158
 :100160007274202A0054007363726800636B00701D
 :100170006565007075006869007374720073697456
 :1001800000747200776B0063720076740063004243
 :1001900000700052007570004C006700460064005B
 :1001A0004F5646000000000800020100000304074B
 :1001B00000000000000000004F56462120576F6EDF
 :1001C00027742073617665210061626F72746564C3
-:1001D000007361766564004E5F3234303132330033
+:1001D000007361766564004E5F3234303230370030
 :1001E000426974746C65004C6F7720706F7765722C
 :1001F0003A00010204081020408001020408102087
 :1002000001020408102000000000250028002B0037

pyUI/release/2.0/Bittle/NyBoard_V1/OpenCatCamera.ino.hex

@@ -221,15 +221,15 @@
 :100DC0004C82A8F1CAF235F19688A6D900D8F1FF75
 :100DD000444D50206661696C6564202800494D557A
 :100DE00000536572766F3A00536B696C6C00526504
-:100DF00061647921004E5F32343031323300426910
+:100DF00061647921004E5F3234303230370042690D
 :100E000074746C65000A2A205374617274202A007D
 :100E100054007363726800636B00706565007075E1
 :100E200000686900737472007369740074720077EB
 :100E30006B00637200767400630042007000520021
 :100E40007570004C006700460064004F5646007AFB
 :100E500001750171016D01680163015D0158015463
 :100E6000014F014A0161626F7274656400736176BB
-:100E70006564004E5F32343031323300426974743D
+:100E70006564004E5F32343032303700426974743A
 :100E80006C65004C6F7720706F7765723A0058235D
 :100E9000BA3411241FBECFEFD8E0DEBFCDBF11E0C2
 :100EA000A0E0B1E0E8EFFBE702C005900D92A83B9F

pyUI/release/2.0/Bittle/NyBoard_V1/OpenCatMind+.ino.hex

@@ -218,15 +218,15 @@
 :100D9000F235F19688A6D900D8F1FF444D5020666F
 :100DA00061696C6564202800494D55005365727671
 :100DB0006F3A00536B696C6C005265616479210075
-:100DC0004E5F32343031323300426974746C6500E6
+:100DC0004E5F32343032303700426974746C6500E3
 :100DD0000A2A205374617274202A005400736372CB
 :100DE0006800636B0070656500707500686900736A
 :100DF00074720073697400747200776B0063720020
 :100E000076740063004200700052007570004C0060
 :100E10006700460064004F5646004F564621205753
 :100E20006F6E27742073617665210061626F727442
-:100E30006564007361766564004E5F323430313230
-:100E40003300426974746C65004C6F7720706F7763
+:100E30006564007361766564004E5F323430323031
+:100E40003700426974746C65004C6F7720706F775F
 :100E500065723A006B234F3511241FBECFEFD8E0E7
 :100E6000DEBFCDBF11E0A0E0B1E0E2E2FDE702C0ED
 :100E700005900D92A03BB107D9F727E0A0EBB1E0B8

pyUI/release/2.0/Bittle/NyBoard_V1/OpenCatRandomMind.ino.hex

@@ -26,7 +26,7 @@
 :100190003A00536B696C6C005461736B510043758A
 :1001A00073746F6D697A656420766F6963653A0070
 :1001B000496E697420766F69636500526561647980
-:1001C00021004E5F32343031323300426974746C36
+:1001C00021004E5F32343032303700426974746C33
 :1001D00065000A2A205374617274202A0054007347
 :1001E00063726800636B0070656500707500686914
 :1001F000007374720073697400747200776B00632B
@@ -35,7 +35,7 @@
 :100220000165015901550131012D012901250121E6
 :10023000011C014F56462120576F6E2774207361B1
 :100240007665210061626F72746564007361766522
-:1002500064004E5F32343031323300426974746C62
+:1002500064004E5F32343032303700426974746C5F
 :1002600065004C6F7720706F7765723A0000000070
 :100270000023002600290000000000250028002B94
 :10028000000404040404040404020202020202033F