Browse Source

Fix Build & cleanup

pull/2/head
Sacha Weatherstone 5 years ago
parent
commit
23434b1f47
  1. 3
      src/components/connection/Serial.tsx
  2. 1
      src/components/menu/buttons/DeviceStatus.tsx
  3. 5
      src/core/slices/meshtasticSlice.ts
  4. 8
      src/pages/settings/Channels.tsx

3
src/components/connection/Serial.tsx

@ -2,14 +2,11 @@ import React from 'react';
import { FiCheck } from 'react-icons/fi'; import { FiCheck } from 'react-icons/fi';
import { useAppDispatch } from '@app/hooks/redux';
import { IconButton } from '@components/generic/IconButton'; import { IconButton } from '@components/generic/IconButton';
import { serial, setConnection } from '@core/connection'; import { serial, setConnection } from '@core/connection';
import { connType } from '@core/slices/appSlice'; import { connType } from '@core/slices/appSlice';
export const Serial = (): JSX.Element => { export const Serial = (): JSX.Element => {
const dispatch = useAppDispatch();
const [serialDevices, setSerialDevices] = React.useState<SerialPort[]>([]); const [serialDevices, setSerialDevices] = React.useState<SerialPort[]>([]);
const updateSerialDeviceList = React.useCallback(async (): Promise<void> => { const updateSerialDeviceList = React.useCallback(async (): Promise<void> => {

1
src/components/menu/buttons/DeviceStatus.tsx

@ -11,7 +11,6 @@ export const DeviceStatus = (): JSX.Element => {
const dispatch = useAppDispatch(); const dispatch = useAppDispatch();
const appState = useAppSelector((state) => state.app); const appState = useAppSelector((state) => state.app);
const state = useAppSelector((state) => state.meshtastic); const state = useAppSelector((state) => state.meshtastic);
const ready = useAppSelector((state) => state.meshtastic.ready);
return ( return (
<Button <Button

5
src/core/slices/meshtasticSlice.ts

@ -10,11 +10,6 @@ export interface MessageWithAck {
isSender: boolean; isSender: boolean;
received: Date; received: Date;
} }
enum connType {
HTTP,
BLE,
SERIAL,
}
export interface ChannelData { export interface ChannelData {
channel: Protobuf.Channel; channel: Protobuf.Channel;

8
src/pages/settings/Channels.tsx

@ -140,10 +140,10 @@ export const Channels = ({
console.log(adminChannel); console.log(adminChannel);
// await connection.setChannel(adminChannel, (): Promise<void> => { await connection.setChannel(adminChannel, (): Promise<void> => {
// setLoading(false); setLoading(false);
// return Promise.resolve(); return Promise.resolve();
// }); });
}); });
return ( return (

Loading…
Cancel
Save