josh/hj_datalink
1
0
Fork 0
forked from gatsby/df_datalink
Code Issues Pull Requests Releases Activity

misc update

Browse Source
This commit is contained in:
Gatsby Van
2024-04-02 00:17:39 +08:00
parent f363d3afba
commit da1659a582
5 changed files with 102 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
df_datalink_sp/src/config/app_config.h
-1
View File
@@ -179,7 +179,6 @@ typedef enum
#define HMC7044_SPI_ENGINE_CS_DELAY 3 #define HMC7044_SPI_ENGINE_CS_DELAY 3
#define HMC7044_SPI_CS_HMC7044 0x00 #define HMC7044_SPI_CS_HMC7044 0x00
// Configuration Check // Configuration Check
#if defined(PHY_BEAM_SET_PRESET) && !defined(PHY_BEAM_FORMING_ENABLE) #if defined(PHY_BEAM_SET_PRESET) && !defined(PHY_BEAM_FORMING_ENABLE)
#define PHY_BEAM_FORMING_ENABLE #define PHY_BEAM_FORMING_ENABLE
df_datalink_sp/src/networking/phy_layer/phy_antenna.c
+1 -1
View File
@@ -80,7 +80,7 @@ const uint16_t freqTable[L1_FRAME_MAX_HOPS] =
1916, 1929, 1942, 1955, 1968, 1981, 1994, 2007, 1916, 1929, 1942, 1955, 1968, 1981, 1994, 2007,
2020, 2033, 2046, 2059, 2072, 2085, 2098, 2111, 2020, 2033, 2046, 2059, 2072, 2085, 2098, 2111,
2124 2124
} };
const uint16_t antCalTable[L1_FRAME_MAX_HOPS][L1_ANT_NUM_CH] = const uint16_t antCalTable[L1_FRAME_MAX_HOPS][L1_ANT_NUM_CH] =
//Antenna-JG01 //Antenna-JG01
df_datalink_sp/src/networking/phy_layer/phy_layer.c
+2 -2
View File
@@ -425,7 +425,7 @@ int32_t Phy_Init(PHY_INST **instPtr, PHY_CONFIG *phyConfig)
memset(&((*instPtr))->tor, PHY_TOR_SUSPEND, sizeof(PHY_RCD)); memset(&((*instPtr))->tor, PHY_TOR_SUSPEND, sizeof(PHY_RCD));
memset(&((*instPtr)->frameType), L1_NONE_FRAME, sizeof(PHY_RCD)); memset(&((*instPtr)->frameType), L1_NONE_FRAME, sizeof(PHY_RCD));
memset(&((*instPtr)->beamNo), (int32_t)L1_INIT_ANT_NO, sizeof(PHY_RCD)); memset(&((*instPtr)->beamNo), (int32_t)L1_INIT_BEAM_NO, sizeof(PHY_RCD));
memset(&((*instPtr)->beamWd), (int32_t)L1_INIT_ANT_WD, sizeof(PHY_RCD)); memset(&((*instPtr)->beamWd), (int32_t)L1_INIT_ANT_WD, sizeof(PHY_RCD));
memset(&((*instPtr)->hwSate), 0x00, sizeof(HWSTATE)); memset(&((*instPtr)->hwSate), 0x00, sizeof(HWSTATE));
memset(&((*instPtr)->phyLog), 0x00, sizeof(PHYLOG)); memset(&((*instPtr)->phyLog), 0x00, sizeof(PHYLOG));
@@ -1152,7 +1152,7 @@ void Phy_RefreshHwSate(PHY_INST *instPtr)
instPtr->hwSate.isAntOk = (instPtr->hwSate.antVolt == (VOLT_ANT_PROC_OK | VOLT_ANT_RF_OK | VOLT_ANT_NIL_OK | ANT_STATE_OK)) instPtr->hwSate.isAntOk = (instPtr->hwSate.antVolt == (VOLT_ANT_PROC_OK | VOLT_ANT_RF_OK | VOLT_ANT_NIL_OK | ANT_STATE_OK))
&& (instPtr->hwSate.antPll == (CLK_ANT_BBPLL_LOCK | CLK_ANT_RFPLL0_LOCK | CLK_ANT_RFPLL1_LOCK)); && (instPtr->hwSate.antPll == (CLK_ANT_BBPLL_LOCK | CLK_ANT_RFPLL0_LOCK | CLK_ANT_RFPLL1_LOCK));
instPtr->hwSate.phyId = instPtr.phyCofig.devId; instPtr->hwSate.phyId = instPtr->phyCofig.devId;
memset(instPtr->hwSate.reserve, 0x00, sizeof(instPtr->hwSate.reserve)); memset(instPtr->hwSate.reserve, 0x00, sizeof(instPtr->hwSate.reserve));
df_datalink_sp/src/system_monitor.h
+1 -1
View File
@@ -204,7 +204,7 @@ typedef struct __attribute__((packed))
uint8_t antMgc0; ///< Antenna rf mgc0~1 indicator uint8_t antMgc0; ///< Antenna rf mgc0~1 indicator
uint8_t antMgc1; ///< Antenna rf mgc2~3 indicator uint8_t antMgc1; ///< Antenna rf mgc2~3 indicator
uint8_t phyId; uint8_t phyId;
uint8_t reserve; uint8_t reserve[1];
} HWSTATE; } HWSTATE;
/** /**
makecopy
+2 -2
View File
@@ -25,14 +25,14 @@ for key in ${!calMap[*]};do
cd $DST_DIR/$projName cd $DST_DIR/$projName
# subtitite ID # subtitite ID
sed -i'' "s/#define PHY_DEVICE_ID 0/#define PHY_DEVICE_ID $id/g" sed -i'' "s/#define PHY_DEVICE_ID 0/#define PHY_DEVICE_ID 0x$id/g" ./config/app_config.h
# subtitute table # subtitute table
sed -i'' "/^const uint16_t antCalTable\[L1_FRAME_MAX_HOPS\]\[L1_ANT_NUM_CH\] =/{ sed -i'' "/^const uint16_t antCalTable\[L1_FRAME_MAX_HOPS\]\[L1_ANT_NUM_CH\] =/{
:table :table
N N
/\};/!b table /\};/!b table
s/=.*\};/=\n\/\/Antenna-$key\n$calMap[$key]/ s/=.*\};/=\n\/\/Antenna-$key\n${calMap[$key]}/
}" ./networking/phy_layer/phy_antenna.c }" ./networking/phy_layer/phy_antenna.c
cd $DST_DIR cd $DST_DIR
done done