From eb2a0e7a98b73b8d0baadb2ab1d2bf0b62621ca6 Mon Sep 17 00:00:00 2001
From: Giovanni Harting <539@idlegandalf.com>
Date: Sun, 5 May 2019 21:30:02 +0200
Subject: [PATCH] added support for color correction

---
 main.go    | 6 +++---
 pca9685.go | 2 +-
 proto      | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/main.go b/main.go
index 8e037a1..0bfda66 100644
--- a/main.go
+++ b/main.go
@@ -91,7 +91,7 @@ func (daemon *LedDaemon) receive() {
 					daemon.name = msg.MLedd.Name
 					log.Infof("Connection with %s established; backend registered", msg.MLedd.Name)
 				case *ledd.BackendWrapperMessage_MSetChannel:
-					for c, v := range msg.MSetChannel.NewChannelValues {
+					for c, v := range msg.MSetChannel.Values {
 						if c > CHANNEL {
 							log.Warningf("[%s] Channel index %d is higher then this device's max channel index %d. Skipping.", daemon.name, c, CHANNEL)
 							continue
@@ -100,10 +100,10 @@ func (daemon *LedDaemon) receive() {
 						v = math.Pow(v, 1/readConfig.Pca9685.Gamma)
 
 						if pwm, ok := pwmMap[c]; ok {
-							pwm.setPercentage(float32(v * 100))
+							pwm.setPercentage(float32(v) * 100 * msg.MSetChannel.Correction[c])
 						} else {
 							pwmMap[c] = pca9685.NewPwm(int(c))
-							pwmMap[c].setPercentage(float32(v * 100))
+							pwm.setPercentage(float32(v) * 100 * msg.MSetChannel.Correction[c])
 						}
 					}
 				}
diff --git a/pca9685.go b/pca9685.go
index ccd0887..dd3d618 100644
--- a/pca9685.go
+++ b/pca9685.go
@@ -180,7 +180,7 @@ func (pwm *Pwm) setPercentage(percentage float32) error {
 		return errors.New(fmt.Sprintf("Percentage must be between 0.0 and 100.0. Got %v.", percentage))
 	}
 
-	pwm.pca.log.Info(fmt.Sprintf("Setting pwm #%v to %v%% at \"%v\" device.", pwm.pin, percentage, pwm.pca.name))
+	pwm.pca.log.Info(fmt.Sprintf("Setting pwm #%v to %v%% (%v) at \"%v\" device.", pwm.pin, percentage, uint16((percentage/100)*float32(pwm.pca.maxPulse)), pwm.pca.name))
 	pwm.pca.setPwm(pwm.pin, 0, uint16((percentage/100)*float32(pwm.pca.maxPulse)))
 
 	return nil
diff --git a/proto b/proto
index 3d37eb6..bb16464 160000
--- a/proto
+++ b/proto
@@ -1 +1 @@
-Subproject commit 3d37eb67b3f0ba5a411f0e7f50257f27a3d19c48
+Subproject commit bb16464756d0abb4c147ef8f17eac8064342c2c9