Dolda2000 GitWeb
/
kaka
/
cakelight.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added a light level config (0-31) for APA102 only
[kaka/cakelight.git]
/
src
/
kaka
/
cakelight
/
Configuration.java
diff --git
a/src/kaka/cakelight/Configuration.java
b/src/kaka/cakelight/Configuration.java
index
2932c01
..
4d727cc
100644
(file)
--- a/
src/kaka/cakelight/Configuration.java
+++ b/
src/kaka/cakelight/Configuration.java
@@
-12,10
+12,12
@@
public class Configuration {
private List<Map.Entry<String, String>> settings = new ArrayList<>();
public VideoConfiguration video;
public LedConfiguration leds;
private List<Map.Entry<String, String>> settings = new ArrayList<>();
public VideoConfiguration video;
public LedConfiguration leds;
+ public double gamma;
private Configuration(Properties prop) {
video = new VideoConfiguration(prop);
leds = new LedConfiguration(prop);
private Configuration(Properties prop) {
video = new VideoConfiguration(prop);
leds = new LedConfiguration(prop);
+ gamma = Double.parseDouble(get(prop,"gamma", "1"));
}
public static Configuration from(String propertiesFile) {
}
public static Configuration from(String propertiesFile) {
@@
-96,14
+98,29
@@
public class Configuration {
public class LedConfiguration {
public int cols;
public int rows;
public class LedConfiguration {
public int cols;
public int rows;
+ public int level;
+ public LedType type;
private LedConfiguration(Properties prop) {
cols = Integer.parseInt(get(prop, "leds.cols"));
rows = Integer.parseInt(get(prop, "leds.rows"));
private LedConfiguration(Properties prop) {
cols = Integer.parseInt(get(prop, "leds.cols"));
rows = Integer.parseInt(get(prop, "leds.rows"));
+ level = Math.min(0, Math.max(31, Integer.parseInt(get(prop, "leds.level", "31"))));
+ switch (get(prop, "leds.type", "").toUpperCase()) {
+ case "WS2801":
+ type = LedType.WS2801;
+ break;
+ case "APA102":
+ default:
+ type = LedType.APA102;
+ }
}
public int getCount() {
return cols * 2 + rows * 2;
}
}
}
public int getCount() {
return cols * 2 + rows * 2;
}
}
+
+ public enum LedType {
+ WS2801, APA102
+ }
}
}