From bed95fa91cf5b92f986a15cddd7496efdfe2d24d Mon Sep 17 00:00:00 2001 From: Rik Veenboer Date: Sun, 3 Jul 2016 12:23:04 +0100 Subject: [PATCH] Prepare merge to module exec.connected in mimis --- .gitignore => java/exec.connected/.gitignore | 0 .../exec.connected/build.gradle | 0 out.yml => java/exec.connected/out.yml | 0 .../main/java/connected/TestFromYaml.java | 0 .../java/connected/TestTcpCommunication.java | 0 .../src}/main/java/dummy/Dummy.java | 194 +++++++++--------- .../main/java/extra/LircTaskMapCycle.java | 0 .../src}/main/java/extra/Task.java | 130 ++++++------ .../main/java/map/DenonRC176EventMap.java | 0 .../java/map/PhiliphsRCLE011EventMap.java | 0 .../java/map/SamsungBN5901015AEventMap.java | 0 .../src}/main/java/yaml/Contact.java | 0 .../src}/main/java/yaml/Phone.java | 0 .../src}/main/java/yaml/TestParsing.java | 0 test.yml => java/exec.connected/test.yml | 0 15 files changed, 162 insertions(+), 162 deletions(-) rename .gitignore => java/exec.connected/.gitignore (100%) rename build.gradle => java/exec.connected/build.gradle (100%) rename out.yml => java/exec.connected/out.yml (100%) rename {src => java/exec.connected/src}/main/java/connected/TestFromYaml.java (100%) rename {src => java/exec.connected/src}/main/java/connected/TestTcpCommunication.java (100%) rename {src => java/exec.connected/src}/main/java/dummy/Dummy.java (96%) rename {src => java/exec.connected/src}/main/java/extra/LircTaskMapCycle.java (100%) rename {src => java/exec.connected/src}/main/java/extra/Task.java (96%) rename {src => java/exec.connected/src}/main/java/map/DenonRC176EventMap.java (100%) rename {src => java/exec.connected/src}/main/java/map/PhiliphsRCLE011EventMap.java (100%) rename {src => java/exec.connected/src}/main/java/map/SamsungBN5901015AEventMap.java (100%) rename {src => java/exec.connected/src}/main/java/yaml/Contact.java (100%) rename {src => java/exec.connected/src}/main/java/yaml/Phone.java (100%) rename {src => java/exec.connected/src}/main/java/yaml/TestParsing.java (100%) rename test.yml => java/exec.connected/test.yml (100%) diff --git a/.gitignore b/java/exec.connected/.gitignore similarity index 100% rename from .gitignore rename to java/exec.connected/.gitignore diff --git a/build.gradle b/java/exec.connected/build.gradle similarity index 100% rename from build.gradle rename to java/exec.connected/build.gradle diff --git a/out.yml b/java/exec.connected/out.yml similarity index 100% rename from out.yml rename to java/exec.connected/out.yml diff --git a/src/main/java/connected/TestFromYaml.java b/java/exec.connected/src/main/java/connected/TestFromYaml.java similarity index 100% rename from src/main/java/connected/TestFromYaml.java rename to java/exec.connected/src/main/java/connected/TestFromYaml.java diff --git a/src/main/java/connected/TestTcpCommunication.java b/java/exec.connected/src/main/java/connected/TestTcpCommunication.java similarity index 100% rename from src/main/java/connected/TestTcpCommunication.java rename to java/exec.connected/src/main/java/connected/TestTcpCommunication.java diff --git a/src/main/java/dummy/Dummy.java b/java/exec.connected/src/main/java/dummy/Dummy.java similarity index 96% rename from src/main/java/dummy/Dummy.java rename to java/exec.connected/src/main/java/dummy/Dummy.java index 8775160..f541e08 100644 --- a/src/main/java/dummy/Dummy.java +++ b/java/exec.connected/src/main/java/dummy/Dummy.java @@ -1,97 +1,97 @@ -package dummy; - -import lirc.Lirc.Color; -import lirc.Lirc.Direction; -import lirc.Lirc.Number; -import lirc.Lirc.Signal; -import base.work.Listen; - -import com.github.boukefalos.ibuddy.iBuddy; -import com.github.boukefalos.lirc.Lirc; -import com.github.boukefalos.lirc.LircButton; -import com.github.boukefalos.lirc.util.SignalObject; - -public class Dummy extends Listen { - protected Lirc lirc; - protected iBuddy iBuddy; - - public Dummy(Lirc lirc, iBuddy iBuddy) { - this.lirc = lirc; - this.iBuddy = iBuddy; - lirc.register(this); - } - - public void start() { - lirc.start(); - super.start(); - } - - public void input(SignalObject signalObject) { - Signal signal = signalObject.signal; - Object object = signalObject.object; - System.out.println(object); - try { - // Move these mappings to config file? - if (object instanceof LircButton) { - LircButton lircButton = (LircButton) object; - String code = lircButton.code; - logger.error(signal.name() + " : " + code + " @ " + lircButton.remote); - } else if (object instanceof Color) { - Color color = (Color) object; - System.err.println("Color: " + color); - try { - switch (color) { - case RED: - iBuddy.setHeadRed(signal.equals(Signal.BEGIN)); - break; - case GREEN: - iBuddy.setHeadGreen(signal.equals(Signal.BEGIN)); - break; - case YELLOW: - if (signal.equals(Signal.BEGIN)) { - iBuddy.setHead(proto.Ibuddy.Color.YELLOW); - } else { - iBuddy.setHead(proto.Ibuddy.Color.NONE); - } - break; - case BLUE: - iBuddy.setHeadBlue(signal.equals(Signal.BEGIN)); - break; - default: - break; - } - } catch (Exception e) {} - } else if (object instanceof Number) { - Number number = (Number) object; - // Find way to reuse enum? - proto.Ibuddy.Color color = proto.Ibuddy.Color.valueOf(number.getNumber()); - if (signal.equals(Signal.BEGIN)) { - System.err.println("Number: " + number + " Color: " + color); - iBuddy.setHead(color); - } else { - iBuddy.setHead(proto.Ibuddy.Color.NONE); - } - } else if (object instanceof Direction && signal.equals(Signal.BEGIN)) { - Direction direction = (Direction) object; - System.err.println("Direction: " + direction); - switch (direction) { - case LEFT: - iBuddy.setRotateLeft(); - break; - case RIGHT: - iBuddy.setRotateRight(); - break; - case UP: - iBuddy.setWingsUp(); - break; - case DOWN: - iBuddy.setWingsDown(); - default: - iBuddy.setRotateCenter(); - iBuddy.setWingsCenter(); - break; - } - } - } catch (Exception e) {} - } -} +package dummy; + +import lirc.Lirc.Color; +import lirc.Lirc.Direction; +import lirc.Lirc.Number; +import lirc.Lirc.Signal; +import base.work.Listen; + +import com.github.boukefalos.ibuddy.iBuddy; +import com.github.boukefalos.lirc.Lirc; +import com.github.boukefalos.lirc.LircButton; +import com.github.boukefalos.lirc.util.SignalObject; + +public class Dummy extends Listen { + protected Lirc lirc; + protected iBuddy iBuddy; + + public Dummy(Lirc lirc, iBuddy iBuddy) { + this.lirc = lirc; + this.iBuddy = iBuddy; + lirc.register(this); + } + + public void start() { + lirc.start(); + super.start(); + } + + public void input(SignalObject signalObject) { + Signal signal = signalObject.signal; + Object object = signalObject.object; + System.out.println(object); + try { + // Move these mappings to config file? + if (object instanceof LircButton) { + LircButton lircButton = (LircButton) object; + String code = lircButton.code; + logger.error(signal.name() + " : " + code + " @ " + lircButton.remote); + } else if (object instanceof Color) { + Color color = (Color) object; + System.err.println("Color: " + color); + try { + switch (color) { + case RED: + iBuddy.setHeadRed(signal.equals(Signal.BEGIN)); + break; + case GREEN: + iBuddy.setHeadGreen(signal.equals(Signal.BEGIN)); + break; + case YELLOW: + if (signal.equals(Signal.BEGIN)) { + iBuddy.setHead(proto.Ibuddy.Color.YELLOW); + } else { + iBuddy.setHead(proto.Ibuddy.Color.NONE); + } + break; + case BLUE: + iBuddy.setHeadBlue(signal.equals(Signal.BEGIN)); + break; + default: + break; + } + } catch (Exception e) {} + } else if (object instanceof Number) { + Number number = (Number) object; + // Find way to reuse enum? + proto.Ibuddy.Color color = proto.Ibuddy.Color.valueOf(number.getNumber()); + if (signal.equals(Signal.BEGIN)) { + System.err.println("Number: " + number + " Color: " + color); + iBuddy.setHead(color); + } else { + iBuddy.setHead(proto.Ibuddy.Color.NONE); + } + } else if (object instanceof Direction && signal.equals(Signal.BEGIN)) { + Direction direction = (Direction) object; + System.err.println("Direction: " + direction); + switch (direction) { + case LEFT: + iBuddy.setRotateLeft(); + break; + case RIGHT: + iBuddy.setRotateRight(); + break; + case UP: + iBuddy.setWingsUp(); + break; + case DOWN: + iBuddy.setWingsDown(); + default: + iBuddy.setRotateCenter(); + iBuddy.setWingsCenter(); + break; + } + } + } catch (Exception e) {} + } +} diff --git a/src/main/java/extra/LircTaskMapCycle.java b/java/exec.connected/src/main/java/extra/LircTaskMapCycle.java similarity index 100% rename from src/main/java/extra/LircTaskMapCycle.java rename to java/exec.connected/src/main/java/extra/LircTaskMapCycle.java diff --git a/src/main/java/extra/Task.java b/java/exec.connected/src/main/java/extra/Task.java similarity index 96% rename from src/main/java/extra/Task.java rename to java/exec.connected/src/main/java/extra/Task.java index 8ba8d93..0e33685 100644 --- a/src/main/java/extra/Task.java +++ b/java/exec.connected/src/main/java/extra/Task.java @@ -1,65 +1,65 @@ -/** - * Copyright (C) 2015 Rik Veenboer - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package extra; - -import com.github.boukefalos.lirc.input.Input; -import com.github.boukefalos.lirc.util.Signal; -import com.github.boukefalos.lirc.value.Action; -import com.github.boukefalos.lirc.value.Target; - -import extra.Task; - -public class Task implements Input { - protected static final long serialVersionUID = 1L; - - public static final Target TARGET = Target.ALL; - public static final Signal SIGNAL = Signal.NONE; - - protected Target target; - protected Action action; - protected Signal signal; - - public Task(Action action) { - this(action, TARGET); - } - - public Task(Action action, Target target) { - this(action, target, SIGNAL); - } - - public Task(Action action, Target target, Signal signal) { - this.target = target; - this.action = action; - this.signal = signal; - } - - public Target getTarget() { - return target; - } - - public Action getAction() { - return action; - } - - public Signal getSignal() { - return signal; - } - - public Task setSignal(Signal signal) { - return new Task(action, target, signal); - } -} +/** + * Copyright (C) 2015 Rik Veenboer + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package extra; + +import com.github.boukefalos.lirc.input.Input; +import com.github.boukefalos.lirc.util.Signal; +import com.github.boukefalos.lirc.value.Action; +import com.github.boukefalos.lirc.value.Target; + +import extra.Task; + +public class Task implements Input { + protected static final long serialVersionUID = 1L; + + public static final Target TARGET = Target.ALL; + public static final Signal SIGNAL = Signal.NONE; + + protected Target target; + protected Action action; + protected Signal signal; + + public Task(Action action) { + this(action, TARGET); + } + + public Task(Action action, Target target) { + this(action, target, SIGNAL); + } + + public Task(Action action, Target target, Signal signal) { + this.target = target; + this.action = action; + this.signal = signal; + } + + public Target getTarget() { + return target; + } + + public Action getAction() { + return action; + } + + public Signal getSignal() { + return signal; + } + + public Task setSignal(Signal signal) { + return new Task(action, target, signal); + } +} diff --git a/src/main/java/map/DenonRC176EventMap.java b/java/exec.connected/src/main/java/map/DenonRC176EventMap.java similarity index 100% rename from src/main/java/map/DenonRC176EventMap.java rename to java/exec.connected/src/main/java/map/DenonRC176EventMap.java diff --git a/src/main/java/map/PhiliphsRCLE011EventMap.java b/java/exec.connected/src/main/java/map/PhiliphsRCLE011EventMap.java similarity index 100% rename from src/main/java/map/PhiliphsRCLE011EventMap.java rename to java/exec.connected/src/main/java/map/PhiliphsRCLE011EventMap.java diff --git a/src/main/java/map/SamsungBN5901015AEventMap.java b/java/exec.connected/src/main/java/map/SamsungBN5901015AEventMap.java similarity index 100% rename from src/main/java/map/SamsungBN5901015AEventMap.java rename to java/exec.connected/src/main/java/map/SamsungBN5901015AEventMap.java diff --git a/src/main/java/yaml/Contact.java b/java/exec.connected/src/main/java/yaml/Contact.java similarity index 100% rename from src/main/java/yaml/Contact.java rename to java/exec.connected/src/main/java/yaml/Contact.java diff --git a/src/main/java/yaml/Phone.java b/java/exec.connected/src/main/java/yaml/Phone.java similarity index 100% rename from src/main/java/yaml/Phone.java rename to java/exec.connected/src/main/java/yaml/Phone.java diff --git a/src/main/java/yaml/TestParsing.java b/java/exec.connected/src/main/java/yaml/TestParsing.java similarity index 100% rename from src/main/java/yaml/TestParsing.java rename to java/exec.connected/src/main/java/yaml/TestParsing.java diff --git a/test.yml b/java/exec.connected/test.yml similarity index 100% rename from test.yml rename to java/exec.connected/test.yml