Value is returned as a struct.

Author: raidoz

cmd/deviceparameter/deviceparameter.go

@@ -8,6 +8,9 @@ import "os"
 import "log"
 import "time"
 import "encoding/hex"
+import "encoding/binary"
+import "strconv"
+import "bytes"
 
 import "github.com/jessevdk/go-flags"
 import "github.com/proactivity-lab/go-loggers"
@@ -33,22 +36,51 @@ func (self HexString) MarshalFlag() (string, error) {
 	return hex.EncodeToString(self), nil
 }
 
-func main() {
+func parseValue(opts Options) ([]byte, error) {
+	buf := new(bytes.Buffer)
+	if opts.Uint8 {
+		if v, err := strconv.ParseUint(opts.Value, 10, 8); err != nil {
+			return nil, err
+		} else if err = binary.Write(buf, binary.BigEndian, uint8(v)); err != nil {
+			return nil, err
+		}
+		return buf.Bytes(), nil
+	} else if opts.Uint16 {
+		if v, err := strconv.ParseUint(opts.Value, 10, 16); err != nil {
+			return nil, err
+		} else if err = binary.Write(buf, binary.BigEndian, uint16(v)); err != nil {
+			return nil, err
+		}
+	} else if opts.Uint32 {
+		if v, err := strconv.ParseUint(opts.Value, 10, 32); err != nil {
+			return nil, err
+		} else if err = binary.Write(buf, binary.BigEndian, uint32(v)); err != nil {
+			return nil, err
+		}
+	}
+	return hex.DecodeString(opts.Value)
+}
 
-	var opts struct {
-		Positional struct {
-			ConnectionString string `description:"Connectionstring sf@HOST:PORT"`
-		} `positional-args:"yes"`
+type Options struct {
+	Positional struct {
+		ConnectionString string `description:"Connectionstring sf@HOST:PORT"`
+	} `positional-args:"yes"`
 
-		Group sfconnection.AMGroup `short:"g" long:"group" default:"22" description:"Packet AM Group (hex)"`
+	Group sfconnection.AMGroup `short:"g" long:"group" default:"22" description:"Packet AM Group (hex)"`
 
-		Parameter string    `short:"p" long:"parameter" description:"Name of the parameter"`
-		Value     HexString `short:"v" long:"value"     description:"Value to set"`
+	Parameter string `short:"p" long:"parameter" description:"Name of the parameter"`
+	Value     string `short:"v" long:"value"     description:"Value to set"`
+	Uint8     bool   `long:"uint8"  description:"Value is uint8"`
+	Uint16    bool   `long:"uint16" description:"Value is uint16"`
+	Uint32    bool   `long:"uint32" description:"Value is uint32"`
 
-		Debug       []bool `short:"D" long:"debug"   description:"Debug mode, print raw packets"`
-		ShowVersion func() `short:"V" long:"version" description:"Show application version"`
-	}
+	Debug       []bool `short:"D" long:"debug"   description:"Debug mode, print raw packets"`
+	ShowVersion func() `short:"V" long:"version" description:"Show application version"`
+}
+
+func main() {
 
+	var opts Options
 	opts.ShowVersion = func() {
 		if ApplicationBuildDate == "" {
 			ApplicationBuildDate = "YYYY-mm-dd_HH:MM:SS"
@@ -91,18 +123,22 @@ func main() {
 
 	if len(opts.Parameter) > 0 {
 		if len(opts.Value) > 0 {
-			logger.Info.Printf("Set %s to %X\n", opts.Parameter, opts.Value)
-			err := dpm.SetValue(opts.Parameter, opts.Value)
+			value, err := parseValue(opts)
 			if err == nil {
-				logger.Info.Printf("Done\n")
+				logger.Info.Printf("Set %s to 0x%X\n", opts.Parameter, value)
+				if val, err := dpm.SetValue(opts.Parameter, value); err == nil {
+					logger.Info.Printf("%s = %s\n", val.Name, val)
+				} else {
+					logger.Info.Printf("Failed: %s\n", err)
+				}
 			} else {
-				logger.Info.Printf("Failed: %s\n", err)
+				logger.Error.Printf("%s", err)
 			}
 		} else {
 			logger.Info.Printf("Get %s\n", opts.Parameter)
 			val, err := dpm.GetValue(opts.Parameter)
 			if err == nil {
-				logger.Info.Printf("%s = %X\n", opts.Parameter, val)
+				logger.Info.Printf("%s = %s\n", val.Name, val)
 			} else {
 				logger.Info.Printf("Failed: %s\n", err)
 			}

deviceparameters.go

@@ -91,7 +91,7 @@ func (self *DeviceParameterManager) SetRetries(retries int) {
 	self.retries = retries
 }
 
-func (self *DeviceParameterManager) GetValue(name string) ([]byte, error) {
+func (self *DeviceParameterManager) GetValue(name string) (*DeviceParameter, error) {
 	// Interrupt the run goroutine
 	self.done <- true
 
@@ -110,7 +110,7 @@ func (self *DeviceParameterManager) GetValue(name string) ([]byte, error) {
 		dp, err := self.waitValueId(name)
 		if err == nil {
 			go self.run()
-			return dp.Value, nil
+			return dp, nil
 		} else {
 			result = err
 			if _, ok := err.(*ParameterError); ok {
@@ -123,7 +123,7 @@ func (self *DeviceParameterManager) GetValue(name string) ([]byte, error) {
 	return nil, result
 }
 
-func (self *DeviceParameterManager) SetValue(name string, value []byte) error {
+func (self *DeviceParameterManager) SetValue(name string, value []byte) (*DeviceParameter, error) {
 	// Interrupt the run goroutine
 	self.done <- true
 
@@ -146,7 +146,7 @@ func (self *DeviceParameterManager) SetValue(name string, value []byte) error {
 				// store in values table
 				self.values[name] = dp
 				go self.run()
-				return nil
+				return dp, nil
 			} else {
 				result = errors.New(fmt.Sprintf("Returned value %X does not match set value %X!", dp.Value, value))
 			}
@@ -159,7 +159,7 @@ func (self *DeviceParameterManager) SetValue(name string, value []byte) error {
 	}
 
 	go self.run()
-	return result
+	return nil, result
 }
 
 func (self *DeviceParameterManager) GetList() (chan *DeviceParameter, error) {

deviceparameters_test.go

@@ -49,7 +49,7 @@ func TestDpm(t *testing.T) {
 	fmt.Printf("%v %v\n", v4, err)
 
 	dp.SetTimeout(time.Second)
-	err = dp.SetValue("radio_channel", []byte{11})
+	_, err = dp.SetValue("radio_channel", []byte{11})
 	fmt.Printf("s %v\n", err)
 
 	dp.Close()