From 81049470567e94cad81151eb9c3ce2380f727cd0 Mon Sep 17 00:00:00 2001
From: Kevin Lyda <kevin@ie.suberic.net>
Date: Wed, 1 Feb 2017 23:52:59 +0000
Subject: [PATCH] Merge a few more config numbers.
---
devices/geiger/gqgmc.go | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/devices/geiger/gqgmc.go b/devices/geiger/gqgmc.go
index de93e88..b459b42 100644
--- a/devices/geiger/gqgmc.go
+++ b/devices/geiger/gqgmc.go
@@ -70,20 +70,17 @@ type DevConfig struct {
BackLightTimeoutSeconds int8 `struct:"int8"`
IdleTitleDisplayMode int8 `struct:"int8"`
AlarmCPMValue int16 `struct:"int16,big"`
- CalibrationCPMHiByte0 byte `struct:"byte"`
- CalibrationCPMLoByte0 byte `struct:"byte"`
+ CalibrationCPM0 byte `struct:"int16,big"`
CalibrationSvUcByte3p0 byte `struct:"byte"`
CalibrationSvUcByte2p0 byte `struct:"byte"`
CalibrationSvUcByte1p0 byte `struct:"byte"`
CalibrationSvUcByte0p0 byte `struct:"byte"`
- CalibrationCPMHiByte1 byte `struct:"byte"`
- CalibrationCPMLoByte1 byte `struct:"byte"`
+ CalibrationCPM1 byte `struct:"int16,big"`
CalibrationSvUcByte3p1 byte `struct:"byte"`
CalibrationSvUcByte2p1 byte `struct:"byte"`
CalibrationSvUcByte1p1 byte `struct:"byte"`
CalibrationSvUcByte0p1 byte `struct:"byte"`
- CalibrationCPMHiByte2 byte `struct:"byte"`
- CalibrationCPMLoByte2 byte `struct:"byte"`
+ CalibrationCPM2 byte `struct:"int16,big"`
CalibrationSvUcByte3p2 byte `struct:"byte"`
CalibrationSvUcByte2p2 byte `struct:"byte"`
CalibrationSvUcByte1p2 byte `struct:"byte"`
--
GitLab