From: SnickerSun Date: Mon, 10 Feb 2025 11:57:42 +0000 (+0800) Subject: 1、更新固件 python app 版本升级到V17, 实现tcpServer.py例子,重定向日志到串口。 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=38deeb22b04fd205d789b1c9fd046d98b8fb92a1;p=mirrors%2FFD230.git 1、更新固件 python app 版本升级到V17, 实现tcpServer.py例子,重定向日志到串口。 2、下载时停止AT指令输入 3、修复时间同步指令 --- diff --git a/cat1modem/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0312_20250210-1952-V17.zip b/cat1modem/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0312_20250210-1952-V17.zip new file mode 100644 index 000000000..f00f0c9e9 Binary files /dev/null and b/cat1modem/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0312_20250210-1952-V17.zip differ diff --git a/cat1modem/src/cat1Service.py b/cat1modem/src/cat1Service.py index 306d718d5..1fd21aaff 100644 --- a/cat1modem/src/cat1Service.py +++ b/cat1modem/src/cat1Service.py @@ -53,8 +53,12 @@ import sms from usr.EventMesh import eventMesh -from usr.telecom_dmp import telecomDmpCb -from usr.china_mobile_dmp import chinamobileCb +# from usr.telecom_dmp import telecomDmpCb +# from usr.china_mobile_dmp import chinamobileCb + +# 设置日志输出级别 +log.basicConfig(level=log.INFO) +clog = log.getLogger("cat1") def msg_cb(args): index = args[1] @@ -74,7 +78,7 @@ sms.setCallback(msg_cb)#sms注册回调 CAT1_SERVICE_HEAD = 'FE' #固定head PROJECT_NAME = "Cat1SlipUDPService" -PROJECT_VERSION = "PY_SRV_V16" +PROJECT_VERSION = "PY_SRV_V17" CONFIG_JSON="/usr/system_config.json" CURRENT_APP_TYPE="pysrv" @@ -83,18 +87,13 @@ CURRENT_APP_TYPE="pysrv" - -# 设置日志输出级别 -log.basicConfig(level=log.INFO) -cat1service_log = log.getLogger("cat1service") - #设置通话音量 voiceCall.setVolume(10) -print("voice call volume {}".format(voiceCall.getVolume())) +clog.info("voice call volume {}".format(voiceCall.getVolume())) # lpm_fd = pm.create_wakelock("system_lock", len("system_lock")) pm.autosleep(1) # pm.wakelock_lock(lpm_fd) -cat1service_log.info("create_wakelock {}".format(pm.get_wakelock_num())) +clog.info("create_wakelock {}".format(pm.get_wakelock_num())) telecomTimerCount = 0 def get_versionkeyname_by_py(app_type): return str("{}version".format(app_type)) @@ -116,13 +115,13 @@ def set_version_to_json_config(app_type,keyvalue): config_data = ql_fs.read_json(CONFIG_JSON) config_data.update( {str(get_versionkeyname_by_py(app_type)):keyvalue}) ql_fs.touch(CONFIG_JSON, config_data) - cat1service_log.info("{}={}".format(get_versionkeyname_by_py(app_type),keyvalue)) - cat1service_log.info("{}".format(config_data)) + clog.info("{}={}".format(get_versionkeyname_by_py(app_type),keyvalue)) + clog.info("{}".format(config_data)) def get_version_from_json_config(app_type): config_data = ql_fs.read_json(CONFIG_JSON) keyvalue = config_data.get( get_versionkeyname_by_py(app_type),get_default_versionvalue_by_py(app_type)) - cat1service_log.info("{}={}".format(get_versionkeyname_by_py(app_type),keyvalue)) + clog.info("{}={}".format(get_versionkeyname_by_py(app_type),keyvalue)) return keyvalue set_version_to_json_config(CURRENT_APP_TYPE,PROJECT_VERSION) @@ -145,16 +144,16 @@ audio.set_qdai_cfg(1,0,0,1,0,0,1,1) # level - 引脚电平,int类型,0 - 设置引脚为低电平, 1- 设置引脚为高电平。 # recvDataPin = Pin(Pin.GPIO22, Pin.IN, Pin.PULL_PU, 0) def ExtIntfun(args): - # cat1service_log.info('### interrupt {} ###'.format(args)) # args[0]:gpio号 args[1]:上升沿或下降沿 + # clog.info('### interrupt {} ###'.format(args)) # args[0]:gpio号 args[1]:上升沿或下降沿 if args[1] == 0: - cat1service_log.info("disable autosleep") + clog.info("disable autosleep") pm.autosleep(0) # pm.wakelock_lock(lpm_fd) elif args[1] == 1: - cat1service_log.info("enable autosleep") + clog.info("enable autosleep") # pm.wakelock_unlock(lpm_fd) pm.autosleep(1) - # cat1service_log.info("recvDataPin={}".format(recvDataPin.read())) + # clog.info("recvDataPin={}".format(recvDataPin.read())) extint = ExtInt(ExtInt.GPIO22, ExtInt.IRQ_RISING_FALLING, ExtInt.PULL_DISABLE, ExtIntfun) extint.enable() @@ -183,36 +182,6 @@ UDP_MSG_COMMING_CALL = 'C' # CAT1 来电消息,包含电话号 UDP_MSG_REPLY = 'F' # 返回值 - -def result(args): - print('download status:',args[0],'download process:',args[1]) -def download_fota_img( srcurl ): - fota_obj = fota() # 创建Fota对象 - cat1service_log.info("httpDownload... {} , {}".format("{}/dfota_1.bin".format(srcurl),"{}/dfota_2.bin".format(srcurl))) - res = fota_obj.httpDownload(url1="{}/dfota_1.bin".format(srcurl),url2="{}/dfota_2.bin".format(srcurl),callback=result) - #差分升级FTP方式 - #res = fota_obj.httpDownload(url1="ftp://user:password@ip:port/fota.bin",callback=result) #其中user,password,ip,port需要填写具体使用的FTP服务器信息 - if res != 0: - cat1service_log.error("httpDownload error") - -def check_fota(): - modem_ver = modem.getDevFwVersion() - imei = modem.getDevImei() - url = "http://icfota.snicker.com.cn:8089/fd230ota.jsp?product=FD230&pkgver={0}&imei={1}".format(modem_ver,imei) - response = request.get(url) - cat1service_log.info(url) - data = response.json() - if(data['UptoDate'] == False): - cat1service_log.info("Need update python application") - srcurl = data['url'] - #差分升级方式 - # res = fota_obj.httpDownload(url1="http://www.example.com/fota.bin",callback=result) - # mini fota方式 - return srcurl - else: - cat1service_log.info("No need update python application") - return "" - class Cat1Service: AP = 0 # SLIP_INNER STA = 1 # SLIP_OUTER @@ -227,14 +196,14 @@ class Cat1Service: # self.__value = None self.__wait_resp = 0 self.__waiting_netstat = 0 - # slip.destroy() - # print('slip uart={0}'.format (self.__uart)) - - # ret = slip.construct(self.__uart, self.__mode, 0) - # if ret != 0: - # print('slip netif construct fail') - # return None - print('slip network card create success') + slip.destroy() + clog.info('slip uart={0}'.format (self.__uart)) + + ret = slip.construct(self.__uart, self.__mode, 0) + if ret != 0: + clog.error('slip netif construct fail') + return None + clog.info('slip network card create success') # self.__queue = Queue(1) self.__sock = self.__socket_init() self.__threadid = _thread.start_new_thread(self.__Socket_Thread, ()) @@ -280,11 +249,7 @@ class Cat1Service: self.send_data_q = Queue(100) self.ack_sem=0 _thread.start_new_thread(self.Socket_SEND_Thread,()) - - # 发数据线程 - - - + # 发数据线程 return None def __socket_init(self): @@ -312,10 +277,10 @@ class Cat1Service: # cell_data = hex(cmd_tmp) # decimal_number = int(cell_data, 16) # cmd = "%02x"%(decimal_number) # 使用两位表示,不足前面补0 - print(cmd) # 输出: 07 - print("btmcu_cmd_handler cmd {0} , args {1}".format(cmd,parm)) + clog.info(cmd) # 输出: 07 + clog.info("btmcu_cmd_handler cmd {0} , args {1}".format(cmd,parm)) if cmd == "00": - print(cmd) + clog.info(cmd) # UDP_CMD_GET_CAT1VER modem_ver = modem.getDevFwVersion() self.reply_cmd('00',"pyVer:{}@modemVer:{}".format(PROJECT_VERSION,modem_ver)) @@ -325,7 +290,7 @@ class Cat1Service: ret = voiceCall.callStart(str(parm)) # if ret != 0: # ret = voiceCall.callStart(str(parm)) - print("ret={} {} {}".format(ret,cmd,parm)) + clog.info("ret={} {} {}".format(ret,cmd,parm)) if ret != 0: self.reply_cmd('0F',"callcmd_fail") else: @@ -333,7 +298,7 @@ class Cat1Service: else: self.reply_cmd('0F',"callcmd_fail") elif cmd == "02": - print(cmd) + clog.info(cmd) # UDP_CMD_HUNGUP ret = voiceCall.callEnd() if ret != 0: @@ -343,7 +308,7 @@ class Cat1Service: else: self.reply_cmd('0F',"callend_success") elif cmd == "03": - print(cmd) + clog.info(cmd) # UDP_CMD_ANSWER ret = voiceCall.callAnswer() if ret != 0: @@ -353,28 +318,22 @@ class Cat1Service: else: self.reply_cmd('0F',"callanswer_success") elif cmd == "04": - print(cmd) - result = check_fota() - if result == "": - self.reply_cmd('04',"no need update!") - else: - self.reply_cmd('04',"start ota {} please wait...".format(result)) - download_fota_img(result) + clog.info(cmd) elif cmd == "05": - print(cmd) + clog.info(cmd) # UDP_CMD_SEND_SMS elif cmd == "06": - print(cmd) + clog.info(cmd) # UDP_CMD_GET_TIME time=utime.localtime() zone=utime.getTimeZone() #(2024, 3, 2, 18, 31, 32, 5, 62),8 # 返回当前时间戳,参数为元组 # timestamp = utime.mktime(time) - # cat1service_log.info(timestamp) + # clog.info(timestamp) self.reply_cmd('06',"{0}@{1}".format(time,zone)) elif cmd == "07": - print("cmd ==== 07!") + clog.info("cmd ==== 07!") # UDP_CMD_GET_RECV_NETWORKSTAT simstat = sim.getStatus() imei = modem.getDevImei() @@ -385,20 +344,20 @@ class Cat1Service: # ([voice_state, voice_lac, voice_cid, voice_rat, voice_reject_cause, voice_psc], [data_state, data_lac, data_cid, data_rat, data_reject_cause, data_psc]) operator = net.operatorName() signal = net.csqQueryPoll() - print("imei:{0},sim:{1},oper:{2},signal:{3},net:{4}".format(imei,simstat,operator,signal,netstat)) + clog.info("imei:{0},sim:{1},oper:{2},signal:{3},net:{4}".format(imei,simstat,operator,signal,netstat)) self.reply_cmd('07',"imei:{0}@sim:{1}@oper:{2}@signal:{3}@net:{4}".format(imei,simstat,operator,signal,netstat)) elif cmd == "09": - print("{},{}".format(cmd,parm)) + clog.info("{},{}".format(cmd,parm)) # UDP_CMD_ATCMD # net.setModemFun(0) # net.setModemFun(1) resp=bytearray(50) ret=atcmd.sendSync("{}\r\n".format(parm),resp,'',10) if ret == 0: - print("reply:{},ret:{}".format(resp.decode(),ret)) + clog.info("reply:{},ret:{}".format(resp.decode(),ret)) self.reply_cmd('09',"{}".format(resp.decode())) else: - print("cmd error ret:{}".format(ret)) + clog.info("cmd error ret:{}".format(ret)) self.reply_cmd('09',"{}".format("at error")) elif cmd == "10" or cmd == "12" or cmd == "14": #获取固件版本号或者获取BT保存的SIM卡的ICCID BLE那边是否开启电信入库功能 @@ -416,7 +375,7 @@ class Cat1Service: pass elif cmd == "13": on = int(parm) - print("set_dmp_change_mode on:{}".format(on)) + clog.info("set_dmp_change_mode on:{}".format(on)) eventMesh.publish("set_dmp_change_mode",on) elif cmd == "16": @@ -441,7 +400,7 @@ class Cat1Service: if cmd == "10": self.software_version = str(parm) eventMesh.publish("set_dev_version",self.software_version) - print("software_version:{},{}".format(self.software_version,parm)) + clog.info("software_version:{},{}".format(self.software_version,parm)) elif cmd == "12": pass elif cmd == "14":# @@ -463,10 +422,10 @@ class Cat1Service: if cmd == "10": self.software_version = str(parm) eventMesh.publish("set_dev_version",self.software_version) - print("software_version:{},{}".format(self.software_version,parm)) + clog.info("software_version:{},{}".format(self.software_version,parm)) elif cmd == "16": #获取BLE mac地址 eventMesh.publish("set_dev_mac",str(parm)) - print("parm:{}\r\n".format(parm)) + clog.info("parm:{}\r\n".format(parm)) pass def get_factory_status(self,event,msg): @@ -492,12 +451,12 @@ class Cat1Service: def delete_sms_cb(self,*argc): eventMesh.publish_async("remove_all_sms_cb","",1*1024) def remove_all_sms_cb(self, event, msg): - print("remove_all_sms_cb\r\n") + clog.info("remove_all_sms_cb\r\n") msg_nums = sms.getMsgNums() #短信数量 if msg_nums == -1: msg_nums = 0 sms_data = sms.getSaveLoc() - print("{}\r\n".format(sms_data)) + clog.info("{}\r\n".format(sms_data)) if sms_data == -1: return sms_max = sms_data[0][2] #最大存储短信数量 @@ -512,7 +471,7 @@ class Cat1Service: if sms_data == -1: return sms_max = sms_data[0][2] #最大存储短信数量 - print("recv:{}".format(int(msg))) + clog.info("recv:{}".format(int(msg))) message=self.sms_get_message_info(int(msg)) if message == -1: #说明没有这条短信 return @@ -653,11 +612,11 @@ class Cat1Service: SMS_lis={} SMS_lis_count = 0 sms_data = sms.getSaveLoc() - print(sms_data) + clog.info(sms_data) if sms_data == -1: return sms_max = sms_data[0][2]#最大存储短信数量 - print(sms_max) + clog.info(sms_max) self.msg_nums = sms.getMsgNums() if self.msg_nums_old != self.msg_nums: self.send_data = [] @@ -686,7 +645,7 @@ class Cat1Service: count = len(self.send_data) for i in range(count): text = self.send_data[i] - print("text:{} {} {}\r\n".format(text[0],text[1],text[2])) + clog.info("text:{} {} {}\r\n".format(text[0],text[1],text[2])) msg_total = "@code:"+str(text[0])+"@totalcodenum:"+str(text[1])+"@currcodeid:"+str(text[2])+"@data:"+str(text[3]) self.reply_cmd('17',msg_total) @@ -728,14 +687,14 @@ class Cat1Service: stage, state = checkNet.waitNetworkReady(30) # pm.wakelock_unlock(lpm_fd) if stage == 3 and state == 1: - print('Network connection successful.') + clog.info('Network connection successful.') self.set_network_config() self.__net_connected = 1 eventMesh.publish("set_network_state",self.__net_connected) self.__waiting_netstat = 0 return 0 else: - print('Network connection failed, stage={}, state={}'.format(stage, state)) + clog.info('Network connection failed, stage={}, state={}'.format(stage, state)) self.reset_network_config() self.__net_connected = 0 eventMesh.publish("set_network_state",self.__net_connected) @@ -758,13 +717,13 @@ class Cat1Service: def reply_cmd(self,cmd,_timesync): try : - print('reply_cmd 1') + clog.info('reply_cmd 1') self.clear_remain() message = str(_timesync) - print('reply_cmd 2') + clog.info('reply_cmd 2') self.__Socket_UDP_noreply(cmd, message) except: - print('reply_cmd') + clog.info('reply_cmd') return 0 def clear_remain(self): @@ -796,16 +755,16 @@ class Cat1Service: def reset_network_config(self): if (self.__net_connected == 0): - print("skip reset_network_config") + clog.info("skip reset_network_config") return 0 Info = dataCall.getInfo(1,0) - print("Info{}".format(Info)) + clog.info("Info{}".format(Info)) default_NIC_ip = Info[2][2] # 假设默认网卡ip地址为10.10.1.1,请根据实际情况更改 segment_ip = '172.16.4.0' # 假设ap模式网段范围是[192.168.4.0 ~ 192.168.4.255],请根据实际情况更改 mask = '255.255.255.0' # 假设子网掩码为255.255.255.0,请根据实际情况更改 # 配置默认网卡,通过默认网卡进行网络转发 cat1service.set_default_NIC(default_NIC_ip) - print("default_NIC_ip {0} segment_ip {1}".format(default_NIC_ip,segment_ip)) + clog.info("default_NIC_ip {0} segment_ip {1}".format(default_NIC_ip,segment_ip)) #添加路由规则,只有该网段IP才进行转发 cat1service.router_add(segment_ip, mask) @@ -820,16 +779,16 @@ class Cat1Service: if (self.__net_connected == 1) : - print("skip set_network_config") + clog.info("skip set_network_config") return 0 Info = dataCall.getInfo(1,0) - print("Info{}".format(Info)) + clog.info("Info{}".format(Info)) default_NIC_ip = Info[2][2] # 假设默认网卡ip地址为10.10.1.1,请根据实际情况更改 segment_ip = '172.16.1.0' # 假设ap模式网段范围是[192.168.4.0 ~ 192.168.4.255],请根据实际情况更改 mask = '255.255.255.0' # 假设子网掩码为255.255.255.0,请根据实际情况更改 # 配置默认网卡,通过默认网卡进行网络转发 cat1service.set_default_NIC(default_NIC_ip) - print("default_NIC_ip {0} segment_ip {1}".format(default_NIC_ip,segment_ip)) + clog.info("default_NIC_ip {0} segment_ip {1}".format(default_NIC_ip,segment_ip)) #添加路由规则,只有该网段IP才进行转发 cat1service.router_add(segment_ip, mask) @@ -844,14 +803,14 @@ class Cat1Service: if 1: #CHINA_TELECOM_DM_FUN_ENABLE == 1:#电信入库功能 不使用设置 0 防止两边不同步修改 if eventMesh.publish("get_dmp_change_mode") == 1: eventMesh.publish("set_network_state",1) - telecomDmpCb.telecom_dmp_power_on_init() + # telecomDmpCb.telecom_dmp_power_on_init() if 1: #CHINA_MOBILE_DM_FUN_ENABLE == 1: if eventMesh.publish("get_dmp_change_mode") > 1: eventMesh.publish("set_network_state",1) if self.china_mobile_init == 1: return self.china_mobile_init = 1 - chinamobileCb.china_mobile_init() + # chinamobileCb.china_mobile_init() def cat1_reply_iccid_to_ble(self,event,msg): ICCID_DATA = str("ICCID:")+str(msg) @@ -872,23 +831,23 @@ class Cat1Service: # self.head = head # self.content = content if len(content) == 0 or len(content) > 9999 or len(head) != 2: - print('illegal pack tlv content') + clog.error('illegal pack tlv content') return -1 len_str ='%04d' % len(content) tlv_pack = CAT1_SERVICE_HEAD+head+len_str+content return tlv_pack # 解码tlv数据包 def __unpack_tlv_format(self, msg): - print('__unpack_tlv_format {}\r\n'.format(msg)) + clog.info('__unpack_tlv_format {}\r\n'.format(msg)) self.msg = str(msg)[2:]#这是去除head FE tag = self.msg[0:2] length = self.msg[2:6] value = self.msg[6:] len_str ='%04d' % len(value) if len(value) == 0 or len(value) > 9999 or len(tag) != 2 or len_str != self.msg[2:6]: - print('__unpack_tlv_format err') + clog.error('__unpack_tlv_format err') return -1 - print('__unpack_tlv_format: {} {} {}\r\n'.format(tag,length,value)) + clog.info('__unpack_tlv_format: {} {} {}\r\n'.format(tag,length,value)) unpack = (tag,length,value) return unpack # socket通信(UDP)模块 @@ -898,7 +857,7 @@ class Cat1Service: def Socket_SEND_Thread(self): while True: try: - print("send====") + clog.info("send====") data=self.send_data_q.get() self.ack_sem=1 # # if data[2]: @@ -907,7 +866,7 @@ class Cat1Service: self.__Socket_UDP_write( data[0], data[1]) - print("Socket_SEND_Thread data:{} {}".format(data[0],data[1])) + clog.info("Socket_SEND_Thread data:{} {}".format(data[0],data[1])) count=20 while count & self.ack_sem : @@ -918,14 +877,14 @@ class Cat1Service: # else : self.__Socket_UDP_write( data[0], data[1]) - print("Socket_SEND_Thread while data:{} {}".format(data[0],data[1])) + clog.info("Socket_SEND_Thread while data:{} {}".format(data[0],data[1])) if data: - print("data ok!!") + clog.info("data ok!!") else: - print("data error!!") + clog.error("data error!!") except Exception : - print("sned Socket >>>") + clog.error("sned Socket >>>") def __Socket_UDP_write(self, head, content): try: @@ -940,17 +899,17 @@ class Cat1Service: # 向服务端发送消息 server_addr = ('172.16.1.5',1000) - print("__Socket_UDP send msg {}".format(msg)) + clog.info("__Socket_UDP send msg {}".format(msg)) self.__err = 0 self.__sock.sendto(msg,server_addr) - print("__Socket_UDP send 2") + clog.info("__Socket_UDP send 2") self.__wait_resp = 1 # data = self.__queue.get() self.__wait_resp = 0 # return data return 1 except Exception as error: - print(error) + clog.error(error) return 0 def __Socket_UDP_noreply(self, head, content): @@ -970,10 +929,10 @@ class Cat1Service: # 向服务端发送消息 server_addr = ('172.16.1.5',1000) - print("__Socket_UDP_noreply send msg {}".format(msg)) + clog.info("__Socket_UDP_noreply send msg {}".format(msg)) self.__err = 0 data_size = self.__sock.sendto(msg,server_addr) - print("self.__sock data_size {}".format(data_size)) + clog.info("self.__sock data_size {}".format(data_size)) self.__wait_resp = 0 return 0 @@ -981,24 +940,24 @@ class Cat1Service: def __Socket_Thread(self): while True: try: - print("recv====") + clog.info("recv====") data=self.__sock.recv(1024) - print("data:{}".format(data)) + clog.info("data:{}".format(data)) if data: value = self.__unpack_tlv_format(data.decode()) if value != -1: - print('mode: {0}, recv {1} bytes, Data: {2}'.format (value[0],len(data), value[2])) + clog.info('mode: {0}, recv {1} bytes, Data: {2}'.format (value[0],len(data), value[2])) if value[1] == 'FF': self.btmcu_cmd_handler(value[0],value[2]) else: # self.__value = value # self.__queue.put('1') self.btmcu_cmd_handler(value[0],value[2]) - print("End else Thread") + clog.info("End else Thread") else: - print("data error!!") + clog.error("data error!!") except Exception as recverr: - print("recverr:{}\r\n".format(recverr)) + clog.error("recverr:{}\r\n".format(recverr)) if "110" in str(recverr): self.__err = 1 # if self.__wait_resp == 1: @@ -1009,7 +968,7 @@ class Cat1Service: - print("End Socket Thread") + clog.info("End Socket Thread") @@ -1023,7 +982,7 @@ class Cat1Service: # UDP_CMD_GET_TIME = '6', // 获取Cat1 时间 ,YYYYMMDD HHmmss zone # UDP_CMD_GET_NETWORKSTAT = '7', //获取Cat1 信号信息,VOLTE信息,信号强度,SIM卡状态 # 下文进行系统配置 -print("Cat1Service start") +clog.info("Cat1Service start") cat1service = Cat1Service() @@ -1032,42 +991,42 @@ cat1service = Cat1Service() #voice call callback function def voice_callback(args): if args[0] == 10: - print('voicecall incoming call, PhoneNO: ', args[6]) + clog.info('voicecall incoming call, PhoneNO: ', args[6]) if eventMesh.publish("get_volte_switch") == 0: #关闭VOLTE功能 - print('voicecall auto end:') + clog.info('voicecall auto end:') voiceCall.callEnd() else: # gpioWakeBT.write(1) cat1service.notifyIncomingcall(args[6]) elif args[0] == 11: if eventMesh.publish("get_volte_switch") == 1: #开启VOLTE功能 - print('voicecall connected, PhoneNO: ', args[6]) + clog.info('voicecall connected, PhoneNO: ', args[6]) cat1service.notifyConnecteCall(args[6]) elif args[0] == 12: - print('voicecall disconnect') + clog.info('voicecall disconnect') if eventMesh.publish("get_volte_switch") == 1: #开启VOLTE功能 - print('voicecall disconnected, PhoneNO: ', args[6]) + clog.info('voicecall disconnected, PhoneNO: ', args[6]) cat1service.notifyDisconnectCall(args[6]) elif args[0] == 13: - print('voicecall is waiting, PhoneNO: ', args[6]) + clog.info('voicecall is waiting, PhoneNO: ', args[6]) elif args[0] == 14: - print('voicecall dialing, PhoneNO: ', args[6]) + clog.info('voicecall dialing, PhoneNO: ', args[6]) elif args[0] == 15: - print('voicecall alerting, PhoneNO: ', args[6]) + clog.info('voicecall alerting, PhoneNO: ', args[6]) elif args[0] == 16: - print('voicecall holding, PhoneNO: ', args[6]) + clog.info('voicecall holding, PhoneNO: ', args[6]) else: - print('voice_callback , args[0]: ', args[0]) + clog.info('voice_callback , args[0]: ', args[0]) #电话消息反馈 voiceCall.setCallback(voice_callback) def checknet_cb(arg): - print("start checktime!!") - if 1: #CHINA_TELECOM_DM_FUN_ENABLE == 1:#这是手表每30s检查一次 - if eventMesh.publish("get_dmp_change_mode") == 1: - telecomDmpCb.telecom_dmp_power_on_count() + clog.info("start checktime!!") + # if 1: #CHINA_TELECOM_DM_FUN_ENABLE == 1:#这是手表每30s检查一次 + # if eventMesh.publish("get_dmp_change_mode") == 1: + # telecomDmpCb.telecom_dmp_power_on_count() _thread.start_new_thread(cat1service.wait_network_ready, ()) # time=utime.localtime() @@ -1087,7 +1046,7 @@ delaybootupmsg_timer = osTimer() delaybootupmsg_timer.start(1000,0,bootupmsg_cb) # def checkpin_cb(arg): -# cat1service_log.info("recvDataPin={}".format(recvDataPin.read())) +# clog.info("recvDataPin={}".format(recvDataPin.read())) # timerCheckRevPin = osTimer() # timerCheckRevPin.start(1000,1,checkpin_cb) diff --git a/cat1modem/src/current_img/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0312.zip b/cat1modem/src/current_img/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0312.zip new file mode 100644 index 000000000..4a0047136 Binary files /dev/null and b/cat1modem/src/current_img/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0312.zip differ diff --git a/cat1modem/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0312_20241124-1030-V16.zip b/cat1modem/src/current_img/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0312_20241124-1030-V16.zip similarity index 100% rename from cat1modem/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0312_20241124-1030-V16.zip rename to cat1modem/src/current_img/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0312_20241124-1030-V16.zip diff --git a/cat1modem/src/main.py b/cat1modem/src/main.py index fa20465a8..af5801711 100644 --- a/cat1modem/src/main.py +++ b/cat1modem/src/main.py @@ -1,30 +1,27 @@ import example +import log +from machine import UART + +# 设置日志输出级别 +log.basicConfig(level=log.INFO) +# 设置输出到debug口 +uart = UART(UART.UART0, 115200, 8, 0, 1, 0) +log.set_output(uart) +clog = log.getLogger("cat1") + main_flag = 1 + + try: - try: - from usr.slipService import slipservice - except Exception as e: - main_flag = 0 - print("启动失败!!!!!\r\n".format(e),'slipservice') - - try: - from usr.tcpService import TcpService - except Exception as e: - main_flag = 0 - print("启动失败!!!!!\r\n".format(e),'tcpService') - - try: - import usr.checkota - except Exception as e: - main_flag = 0 - print("启动失败!!!!!\r\n".format(e),'checkota') - example.exec('/usr/main_init.py') - print("启动成功!!!!!\r\n") + clog.info("启动main_init成功!!!!!\r\n") except Exception as e: main_flag = 0 - print("启动失败!!!!!\r\n".format(e)) - - + clog.error("启动失败!!!!!\r\n".format(e)) +try: + example.exec('/usr/tcpServer.py') + clog.info("启动tcpserver成功!!!!!\r\n") +except Exception as e: + clog.error("启动失败!!!!!\r\n".format(e)) diff --git a/cat1modem/src/main_init.py b/cat1modem/src/main_init.py index 6c2d33926..ea22f343f 100644 --- a/cat1modem/src/main_init.py +++ b/cat1modem/src/main_init.py @@ -4,44 +4,50 @@ import ql_fs import log import sms from misc import Power + + +# 设置日志输出级别 +log.basicConfig(level=log.INFO) +clog = log.getLogger("cat1") + ota_flag = 0 try: try: from usr.EventMesh import eventMesh - print("检测文件成功!!!!!!!\r\n",'eventMesh') + clog.info("检测文件成功 eventMesh!!!!!!!\r\n") except Exception as e: - print("检测文件失败!!!!!!!{}\r\n",'eventMesh') + clog.error("检测文件失败 eventMesh!!!!!!!\r\n") try: from usr.telecom_dmp import telecomDmpCb - print("检测文件成功!!!!!!!\r\n",'telecomDmpCb') + clog.info("检测文件成功 telecomDmpCb !!!!!!!\r\n") except Exception as e: - print("检测文件失败!!!!!!!{}\r\n",'telecomDmpCb') + clog.error("检测文件失败 telecomDmpCb!!!!!!!\r\n") try: from usr.china_mobile_dmp import chinamobileCb - print("检测文件成功!!!!!!!\r\n",'chinamobileCb') + clog.info("检测文件成功 chinamobileCb!!!!!!!\r\n") except Exception as e: - print("检测文件失败!!!!!!!{}\r\n",'chinamobileCb') + clog.error("检测文件失败 chinamobileCb!!!!!!!\r\n") try: from usr.cat1Service import cat1service - print("检测文件成功!!!!!!!\r\n",'cat1service') + clog.info("检测文件成功 cat1service!!!!!!!\r\n") except Exception as e: - print("检测文件失败!!!!!!!{}\r\n",'cat1service') + clog.error("检测文件失败 cat1service!!!!!!!\r\n") ota_flag = 1 - print("检测文件成功!!!!!!!\r\n") + clog.info("检测文件成功!!!!!!!\r\n") except Exception as e: - print("检测文件失败!!!!!!!{}\r\n".format(e)) + clog.error(str("检测文件失败!!!!!!!{}\r\n".format(e))) ota_flag = 0 tmp_dir = ql_fs.path_exists("/usr/TmpPyFile") #临时存放的文件夹 if tmp_dir == True: try: ql_fs.rmdirs("/usr/TmpPyFile") - print("移除 TmpPyFile 成功!!!!!!!\r\n") + clog.info("移除 TmpPyFile 成功!!!!!!!\r\n") except Exception as e: - print("移除 TmpPyFile 失败!!!!!!!{}\r\n".format(e)) + clog.error(str("移除 TmpPyFile 失败!!!!!!!{}\r\n".format(e))) sms_get = sms.getSaveLoc() if(sms_get != -1): @@ -54,11 +60,6 @@ CONFIG_JSON="/usr/system_config.json" CURRENT_APP_TYPE="pymain" -# 设置日志输出级别 -log.basicConfig(level=log.INFO) -cat1service_log = log.getLogger("pymain") - - def get_versionkeyname_by_py(app_type): return str("{}version".format(app_type)) @@ -79,14 +80,14 @@ def set_version_to_json_config(app_type,keyvalue): config_data = ql_fs.read_json(CONFIG_JSON) config_data.update( {str(get_versionkeyname_by_py(app_type)):keyvalue}) ql_fs.touch(CONFIG_JSON, config_data) - cat1service_log.info("{}={}".format(get_versionkeyname_by_py(app_type),keyvalue)) - cat1service_log.info("{}".format(config_data)) + clog.info("{}={}".format(get_versionkeyname_by_py(app_type),keyvalue)) + clog.info("{}".format(config_data)) set_version_to_json_config(CURRENT_APP_TYPE,PROJECT_VERSION) def checkota_cb(arg): - print("start checkota!!") + clog.info("start checkota!!") example.exec('/usr/checkota.py') # 创建os定时器 @@ -94,4 +95,4 @@ timer = osTimer() # 启动定时器,参数依次为时间、是否循环、回调函数 定时器超时的时间(单位ms) # 开机delay 20秒后执行一次ota升级 timer.start(20000,0,checkota_cb) -print("checkota py end!!") +clog.info("checkota py end!!") diff --git a/cat1modem/src/tcpServer.py b/cat1modem/src/tcpServer.py new file mode 100644 index 000000000..8c7da53b8 --- /dev/null +++ b/cat1modem/src/tcpServer.py @@ -0,0 +1,47 @@ +import usocket +import _thread +import log + +# 设置日志输出级别 +log.basicConfig(level=log.INFO) +clog = log.getLogger("cat1") + +def _client_conn_proc(conn, ip_addr, port): + while True: + try: + # Receive data sent by the client + data = conn.recv(1024) + clog.info('[server] [client addr: %s, %s] recv data:' % (ip_addr, port), data) + + # Send data back to the client + conn.send(data) + except: + # Exception occurred and connection closed + clog.error('[server] [client addr: %s, %s] disconnected' % (ip_addr, port)) + conn.close() + break + +def tcp_server(address, port): + # Create a socket object + sock = usocket.socket(usocket.AF_INET, usocket.SOCK_STREAM, usocket.IPPROTO_TCP_SER) + clog.info('[server] socket object created.') + + # Bind the server IP address and port + sock.bind((address, port)) + clog.info('[server] bind address: %s, %s' % (address, port)) + + # Listen for client connection requests + sock.listen(10) + clog.info('[server] started, listening ...') + + while True: + # Accept a client connection request + clog.info('[server] start accept a client' ) + cli_conn, cli_ip_addr, cli_port = sock.accept() + clog.info('[server] accept a client: %s, %s' % (cli_ip_addr, cli_port)) + + # Create a new thread for each client connection for concurrent processing + _thread.start_new_thread(_client_conn_proc, (cli_conn, cli_ip_addr, cli_port)) + +if __name__ == '__main__': + _thread.start_new_thread(tcp_server, ('172.16.1.2', 6000)) \ No newline at end of file diff --git a/code/sdk/build/config/target_config/brandy/config.py b/code/sdk/build/config/target_config/brandy/config.py index 4e37b1eea..17656673d 100644 --- a/code/sdk/build/config/target_config/brandy/config.py +++ b/code/sdk/build/config/target_config/brandy/config.py @@ -120,7 +120,7 @@ target = { 'BOARD_FD230', 'CFG_FLASH_SIZE=16', 'SUPPORT_CAT1_SERVICE', - 'TEST_4G_SDK', + # 'TEST_4G_SDK', 'SUPPORT_BATTERY_SERVICE', 'ENABLE_ECC', 'MIPI_ULPS_SUPPORT', 'SUPPORT_ALIPAY_SEC'], 'ram_component': ["algorithm", "dfx_port_brandy", "dfx_update", 'dfx_nv', "osal", "arch_port", "-:testsuite", diff --git a/code/sdk/zhihui/4g/cat1Service/Service/cat1_server.c b/code/sdk/zhihui/4g/cat1Service/Service/cat1_server.c index 8fce79d8b..5b1ae975c 100644 --- a/code/sdk/zhihui/4g/cat1Service/Service/cat1_server.c +++ b/code/sdk/zhihui/4g/cat1Service/Service/cat1_server.c @@ -104,6 +104,15 @@ static uint8_t g_msg_format_type = 0; // void watch_replay_cat1_ANSWER(void); static char ble_buffer[20] = {0}; + +static uint8_t g_flag_disable_cat1_cmd = 0; + +errcode_t cat1_api_disable_cat1_cmd(uint8_t disable_cmd) +{ + g_flag_disable_cat1_cmd = disable_cmd; + return ERRCODE_SUCC; +} + void set_skip_cat1_service_udp_transfer(uint8_t skip) { g_skip_cat1_service_udp_transfer = skip; @@ -396,6 +405,13 @@ void udp_send_msg_toCat1(uint8_t cmd,char *content) cat1_print_warning("Error cat1 poweroff skipp send data\n"); return ; } + + if (g_flag_disable_cat1_cmd) + { + cat1_print_warning("Disable cat1 cmd skipp send data\n"); + return ; + } + cat1_api_wakeup_cat1(1); // uart_port_register_irq(UART_BUS_0); osal_irq_enable(UART_1_IRQN); diff --git a/code/sdk/zhihui/4g/cat1Service/include/cat1_pub_api.h b/code/sdk/zhihui/4g/cat1Service/include/cat1_pub_api.h index b1a0ed1d8..7e9af1888 100644 --- a/code/sdk/zhihui/4g/cat1Service/include/cat1_pub_api.h +++ b/code/sdk/zhihui/4g/cat1Service/include/cat1_pub_api.h @@ -133,6 +133,14 @@ char* cat1_api_runtime_get_cat1_pyver(void); char* cat1_api_runtime_get_cat1_modemver(void); + +/*** + * @brief 做网络操作时,停止cat1的指令 + * + * @return 成功 ERRCODE_SUCC +*/ +errcode_t cat1_api_disable_cat1_cmd(uint8_t disable_cmd); + #include "cat1_porting.h" #ifdef __cplusplus diff --git a/code/sdk/zhihui/4g/cat1Service/include/cat1_server.h b/code/sdk/zhihui/4g/cat1Service/include/cat1_server.h index a2acc6eef..80e90942d 100644 --- a/code/sdk/zhihui/4g/cat1Service/include/cat1_server.h +++ b/code/sdk/zhihui/4g/cat1Service/include/cat1_server.h @@ -9,10 +9,8 @@ #ifndef __CAT1_SERVER_H #define __CAT1_SERVER_H #ifdef __cplusplus -#if __cplusplus extern "C" { #endif /* __cplusplus */ -#endif /* __cplusplus */ #include #include #include "errcode.h" @@ -48,12 +46,7 @@ uint8_t set_call_hungup_flag(uint8_t data); void cat1_call_hungup_timer(void); - - - #ifdef __cplusplus -#if __cplusplus } #endif /* __cplusplus */ -#endif /* __cplusplus */ #endif diff --git a/code/sdk/zhihui/4gTest/cat1_at_cmd.c b/code/sdk/zhihui/4gTest/cat1_at_cmd.c index 6ecc173f3..f908b3b46 100644 --- a/code/sdk/zhihui/4gTest/cat1_at_cmd.c +++ b/code/sdk/zhihui/4gTest/cat1_at_cmd.c @@ -311,8 +311,12 @@ errcode_t http_single_download_start( uint8_t *server, uint16_t port,uint8_t *ur }else{ g_http_download_started = 1; } - //通讯开始,唤醒cat1 + + //通讯开始,唤醒cat1 + cat1_api_add_cat1_vote(); + cat1_api_wakeup_cat1(1); cat1_api_keep_wakeup(1); + cat1_api_disable_cat1_cmd(1); //httpc_connection_t settings = {0}; settings.result_fn=callback_result_fn; @@ -348,8 +352,11 @@ errcode_t http_single_download_start( uint8_t *server, uint16_t port,uint8_t *ur errcode_t http_single_download_stop(void) { //通讯结束,休眠cat1 - cat1_api_keep_wakeup(0); g_http_download_started = 0; + cat1_api_remove_cat1_vote(); + cat1_api_keep_wakeup(0); + cat1_api_wakeup_cat1(0); + cat1_api_disable_cat1_cmd(0); return ERRCODE_SUCC; } void httpc_download_result(void *arg, httpc_result_t httpc_result, u32_t rx_content_len, u32_t srv_res, err_t err) @@ -391,8 +398,7 @@ static uint32_t custom_start_ota_download(uint8_t *para, uint32_t paraLen, char return ERRCODE_FAIL; } - //通讯开始,唤醒cat1 - cat1_api_keep_wakeup(1); + uint8_t *server = (uint8_t*)argv[0]; uint16_t port = atoi((const char*)argv[1]); uint8_t *uri = (uint8_t*)argv[2]; diff --git a/code/sdk/zhihui/4gTest/cat1_porting.c b/code/sdk/zhihui/4gTest/cat1_porting.c index 087026c33..531a40ce7 100644 --- a/code/sdk/zhihui/4gTest/cat1_porting.c +++ b/code/sdk/zhihui/4gTest/cat1_porting.c @@ -52,7 +52,7 @@ static uint32_t sync_time_utc(uint32_t timestamp, uint32_t timezone_quarters) set_timezone(timezone_quarters); struct timeval tv = {0}; struct timezone tzone = {0}; - tv.tv_sec = seconds; + tv.tv_sec = seconds + timezone_quarters * MINUTES_PER_QUARTER * 60; tv.tv_usec = 0; tzone.tz_dsttime = 0; tzone.tz_minuteswest = timezone_quarters * MINUTES_PER_QUARTER; @@ -139,8 +139,10 @@ int32_t cat1_api_stop_cat1_volte_voice(void) #include "power_display_service.h" /*获取屏幕状态: return 1 need update */ + uint8_t cat1_api_need_update_signal(void) { + const power_display_svr_api_t *display_api = power_display_svr_get_api(); screen_state_t state = display_api->get_screen_state(); // printf("uapi_get_screen_state = %s . \r\n", state==SCREEN_ON?"on":"off"); diff --git a/code/sdk/zhihui/4gsdk/cat1Service/include/cat1_pub_api.h b/code/sdk/zhihui/4gsdk/cat1Service/include/cat1_pub_api.h index b1a0ed1d8..12502cc58 100644 --- a/code/sdk/zhihui/4gsdk/cat1Service/include/cat1_pub_api.h +++ b/code/sdk/zhihui/4gsdk/cat1Service/include/cat1_pub_api.h @@ -81,6 +81,12 @@ void cat1_api_wakeup_cat1(uint8_t wakeup); void cat1_api_keep_wakeup(uint8_t keep_wakeup); +/*** + * @brief 做网络操作时,停止cat1的指令 + * + * @return 成功 ERRCODE_SUCC +*/ +errcode_t cat1_api_disable_cat1_cmd(uint8_t disable_cmd); /******************* Cat1 实时状态获取函数,此变量每次开机后才会被赋值 **********************/ /**