diff --git a/df_datalink_sp/src/networking/phy_layer/phy_layer.c b/df_datalink_sp/src/networking/phy_layer/phy_layer.c index 8975c55..55b695b 100644 --- a/df_datalink_sp/src/networking/phy_layer/phy_layer.c +++ b/df_datalink_sp/src/networking/phy_layer/phy_layer.c @@ -35,10 +35,31 @@ /************************** Constant Definitions *****************************/ -#define TOR_BUFF_MAX_SIZE 1024 // 8192bits +#define L1_FRAME_NONE_LEN UINT32_MAX // byte +#define L1_FRAME_LEN_MAX (8192 / 8) // byte +#define L1_FRAME_2KBPS_20MS_LEN 0 // byte +#define L1_FRAME_2KBPS_100MS_LEN (312 / 8) // byte +#define L1_FRAME_10KBPS_10MS_LEN 0 // byte +#define L1_FRAME_10KBPS_20MS_LEN (232 / 8) // byte +#define L1_FRAME_40KBPS_20MS_LEN (2152 / 8) // byte +#define L1_FRAME_40KBPS_10MS_LEN (712 / 8) // byte +#define L1_FRAME_200KBPS_5MS_LEN (2040 / 8) // byte +#define L1_FRAME_1M2BPS_5MS_LEN (8176 / 8) // byte + +#define L1_FRAME_NONE_COMP UINT32_MAX // *10ns(Timer_L) +#define L1_FRAME_2KBPS_20MS_COMP 1841158 // *10ns(Timer_L) +#define L1_FRAME_2KBPS_100MS_COMP 1841158 // *10ns(Timer_L) +#define L1_FRAME_10KBPS_10MS_COMP 850950 // *10ns(Timer_L) +#define L1_FRAME_10KBPS_20MS_COMP 850950 // *10ns(Timer_L) +#define L1_FRAME_40KBPS_20MS_COMP 110667 // *10ns(Timer_L) +#define L1_FRAME_40KBPS_10MS_COMP 110667 // *10ns(Timer_L) +#define L1_FRAME_200KBPS_5MS_COMP 22493 // *10ns(Timer_L) +#define L1_FRAME_1M2BPS_5MS_COMP 22493 // *10ns(Timer_L) + +#define L1_ANTCONFIG_MAX_LEN 8192 +#define L1_TXRXDATA_MAX_LEN 2048 + #define ANT_COINFO_LEN 32 // bytes -#define ANTCONFIG_MAX_LEN (8192 / 2) -#define PAYLOAD_MAX_LEN (4096 / 2) /***************** Macros (Inline Functions) Definitions *********************/ /************************** Function Prototypes ******************************/ diff --git a/df_datalink_sp/src/networking/phy_layer/phy_layer.h b/df_datalink_sp/src/networking/phy_layer/phy_layer.h index b5948d8..5b8dcf2 100644 --- a/df_datalink_sp/src/networking/phy_layer/phy_layer.h +++ b/df_datalink_sp/src/networking/phy_layer/phy_layer.h @@ -35,9 +35,6 @@ #include "../../system_monitor.h" #include "../../time_ctrl/time_ctrl.h" /************************** Constant Definitions *****************************/ -#define L1_TMWORD_FRAC_MAX 500000 -#define L1_ANTCONFIG_MAX_LEN 8192 -#define L1_TXRXDATA_MAX_LEN 2048 #define L1_NUM_ANT_SUBNRRW_PATTERN 37 #define L1_NUM_ANT_NRRW_PATTERN 61 #define L1_INIT_BEAM_NO 0 @@ -55,27 +52,6 @@ #define L1_FRAME_200KBPS_5MS_HOPS 20 #define L1_FRAME_1M2BPS_5MS_HOPS 20 -#define L1_FRAME_NONE_LEN UINT32_MAX // byte -#define L1_FRAME_LEN_MAX (8192 / 8) // byte -#define L1_FRAME_2KBPS_20MS_LEN 1 // byte -#define L1_FRAME_2KBPS_100MS_LEN 312 / 8 // byte -#define L1_FRAME_10KBPS_10MS_LEN 1 // byte -#define L1_FRAME_10KBPS_20MS_LEN (232 / 8) // byte -#define L1_FRAME_40KBPS_20MS_LEN (2152 / 8) // byte -#define L1_FRAME_40KBPS_10MS_LEN (712 / 8) // byte -#define L1_FRAME_200KBPS_5MS_LEN (2040 / 8) // byte -#define L1_FRAME_1M2BPS_5MS_LEN (8176 / 8) // byte - -#define L1_FRAME_NONE_COMP UINT32_MAX // *10ns(Timer_L) -#define L1_FRAME_2KBPS_20MS_COMP 1841158 // *10ns(Timer_L) -#define L1_FRAME_2KBPS_100MS_COMP 1841158 // *10ns(Timer_L) -#define L1_FRAME_10KBPS_10MS_COMP 850950 // *10ns(Timer_L) -#define L1_FRAME_10KBPS_20MS_COMP 850950 // *10ns(Timer_L) -#define L1_FRAME_40KBPS_20MS_COMP 110667 // *10ns(Timer_L) -#define L1_FRAME_40KBPS_10MS_COMP 110667 // *10ns(Timer_L) -#define L1_FRAME_200KBPS_5MS_COMP 22493 // *10ns(Timer_L) -#define L1_FRAME_1M2BPS_5MS_COMP 22493 // *10ns(Timer_L) - #define PHY_TIME_WORD_H_MAX UINT32_MAX #define PHY_TIME_WORD_L_MAX 0x0007A120 // 5ms/10ns /***************** Macros (Inline Functions) Definitions *********************/