Fix of a very stoopid mistake

This commit is contained in:
2025-10-29 22:23:58 +00:00
parent a15d5a4c3c
commit da1fcf3dec
3 changed files with 22 additions and 13 deletions
+1 -1
View File
@@ -57,7 +57,7 @@ func NewPeripheralDevice(port string) *PeripheralDevice {
func (p *PeripheralDevice) Probe() error { func (p *PeripheralDevice) Probe() error {
err := p.WT.TurnOn() err := p.WT.TurnOn()
if err != nil { if err != nil {
return nil return err
} }
// Papers, please! // Papers, please!
+1 -3
View File
@@ -13,15 +13,13 @@ type IdentificationPacket struct {
} }
func (pkt *IdentificationPacket) Read(wt *WalkieTalkie) error { func (pkt *IdentificationPacket) Read(wt *WalkieTalkie) error {
fmt.Println("Reading framed data")
err := wt.ReadFramedData(binary.Size(IdentificationPacket{}), pkt) err := wt.ReadFramedData(binary.Size(IdentificationPacket{}), pkt)
if err != nil { if err != nil {
return err return err
} }
if !pkt.Validate() { if !pkt.Validate() {
return fmt.Errorf("invalid packet") return fmt.Errorf("invalid data")
} }
return nil return nil
+20 -9
View File
@@ -13,11 +13,13 @@ const (
) )
type PeripheralDeviceClerk struct { type PeripheralDeviceClerk struct {
// Devices map[string]PeripheralDevice Devices map[string]*PeripheralDevice
} }
func NewPeripheralDeviceClerk() *PeripheralDeviceClerk { func NewPeripheralDeviceClerk() *PeripheralDeviceClerk {
return &PeripheralDeviceClerk{} return &PeripheralDeviceClerk{
Devices: make(map[string]*PeripheralDevice),
}
} }
func (clerk *PeripheralDeviceClerk) listPorts() ([]string, error) { func (clerk *PeripheralDeviceClerk) listPorts() ([]string, error) {
@@ -29,6 +31,10 @@ func (clerk *PeripheralDeviceClerk) listPorts() ([]string, error) {
return ttyUSBs, nil return ttyUSBs, nil
} }
func (clerk *PeripheralDeviceClerk) addDevice(dev *PeripheralDevice) {
clerk.Devices[string(dev.Name[:])] = dev
}
func (clerk *PeripheralDeviceClerk) FindDevices() error { func (clerk *PeripheralDeviceClerk) FindDevices() error {
ports, err := clerk.listPorts() ports, err := clerk.listPorts()
if err != nil { if err != nil {
@@ -37,17 +43,22 @@ func (clerk *PeripheralDeviceClerk) FindDevices() error {
for _, p := range ports { for _, p := range ports {
newDevice := NewPeripheralDevice(p) newDevice := NewPeripheralDevice(p)
err := newDevice.Probe()
var msg string err := newDevice.Probe()
if err == nil { if err != nil {
msg = string(newDevice.Name[:]) fmt.Println(p, err.Error())
} else { continue
msg = err.Error()
} }
fmt.Println(p, msg) clerk.addDevice(newDevice)
fmt.Println(p, string(newDevice.Name[:]))
} }
return nil return nil
} }
// func (c *PeripheralDeviceClerk) clerkBackgroundJob() {
// for {
//
// }
// }