From 8f4c3d4bcb73538dbc8fdc0801deea4f03f0dc3d Mon Sep 17 00:00:00 2001 From: hcj <1224667075@qq.com> Date: Wed, 27 Aug 2025 18:19:28 +0800 Subject: [PATCH] =?utf8?q?n9=20=E5=85=A5=E5=BA=93=E4=BF=AE=E6=94=B9=20?= =?utf8?q?=E4=BF=AE=E6=94=B9=E4=BD=8E=E5=8A=9F=E8=80=97=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- autobuild.sh | 11 ++++ cat1modem/src/N9/cat1Service.py | 11 ++-- cat1modem/src/N9/china_mobile_dmp.py | 6 +- cat1modem/src/china_mobile_dmp.py | 6 +- .../config/target_config/brandy/config.py | 55 +++++++++++++++++++ .../n9/fs/user/system/cat1ota/cat1Service.py | 2 +- .../user/system/cat1ota/china_mobile_dmp.py | 7 +-- .../w9/fs/user/system/cat1ota/cat1Service.py | 2 +- .../user/system/cat1ota/china_mobile_dmp.py | 8 +-- .../slip/cat1Service/cat1_server.cpp | 4 +- 10 files changed, 85 insertions(+), 27 deletions(-) diff --git a/autobuild.sh b/autobuild.sh index 93abc830b..2f14c8e6a 100755 --- a/autobuild.sh +++ b/autobuild.sh @@ -110,6 +110,17 @@ BUILD_NAME=_CM_N9 CAT1_FW_DIR=n9 fi +if [ "$1" == "ctn9" ] +then +TARGET_PACK_NAME=pack_brandy_native_js_ct_n9 +APPLICATION_NAME=brandy-native-js-ct-n9 +RECOVERY_NAME=brandy-native-js-ct-n9-r +DEFAULT_SSB_NAME=brandy-native-js-ct-n9-ssb +BUILD_NAME=_CT_N9 +CAT1_FW_DIR=n9 +fi + + if [ "$1" == "leakcheck" ] then TARGET_PACK_NAME=pack_brandy_native_js_leakcheck diff --git a/cat1modem/src/N9/cat1Service.py b/cat1modem/src/N9/cat1Service.py index a69f71641..97baa827d 100644 --- a/cat1modem/src/N9/cat1Service.py +++ b/cat1modem/src/N9/cat1Service.py @@ -94,7 +94,7 @@ CURRENT_APP_TYPE="pysrv" voiceCall.setVolume(10) clog.info("voice call volume {}".format(voiceCall.getVolume())) lpm_fd = pm.create_wakelock("system_lock", len("system_lock")) -# pm.autosleep(1) +pm.autosleep(1) pm.wakelock_lock(lpm_fd) clog.info("create_wakelock {}".format(pm.get_wakelock_num())) telecomTimerCount = 0 @@ -359,9 +359,10 @@ class Cat1Service: # net.setModemFun(0) # net.setModemFun(1) resp=bytearray(50) - ret=atcmd.sendSync("{}\r\n".format(parm),resp,'',10) + ret=atcmd.sendSync("{}\r\n".format(parm),resp,'',20) if ret == 0: - clog.info("reply:{},ret:{}".format(resp.decode(),ret)) + clog.info("AT reply:{},ret:{}".format(resp,ret)) + clog.info("ATret:{}".format(ret)) self.reply_cmd('09',"{}".format(resp.decode())) else: clog.info("cmd error ret:{}".format(ret)) @@ -884,6 +885,8 @@ class Cat1Service: tlv_pack = CAT1_SERVICE_HEAD+head+len_str+content return tlv_pack # 解码tlv数据包 + # F700010 + def __unpack_tlv_format(self, msg): clog.info('__unpack_tlv_format {}\r\n'.format(msg)) self.msg = str(msg)[2:]#这是去除head FE @@ -892,7 +895,7 @@ class Cat1Service: 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]: - clog.error('__unpack_tlv_format err') + clog.error('__unpack_tlv_format err{}'.format(len(value))) return -1 clog.info('__unpack_tlv_format: {} {} {}\r\n'.format(tag,length,value)) unpack = (tag,length,value) diff --git a/cat1modem/src/N9/china_mobile_dmp.py b/cat1modem/src/N9/china_mobile_dmp.py index 8128328bd..d7c28ae6e 100644 --- a/cat1modem/src/N9/china_mobile_dmp.py +++ b/cat1modem/src/N9/china_mobile_dmp.py @@ -795,11 +795,7 @@ class chinamobile: self.reportTime_Sec = 0 #保存本地 保存时间戳下一次开机使用 self.report_Num_old = 0#保存本地 self.retryNum_old = 0#保存本地 - get_address = eventMesh.publish("get_dmp_cm_address") - if get_address == None:#获取出来地址是空的使用适配地址 - self.address = "a.fxltsbl.com"#默认 - else: #恢复出厂使用BLE传送过来的地址 - self.address = str(eventMesh.publish("get_dmp_cm_address")) + self.address = "a.fxltsbl.com"#默认 self.config_data["retryInterval"] = self.retryInterval self.config_data["retryNum"] = self.retryNum diff --git a/cat1modem/src/china_mobile_dmp.py b/cat1modem/src/china_mobile_dmp.py index 9382f43f8..cbab14064 100644 --- a/cat1modem/src/china_mobile_dmp.py +++ b/cat1modem/src/china_mobile_dmp.py @@ -712,11 +712,7 @@ class chinamobile: self.reportTime_Sec = 0 #保存本地 保存时间戳下一次开机使用 self.report_Num_old = 0#保存本地 self.retryNum_old = 0#保存本地 - get_address = eventMesh.publish("get_dmp_cm_address") - if get_address == None:#获取出来地址是空的使用适配地址 - self.address = "a.fxltsbl.com"#默认 - else: #恢复出厂使用BLE传送过来的地址 - self.address = str(eventMesh.publish("get_dmp_cm_address")) + self.address = "a.fxltsbl.com"#默认 self.config_data["retryInterval"] = self.retryInterval self.config_data["retryNum"] = self.retryNum diff --git a/code/sdk/build/config/target_config/brandy/config.py b/code/sdk/build/config/target_config/brandy/config.py index 1557fc21c..ede7f805c 100755 --- a/code/sdk/build/config/target_config/brandy/config.py +++ b/code/sdk/build/config/target_config/brandy/config.py @@ -682,6 +682,60 @@ target = { 'NANDFLASH_F35UQA' ] }, + + 'brandy-native-js-ct-n9': { + 'base_target_name': 'brandy-native-js', + 'defines': [ + '-:TPTYPE_FT6X46', + '-:PPG_HX3695', + '-:ROTARYENCODER_HX3507', + '-:BOARD_FD230', + 'BOARD_N9', + # 'SUPPORT_GNSS', + # 'DISABLE_UART_LOG', + # 'CONFIG_GNSS_UART_WITH_FLOWCTRL', + # 'DOWNLOAD_GNSS_SWITCH', + 'TPTYPE_CST86XX', + 'NANDFLASH_F35UQA', + 'PPG_PAH8009', + 'GYRO_SH5001', + 'ROTARYENCODER_MIXO', + 'ENABLE_GYRO', + 'SUPPORT_TELECOM_DMP', + ], + 'ram_component': [ + "gnss", + # "gnss_sample", + "pgnss_sample", + #"ppg_sensor_gh3x2x", + "ppg_sensor_pah8009", + #"bp_sensor", + "gyro", + ], + 'image_analysis': False, + 'fs_image_path':'n9', + 'fs_image': True + }, + + 'brandy-native-js-ct-n9-r': { + 'base_target_name': 'brandy-native-js-r', + #自定义配置项，选择硬件及功能参数 + 'defines': [ + '-:TPTYPE_FT6X46', + 'BOARD_N9', + 'TPTYPE_CST86XX', + 'NANDFLASH_F35UQA' + ], + }, + 'brandy-native-js-ct-n9-ssb': { + 'base_target_name': 'brandy-ssb', + #自定义配置项，选择硬件及功能参数 + 'defines': [ + 'BOARD_N9', + 'GPIO_POWERON_FLASH', + 'NANDFLASH_F35UQA' + ] + }, 'brandy-native-js-cm-ai': { 'base_target_name': 'brandy-native-js', 'defines': [ @@ -775,6 +829,7 @@ target_group = { 'pack_brandy_native_js_w9': ['brandy-native-js-w9-ssb', 'brandy-native-js-w9-r', 'brandy-native-js-w9'], 'pack_brandy_native_js_n9': ['brandy-native-js-n9-ssb', 'brandy-native-js-n9-r', 'brandy-native-js-n9'], 'pack_brandy_native_js_cm_n9': ['brandy-native-js-cm-n9-ssb', 'brandy-native-js-cm-n9-r', 'brandy-native-js-cm-n9'], + 'pack_brandy_native_js_ct_n9': ['brandy-native-js-ct-n9-ssb', 'brandy-native-js-ct-n9-r', 'brandy-native-js-ct-n9'], 'pack_brandy_native_js_fd230': ['brandy-native-js-fd230-ssb', 'brandy-native-js-fd230-r', 'brandy-native-js-fd230'], 'pack_brandy_xts': ['brandy-ssb', 'brandy-xts-r', 'brandy-xts'], 'pack_brandy_native_js_oob128': ['brandy-ssb-oob128', 'brandy-native-js-r', 'brandy-native-js-oob128'], diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/n9/fs/user/system/cat1ota/cat1Service.py b/code/sdk/build/config/target_config/brandy/mk_fs_image/n9/fs/user/system/cat1ota/cat1Service.py index a69f71641..c9d4c1162 100644 --- a/code/sdk/build/config/target_config/brandy/mk_fs_image/n9/fs/user/system/cat1ota/cat1Service.py +++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/n9/fs/user/system/cat1ota/cat1Service.py @@ -94,7 +94,7 @@ CURRENT_APP_TYPE="pysrv" voiceCall.setVolume(10) clog.info("voice call volume {}".format(voiceCall.getVolume())) lpm_fd = pm.create_wakelock("system_lock", len("system_lock")) -# pm.autosleep(1) +pm.autosleep(1) pm.wakelock_lock(lpm_fd) clog.info("create_wakelock {}".format(pm.get_wakelock_num())) telecomTimerCount = 0 diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/n9/fs/user/system/cat1ota/china_mobile_dmp.py b/code/sdk/build/config/target_config/brandy/mk_fs_image/n9/fs/user/system/cat1ota/china_mobile_dmp.py index 8128328bd..2d9f2cc3e 100644 --- a/code/sdk/build/config/target_config/brandy/mk_fs_image/n9/fs/user/system/cat1ota/china_mobile_dmp.py +++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/n9/fs/user/system/cat1ota/china_mobile_dmp.py @@ -795,12 +795,9 @@ class chinamobile: self.reportTime_Sec = 0 #保存本地 保存时间戳下一次开机使用 self.report_Num_old = 0#保存本地 self.retryNum_old = 0#保存本地 - get_address = eventMesh.publish("get_dmp_cm_address") - if get_address == None:#获取出来地址是空的使用适配地址 - self.address = "a.fxltsbl.com"#默认 - else: #恢复出厂使用BLE传送过来的地址 - self.address = str(eventMesh.publish("get_dmp_cm_address")) + self.address = "a.fxltsbl.com"#默认 + self.config_data["retryInterval"] = self.retryInterval self.config_data["retryNum"] = self.retryNum self.config_data["heartBeatTime"] = self.heartBeatTime diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/w9/fs/user/system/cat1ota/cat1Service.py b/code/sdk/build/config/target_config/brandy/mk_fs_image/w9/fs/user/system/cat1ota/cat1Service.py index d0b727137..aafedc033 100644 --- a/code/sdk/build/config/target_config/brandy/mk_fs_image/w9/fs/user/system/cat1ota/cat1Service.py +++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/w9/fs/user/system/cat1ota/cat1Service.py @@ -91,7 +91,7 @@ CURRENT_APP_TYPE="pysrv" voiceCall.setVolume(10) clog.info("voice call volume {}".format(voiceCall.getVolume())) lpm_fd = pm.create_wakelock("system_lock", len("system_lock")) -# pm.autosleep(1) +pm.autosleep(1) pm.wakelock_lock(lpm_fd) clog.info("create_wakelock {}".format(pm.get_wakelock_num())) telecomTimerCount = 0 diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/w9/fs/user/system/cat1ota/china_mobile_dmp.py b/code/sdk/build/config/target_config/brandy/mk_fs_image/w9/fs/user/system/cat1ota/china_mobile_dmp.py index 45962cc11..bc3454130 100644 --- a/code/sdk/build/config/target_config/brandy/mk_fs_image/w9/fs/user/system/cat1ota/china_mobile_dmp.py +++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/w9/fs/user/system/cat1ota/china_mobile_dmp.py @@ -712,11 +712,9 @@ class chinamobile: self.reportTime_Sec = 0 #保存本地 保存时间戳下一次开机使用 self.report_Num_old = 0#保存本地 self.retryNum_old = 0#保存本地 - get_address = eventMesh.publish("get_dmp_cm_address") - if get_address == None:#获取出来地址是空的使用适配地址 - self.address = "a.fxltsbl.com"#默认 - else: #恢复出厂使用BLE传送过来的地址 - self.address = str(eventMesh.publish("get_dmp_cm_address")) + + self.address = "a.fxltsbl.com"#默认 + self.config_data["retryInterval"] = self.retryInterval self.config_data["retryNum"] = self.retryNum diff --git a/code/sdk/drivers/peripheral/slip/cat1Service/cat1_server.cpp b/code/sdk/drivers/peripheral/slip/cat1Service/cat1_server.cpp index 160f71e3a..987223095 100644 --- a/code/sdk/drivers/peripheral/slip/cat1Service/cat1_server.cpp +++ b/code/sdk/drivers/peripheral/slip/cat1Service/cat1_server.cpp @@ -948,6 +948,7 @@ void cat1_gettime(void) void cat1_get_DEV_ID(void) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"UDP_CMD_get_DEV_ID\n"); udp_send_msg_toCat1(UDP_MSG_SEND_AI_ID,"0"); } @@ -1568,7 +1569,7 @@ static int udp_packet_parse(char *rx_buffer, int len) }else if (stateNew == 2){ //移动入库功能 get_software_version_toCat1(); send_ble_mac_toCat1(); - send_dmp_cm_address_toCat1(); + // send_dmp_cm_address_toCat1(); send_volte_switch_toCat1(); send_dmp_factory_flag(); }else if(stateNew == 3) @@ -1640,6 +1641,7 @@ static int udp_packet_parse(char *rx_buffer, int len) uapi_dev_runtime_set_cat1_DEV_ID(msg_buffer); // if(msg_buffer) set_dev_id(msg_buffer); + break; default: WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"error message: %s\n", rx_buffer); index = 1; -- 2.17.1