24-project-life #28

Merged
thinkode merged 3 commits from 24-project-life into develop 2025-11-11 19:14:45 +00:00
3 changed files with 12 additions and 6 deletions
Showing only changes of commit 621c1922ca - Show all commits

View File

@@ -27,11 +27,12 @@ function removePeripheral (peripheralInfo){
let lastSavedProperty = peripheralsList[peripheralInfo.SerialNumber]?.isSaved
let needToDelete = (lastSavedProperty !== true) ? true : false
peripherals.update((storedPeripherals) => {
if (needToDelete){
delete storedPeripherals[peripheralInfo.SerialNumber];
return { ...storedPeripherals };
}
storedPeripherals[peripheralInfo.SerialNumber].isDetected = false
if (needToDelete){
delete storedPeripherals[peripheralInfo.SerialNumber];
return { ...storedPeripherals };
}
storedPeripherals[peripheralInfo.SerialNumber].isDetected = false
storedPeripherals[peripheralInfo.SerialNumber].Status = "disconnected"
return {...storedPeripherals}
})
generateToast('warning', 'bxs-hdd', get(_)("peripheralRemovalToast") + ' <b>' + peripheralInfo.Name + '</b>')

View File

@@ -60,11 +60,13 @@ func (f *FTDIFinder) RegisterPeripheral(ctx context.Context, peripheralData Peri
err = ftdiPeripheral.Connect(ctx)
if err != nil {
log.Err(err).Str("file", "FTDIFinder").Str("peripheralSN", peripheralData.SerialNumber).Msg("unable to connect the peripheral")
return peripheralData.SerialNumber, nil
}
// Peripheral connected, activate it
err = ftdiPeripheral.Activate(ctx)
if err != nil {
log.Err(err).Str("file", "FTDIFinder").Str("peripheralSN", peripheralData.SerialNumber).Msg("unable to activate the peripheral")
return peripheralData.SerialNumber, nil
}
// Peripheral activated
return peripheralData.SerialNumber, nil
@@ -131,7 +133,7 @@ func (f *FTDIFinder) Start(ctx context.Context) error {
return nil
}
// ForceScan explicily asks for scanning peripherals
// ForceScan explicitly asks for scanning peripherals
func (f *FTDIFinder) ForceScan() {
select {
case f.scanChannel <- struct{}{}:

View File

@@ -51,6 +51,7 @@ func (p *FTDIPeripheral) Connect(ctx context.Context) error {
serialNumber := C.CString(p.info.SerialNumber)
defer C.free(unsafe.Pointer(serialNumber))
if C.dmx_connect(p.dmxSender, serialNumber) != C.DMX_OK {
runtime.EventsEmit(ctx, string(PeripheralStatus), p.info, "disconnected")
log.Error().Str("file", "FTDIPeripheral").Str("s/n", p.info.SerialNumber).Msg("unable to connect the DMX device")
return errors.Errorf("unable to connect '%s'")
}
@@ -92,9 +93,11 @@ func (p *FTDIPeripheral) Activate(ctx context.Context) error {
err := C.dmx_activate(p.dmxSender)
if err != C.DMX_OK {
runtime.EventsEmit(ctx, string(PeripheralStatus), p.info, "deactivated")
return errors.Errorf("unable to activate the DMX sender!")
}
// Test only
C.dmx_setValue(p.dmxSender, C.uint16_t(1), C.uint8_t(255))
C.dmx_setValue(p.dmxSender, C.uint16_t(5), C.uint8_t(255))