From 96805fd998b65375e8a37ed090726fbee8772dfd Mon Sep 17 00:00:00 2001 From: dxy15521469561 <1731678236@qq.com> Date: Fri, 4 Aug 2023 20:27:02 +0800 Subject: [PATCH] =?utf8?q?1.=E4=BC=98=E5=8C=96=E8=A1=A8=E7=9B=98=202.?= =?utf8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- 2.sdk/project/K5/ext/static/charge_ing.png | Bin 370 -> 444 bytes 2.sdk/project/K5/ext/static/mpsignal1.png | Bin 2899 -> 362 bytes 2.sdk/project/K5/ext/static/mpsignal2.png | Bin 2896 -> 386 bytes 2.sdk/project/K5/ext/static/mpsignal3.png | Bin 2906 -> 411 bytes 2.sdk/project/K5/ext/static/mpsignal4.png | Bin 2900 -> 440 bytes 2.sdk/project/K5/ext/static/mpsignal5.png | Bin 1992 -> 907 bytes 2.sdk/project/K5/ext/static/vbat_0.png | Bin 2901 -> 1439 bytes .../microPython/ports/quectel/core/mgr.py | 76 +++++++----- .../ports/quectel/core/protocol.py | 2 +- .../ports/quectel/core/ui_WatchFaceScreen.py | 109 ++++++++++++++---- 2.sdk/project/K5/usr/static/DIAL_PREV01.png | Bin 12765 -> 12921 bytes 2.sdk/project/K5/usr/static/DIAL_PREV02.png | Bin 3121 -> 3146 bytes 12 files changed, 133 insertions(+), 54 deletions(-) diff --git a/2.sdk/project/K5/ext/static/charge_ing.png b/2.sdk/project/K5/ext/static/charge_ing.png index 1e4a346ce41244ad62a9618d9d4b69811075c039..070a502c15157c3089d1ec09f42e3c59b9406907 100644 GIT binary patch delta 432 zcmV;h0Z;z&0=xquiBL{Q4GJ0x0000DNk~Le0000e0000M2nGNE0J4tWu#q7ce{M-c zK~zYI%~y*}!!Q)QS1~|F=m^<>G6C%bq#M8lumNm9m;ji7Za_Dn8_*37o%Dj-U{va7 z)Sgr&wd3cD@BIRSj))z7n~H+yEUUYU$UOzjh)0tSoJEOYmz?B%37V4% zGrwO~AqYS&(z=sxgSJ|KSz$Zb^YC6M$UFiOlsAVaM9_2BKyG7ZtI7n+ebCdvZ8Eg^ zCE0Gx?4fj@B7#m%(x#aCZ;VALIV5T35OS>t#b2;AvrtqYbb_8vBehfMI~~wwQDEZu$DHc89QCBVLgSGU;FFi@-4q`vL8(V az5rDhv6|E5O^^Tp002ov22Mn-LSTYMz`}a~ delta 357 zcmV-r0h<221M&hPiBL{Q4GJ0x0000DNk~Le0000U0000I2nGNE08H|3*^wa_ekFNP5)&Vk2ov2}zBlcS$#r#vBZsB0@x)ePrzl{ILiu#s7J`3fBPhLBI#{kK51aMc-CB$%dRj&EmtaK{ni58$Erd=AXx zeQ9O~g@2nkI7k@EK00000NkvXXu0mjf D=24jp diff --git a/2.sdk/project/K5/ext/static/mpsignal1.png b/2.sdk/project/K5/ext/static/mpsignal1.png index ba1c2c57f571582f5e70116178fedda7068868a2..2691f7185e44e63f4e188c717d73371ec6385326 100644 GIT binary patch literal 362 zcmV-w0hRuVP)KmC+4?Kn#Ze8V7I$M_>d-a03}ZClDuK1a%U00@*+} zP$#Hq?2)D-A#hP2_+O4|Nxxp(1C08Kn7QPaQp=Y;GZ*ULF>@9zKMl?vte_^%V}VN# zX6D@3F1kNUGO?hUJ5d1NbT6=36qstN>qgf-fJ~tYfB@SP(Or96mzaq1-ehyyohfbV zdOpK@J9x;6-+~zx<~dZM&|VJ)Pg;Br09Sn$U_wM|0EZ#KS`yHdHe8*RTo+gFFl2E` z?UJZ_Y-|fN-B$evO9s<{=Q_2OOtJH&>bo}iNBynnQ(}5|m&R1-b&8^COAr|(|9dO| zB*t`b$#u0=ZQv#)E}4^0uB)vLe02Np6_X&J-sx%!vA!$-Pw?S~avAHqwUH||9 literal 2899 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 x@8q*&x~j)!D~J|V1002ovPDHLkV1l`whRpx~ diff --git a/2.sdk/project/K5/ext/static/mpsignal2.png b/2.sdk/project/K5/ext/static/mpsignal2.png index 16d8b5a663ecf0ab244f1650f69a86a0f0e96cc4..7afdd947d1f5a8a3221bb41a0e23d01f13ece1e6 100644 GIT binary patch literal 386 zcmV-|0e$|7P)Kl+kg*Fbsx&aSXr+86hKN1U4WelnH(5A*T(j(>yreN3R=1w1@Moq1vX0pQ%!YT>9_+>Dl`WWU>hR()!McxCZhFVvbpWn zq_%K1pW(h7Jm$uChZ$979_*_u~t9Fq_3*vHldKDc%G#cV_Q gJ$-HAtUnfjD^2i=2=>^0jsO4v07*qoM6N<$f<}L(ZvX%Q literal 2896 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 FV1fpxuk`=` literal 2906 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 XMe~|_W)@EM{A*K^({yzU*A)E?Gl|8~ diff --git a/2.sdk/project/K5/ext/static/vbat_0.png b/2.sdk/project/K5/ext/static/vbat_0.png index 89ae52485663c8efee701c5b488b309a07631169..a830107c86e76ee1eb3aa60496f7912fb35cf9fb 100644 GIT binary patch literal 1439 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 diff --git a/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/mgr.py b/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/mgr.py index f6048e4c..5053204c 100644 --- a/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/mgr.py +++ b/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/mgr.py @@ -255,16 +255,16 @@ class CountdownManager(Abstract): BATTERY_OCV_TABLE = { "nix_coy_mnzo2": { 55: { - 4152: 100, 4083: 95, 4023: 90, 3967: 85, 3915: 80, 3864: 75, 3816: 70, 3773: 65, 3737: 60, 3685: 55, - 3656: 50, 3638: 45, 3625: 40, 3612: 35, 3596: 30, 3564: 25, 3534: 20, 3492: 15, 3457: 10, 3410: 5, 3380: 0, + 4331: 100, 4237: 95, 4179: 90, 4123: 85, 4070: 80, 4020: 75, 3963: 70, 3919: 65, 3882: 60, 3847: 55, + 3818: 50, 3794: 45, 3772: 40, 3752: 35, 3733: 30, 3716: 25, 3699: 20, 3677: 15, 3652: 10, 3629: 5, 3355: 0, }, 20: { - 4143: 100, 4079: 95, 4023: 90, 3972: 85, 3923: 80, 3876: 75, 3831: 70, 3790: 65, 3754: 60, 3720: 55, - 3680: 50, 3652: 45, 3634: 40, 3621: 35, 3608: 30, 3595: 25, 3579: 20, 3548: 15, 3511: 10, 3468: 5, 3430: 0, + 4331: 100, 4237: 95, 4179: 90, 4123: 85, 4070: 80, 4020: 75, 3963: 70, 3919: 65, 3882: 60, 3847: 55, + 3818: 50, 3794: 45, 3772: 40, 3752: 35, 3733: 30, 3716: 25, 3699: 20, 3677: 15, 3652: 10, 3629: 5, 3355: 0, }, 0: { - 4147: 100, 4089: 95, 4038: 90, 3990: 85, 3944: 80, 3899: 75, 3853: 70, 3811: 65, 3774: 60, 3741: 55, - 3708: 50, 3675: 45, 3651: 40, 3633: 35, 3620: 30, 3608: 25, 3597: 20, 3585: 15, 3571: 10, 3550: 5, 3500: 0, + 4331: 100, 4237: 95, 4179: 90, 4123: 85, 4070: 80, 4020: 75, 3963: 70, 3919: 65, 3882: 60, 3847: 55, + 3818: 50, 3794: 45, 3772: 40, 3752: 35, 3733: 30, 3716: 25, 3699: 20, 3677: 15, 3652: 10, 3629: 5, 3355: 0, }, }, } @@ -356,6 +356,7 @@ class Battery(object): break else: pre_volt = volt + # print("__get_soc_from_dict:{}".format(soc2 - (soc2 - soc1) * (pre_volt - volt_arg) // (pre_volt - volt))) if pre_volt == 0: # Input Voltarg > Highest Voltarg return soc1 elif volt_not_under == 0: @@ -404,9 +405,12 @@ class Battery(object): else: return self.__get_adc_vbatt() - def get_energy(self): + def get_energy(self,volt_arg ): """Get battery energy""" - self.__energy = self.__get_soc(self.__temp, self.get_voltage()) + if( volt_arg == None) : + volt_arg = self.get_voltage() + self.__energy = self.__get_soc(self.__temp, volt_arg) + # print("get_energy:volt_arg {} __energy{}".format(volt_arg,self.__energy)) return self.__energy def set_charge_callback(self, charge_callback): @@ -430,7 +434,7 @@ class BatteryManager(Abstract): EventMesh.subscribe("get_battery", self.get_battery) def get_battery(self, event=None, msg=None): - battery = self.battery.get_energy() + battery = self.battery.get_energy(msg) return battery def get_voltage(self, event=None, msg=None): @@ -810,8 +814,14 @@ class DeviceInfoManager(Abstract): EventMesh.publish(constants.EVENT.PUSH_STEP, self.get_step_count()) temp = Power.getVbatt() - self.bat_count+=1 - self.vbat_buf.append(temp) + + if self.bat_count < 10: + self.vbat_buf.append(temp) + self.bat_count += 1 + else: + for i in range(9): + self.vbat_buf[i] = self.vbat_buf[i+1] + self.vbat_buf[9] = temp curr_count = len(self.vbat_buf) bat_total_value = 0 @@ -821,10 +831,8 @@ class DeviceInfoManager(Abstract): bat_total_value = bat_total_value//curr_count#一分钟更新一次电量 10个平均值 EventMesh.publish("set_curr_battery_level",bat_total_value) - # print("self.vbat_buf:{} curr_count :{} bat_total_value:{}".format(self.vbat_buf,curr_count,bat_total_value)) - if self.bat_count >= 10: - self.bat_count = 0 - self.vbat_buf = [] + # print("self.vbat_buf:{} curr_count :{} bat_total_value:{} temp:{}".format(self.vbat_buf,curr_count,bat_total_value,temp)) + bat_tmp = EventMesh.publish("screen_get_battery") self.vbat_count+=10 @@ -1348,8 +1356,8 @@ class DeviceInfoManager(Abstract): voiceCall.setCallback(voice_callback) if EventMesh.publish(constants.EVENT.GET_CONNECT) == 0:#未插卡提示关机 if battery[0] == "0": - self.no_smi_count+=1 - if self.no_smi_count > 6 and self.no_smi_state == 0: + self.no_smi_count+=10 + if self.no_smi_count > (15*60) and self.no_smi_state == 0: self.no_smi_count = 0 self.no_smi_state = 1 EventMesh.publish("load_screen", {"screen": "no_sim_auto_screen"}) @@ -1493,21 +1501,27 @@ class DeviceInfoManager(Abstract): #temp = Power.getVbatt() temp = EventMesh.publish("get_curr_battery_level") - if temp != None : - if temp <= 3505: - vbat = 0 - elif temp <= 3699: - vbat = 20 #"E:/vbat_20.jpg" - elif temp <= 3772: - vbat = 40 #"E:/vbat_40.jpg" - elif temp <= 3882: - vbat = 60 #"E:/vbat_60.jpg" - elif temp <= 4070: - vbat = 80 #"E:/vbat_80.jpg" - else: - vbat = 100 #"E:/vbat_100.jpg" - else: + vbat = EventMesh.publish("get_battery",temp) + if vbat == None: vbat = 100 + # print("vbat",vbat) + # if temp != None : + # if temp <= 3505: + # vbat = 0 + # elif temp <= 3699: + # vbat = 20 #"E:/vbat_20.jpg" + # elif temp <= 3772: + # vbat = 40 #"E:/vbat_40.jpg" + # elif temp <= 3882: + # vbat = 60 #"E:/vbat_60.jpg" + # elif temp <= 4070: + # vbat = 80 #"E:/vbat_80.jpg" + # elif temp <= 4200: + # vbat = 90 # + # else: + # vbat = 100 #"E:/vbat_100.jpg" + # else: + # vbat = 100 result = [charge_state, vbat] diff --git a/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/protocol.py b/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/protocol.py index 0b25bf5d..8a23d387 100644 --- a/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/protocol.py +++ b/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/protocol.py @@ -1373,7 +1373,7 @@ class ProtoColResolver(object): def handler(self, data): # 这里接收数据 - print("handler -> {}".format(data)) + # print("handler -> {}".format(data)) # if data.startswith('Init;'): # data = data[5:] # EventMesh.publish(constants.EVENT.SET_KEY, {"value": ujson.loads(data)['KEY']}) diff --git a/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/ui_WatchFaceScreen.py b/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/ui_WatchFaceScreen.py index 9e472e74..5ce82317 100644 --- a/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/ui_WatchFaceScreen.py +++ b/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/ui_WatchFaceScreen.py @@ -27,6 +27,12 @@ style_font_youyuan_28.init() style_font_youyuan_28.set_text_color(lv.color_make(0xFF, 0xFF, 0xFF)) style_font_youyuan_28.set_text_font(lv.font_28_dial) +power_line_points = [{"x":0,"y":0},{"x":0,"y":16}] +power_line_red = lv.style_t() +power_line_red.init() +power_line_red.set_line_width(0)#23 宽度 +power_line_red.set_line_color(lv.color_make(0xff, 0xff, 0xff)) + Watchface = lv.obj() print("Watchface") Watchface1 = lv.obj(Watchface) @@ -49,21 +55,30 @@ style_watchface_img_default.set_img_opa(255) #状态栏 watchface1_mpsignal_img = lv.img(Watchface1) -watchface1_mpsignal_img.set_pos(int(20),int(0)) -watchface1_mpsignal_img.set_size(24,17) +watchface1_mpsignal_img.set_pos(int(20),int(5)) +watchface1_mpsignal_img.set_size(30,22) watchface1_mpsignal_img.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) watchface1_mpsignal_img.add_flag(lv.obj.FLAG.CLICKABLE) watchface1_mpsignal_img.set_src("E:/static/mpsignal5.png") watchface1_mpsignal_img.add_style(style_watchface_img_default, lv.PART.MAIN|lv.STATE.DEFAULT) watchface1_res_stat_battery_img = lv.img(Watchface1) -watchface1_res_stat_battery_img.set_pos(int(200),int(0)) -watchface1_res_stat_battery_img.set_size(30,18) +watchface1_res_stat_battery_img.set_pos(int(196),int(5)) +watchface1_res_stat_battery_img.set_size(40,22) watchface1_res_stat_battery_img.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) watchface1_res_stat_battery_img.add_flag(lv.obj.FLAG.CLICKABLE) -watchface1_res_stat_battery_img.set_src("E:/static/vbat_100.png") +watchface1_res_stat_battery_img.set_src("E:/static/vbat_0.png") watchface1_res_stat_battery_img.add_style(style_watchface_img_default, lv.PART.MAIN|lv.STATE.DEFAULT) + + + +watchface1_res_stat_battery_line = lv.line(Watchface1) +watchface1_res_stat_battery_line.set_points(power_line_points,2) +watchface1_res_stat_battery_line.set_pos(int(203),int(3)) +watchface1_res_stat_battery_line.set_size(0,16)#高度12 +watchface1_res_stat_battery_line.add_style(power_line_red,0) + watchface1_res_stat_charge_in_img = lv.img(Watchface1) watchface1_res_stat_charge_in_img.set_pos(int(180),int(0)) watchface1_res_stat_charge_in_img.set_size(10,18) @@ -258,10 +273,31 @@ class WatchFace1(): #print("__battery_cb:",str(msg)) #print(msg) if msg[0] == '1': + + watchface1_res_stat_battery_line.set_pos(int(0),int(8)) + watchface1_res_stat_battery_line.set_size(0,0) + watchface1_res_stat_battery_line.set_style_line_width(0,lv.PART.MAIN) watchface1_res_stat_battery_img.set_src("E:/static/charge_ing.png") else: - # watchface1_res_stat_charge_in_img.set_src("E:/static/charge_in1.png") - watchface1_res_stat_battery_img.set_src("E:/static/vbat_%d.png"%(msg[1]))#"E:/vbat_60.png" + watchface1_res_stat_battery_img.set_src("E:/static/vbat_0.png") + level = msg[1] + if level >= 100: + level = 100 + line_len = int(level*(30/100)) + # print("__battery_cb:",level,line_len,30/100) + if line_len >= 30: + line_len = 30 + if line_len <= 6: + line_len = 6 + set_x = int(199+line_len//2) + watchface1_res_stat_battery_line.set_pos(int(set_x),int(8)) + watchface1_res_stat_battery_line.set_size(line_len,15) + watchface1_res_stat_battery_line.set_style_line_width(line_len,lv.PART.MAIN) + if line_len <= 6: + watchface1_res_stat_battery_line.set_style_line_color(lv.color_make(0xff,0x00,0x00),0) + else: + watchface1_res_stat_battery_line.set_style_line_color(lv.color_make(0x00,0xff,0x00),0) + # watchface2_res_stat_battery_img.set_src("E:/static/vbat_%d.png"%(msg[1]))#"E:/vbat_60.png" pass def __oldHrValue(self, event, msg): @@ -309,29 +345,37 @@ Watchface2.add_style(style_screen, lv.PART.MAIN|lv.STATE.DEFAULT) #状态栏 watchface2_mpsignal_img = lv.img(Watchface2) -watchface2_mpsignal_img.set_pos(int(20),int(0)) -watchface2_mpsignal_img.set_size(24,17) +watchface2_mpsignal_img.set_pos(int(20),int(5)) +watchface2_mpsignal_img.set_size(30,22) watchface2_mpsignal_img.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) watchface2_mpsignal_img.add_flag(lv.obj.FLAG.CLICKABLE) watchface2_mpsignal_img.set_src("E:/static/mpsignal5.png") watchface2_mpsignal_img.add_style(style_watchface_img_default, lv.PART.MAIN|lv.STATE.DEFAULT) watchface2_res_stat_battery_img = lv.img(Watchface2) -watchface2_res_stat_battery_img.set_pos(int(200),int(0)) -watchface2_res_stat_battery_img.set_size(30,18) +watchface2_res_stat_battery_img.set_pos(int(196),int(5)) +watchface2_res_stat_battery_img.set_size(40,22) watchface2_res_stat_battery_img.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) watchface2_res_stat_battery_img.add_flag(lv.obj.FLAG.CLICKABLE) -watchface2_res_stat_battery_img.set_src("E:/static/vbat_100.png") +watchface2_res_stat_battery_img.set_src("E:/static/vbat_0.png") watchface2_res_stat_battery_img.add_style(style_watchface_img_default, lv.PART.MAIN|lv.STATE.DEFAULT) -watchface2_res_stat_charge_in_img = lv.img(Watchface2) -watchface2_res_stat_charge_in_img.set_pos(int(180),int(0)) -watchface2_res_stat_charge_in_img.set_size(10,18) -watchface2_res_stat_charge_in_img.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) -watchface2_res_stat_charge_in_img.add_flag(lv.obj.FLAG.CLICKABLE) -watchface2_res_stat_charge_in_img.set_src("E:/static/charge_in.png") -# add style for watchface_res_stat_charge_in_img -watchface2_res_stat_charge_in_img.add_style(style_watchface_img_default, lv.PART.MAIN|lv.STATE.DEFAULT) + +watchface2_res_stat_battery_line = lv.line(Watchface2) +watchface2_res_stat_battery_line.set_points(power_line_points,2) +watchface2_res_stat_battery_line.set_pos(int(203),int(3)) +watchface2_res_stat_battery_line.set_size(0,16)#高度12 +watchface2_res_stat_battery_line.add_style(power_line_red,0) + + +# watchface2_res_stat_charge_in_img = lv.img(Watchface2) +# watchface2_res_stat_charge_in_img.set_pos(int(180),int(0)) +# watchface2_res_stat_charge_in_img.set_size(10,18) +# watchface2_res_stat_charge_in_img.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) +# watchface2_res_stat_charge_in_img.add_flag(lv.obj.FLAG.CLICKABLE) +# watchface2_res_stat_charge_in_img.set_src("E:/static/charge_ing.png") +# # add style for watchface_res_stat_charge_in_img +# watchface2_res_stat_charge_in_img.add_style(style_watchface_img_default, lv.PART.MAIN|lv.STATE.DEFAULT) style_font_youyuan_70_red = lv.style_t() style_font_youyuan_70_red.init() @@ -481,10 +525,31 @@ class WatchFace2(): #print("__battery_cb:",str(msg)) #print(msg) if msg[0] == '1': + + watchface2_res_stat_battery_line.set_pos(int(0),int(0)) + watchface2_res_stat_battery_line.set_size(0,0) + watchface2_res_stat_battery_line.set_style_line_width(0,lv.PART.MAIN) watchface2_res_stat_battery_img.set_src("E:/static/charge_ing.png") else: - # watchface2_res_stat_charge_in_img.set_src("E:/static/charge_in1.png") - watchface2_res_stat_battery_img.set_src("E:/static/vbat_%d.png"%(msg[1]))#"E:/vbat_60.png" + watchface2_res_stat_battery_img.set_src("E:/static/vbat_0.png") + level = msg[1] + if level >= 100: + level = 100 + line_len = int(level*(30/100)) + # print("__battery_cb:",level,line_len,30/100) + if line_len >= 30: + line_len = 30 + if line_len <= 6: + line_len = 6 + set_x = int(199+line_len//2) + watchface2_res_stat_battery_line.set_pos(int(set_x),int(8)) + watchface2_res_stat_battery_line.set_size(line_len,16) + watchface2_res_stat_battery_line.set_style_line_width(line_len,lv.PART.MAIN) + if line_len <= 6: + watchface2_res_stat_battery_line.set_style_line_color(lv.color_make(0xff,0x00,0x00),0) + else: + watchface2_res_stat_battery_line.set_style_line_color(lv.color_make(0x00,0xff,0x00),0) + # watchface2_res_stat_battery_img.set_src("E:/static/vbat_%d.png"%(msg[1]))#"E:/vbat_60.png" pass def __stepValue(self, event, msg): if msg == None: diff --git a/2.sdk/project/K5/usr/static/DIAL_PREV01.png b/2.sdk/project/K5/usr/static/DIAL_PREV01.png index ea14d89960bd4c4f2a06cb37d75ceb91102ce905..3e6567e92dff2d98005fba22057cb4c5e9f71c12 100644 GIT binary patch literal 12921 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 WX=Uv7=)ZprfQ*Eqc(tf;$o~TlK7cv^ diff --git a/2.sdk/project/K5/usr/static/DIAL_PREV02.png b/2.sdk/project/K5/usr/static/DIAL_PREV02.png index 62cca4128cded1daec55fba9010f2a190d7d8b1b..a7c9c0baa69b8b83ab709d0ef93b0752c7d5c3be 100644 GIT binary patch literal 3146 zcmcJSS5OlG)`bxP=>gFQh8C(+5k#tVX$A~EGzmrNAOut(w1m*4sgxifph)jsAYdRA zgD4$DkgD`RXrb!z&-^nx`>;>D`*7}e?!$e$Gw05YgBt6xFkWY*qM~9k(AP0NXTrJ4 z>FLgEiI)!jIT)VkTO+8bm@faHE)36vot~Rh107BC=h>S%-#oeXfW5iSuH5>lz$xv? zJhHHoq^4~9p$G$VdXD_4Djh7O*Z(&{IG4hIQfp;BcQVNath>}79g$oMj>c^mDjz!O z2x-R}IBiMJ*8D7NG_$a;YHe}V-96I~9Dw{SE%n6(Ta2Bp5#TbM^x(McP9IU@YTLA9jS@J)K?+So+nUu``Fi=valb55~Q< zYkfKpFi>VyMI@1YhTE-a5afk>A44dWZO_S0heu1FU+)Y|IP_zfuAN&^C27senYpkS zx*S_y3|~BQJMv5W-}ckhy;TOH+GRo8*9E8R84h!VSma+^U$QzeTxTh!$=90R`OEO| zE7joC@u)`}319U>DI*Vdn$ALx{KFmo46gP$P$<7=0Ha($%{{L-gj z_CrHGA128cnU$Hz<>lqY9A92hky(jrYg3*4{{3hs$nHswPty;>mUz&x8K%3tdnHKw zX!*X%fwzFSc11my(`5mVk5q^(L1~J3d3$HZQ!gm9qRuxA_?-*bc;PH!EF(6~e@}+3 z|KQ;12b7!bZA%jgF#eON4dLA!b~^p>U@AQ2a5UjQ`_*Sa7nkSo~N_oZl`}y!(+UPW{5Pa0s zlj*jqAaM>zUrTv;`Ev>&u24*`8X|L}uXGuef;=oY(YI5okZ?nC)6KMHDfkk<*SQ+y z*Q7d8*ymK6d}ek?;b+HzTa*&Vd+T$px;Z{RD{n(DFlz^`v#KoRnc$~CBJ{rIsEB%c zdZx*J6~)2`z0jVcuXVMx0xBvhT`ZJInq)rpO5`|HSxTVT)WG?+0H@Futr|i#V7@<_ z8*Rqce|+3py*g=WWfhaVp7JB!QARpoOKcXrgGb0u~X!ox(0uZoPk= z169BoPlf&gA!QCNrsR7Zkj9&&7^LD}L@@5>U@im83g)y;Sq@<1q_(Rzo!+n>i150}hmt?7)=_ct;>j^N~n z71R-n%LDmGg(>xY1bR9Ucbhmu+^GIneud(*-&smYMncC2`}qSkNxU(?H;9rGHNXV! z#K(mYvO=08aGp>oI2b~XG@K_bgBn6QH zHQT*3PRg$}2n+ON-U2EK*97~8&r1WKEWNiKy&cnHuguB+Mb z1^aX&yHMu&hE__L65iD@soTfyIYdfk$f0`Rh#L>_!N)Bq;@bPTCSeg%nfAhBq9lU6 zpP0S1Q;?u<>(DrY=y`KDr^&-300h}DtzAi{1mossLnx$Q;mVuES&1a+%1Ba0`>@TW zY`~)GRAP^kAE{+o>S80NpY63vGxM!m+W(CCe+~VA-z8w3uyqT^42!y+04O-jZbMk| zk-NLtdY~DaXTiOp^g+4Q&71vc5>~Gcx<~wc3ck&oc^Us%l-r@AEQD~e_9m?f-<`Jg zEX&l8d`{z!K*$}2%;ZI>v2CyosZtIOP$zDVR#%yMGomc$G04EG_i1#!8g2{h@(0=v z@l(yzntzJ-{gNMCSk_h>6)uCPMBLAiX5si%cjZRCIOd&vGpsdU9z>1^U5?Rrp0J0( zWM<9S?bAhc(oWtKFcJgUxb)*?Lf@_sR71^mcHc zKK-Q=OBVi_JI#79AWUPTb54%tVLBbX*t6XnEg*jH%?RJ@I3znC(a!V$lFC@VdN zN5l5ylNuv6{5ETeY?tdi#p17O^T5T}Ep11E%t)Y1x(%1Na?0QxMnGol`l@`WmeJ=G zW$@2=$h)AZz)vT1{6*i9_=l2=(fT|qGNUg@~)P1P4 zIBv=p=qbHJrJ1-bo6Sf)0En8aE1vAdyv9e`-nI#?aX6%09H~x3?C`h;joIZLf&)<+0L6cs#w;Po`l+03IQ5J$i6yC^Q#Yq%8&v)^^hbPT%ze{)Donsx;Wd6uw z8q0=xM~m`=d#W_@l#89FqtO?)w%WCN`lLx9)@nwUBlO9{L$)11bHNr9e;waJdj0Em zocV-!6A)1V?7p21TcT1}VHJ>S#wYlNItbCTl(5@s0ocL*F>X@#lNFgBxP`4=Pik4J zzR9=$wha1AiZ-P?Ch~6ti+npw0v>FFkjb;8Iq|gO#wEbE+ZT}6D$xj!Z-SN}NAf6O z+oXt#Y2alE`nrcM+#o=l;2pNjvqN(fz2_dqu#^a@$S3C6C(XrL7ttXxbYOmj7TR68 zEsDVQJPLDTbGhYh!z2ZWG)K&vGJBcD9>$&DH;Wy zDM6a9&=eO=5*nKik7Zzt#^(Lcfi=XtE%p1w8Y=lM#ri22Wc8#;^n6)N2QK=QN+w9Z z%dc5*^4rpKYnv}=FdlJoY?&ebm3#pT;uumi`xaT8E`6QsZ&N-3l^7A=jJ=ozIAeLo z$WxVX%-(6C9;1abmFb0#z&h_qEMAs44eL->9Y13QUaCQfVa2W*m2Z=6Zz%>=O@Mf> z)j@iVWX$IGIzMCT%KE9IJ8OH#O$ff-fr9eTo!d&E%#>I;I9O2P+IEw-4V8`($1T%% zgsW*t)Hd{pykp%Sn9tvSrG`hM(Ay(#t;Y{5wqZFjqd2U>`9z*WaK+vc zH1?|ZJxwD91^)cx2;>xv0*l<>bVB{-h^`{Ghh!wCT-I6Y2*$oPwP4O!J%0|U4DK20 JRBFLd{{WWY-QNHJ delta 2776 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