Revert device naming scheme to 0.11

andig · andig · commit fa6b574a16c0 · 2020-08-09T15:40:00.000+02:00
diff --git a/server/handler.go b/server/handler.go
@@ -39,7 +39,7 @@ func NewHandler(id int, m *meters.Manager) *Handler {
 // deviceID creates a unique id per device
 func (h *Handler) deviceID(id uint8, dev meters.Device) string {
 	desc := dev.Descriptor()
-	devID := fmt.Sprintf("%s%d-%d", desc.Type, h.ID, id)
+	devID := fmt.Sprintf("%s%d.%d", desc.Type, h.ID, id)
 	if desc.SubDevice > 0 {
 		devID = fmt.Sprintf("%s.%d", devID, desc.SubDevice)
 	}

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ func NewHandler(id int, m meters.Manager) Handler {`
`39`	`39`	`// deviceID creates a unique id per device`
`40`	`40`	`func (h *Handler) deviceID(id uint8, dev meters.Device) string {`
`41`	`41`	`desc := dev.Descriptor()`
`42`		`- devID := fmt.Sprintf("%s%d-%d", desc.Type, h.ID, id)`
	`42`	`+ devID := fmt.Sprintf("%s%d.%d", desc.Type, h.ID, id)`
`43`	`43`	`if desc.SubDevice > 0 {`
`44`	`44`	`devID = fmt.Sprintf("%s.%d", devID, desc.SubDevice)`
`45`	`45`	`}`