From eb5491008fedca44e627b45aeccc0d72b042ee97 Mon Sep 17 00:00:00 2001 From: James Lincoln Date: Thu, 16 May 2024 14:41:14 +0930 Subject: [PATCH 1/4] add additional items Signed-off-by: James Lincoln --- src/validation/config/position.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/validation/config/position.ts b/src/validation/config/position.ts index 752a7093..65bb8230 100644 --- a/src/validation/config/position.ts +++ b/src/validation/config/position.ts @@ -40,4 +40,10 @@ export class PositionValidation @IsArray() channelPrecision: number[]; + + @IsInt() + gpsAttemptTime: number; + + @IsBoolean() + gpsEnabled: boolean; } From 0cf4a6754fa5250c8518212bdc2132a0526306fa Mon Sep 17 00:00:00 2001 From: James Lincoln Date: Tue, 11 Jun 2024 13:28:10 +0930 Subject: [PATCH 2/4] move deprecated fields into const Signed-off-by: James Lincoln --- src/validation/config/position.ts | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/validation/config/position.ts b/src/validation/config/position.ts index 65bb8230..39daf98a 100644 --- a/src/validation/config/position.ts +++ b/src/validation/config/position.ts @@ -2,8 +2,11 @@ import type { Message } from "@bufbuild/protobuf"; import { Protobuf } from "@meshtastic/js"; import { IsArray, IsBoolean, IsEnum, IsInt } from "class-validator"; +//type DeprecatedPositionValidationFields = 'gpsEnabled' | 'gpdAttempttime'; +const DeprecatedPositionValidationFields = ['gpsEnabled', 'gpsAttemptTime']; + export class PositionValidation - implements Omit + implements Omit { @IsInt() positionBroadcastSecs: number; @@ -40,10 +43,4 @@ export class PositionValidation @IsArray() channelPrecision: number[]; - - @IsInt() - gpsAttemptTime: number; - - @IsBoolean() - gpsEnabled: boolean; } From 6e1e5c80d19d0b4e2c1c56cfda7b73f21a60ed81 Mon Sep 17 00:00:00 2001 From: James Lincoln Date: Tue, 11 Jun 2024 13:43:38 +0930 Subject: [PATCH 3/4] remove unused comments Signed-off-by: James Lincoln --- src/validation/config/position.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/validation/config/position.ts b/src/validation/config/position.ts index 39daf98a..2f035744 100644 --- a/src/validation/config/position.ts +++ b/src/validation/config/position.ts @@ -2,7 +2,6 @@ import type { Message } from "@bufbuild/protobuf"; import { Protobuf } from "@meshtastic/js"; import { IsArray, IsBoolean, IsEnum, IsInt } from "class-validator"; -//type DeprecatedPositionValidationFields = 'gpsEnabled' | 'gpdAttempttime'; const DeprecatedPositionValidationFields = ['gpsEnabled', 'gpsAttemptTime']; export class PositionValidation From 3411dd472f2e51fc5106730f307bee95b762f735 Mon Sep 17 00:00:00 2001 From: Hunter Thornsberry Date: Sun, 16 Jun 2024 01:39:44 -0400 Subject: [PATCH 4/4] remove gpsEnabled and gpsAttemptTime again --- src/validation/config/position.ts | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/validation/config/position.ts b/src/validation/config/position.ts index df991961..2f035744 100644 --- a/src/validation/config/position.ts +++ b/src/validation/config/position.ts @@ -7,12 +7,6 @@ const DeprecatedPositionValidationFields = ['gpsEnabled', 'gpsAttemptTime']; export class PositionValidation implements Omit { - @IsBoolean() - gpsEnabled: boolean; - - @IsInt() - gpsAttemptTime: number; - @IsInt() positionBroadcastSecs: number;