From e10b0fe99709958da799124d0e31ec72ac662f96 Mon Sep 17 00:00:00 2001 From: Marc Nijdam Date: Sat, 15 Mar 2025 13:02:37 -0500 Subject: [PATCH 1/3] deprecate wifi tilt info, correct docs for azimuth --- .../src/backfill-mobile-deployment-infos.ts | 24 +++++++++---------- programs/helium-entity-manager/src/state.rs | 10 ++++---- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/packages/helium-admin-cli/src/backfill-mobile-deployment-infos.ts b/packages/helium-admin-cli/src/backfill-mobile-deployment-infos.ts index b9c83a25e..e0735a1f4 100644 --- a/packages/helium-admin-cli/src/backfill-mobile-deployment-infos.ts +++ b/packages/helium-admin-cli/src/backfill-mobile-deployment-infos.ts @@ -39,8 +39,8 @@ type WifiInfo = { antenna: number; elevation: number; azimuth: number; - mechanicalDownTilt: number; - electricalDownTilt: number; + _deprecatedMechanicalDownTilt: number; + _deprecatedElectricalDownTilt: number; }; }; @@ -52,8 +52,8 @@ const hasDeploymentInfo = (wi: WifiInfo) => { wi.deploymentInfo.antenna || wi.deploymentInfo.elevation || wi.deploymentInfo.azimuth || - wi.deploymentInfo.mechanicalDownTilt || - wi.deploymentInfo.electricalDownTilt + wi.deploymentInfo._deprecatedMechanicalDownTilt || + wi.deploymentInfo._deprecatedElectricalDownTilt ); }; @@ -117,8 +117,8 @@ export async function run(args: any = process.argv) { port: Number(argv.pgPort), ssl: argv.noSsl ? { - rejectUnauthorized: false, - } + rejectUnauthorized: false, + } : false, }); @@ -146,8 +146,8 @@ export async function run(args: any = process.argv) { antenna: Number(wifiInfo.antenna), elevation: Number(wifiInfo.elevation), azimuth: Number(wifiInfo.azimuth), - mechanicalDownTilt: Number(wifiInfo.mechanical_down_tilt), - electricalDownTilt: Number(wifiInfo.electrical_down_tilt), + _deprecatedMechanicalDownTilt: Number(wifiInfo.mechanical_down_tilt), + _deprecatedElectricalDownTilt: Number(wifiInfo.electrical_down_tilt), }, }) ); @@ -203,14 +203,14 @@ export async function run(args: any = process.argv) { // decodedAcc.deploymentInfo?.wifiInfoV0?.azimuth || // acc.wifiInfo.deploymentInfo.azimuth || // 0, - mechanicalDownTilt: - decodedAcc.deploymentInfo?.wifiInfoV0?.mechanicalDownTilt || 0, + deprecatedMechanicalDownTilt: + decodedAcc.deploymentInfo?.wifiInfoV0?.deprecatedMechanicalDownTilt || 0, // mechanicalDownTilt descrepency was found and backfilled so default to whats on chain // decodedAcc.deploymentInfo?.wifiInfoV0?.mechanicalDownTilt || // acc.wifiInfo.deploymentInfo.mechanicalDownTilt || // 0, - electricalDownTilt: - decodedAcc.deploymentInfo?.wifiInfoV0?.electricalDownTilt || 0, + deprecatedElectricalDownTilt: + decodedAcc.deploymentInfo?.wifiInfoV0?.deprecatedElectricalDownTilt || 0, // electricalDownTilt descrepency was found and backfilled so default to whats on chain // decodedAcc.deploymentInfo?.wifiInfoV0?.electricalDownTilt || // acc.wifiInfo.deploymentInfo.electricalDownTilt || diff --git a/programs/helium-entity-manager/src/state.rs b/programs/helium-entity-manager/src/state.rs index 433692082..91ce275d8 100644 --- a/programs/helium-entity-manager/src/state.rs +++ b/programs/helium-entity-manager/src/state.rs @@ -254,12 +254,12 @@ pub enum MobileDeploymentInfoV0 { antenna: u32, // the height of the hotspot above ground level in whole meters elevation: i32, - // integer representation of a 2-point precision decimal + // the azimuht of the hotspot in rounded number of degrees azimuth: u16, - // integer representation of a 2-point precision decimal - mechanical_down_tilt: u16, - // integer representation of a 2-point precision decimal - electrical_down_tilt: u16, + // deprecated: integer representation of a 2-point precision decimal + _deprecated_mechanical_down_tilt: u16, + // deprecated: integer representation of a 2-point precision decimal + _deprecated_electrical_down_tilt: u16, }, CbrsInfoV0 { radio_infos: Vec, From 6a8adeea5f15f9077ce952efb708d229ccdd3737 Mon Sep 17 00:00:00 2001 From: Marc Nijdam Date: Sat, 15 Mar 2025 13:26:49 -0500 Subject: [PATCH 2/3] attempting fixes --- tests/helium-entity-manager.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/helium-entity-manager.ts b/tests/helium-entity-manager.ts index 6c7ab1b9b..de0f1b3a1 100644 --- a/tests/helium-entity-manager.ts +++ b/tests/helium-entity-manager.ts @@ -1012,8 +1012,8 @@ describe("helium-entity-manager", () => { antenna: 1, elevation: 2, azimuth: 3, - mechanicalDownTilt: 4, - electricalDownTilt: 5, + deprecatedMechanicalDownTilt: 4, + deprecatedElectricalDownTilt: 5, }; const method = ( From 9cd7511fb1002f0fff50ba06682bfb7f27a67d47 Mon Sep 17 00:00:00 2001 From: bry Date: Mon, 17 Mar 2025 09:50:17 -0500 Subject: [PATCH 3/3] fix names in backfill script --- .../src/backfill-mobile-deployment-infos.ts | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/packages/helium-admin-cli/src/backfill-mobile-deployment-infos.ts b/packages/helium-admin-cli/src/backfill-mobile-deployment-infos.ts index e0735a1f4..cb65d5676 100644 --- a/packages/helium-admin-cli/src/backfill-mobile-deployment-infos.ts +++ b/packages/helium-admin-cli/src/backfill-mobile-deployment-infos.ts @@ -39,8 +39,8 @@ type WifiInfo = { antenna: number; elevation: number; azimuth: number; - _deprecatedMechanicalDownTilt: number; - _deprecatedElectricalDownTilt: number; + deprecatedMechanicalDownTilt: number; + deprecatedElectricalDownTilt: number; }; }; @@ -52,8 +52,8 @@ const hasDeploymentInfo = (wi: WifiInfo) => { wi.deploymentInfo.antenna || wi.deploymentInfo.elevation || wi.deploymentInfo.azimuth || - wi.deploymentInfo._deprecatedMechanicalDownTilt || - wi.deploymentInfo._deprecatedElectricalDownTilt + wi.deploymentInfo.deprecatedMechanicalDownTilt || + wi.deploymentInfo.deprecatedElectricalDownTilt ); }; @@ -117,8 +117,8 @@ export async function run(args: any = process.argv) { port: Number(argv.pgPort), ssl: argv.noSsl ? { - rejectUnauthorized: false, - } + rejectUnauthorized: false, + } : false, }); @@ -146,8 +146,8 @@ export async function run(args: any = process.argv) { antenna: Number(wifiInfo.antenna), elevation: Number(wifiInfo.elevation), azimuth: Number(wifiInfo.azimuth), - _deprecatedMechanicalDownTilt: Number(wifiInfo.mechanical_down_tilt), - _deprecatedElectricalDownTilt: Number(wifiInfo.electrical_down_tilt), + deprecatedMechanicalDownTilt: Number(wifiInfo.mechanical_down_tilt), + deprecatedElectricalDownTilt: Number(wifiInfo.electrical_down_tilt), }, }) ); @@ -204,13 +204,15 @@ export async function run(args: any = process.argv) { // acc.wifiInfo.deploymentInfo.azimuth || // 0, deprecatedMechanicalDownTilt: - decodedAcc.deploymentInfo?.wifiInfoV0?.deprecatedMechanicalDownTilt || 0, + decodedAcc.deploymentInfo?.wifiInfoV0 + ?.deprecatedMechanicalDownTilt || 0, // mechanicalDownTilt descrepency was found and backfilled so default to whats on chain // decodedAcc.deploymentInfo?.wifiInfoV0?.mechanicalDownTilt || // acc.wifiInfo.deploymentInfo.mechanicalDownTilt || // 0, deprecatedElectricalDownTilt: - decodedAcc.deploymentInfo?.wifiInfoV0?.deprecatedElectricalDownTilt || 0, + decodedAcc.deploymentInfo?.wifiInfoV0 + ?.deprecatedElectricalDownTilt || 0, // electricalDownTilt descrepency was found and backfilled so default to whats on chain // decodedAcc.deploymentInfo?.wifiInfoV0?.electricalDownTilt || // acc.wifiInfo.deploymentInfo.electricalDownTilt ||