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

fix: 调整ad9528 profile, 修复跳频频点缺失, 调整建网帧时间调整量

Browse Source
This commit is contained in:
josh
2025-06-05 11:38:22 +08:00
parent 67c64ae42a
commit 7dc59a4b46
7 changed files with 77 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/dev_profile/ad9528_profile.c
+18 -4
View File
@@ -38,16 +38,30 @@ static struct gpio_init_param ad9528_gpio_sysref_req_init = {
.extra = &xil_gpio_param .extra = &xil_gpio_param
}; };
// single board, without rf
// static ad9528pll1Settings_t clockPll1Settings = {
// .refA_Frequency_Hz = 50000000,
// .refA_Divider = 1,
// .refA_bufferCtrl = SINGLE_ENDED,
// .refB_Frequency_Hz = 0,
// .refB_Divider = 1,
// .refB_bufferCtrl = DISABLED,
// .vcxo_Frequency_Hz = 50000000,
// .vcxoBufferCtrl = SINGLE_ENDED,
// .nDivider = 1
// };
// with rf
static ad9528pll1Settings_t clockPll1Settings = { static ad9528pll1Settings_t clockPll1Settings = {
.refA_Frequency_Hz = 50000000, .refA_Frequency_Hz = 40000000,
.refA_Divider = 1, .refA_Divider = 4,
.refA_bufferCtrl = SINGLE_ENDED, .refA_bufferCtrl = DIFFERENTIAL,
.refB_Frequency_Hz = 0, .refB_Frequency_Hz = 0,
.refB_Divider = 1, .refB_Divider = 1,
.refB_bufferCtrl = DISABLED, .refB_bufferCtrl = DISABLED,
.vcxo_Frequency_Hz = 50000000, .vcxo_Frequency_Hz = 50000000,
.vcxoBufferCtrl = SINGLE_ENDED, .vcxoBufferCtrl = SINGLE_ENDED,
.nDivider = 1 .nDivider = 5
}; };
static ad9528pll2Settings_t clockPll2Settings = { static ad9528pll2Settings_t clockPll2Settings = {
src/drivers/frequency/ad9528/ad9528.c
+1 -1
View File
@@ -668,7 +668,7 @@ int32_t AD9528_config(ad9528Device_t
if(AD9528_hasTimeoutExpired() > 0) { if(AD9528_hasTimeoutExpired() > 0) {
return FAILURE; return FAILURE;
} }
} while((reg508 & 0x26) != 0x26); } while((reg508 & 0xE7) != 0xE7);
return SUCCESS; return SUCCESS;
} }
src/hwconfig.c
+51 -51
View File
@@ -312,31 +312,31 @@ int32_t Hardware_Init(void)
* *
*/ */
// get & set mixer settings // // get & set mixer settings
XRFdc_Mixer_Settings Mixer_Settings_DAC; // XRFdc_Mixer_Settings Mixer_Settings_DAC;
//
// 3th channel // // 3th channel
Status = XRFdc_GetMixerSettings(&RFdc, XRFDC_DAC_TILE, XRFDC_TILE_ID1, // Status = XRFdc_GetMixerSettings(&RFdc, XRFDC_DAC_TILE, XRFDC_TILE_ID1,
XRFDC_BLK_ID0, &Mixer_Settings_DAC); // XRFDC_BLK_ID0, &Mixer_Settings_DAC);
if (Status != XST_SUCCESS) { // if (Status != XST_SUCCESS) {
return XST_FAILURE; // return XST_FAILURE;
} // }
//
Mixer_Settings_DAC.Freq = 1500; // Mixer_Settings_DAC.Freq = 1500;
//
Status = XRFdc_SetMixerSettings(&RFdc, XRFDC_DAC_TILE, XRFDC_TILE_ID1, // Status = XRFdc_SetMixerSettings(&RFdc, XRFDC_DAC_TILE, XRFDC_TILE_ID1,
XRFDC_BLK_ID0, &Mixer_Settings_DAC); // XRFDC_BLK_ID0, &Mixer_Settings_DAC);
if (Status != XST_SUCCESS) { // if (Status != XST_SUCCESS) {
return XST_FAILURE; // return XST_FAILURE;
} // }
//
mdelay(100); // mdelay(100);
//
Status = XRFdc_UpdateEvent(&RFdc, XRFDC_DAC_TILE, XRFDC_TILE_ID1, // Status = XRFdc_UpdateEvent(&RFdc, XRFDC_DAC_TILE, XRFDC_TILE_ID1,
XRFDC_BLK_ID0, XRFDC_EVENT_MIXER); // XRFDC_BLK_ID0, XRFDC_EVENT_MIXER);
if (Status != XST_SUCCESS) { // if (Status != XST_SUCCESS) {
return XST_FAILURE; // return XST_FAILURE;
} // }
/* /*
* ADC Mapping: * ADC Mapping:
@@ -352,32 +352,32 @@ int32_t Hardware_Init(void)
* *
*/ */
// get & set mixer settings // // get & set mixer settings
XRFdc_Mixer_Settings Mixer_Settings_ADC; // XRFdc_Mixer_Settings Mixer_Settings_ADC;
//
// 3rd channel // // 3rd channel
Status = XRFdc_GetMixerSettings(&RFdc, XRFDC_ADC_TILE, XRFDC_TILE_ID1, // Status = XRFdc_GetMixerSettings(&RFdc, XRFDC_ADC_TILE, XRFDC_TILE_ID1,
XRFDC_BLK_ID0, &Mixer_Settings_ADC); // XRFDC_BLK_ID0, &Mixer_Settings_ADC);
if (Status != XST_SUCCESS) { // if (Status != XST_SUCCESS) {
return XST_FAILURE; // return XST_FAILURE;
} // }
//
Mixer_Settings_ADC.Freq = 1500; // Mixer_Settings_ADC.Freq = 1500;
Mixer_Settings_ADC.EventSource = XRFDC_EVNT_SRC_TILE; // Mixer_Settings_ADC.EventSource = XRFDC_EVNT_SRC_TILE;
//
Status = XRFdc_SetMixerSettings(&RFdc, XRFDC_ADC_TILE, XRFDC_TILE_ID1, // Status = XRFdc_SetMixerSettings(&RFdc, XRFDC_ADC_TILE, XRFDC_TILE_ID1,
XRFDC_BLK_ID0, &Mixer_Settings_ADC); // XRFDC_BLK_ID0, &Mixer_Settings_ADC);
if (Status != XST_SUCCESS) { // if (Status != XST_SUCCESS) {
return XST_FAILURE; // return XST_FAILURE;
} // }
//
mdelay(100); // mdelay(100);
//
Status = XRFdc_UpdateEvent(&RFdc, XRFDC_ADC_TILE, XRFDC_TILE_ID1, // Status = XRFdc_UpdateEvent(&RFdc, XRFDC_ADC_TILE, XRFDC_TILE_ID1,
XRFDC_BLK_ID0, XRFDC_EVENT_MIXER); // XRFDC_BLK_ID0, XRFDC_EVENT_MIXER);
if (Status != XST_SUCCESS) { // if (Status != XST_SUCCESS) {
return XST_FAILURE; // return XST_FAILURE;
} // }
#endif #endif
src/networking/link_layer/routine_table.c
+1 -1
View File
@@ -311,4 +311,4 @@ L2_RTNE_TABLE_ENTRY *normalTable[L2_NORMAL_RTNE_PERIOD] =
}; };
/** @} RoutineTable*/ /** @} RoutineTable*/
/** @} LinkLayer*/ /** @} LinkLayer*/
src/networking/phy_layer/phy_antenna.c
+2 -1
View File
@@ -204,11 +204,12 @@ const uint8_t hopPattern_ADV_24MS[L1_FRAME_ADV_24MS_HOPS] =
{ {
0U, 35U, 66U, 47U, 40U, 16U, 30U, 65U, 0U, 35U, 66U, 47U, 40U, 16U, 30U, 65U,
43U, 7U, 70U, 63U, 7U, 65U, 42U, 28U, 43U, 7U, 70U, 63U, 7U, 65U, 42U, 28U,
2U
}; };
const uint8_t hopPattern_ACK_8MS[L1_FRAME_ACK_8MS_HOPS] = const uint8_t hopPattern_ACK_8MS[L1_FRAME_ACK_8MS_HOPS] =
{ {
0U, 5U, 49U, 25U, 0U, 5U, 49U, 25U, 7U
}; };
const uint8_t hopPattern_128KBPS_4MS[L1_FRAME_128KBPS_4MS_HOPS] = const uint8_t hopPattern_128KBPS_4MS[L1_FRAME_128KBPS_4MS_HOPS] =
src/networking/phy_layer/phy_layer.c
+2 -2
View File
@@ -43,7 +43,7 @@
#define L1_FRAME_2MBPS_4MS_LEN (10224 / 8) // byte #define L1_FRAME_2MBPS_4MS_LEN (10224 / 8) // byte
//#define L1_FRAME_ADV_24MS_COMP 1399800 // *10ns(Timer_L) //#define L1_FRAME_ADV_24MS_COMP 1399800 // *10ns(Timer_L)
#define L1_FRAME_ADV_24MS_COMP 1463848 // *10ns(Timer_L) #define L1_FRAME_ADV_24MS_COMP 1464362 // *10ns(Timer_L)
#define L1_FRAME_ACK_8MS_COMP 598408 // *10ns(Timer_L) #define L1_FRAME_ACK_8MS_COMP 598408 // *10ns(Timer_L)
#define L1_FRAME_128KBPS_4MS_COMP 9950 // *10ns(Timer_L) #define L1_FRAME_128KBPS_4MS_COMP 9950 // *10ns(Timer_L)
#define L1_FRAME_512KBPS_4MS_COMP 9950 // *10ns(Timer_L) #define L1_FRAME_512KBPS_4MS_COMP 9950 // *10ns(Timer_L)
@@ -1147,7 +1147,7 @@ void Phy_RefreshHwSate(PHY_INST *instPtr)
/*** Temperature and Reserved Control ***/ /*** Temperature and Reserved Control ***/
rawData = PhyRead(instPtr, ANT_STATUS_TEMP); rawData = PhyRead(instPtr, ANT_STATUS_TEMP);
//-- Update Antenna Temperature (signed 8bit integer, 1 centigrade per LSB) //-- Update Antenna Temperature (signed 8bit integer, 1 centigrade per LSB)
instPtr->hwSate.antTemp = (uint8_t)(rawData & ANT_STATUS_TEMP_MASK) >> ANT_STATUS_TEMP_SHIFT; instPtr->hwSate.antTemp = (int8_t)(rawData & ANT_STATUS_TEMP_MASK) >> ANT_STATUS_TEMP_SHIFT;
instPtr->hwSate.antRsvd = (uint8_t)(rawData & ANT_STATUS_TEMP_RSVD_MASK) >> ANT_STATUS_TEMP_RSVD_SHIFT; instPtr->hwSate.antRsvd = (uint8_t)(rawData & ANT_STATUS_TEMP_RSVD_MASK) >> ANT_STATUS_TEMP_RSVD_SHIFT;
// Determine if antenna is ok. // Determine if antenna is ok.
src/networking/phy_layer/phy_layer.h
+2 -2
View File
@@ -46,8 +46,8 @@
#define L1_FRAME_NONE_COMP UINT32_MAX // *10ns(Timer_L) #define L1_FRAME_NONE_COMP UINT32_MAX // *10ns(Timer_L)
#define L1_FRAME_NONE_HOPS UINT32_MAX #define L1_FRAME_NONE_HOPS UINT32_MAX
#define L1_FRAME_MAX_HOPS 81 #define L1_FRAME_MAX_HOPS 81
#define L1_FRAME_ADV_24MS_HOPS 16U // sync 16 ms + data 8 ms, 2000 hops/s #define L1_FRAME_ADV_24MS_HOPS 17U // sync 16 ms + data 8 ms, 2000 hops/s
#define L1_FRAME_ACK_8MS_HOPS 4U // sync 6 ms + data 2 ms, 2000 hops/s #define L1_FRAME_ACK_8MS_HOPS 5U // sync 6 ms + data 2 ms, 2000 hops/s
#define L1_FRAME_128KBPS_4MS_HOPS 33U #define L1_FRAME_128KBPS_4MS_HOPS 33U
#define L1_FRAME_512KBPS_4MS_HOPS 36U #define L1_FRAME_512KBPS_4MS_HOPS 36U
#define L1_FRAME_2MBPS_4MS_HOPS 38U #define L1_FRAME_2MBPS_4MS_HOPS 38U