Merge pull request #737 from ExpressLRS/remove-manual-user-defines

Remove manual user defines mode

Author: jurgelenas

.github/workflows/publish.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: ['ubuntu-22.04', 'windows-2019', 'macos-13']
+        os: ['ubuntu-22.04', 'windows-2022', 'macos-13']
     steps:
       - name: Setup apt dependencies
         if: matrix.os == 'ubuntu-22.04'
@@ -37,7 +37,7 @@ jobs:
           yarn install --prefer-offline --network-timeout 180000
 
       - name: Publish Windows releases
-        if: matrix.os == 'windows-2019'
+        if: matrix.os == 'windows-2022'
         shell: powershell
         env:
           # These values are used for auto updates signing

.github/workflows/test.yml

@@ -15,7 +15,7 @@ jobs:
 
     strategy:
       matrix:
-        os: ['ubuntu-22.04', 'windows-2019', 'macos-latest']
+        os: ['ubuntu-22.04', 'windows-2022', 'macos-latest']
 
     steps:
       - name: Setup apt dependencies

graphql.schema.json

@@ -87,12 +87,6 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
-          {
-            "name": "BUILDING_USER_DEFINES",
-            "description": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
           {
             "name": "DOWNLOADING_FIRMWARE",
             "description": null,
@@ -235,38 +229,6 @@
             "defaultValue": "[]",
             "isDeprecated": false,
             "deprecationReason": null
-          },
-          {
-            "name": "userDefinesMode",
-            "description": null,
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "ENUM",
-                "name": "UserDefinesMode",
-                "ofType": null
-              }
-            },
-            "defaultValue": "UserInterface",
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "userDefinesTxt",
-            "description": null,
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              }
-            },
-            "defaultValue": "\"\"",
-            "isDeprecated": false,
-            "deprecationReason": null
           }
         ],
         "interfaces": null,
@@ -3572,29 +3534,6 @@
         ],
         "possibleTypes": null
       },
-      {
-        "kind": "ENUM",
-        "name": "UserDefinesMode",
-        "description": null,
-        "fields": null,
-        "inputFields": null,
-        "interfaces": null,
-        "enumValues": [
-          {
-            "name": "Manual",
-            "description": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "UserInterface",
-            "description": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          }
-        ],
-        "possibleTypes": null
-      },
       {
         "kind": "OBJECT",
         "name": "__Directive",

src/api/src/graphql/inputs/BuildFlashFirmwareInput.ts

@@ -1,7 +1,6 @@
 import { Field, InputType } from 'type-graphql';
 import BuildJobType from '../../models/enum/BuildJobType';
 import FirmwareVersionDataInput from './FirmwareVersionDataInput';
-import UserDefinesMode from '../../models/enum/UserDefinesMode';
 import UserDefineInput from './UserDefineInput';
 
 @InputType('BuildFlashFirmwareInput')
@@ -18,15 +17,9 @@ export default class BuildFlashFirmwareInput {
   @Field(() => String)
   target: string;
 
-  @Field(() => UserDefinesMode)
-  userDefinesMode: UserDefinesMode;
-
   @Field(() => [UserDefineInput])
   userDefines: UserDefineInput[];
 
-  @Field(() => String)
-  userDefinesTxt: string;
-
   @Field(() => Boolean)
   erase: boolean;
 
@@ -37,9 +30,7 @@ export default class BuildFlashFirmwareInput {
     this.type = BuildJobType.Build;
     this.firmware = new FirmwareVersionDataInput();
     this.target = 'DIY_2400_TX_ESP32_SX1280_E28_via_UART';
-    this.userDefinesMode = UserDefinesMode.UserInterface;
     this.userDefines = [];
-    this.userDefinesTxt = '';
     this.erase = false;
     this.forceFlash = false;
   }

src/api/src/graphql/inputs/BuildUserDefinesTxtInput.ts

@@ -24,9 +24,6 @@ import FlashingStrategyLocatorService from '../../services/FlashingStrategyLocat
 import { BuildProgressNotificationPayload } from '../../services/FlashingStrategyLocator/BuildProgressNotificationPayload';
 import { BuildLogUpdatePayload } from '../../services/FlashingStrategyLocator/BuildLogUpdatePayload';
 import Platformio from '../../library/Platformio';
-import BuildUserDefinesTxtInput from '../inputs/BuildUserDefinesTxtInput';
-import BuildUserDefinesTxtResult from '../objects/BuilduserDefinesTxtResult';
-import UserDefinesTxtFactory from '../../factories/UserDefinesTxtFactory';
 
 @Service()
 @Resolver()
@@ -72,15 +69,6 @@ export default class FirmwareResolver {
     return strategy.buildFlashFirmware(input, gitRepository);
   }
 
-  @Mutation(() => BuildUserDefinesTxtResult)
-  async buildUserDefinesTxt(
-    @Arg('input', () => BuildUserDefinesTxtInput)
-    input: BuildUserDefinesTxtInput
-  ): Promise<BuildUserDefinesTxtResult> {
-    const userDefinesTxt = new UserDefinesTxtFactory().build(input.userDefines);
-    return new BuildUserDefinesTxtResult(userDefinesTxt);
-  }
-
   @Mutation(() => ClearPlatformioCoreDirResult)
   async clearPlatformioCoreDir(): Promise<ClearPlatformioCoreDirResult> {
     try {

src/api/src/graphql/objects/BuilduserDefinesTxtResult.ts

@@ -3,7 +3,6 @@ import { registerEnumType } from 'type-graphql';
 enum BuildFirmwareStep {
   VERIFYING_BUILD_SYSTEM = 'VERIFYING_BUILD_SYSTEM',
   DOWNLOADING_FIRMWARE = 'DOWNLOADING_FIRMWARE',
-  BUILDING_USER_DEFINES = 'BUILDING_USER_DEFINES',
   BUILDING_FIRMWARE = 'BUILDING_FIRMWARE',
   FLASHING_FIRMWARE = 'FLASHING_FIRMWARE',
 }

src/api/src/graphql/resolvers/Firmware.resolver.ts

@@ -5,7 +5,6 @@ import UserDefineKey from '../../../library/FirmwareBuilder/Enum/UserDefineKey';
 import { NoOpFunc, OnOutputFunc } from '../../../library/Commander';
 import Python from '../../../library/Python';
 import { LoggerService } from '../../../logger';
-import UserDefinesMode from '../../../models/enum/UserDefinesMode';
 
 const maskSensitiveFlags = (data: string[][]): string[][] => {
   const sensitiveData = ['--phrase', '--ssid', '--password'];
@@ -57,9 +56,7 @@ export default class BinaryConfigurator {
       flags.push(['--tx']);
     }
 
-    if (params.userDefinesMode === UserDefinesMode.UserInterface) {
-      flags.push(...this.userDefinesToFlags(params.userDefines));
-    }
+    flags.push(...this.userDefinesToFlags(params.userDefines));
 
     if (params.forceFlash) {
       flags.push(['--force']);