From 36a9ef733299580915ec2bcb09313ef3273ae2df Mon Sep 17 00:00:00 2001 From: "lishuang.xie" Date: Fri, 20 Oct 2023 14:15:56 +0800 Subject: [PATCH] update New Feature#1167 1. UCP_API_RFIC_CellInit() and UCP_API_RFIC_CellSetup() changed input parameter. 2. modify: ucp_rfic_cfg.json file add two parameter. 3. modify: /rfic/src/main.c read the new input parameter from the ucp_rfic_cfg.json. 4. test: spu(case44) + arm(case5): pass --- rfic/src/main.c | 20 +++++++++++++++----- rfic/ucp_rfic_cfg.json | 4 +++- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/rfic/src/main.c b/rfic/src/main.c index eddef42..8ec5466 100644 --- a/rfic/src/main.c +++ b/rfic/src/main.c @@ -30,7 +30,10 @@ typedef struct ucp_rfic_cfg_info uint64_t txLo; uint64_t rxLo; uint64_t bw; + uint16_t signalType; uint16_t initAtt; + uint16_t initGain; + uint16_t padding; }ucp_rfic_cfg_info_t; #if 1 @@ -59,8 +62,13 @@ ucp_rfic_cfg_info_t rfic_get_cfg_info() st_rfic_cfg.rxLo = config->valuedouble; config = xzJSON_GetObjectItem(item, "bw"); st_rfic_cfg.bw = config->valuedouble; + config = xzJSON_GetObjectItem(item, "signalType"); + st_rfic_cfg.signalType = config->valueint; config = xzJSON_GetObjectItem(item, "initAtt"); - st_rfic_cfg.initAtt = config->valueint; + st_rfic_cfg.initAtt = config->valueint; + config = xzJSON_GetObjectItem(item, "initGain"); + st_rfic_cfg.initGain = config->valueint; + xzJSON_Delete(root); return st_rfic_cfg; @@ -125,15 +133,17 @@ int32_t main(int32_t argc, char* argvp[]) #if 1 st_rfic_cfg_info = rfic_get_cfg_info(); - printf("para: txLo:%ld, rxLo:%ld, bw:%ld, initAtt:%d\r\n", + printf("para: txLo:%ld, rxLo:%ld, bw:%ld, st:%d, initAtt:%d, initGain:%d\r\n", st_rfic_cfg_info.txLo, st_rfic_cfg_info.rxLo, st_rfic_cfg_info.bw, - st_rfic_cfg_info.initAtt); + st_rfic_cfg_info.signalType, + st_rfic_cfg_info.initAtt, + st_rfic_cfg_info.initGain); #endif /* call jesd init function */ - UCP_API_RFIC_CellInit(st_rfic_cfg_info.bw); - UCP_API_RFIC_CellSetup(st_rfic_cfg_info.txLo, st_rfic_cfg_info.rxLo, st_rfic_cfg_info.initAtt); + UCP_API_RFIC_CellInit(st_rfic_cfg_info.signalType, st_rfic_cfg_info.bw); + UCP_API_RFIC_CellSetup(st_rfic_cfg_info.txLo, st_rfic_cfg_info.rxLo, st_rfic_cfg_info.initAtt, st_rfic_cfg_info.initGain); //UCP_API_RFIC_CellSetup(2575770000u, 2575770000u, 0); /* post sem */ diff --git a/rfic/ucp_rfic_cfg.json b/rfic/ucp_rfic_cfg.json index 7de7122..f20d4c0 100644 --- a/rfic/ucp_rfic_cfg.json +++ b/rfic/ucp_rfic_cfg.json @@ -3,6 +3,8 @@ "txLo": 2575770000, "rxLo": 2575770000, "bw": 100000000, - "initAtt": 0 + "signalType": 0, + "initAtt": 0, + "initGain": 255 } }