-
-
{#if disconnected} {/if}{title}
+
+
+
{#if status == "disconnected" } {/if}{title}
{type} {location != '' ? "- " : ""}{location}
- {#if disconnected}
+ {#if status == "disconnected"}
Disconnected
{:else}
{line1}
@@ -50,15 +50,13 @@
-
-
-
+
+
+
-
-
\ No newline at end of file
diff --git a/frontend/src/components/Settings/InputsOutputsContent.svelte b/frontend/src/components/Settings/InputsOutputsContent.svelte
index 415e380..0f5b2c8 100644
--- a/frontend/src/components/Settings/InputsOutputsContent.svelte
+++ b/frontend/src/components/Settings/InputsOutputsContent.svelte
@@ -5,61 +5,24 @@
import { t, _ } from 'svelte-i18n'
import { generateToast, needProjectSave, peripherals } from "../../stores";
import { get } from "svelte/store"
- import { UpdatePeripheralSettings, GetPeripheralSettings, AddOS2LPeripheral, RemovePeripheral, ConnectFTDI, ActivateFTDI, DeactivateFTDI, DisconnectFTDI, SetDeviceFTDI, AddPeripheral } from "../../../wailsjs/go/main/App";
+ import { UpdatePeripheralSettings, GetPeripheralSettings, RemovePeripheral, AddPeripheral } from "../../../wailsjs/go/main/App";
import RoundedButton from "../General/RoundedButton.svelte";
- function ftdiConnect(){
- ConnectFTDI().then(() =>
- console.log("FTDI connected"))
- .catch((error) => {
- console.log("Error when trying to connect: " + error)
- })
- }
-
- function ftdiActivate(){
- ActivateFTDI().then(() =>
- console.log("FTDI activated"))
- .catch((error) => {
- console.log("Error when trying to activate: " + error)
- })
- }
-
- function ftdiDeactivate(){
- DeactivateFTDI().then(() =>
- console.log("FTDI deactivated"))
- .catch((error) => {
- console.log("Error when trying to deactivate: " + error)
- })
- }
-
- let sliderValue = 0
- function ftdiSetDevice(value){
- console.log("value is " + value)
- SetDeviceFTDI(value).then(() =>
- console.log("FTDI device set up"))
- .catch((error) => {
- console.log("Error when trying to set the device: " + error)
- })
- }
-
- function ftdiDisconnect(){
- DisconnectFTDI().then(() =>
- console.log("FTDI disconnected"))
- .catch((error) => {
- console.log("Error when trying to disconnect: " + error)
- })
- }
-
// Add the peripheral to the project
function addPeripheral(peripheral){
// Add the peripheral to the project (backend)
- AddPeripheral(peripheral.ProtocolName, peripheral.SerialNumber).then(() => {
- peripherals.update((value) => {
- if (value[peripheral.SerialNumber]) {
- value[peripheral.SerialNumber].isSaved = true;
- }
- return {...value}
- })
+ AddPeripheral(peripheral).then((serialNumber) => {
+ peripherals.update((storedPeripherals) => {
+ return {
+ ...storedPeripherals,
+ [serialNumber]: {
+ ...storedPeripherals[serialNumber],
+ Name: peripheral.Name,
+ ProtocolName: peripheral.ProtocolName,
+ SerialNumber: serialNumber,
+ isSaved: true,
+ },
+ }})
$needProjectSave = true
}).catch((error) => {
console.log("Unable to add the peripheral to the project: " + error)
@@ -96,37 +59,20 @@
})
}
- // Create the OS2L peripheral
- function createOS2L(){
- AddOS2LPeripheral().then(os2lDevice => {
- peripherals.update(currentPeriph => {
- os2lDevice.isSaved = true
- os2lDevice.isDetected = true
- currentPeriph[os2lDevice.SerialNumber] = os2lDevice
- return {...currentPeriph}
- })
- $needProjectSave = true
- generateToast('info', 'bx-signal-5', $_("os2lPeripheralCreatedToast"))
- }).catch(error => {
- console.log("Unable to add the OS2L peripheral: " + error)
- generateToast('danger', 'bx-error', $_("os2lPeripheralCreateErrorToast"))
- })
- }
-
// Select the peripheral to edit its settings
let selectedPeripheralSN = null
let selectedPeripheralSettings = {}
function selectPeripheral(peripheral){
// Load the settings array if the peripheral is detected
- if (peripheral.isDetected){
+ if (peripheral.isSaved){
GetPeripheralSettings(peripheral.ProtocolName, peripheral.SerialNumber).then((peripheralSettings) => {
selectedPeripheralSettings = peripheralSettings
+ // Select the current peripheral
+ selectedPeripheralSN = peripheral.SerialNumber
}).catch((error) => {
console.log("Unable to get the peripheral settings: " + error)
generateToast('danger', 'bx-error', $_("getPeripheralSettingsErrorToast"))
})
- // Select the current peripheral
- selectedPeripheralSN = peripheral.SerialNumber
}
}
@@ -153,7 +99,6 @@
boolean: Boolean,
}[typeof(selectedPeripheralSettings[settingName])] || (x => x)
selectedPeripheralSettings[settingName] = convert(settingValue)
- console.log(typeof(selectedPeripheralSettings[settingName]))
let peripheralProtocolName = get(peripherals)[selectedPeripheralSN].ProtocolName
UpdatePeripheralSettings(peripheralProtocolName, selectedPeripheralSN, selectedPeripheralSettings).then(()=> {
$needProjectSave = true
@@ -175,11 +120,11 @@
if(!peripheral.isSaved)
addPeripheral(peripheral)
}}
- title={peripheral.Name} type={peripheral.ProtocolName} location={peripheral.Location ? peripheral.Location : ""} line1={"S/N: " + peripheral.SerialNumber} addable={!peripheral.isSaved}/>
+ status="connected" title={peripheral.Name} type={peripheral.ProtocolName} location={peripheral.Location ? peripheral.Location : ""} line1={"S/N: " + peripheral.SerialNumber} addable={!peripheral.isSaved}/>
{/if}
{/each}
{$_("projectHardwareOthersLabel")}
-
+
addPeripheral({Name: "OS2L connection", ProtocolName: "OS2L"})} text="Add an OS2L peripheral" icon="bx-plus-circle" tooltip="Configure an OS2L connection"/>