Browse Source

Add new mqtt option & update deps

pull/39/head
Sacha Weatherstone 4 years ago
parent
commit
47b34a8f27
  1. 12
      package.json
  2. 495
      pnpm-lock.yaml
  3. 15
      src/components/PageComponents/ModuleConfig/MQTT.tsx
  4. 1
      src/components/SlideSheets/tabs/connect/Serial.tsx
  5. 3
      src/validation/moduleConfig/mqtt.ts

12
package.json

@ -22,7 +22,7 @@
"@emeraldpay/hashicon-react": "^0.5.2",
"@hookform/resolvers": "^2.9.7",
"@meshtastic/eslint-config": "^1.0.8",
"@meshtastic/meshtasticjs": "^0.6.95",
"@meshtastic/meshtasticjs": "^0.6.97",
"base64-js": "^1.5.1",
"class-transformer": "^0.5.1",
"class-validator": "^0.13.2",
@ -44,20 +44,20 @@
"zustand": "4.1.1"
},
"devDependencies": {
"@types/chrome": "^0.0.195",
"@types/chrome": "^0.0.196",
"@types/geodesy": "^2.2.3",
"@types/node": "^18.7.14",
"@types/node": "^18.7.15",
"@types/react": "^18.0.18",
"@types/react-dom": "^18.0.6",
"@types/w3c-web-serial": "^1.0.2",
"@types/web-bluetooth": "^0.0.15",
"@vitejs/plugin-react": "^2.0.1",
"@vitejs/plugin-react": "^2.1.0",
"gzipper": "^7.1.0",
"rollup-plugin-visualizer": "^5.8.0",
"rollup-plugin-visualizer": "^5.8.1",
"tar": "^6.1.11",
"tslib": "^2.4.0",
"typescript": "^4.8.2",
"vite": "^3.0.9",
"vite": "^3.1.0",
"vite-plugin-environment": "^1.1.2"
}
}

495
pnpm-lock.yaml

File diff suppressed because it is too large

15
src/components/PageComponents/ModuleConfig/MQTT.tsx

@ -100,6 +100,21 @@ export const MQTT = (): JSX.Element => {
)}
/>
</FormField>
<FormField
label="JSON Output Enabled"
description="Description"
disabled={!moduleEnabled}
isInvalid={!!errors.jsonEnabled?.message}
validationMessage={errors.jsonEnabled?.message}
>
<Controller
name="jsonEnabled"
control={control}
render={({ field: { value, ...field } }) => (
<Switch height={24} marginLeft="auto" checked={value} {...field} />
)}
/>
</FormField>
</Form>
);
};

1
src/components/SlideSheets/tabs/connect/Serial.tsx

@ -42,7 +42,6 @@ export const Serial = ({ close }: CloseProps): JSX.Element => {
const connection = new ISerialConnection(id);
await connection.connect({
port,
baudRate: 115200,
});
device.addConnection(connection);
subscribeAll(device, connection);

3
src/validation/moduleConfig/mqtt.ts

@ -17,4 +17,7 @@ export class MQTTValidation implements Protobuf.ModuleConfig_MQTTConfig {
@IsBoolean()
encryptionEnabled: boolean;
@IsBoolean()
jsonEnabled: boolean;
}

Loading…
Cancel
Save