From 34b851fab7e95c5352f3e63e3fb45ad5b7786aa4 Mon Sep 17 00:00:00 2001 From: Gatsby Van Date: Tue, 5 Mar 2024 21:31:06 +0800 Subject: [PATCH] delete trailing blank space --- .../src/networking/phy_layer/phy_antenna.c | 43 +++++++++---------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/df_datalink_sp/src/networking/phy_layer/phy_antenna.c b/df_datalink_sp/src/networking/phy_layer/phy_antenna.c index b7c41ca..ef0a494 100644 --- a/df_datalink_sp/src/networking/phy_layer/phy_antenna.c +++ b/df_datalink_sp/src/networking/phy_layer/phy_antenna.c @@ -54,17 +54,17 @@ // Pair by regex // Regex: (([0-9]+, ){8}) -uint16_t hopPattern_Config[L1_FRAME_MAX_HOPS] = +uint16_t hopPattern_Config[L1_FRAME_MAX_HOPS] = { 0 }; -uint16_t hopPattern_2KBPS_20MS[L1_FRAME_2KBPS_20MS_HOPS] = +uint16_t hopPattern_2KBPS_20MS[L1_FRAME_2KBPS_20MS_HOPS] = { 1500 }; -uint16_t hopPattern_2KBPS_100MS[L1_FRAME_2KBPS_100MS_HOPS] = +uint16_t hopPattern_2KBPS_100MS[L1_FRAME_2KBPS_100MS_HOPS] = { 0, 44, 88, 131, 175, 219, 263, 306, 350, 394, 438, 481, 525, 569, 613, 656, @@ -79,27 +79,27 @@ uint16_t hopPattern_2KBPS_100MS[L1_FRAME_2KBPS_100MS_HOPS] = 3500 }; -uint16_t hopPattern_10KBPS_10MS[L1_FRAME_10KBPS_10MS_HOPS] = +uint16_t hopPattern_10KBPS_10MS[L1_FRAME_10KBPS_10MS_HOPS] = { 1500 }; -uint16_t hopPattern_10KBPS_20MS[L1_FRAME_10KBPS_20MS_HOPS] = +uint16_t hopPattern_10KBPS_20MS[L1_FRAME_10KBPS_20MS_HOPS] = { - 1500, 1600, 1700, 1800, 1900, 1400, 1300, 1200, + 1500, 1600, 1700, 1800, 1900, 1400, 1300, 1200, 1100, 1000, 900 }; -uint16_t hopPattern_40KBPS_10MS[L1_FRAME_40KBPS_10MS_HOPS] = +uint16_t hopPattern_40KBPS_10MS[L1_FRAME_40KBPS_10MS_HOPS] = { - 1600, 1650, 1700, 1750, 1800, 1850, 1900, 1550, + 1600, 1650, 1700, 1750, 1800, 1850, 1900, 1550, 1500 }; -uint16_t hopPattern_40KBPS_20MS[L1_FRAME_40KBPS_20MS_HOPS] = +uint16_t hopPattern_40KBPS_20MS[L1_FRAME_40KBPS_20MS_HOPS] = { - 1600, 1650, 1700, 1750, 1800, 1850, 1900, 1550, - 1500, 1450, 1400, 1350, 1300, 1250, 1200, 1150, + 1600, 1650, 1700, 1750, 1800, 1850, 1900, 1550, + 1500, 1450, 1400, 1350, 1300, 1250, 1200, 1150, 1100, 1050, 1000 }; @@ -110,7 +110,7 @@ uint16_t hopPattern_200KBPS_5MS[L1_FRAME_200KBPS_5MS_HOPS] = 1900, 2000, 1500, 1500 }; -uint16_t hopPattern_1M2BPS_5MS[L1_FRAME_1M2BPS_5MS_HOPS] = +uint16_t hopPattern_1M2BPS_5MS[L1_FRAME_1M2BPS_5MS_HOPS] = { 500, 600, 700, 800, 900, 1000, 500, 600, 700, 800, 900, 1000, 500, 600, 700, 800, @@ -120,7 +120,7 @@ uint16_t hopPattern_1M2BPS_5MS[L1_FRAME_1M2BPS_5MS_HOPS] = // Pair by regex // Regex: ((\{\.oaxis = [0-9]+[ ,]+\.raxis = [0-9]+[ ]*\}, ){2}) #ifdef PHY_BEAM_SET_PRESET -PHY_ANT_ANGLE antSubnrrwPattern[L1_NUM_ANT_SUBNRRW_PATTERN] = +PHY_ANT_ANGLE antSubnrrwPattern[L1_NUM_ANT_SUBNRRW_PATTERN] = { {.oaxis = 0 , .raxis = 0 }, {.oaxis = 10, .raxis = 85 }, {.oaxis = 14, .raxis = 307}, {.oaxis = 17, .raxis = 170}, @@ -142,7 +142,7 @@ PHY_ANT_ANGLE antSubnrrwPattern[L1_NUM_ANT_SUBNRRW_PATTERN] = {.oaxis = 58, .raxis = 227}, {.oaxis = 59, .raxis = 90 }, {.oaxis = 60, .raxis = 312} }; -PHY_ANT_ANGLE antNrrwPattern[L1_NUM_ANT_NRRW_PATTERN] = +PHY_ANT_ANGLE antNrrwPattern[L1_NUM_ANT_NRRW_PATTERN] = { {.oaxis = 0 , .raxis = 0 }, {.oaxis = 7 , .raxis = 85 }, {.oaxis = 10, .raxis = 307}, {.oaxis = 13, .raxis = 170}, @@ -177,11 +177,11 @@ PHY_ANT_ANGLE antNrrwPattern[L1_NUM_ANT_NRRW_PATTERN] = {.oaxis = 60, .raxis = 252} }; #else -PHY_ANT_ANGLE antSubnrrwPattern[L1_NUM_ANT_SUBNRRW_PATTERN] = +PHY_ANT_ANGLE antSubnrrwPattern[L1_NUM_ANT_SUBNRRW_PATTERN] = { 0 }; -PHY_ANT_ANGLE antNrrwPattern[L1_NUM_ANT_NRRW_PATTERN] = +PHY_ANT_ANGLE antNrrwPattern[L1_NUM_ANT_NRRW_PATTERN] = { 0 }; @@ -246,7 +246,7 @@ void Phy_AntConfigInit(PHY_ANT_CONFIG *antConfig) // *********************** } -void Phy_AntConfigMode(PHY_INST *instPtr, PHY_ANT_MODE mode) +void Phy_AntConfigMode(PHY_INST *instPtr, PHY_ANT_MODE mode) { ASSERT(instPtr != NULL); uint8_t config = instPtr->antConfig.antMode & ANT_MODE_BEAM_MASK; @@ -280,10 +280,10 @@ int32_t Phy_SetBeamNo(PHY_INST *instPtr, int32_t beamNo) else { instPtr->beamNo.next = beamNo; - instPtr->antConfig.oaxis[1] = (uint8_t)(antNrrwPattern[beamNo].oaxis >> 8); - instPtr->antConfig.oaxis[0] = (uint8_t)(antNrrwPattern[beamNo].oaxis); - instPtr->antConfig.raxis[1] = (uint8_t)(antNrrwPattern[beamNo].raxis >> 8); - instPtr->antConfig.raxis[0] = (uint8_t)(antNrrwPattern[beamNo].raxis); + instPtr->antConfig.oaxis[0] = (uint8_t)(antNrrwPattern[beamNo].oaxis >> 8); + instPtr->antConfig.oaxis[1] = (uint8_t)(antNrrwPattern[beamNo].oaxis); + instPtr->antConfig.raxis[0] = (uint8_t)(antNrrwPattern[beamNo].raxis >> 8); + instPtr->antConfig.raxis[1] = (uint8_t)(antNrrwPattern[beamNo].raxis); return SUCCESS; } } @@ -312,7 +312,6 @@ int32_t Phy_SetBeamNo(PHY_INST *instPtr, int32_t beamNo) instPtr->antConfig.oaxis[1] = 0; instPtr->antConfig.raxis[0] = 0; instPtr->antConfig.raxis[1] = 0; - instPtr->antConfig.raxis[0] = 0; DBG_WARNING("Using default beam number...\n"); return SUCCESS; }