clean up arch

hardware/FTDIPeripheral.go

@@ -13,6 +13,7 @@ import (
 )
 
 /*
+#include <stdlib.h>
 #cgo LDFLAGS: -L${SRCDIR}/../build/bin -ldmxSender
 #include "cpp/include/dmxSenderBridge.h"
 */
@@ -20,29 +21,23 @@ import "C"
 
 // FTDIPeripheral contains the data of an FTDI peripheral
 type FTDIPeripheral struct {
-	info        PeripheralInfo         // The peripheral basic data
-	settings    map[string]interface{} // The settings of the peripheral
-	dmxSender   unsafe.Pointer         // The command object for piloting the DMX ouptut
-	waitGroup   sync.WaitGroup         // Waitgroup to wait goroutines
-	isConnected bool                   // If the FTDI is connected or not
+	wg sync.WaitGroup
+
+	info      PeripheralInfo // The peripheral basic data
+	dmxSender unsafe.Pointer // The command object for piloting the DMX ouptut
 }
 
 // NewFTDIPeripheral creates a new FTDI peripheral
 func NewFTDIPeripheral(info PeripheralInfo) (*FTDIPeripheral, error) {
 	log.Info().Str("file", "FTDIPeripheral").Str("name", info.Name).Str("s/n", info.SerialNumber).Msg("FTDI peripheral created")
-	settings := make(map[string]interface{})
 	return &FTDIPeripheral{
-		info:        info,
-		dmxSender:   nil,
-		settings:    settings,
-		isConnected: false,
+		info:      info,
+		dmxSender: nil,
 	}, nil
 }
 
 // Connect connects the FTDI peripheral
 func (p *FTDIPeripheral) Connect(ctx context.Context) error {
-	runtime.EventsEmit(ctx, string(PeripheralStatus), p.info, "connecting")
-
 	// Check if the device has already been created
 	if p.dmxSender != nil {
 		return errors.Errorf("the DMX device has already been created!")
@@ -51,30 +46,31 @@ func (p *FTDIPeripheral) Connect(ctx context.Context) error {
 	// Create the DMX sender
 	p.dmxSender = C.dmx_create()
 
-	// Connect the peripheral
-	log.Trace().Str("file", "FTDIPeripheral").Str("s/n", p.info.SerialNumber).Msg("connecting FTDI peripheral...")
-	err := C.dmx_connect(p.dmxSender, C.CString(p.info.SerialNumber))
-	if err != C.DMX_OK {
-		log.Error().Str("file", "FTDIPeripheral").Str("s/n", p.info.SerialNumber).Any("err", err).Msg("unable to connect the DMX device")
-		return errors.Errorf("Unable to connect the DMX Device on the specified port")
+	// Connect the FTDI
+	runtime.EventsEmit(ctx, string(PeripheralStatus), p.info, "connecting")
+	serialNumber := C.CString(p.info.SerialNumber)
+	defer C.free(unsafe.Pointer(serialNumber))
+	if C.dmx_connect(p.dmxSender, serialNumber) != C.DMX_OK {
+		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'")
 	}
 
-	p.waitGroup.Add(1)
+	p.wg.Add(1)
 	go func() {
-		defer p.waitGroup.Done()
+		defer p.wg.Done()
 		<-ctx.Done()
-		p.Disconnect(ctx)
+		_ = p.Disconnect()
 	}()
 
-	p.isConnected = true
+	// Send deactivated state (connected but not activated for now)
 	runtime.EventsEmit(ctx, string(PeripheralStatus), p.info, "deactivated")
-
 	log.Trace().Str("file", "FTDIPeripheral").Str("s/n", p.info.SerialNumber).Msg("DMX device connected successfully")
+
 	return nil
 }
 
 // Disconnect disconnects the FTDI peripheral
-func (p *FTDIPeripheral) Disconnect(ctx context.Context) error {
+func (p *FTDIPeripheral) Disconnect() error {
 	// Check if the device has already been created
 	if p.dmxSender == nil {
 		return errors.Errorf("the DMX device has not been connected!")
@@ -82,15 +78,9 @@ func (p *FTDIPeripheral) Disconnect(ctx context.Context) error {
 
 	// Destroy the dmx sender
 	C.dmx_destroy(p.dmxSender)
-	p.isConnected = false
 	return nil
 }
 
-// IsConnected returns if the FTDI is connected or not
-func (p *FTDIPeripheral) IsConnected() bool {
-	return p.isConnected
-}
-
 // Activate activates the FTDI peripheral
 func (p *FTDIPeripheral) Activate(ctx context.Context) error {
 	// Check if the device has already been created
@@ -136,8 +126,7 @@ func (p *FTDIPeripheral) Deactivate(ctx context.Context) error {
 
 // SetSettings sets a specific setting for this peripheral
 func (p *FTDIPeripheral) SetSettings(settings map[string]interface{}) error {
-	p.settings = settings
-	return nil
+	return errors.Errorf("unable to set the settings: not implemented")
 }
 
 // SetDeviceProperty sends a command to the specified device
@@ -161,10 +150,18 @@ func (p *FTDIPeripheral) SetDeviceProperty(ctx context.Context, channelNumber ui
 
 // GetSettings gets the peripheral settings
 func (p *FTDIPeripheral) GetSettings() map[string]interface{} {
-	return p.settings
+	return map[string]interface{}{}
 }
 
 // GetInfo gets all the peripheral information
 func (p *FTDIPeripheral) GetInfo() PeripheralInfo {
 	return p.info
 }
+
+// WaitStop wait about the peripheral to close
+func (p *FTDIPeripheral) WaitStop() error {
+	log.Info().Str("file", "FTDIPeripheral").Str("s/n", p.info.SerialNumber).Msg("waiting for FTDI peripheral to close...")
+	p.wg.Wait()
+	log.Info().Str("file", "FTDIPeripheral").Str("s/n", p.info.SerialNumber).Msg("FTDI peripheral closed!")
+	return nil
+}