Changing the alarm/siren driver - make it always authenticate when it is to make...

diff --git a/benchmarks/Java/Lifxtest/Lifxtest.java b/benchmarks/Java/Lifxtest/Lifxtest.java
index 1c307147389e7f49d8016b2bd40723278c5e9dfa..64469f5481a68b5f2172dc3db83f4635fb273197 100644 (file)
--- a/benchmarks/Java/Lifxtest/Lifxtest.java
+++ b/benchmarks/Java/Lifxtest/Lifxtest.java
@@ -68,7 +68,7 @@ public class Lifxtest {
                                lifx.setColor(lifx.getHue(), lifx.getSaturation(), i);
                                Thread.sleep(500);
                        }
-
+                        lifx.turnOff();
                        //thread.join();
                }
        }

diff --git a/benchmarks/Java/SmartLightsController/Makefile~ b/benchmarks/Java/SmartLightsController/Makefile~
deleted file mode 100644 (file)
index ffda80c..0000000
--- a/benchmarks/Java/SmartLightsController/Makefile~
+++ /dev/null
@@ -1,19 +0,0 @@
-BASE = ../..
-
-include $(BASE)/common.mk
-
-BOOFDIR := ../libs/boofcv_libs
-BOOFJARS := $(BOOFDIR)/BoofCV-feature-0.21.jar:$(BOOFDIR)/BoofCV-io-0.21.jar:$(BOOFDIR)/BoofCV-visualize-0.21.jar:$(BOOFDIR)/BoofCV-ip-0.21.jar:$(CHECKERJARS)
-
-JFLAGS = -d $(BIN_DIR) -cp $(BOOFJARS):$(BIN_DIR):.
-JARFLAGS = cf 
-
-all: smartlights
-
-PHONY += smartlights
-smartlights:
-       $(JAVAC) $(JFLAGS) *.java
-       cp SmartLightsController.config $(BIN_DIR)/SmartLightsController
-       cd $(BIN_DIR)/SmartLightsController; $(JAR) $(JARFLAGS) SmartLightsController.jar ../SmartLightsController/SmartLightsController*.class ../SmartLightsController/ColorTemperature*.class ../SmartLightsController/MotionDetection*.class ../iotcode/interfaces/Camera*.class ../iotcode/interfaces/Room*.class ../iotcode/interfaces/LightBulb*.class ../iotcode/interfaces/Resolution*.class
-
-.PHONY: $(PHONY)

diff --git a/benchmarks/drivers/Java/DlinkAlarm/DlinkAlarm.java b/benchmarks/drivers/Java/DlinkAlarm/DlinkAlarm.java
index e19b37545a61cf572b2d2fe89049105eaca6b805..383d7c21ea0e928a5a954926bfc115557e9994fa 100644 (file)
--- a/benchmarks/drivers/Java/DlinkAlarm/DlinkAlarm.java
+++ b/benchmarks/drivers/Java/DlinkAlarm/DlinkAlarm.java
@@ -47,7 +47,7 @@ public class DlinkAlarm implements Alarm {
        *******************************************************************************************************************************************/
     private static final String STR_HMAC_ALGO = "HmacMD5";
     private static final int INT_ALARM_SOUND_TYPE = 6;
-    private static final int INT_ALARM_VOLUME = 0;
+    private static final int INT_ALARM_VOLUME = 1;
     private static final int INT_ALARM_MAX_DUR = 86400;
 
     private String host = null;
@@ -100,6 +100,10 @@ public class DlinkAlarm implements Alarm {
         
         // We don't use zone at this point (for this alarm there is only 1 zone and 1 alarm)
 
+        // Send login request first
+        sendLoginRequest();
+        // Send login info (challenge and HMAC encrypted message)
+        sendLoginInfo();
         // True means on
         if (_onOff) {
             if ((_onDurationSeconds == -1) || (_onDurationSeconds > 86400)) {
@@ -169,10 +173,6 @@ public class DlinkAlarm implements Alarm {
                           "\"http://schemas.xmlsoap.org/soap/envelope/\"><soap:Body>";
             // End!
             end = "</soap:Body></soap:Envelope>\r\n";
-            // Send login request first
-            sendLoginRequest();
-            // Send login info (challenge and HMAC encrypted message)
-            sendLoginInfo();
                } catch (Exception e) {
                        e.printStackTrace();
                }

diff --git a/benchmarks/drivers/Java/Makefile b/benchmarks/drivers/Java/Makefile
index b144b739d8825019912f37fb2d7dab9cd7a85cda..48e9c0539bc359ac153f0f37a069a9c3caeca097 100644 (file)
--- a/benchmarks/drivers/Java/Makefile
+++ b/benchmarks/drivers/Java/Makefile
@@ -25,7 +25,6 @@ PHONY += light
 light:
        $(JAVAC) $(JFLAGS) LifxLightBulb/*.java
        cp LifxLightBulb/LifxLightBulb.config $(BIN_DIR)/iotcode/LifxLightBulb
-       cp LifxLightBulb/LifxLightBulb.tomoyo $(BIN_DIR)/iotcode/LifxLightBulb
        cd $(BIN_DIR)/iotcode/LifxLightBulb; $(JAR) $(JARFLAGS) LifxLightBulb.jar ../../iotcode/LifxLightBulb/*.class ../../iotcode/interfaces/LightBulb*.class
 
 PHONY += camera
@@ -39,35 +38,30 @@ PHONY += labroom
 labroom:
        $(JAVAC) $(JFLAGS) LabRoom/*.java
        cp LabRoom/LabRoom.config $(BIN_DIR)/iotcode/LabRoom
-       cp LabRoom/LabRoom.tomoyo $(BIN_DIR)/iotcode/LabRoom
        cd $(BIN_DIR)/iotcode/LabRoom; $(JAR) $(JARFLAGS) LabRoom.jar ../../iotcode/LabRoom/*.class ../../iotcode/interfaces/Room*.class
 
 PHONY += greenlawn
 greenlawn:
        $(JAVAC) $(JFLAGS) GreenLawn/*.java
        cp GreenLawn/GreenLawn.config $(BIN_DIR)/iotcode/GreenLawn
-       cp GreenLawn/GreenLawn.tomoyo $(BIN_DIR)/iotcode/GreenLawn
        cd $(BIN_DIR)/iotcode/GreenLawn; $(JAR) $(JARFLAGS) GreenLawn.jar ../../iotcode/GreenLawn/*.class ../../iotcode/interfaces/Lawn*.class
 
 PHONY += sprinkler
 sprinkler:
        $(JAVAC) $(JFLAGS) EspSprinkler/*.java
        cp EspSprinkler/EspSprinkler.config $(BIN_DIR)/iotcode/EspSprinkler
-       cp EspSprinkler/EspSprinkler.tomoyo $(BIN_DIR)/iotcode/EspSprinkler
        cd $(BIN_DIR)/iotcode/EspSprinkler; $(JAR) $(JARFLAGS) EspSprinkler.jar ../../iotcode/EspSprinkler/*.class ../../iotcode/interfaces/Sprinkler*.class ../../iotcode/interfaces/ZoneState*.class
        
 PHONY += blossomsprinkler
 blossomsprinkler:
        $(JAVAC) $(JFLAGS) BlossomSprinkler/*.java
        cp BlossomSprinkler/BlossomSprinkler.config $(BIN_DIR)/iotcode/BlossomSprinkler
-       cp BlossomSprinkler/BlossomSprinkler.tomoyo $(BIN_DIR)/iotcode/BlossomSprinkler
        cd $(BIN_DIR)/iotcode/BlossomSprinkler; $(JAR) $(JARFLAGS) BlossomSprinkler.jar ../../iotcode/BlossomSprinkler/*.class ../../iotcode/interfaces/Sprinkler*.class ../../iotcode/interfaces/ZoneState*.class
 
 PHONY += moisture
 moisture:
        $(JAVAC) $(JFLAGS) SpruceSensor/*.java
        cp SpruceSensor/SpruceSensor.config $(BIN_DIR)/iotcode/SpruceSensor
-       cp SpruceSensor/SpruceSensor.tomoyo $(BIN_DIR)/iotcode/SpruceSensor
        #cd $(BIN_DIR)/iotcode/SpruceSensor; $(JAR) $(JARFLAGS) SpruceSensor.jar ../../iotcode/SpruceSensor/*.class ../../iotcode/interfaces/MoistureSensor*.class ../../iotcode/interfaces/Camera*.class ../../IrrigationController/MotionDetection*.class
        cd $(BIN_DIR)/iotcode/SpruceSensor; $(JAR) $(JARFLAGS) SpruceSensor.jar ../../iotcode/SpruceSensor/*.class ../../iotcode/interfaces/MoistureSensor*.class ../../iotcode/interfaces/Camera*.class
 
@@ -75,56 +69,48 @@ PHONY += weathergateway
 weathergateway:
        $(JAVAC) $(JFLAGS) WeatherPhoneGateway/*.java
        cp WeatherPhoneGateway/WeatherPhoneGateway.config $(BIN_DIR)/iotcode/WeatherPhoneGateway
-       cp WeatherPhoneGateway/WeatherPhoneGateway.tomoyo $(BIN_DIR)/iotcode/WeatherPhoneGateway
        cd $(BIN_DIR)/iotcode/WeatherPhoneGateway; $(JAR) $(JARFLAGS) WeatherPhoneGateway.jar ../../iotcode/WeatherPhoneGateway/*.class ../../iotcode/interfaces/WeatherGateway*.class
 
 PHONY += audioroom
 audioroom:
        $(JAVAC) $(JFLAGS) AudioRoom/*.java
        cp AudioRoom/AudioRoom.config $(BIN_DIR)/iotcode/AudioRoom
-       cp AudioRoom/AudioRoom.tomoyo $(BIN_DIR)/iotcode/AudioRoom
        cd $(BIN_DIR)/iotcode/AudioRoom; $(JAR) $(JARFLAGS) AudioRoom.jar ../../iotcode/AudioRoom/*.class ../../iotcode/interfaces/Room*.class
 
 PHONY += gpsgateway
 gpsgateway:
        $(JAVAC) $(JFLAGS) GPSPhoneGateway/*.java
        cp GPSPhoneGateway/GPSPhoneGateway.config $(BIN_DIR)/iotcode/GPSPhoneGateway
-       cp GPSPhoneGateway/GPSPhoneGateway.tomoyo $(BIN_DIR)/iotcode/GPSPhoneGateway
        cd $(BIN_DIR)/iotcode/GPSPhoneGateway; $(JAR) $(JARFLAGS) GPSPhoneGateway.jar ../../iotcode/GPSPhoneGateway/*.class ../../iotcode/interfaces/GPSGateway*.class
 
 PHONY += ihome
 ihome:
        $(JAVAC) $(JFLAGS) IHome/*.java
        cp IHome/IHome.config $(BIN_DIR)/iotcode/IHome
-       cp IHome/IHome.tomoyo $(BIN_DIR)/iotcode/IHome
        cd $(BIN_DIR)/iotcode/IHome; $(JAR) $(JARFLAGS) IHome.jar ../../iotcode/IHome/*.class ../../iotcode/interfaces/Speaker*.class
 
 PHONY += homeroom
 homeroom:
        $(JAVAC) $(JFLAGS) HomeRoom/*.java
        cp HomeRoom/HomeRoom.config $(BIN_DIR)/iotcode/HomeRoom
-       cp HomeRoom/HomeRoom.tomoyo $(BIN_DIR)/iotcode/HomeRoom
        cd $(BIN_DIR)/iotcode/HomeRoom; $(JAR) $(JARFLAGS) HomeRoom.jar ../../iotcode/HomeRoom/*.class ../../iotcode/interfaces/Room*.class
 
 PHONY += alarm
 alarm:
        $(JAVAC) $(JFLAGS) EspAlarm/*.java
        cp EspAlarm/EspAlarm.config $(BIN_DIR)/iotcode/EspAlarm
-       cp EspAlarm/EspAlarm.tomoyo $(BIN_DIR)/iotcode/EspAlarm
        cd $(BIN_DIR)/iotcode/EspAlarm; $(JAR) $(JARFLAGS) EspAlarm.jar ../../iotcode/EspAlarm/*.class ../../iotcode/interfaces/Alarm*.class ../../iotcode/interfaces/ZoneState*.class
        
 PHONY += dlink-alarm
 dlink-alarm:
        $(JAVAC) $(JFLAGS) DlinkAlarm/*.java
        cp DlinkAlarm/DlinkAlarm.config $(BIN_DIR)/iotcode/DlinkAlarm
-       cp DlinkAlarm/DlinkAlarm.tomoyo $(BIN_DIR)/iotcode/DlinkAlarm
        cd $(BIN_DIR)/iotcode/DlinkAlarm; $(JAR) $(JARFLAGS) DlinkAlarm.jar ../../iotcode/DlinkAlarm/*.class ../../iotcode/interfaces/Alarm*.class ../../iotcode/interfaces/ZoneState*.class
 
 PHONY += motion
 motion:
        $(JAVAC) $(JFLAGS) MotionSensor/*.java
        cp MotionSensor/MotionSensor.config $(BIN_DIR)/iotcode/MotionSensor
-       cp MotionSensor/MotionSensor.tomoyo $(BIN_DIR)/iotcode/MotionSensor
        #cd $(BIN_DIR)/iotcode/MotionSensor; $(JAR) $(JARFLAGS) MotionSensor.jar ../../iotcode/MotionSensor/*.class ../../iotcode/interfaces/SmartthingsSensor*.class ../../iotcode/interfaces/Camera*.class ../../IrrigationController/MotionDetection*.class
        cd $(BIN_DIR)/iotcode/MotionSensor; $(JAR) $(JARFLAGS) MotionSensor.jar ../../iotcode/MotionSensor/*.class ../../iotcode/interfaces/SmartthingsSensor*.class ../../iotcode/interfaces/Camera*.class
 
@@ -132,7 +118,6 @@ PHONY += multipurpose
 multipurpose:
        $(JAVAC) $(JFLAGS) MultipurposeSensor/*.java
        cp MultipurposeSensor/MultipurposeSensor.config $(BIN_DIR)/iotcode/MultipurposeSensor
-       cp MultipurposeSensor/MultipurposeSensor.tomoyo $(BIN_DIR)/iotcode/MultipurposeSensor
        #cd $(BIN_DIR)/iotcode/MultipurposeSensor; $(JAR) $(JARFLAGS) MultipurposeSensor.jar ../../iotcode/MultipurposeSensor/*.class ../../iotcode/interfaces/SmartthingsSensor*.class ../../iotcode/interfaces/Camera*.class ../../IrrigationController/MotionDetection*.class
        cd $(BIN_DIR)/iotcode/MultipurposeSensor; $(JAR) $(JARFLAGS) MultipurposeSensor.jar ../../iotcode/MultipurposeSensor/*.class ../../iotcode/interfaces/SmartthingsSensor*.class ../../iotcode/interfaces/Camera*.class
 
@@ -140,7 +125,6 @@ PHONY += waterleak
 waterleak:
        $(JAVAC) $(JFLAGS) WaterLeakSensor/*.java
        cp WaterLeakSensor/WaterLeakSensor.config $(BIN_DIR)/iotcode/WaterLeakSensor
-       cp WaterLeakSensor/WaterLeakSensor.tomoyo $(BIN_DIR)/iotcode/WaterLeakSensor
        #cd $(BIN_DIR)/iotcode/WaterLeakSensor; $(JAR) $(JARFLAGS) WaterLeakSensor.jar ../../iotcode/WaterLeakSensor/*.class ../../iotcode/interfaces/SmartthingsSensor*.class ../../iotcode/interfaces/Camera*.class ../../IrrigationController/MotionDetection*.class
        cd $(BIN_DIR)/iotcode/WaterLeakSensor; $(JAR) $(JARFLAGS) WaterLeakSensor.jar ../../iotcode/WaterLeakSensor/*.class ../../iotcode/interfaces/SmartthingsSensor*.class ../../iotcode/interfaces/Camera*.class
 
@@ -148,14 +132,12 @@ PHONY += doorlock
 doorlock:
        $(JAVAC) $(JFLAGS) DoorlockSensor/*.java
        cp DoorlockSensor/DoorlockSensor.config $(BIN_DIR)/iotcode/DoorlockSensor
-       cp DoorlockSensor/DoorlockSensor.tomoyo $(BIN_DIR)/iotcode/DoorlockSensor
        cd $(BIN_DIR)/iotcode/DoorlockSensor; $(JAR) $(JARFLAGS) DoorlockSensor.jar ../../iotcode/DoorlockSensor/*.class ../../iotcode/interfaces/SmartthingsSensor*.class ../../iotcode/interfaces/Camera*.class
 
 PHONY += doorlockactuator
 doorlockactuator:
        $(JAVAC) $(JFLAGS) DoorlockActuator/*.java
        cp DoorlockActuator/DoorlockActuator.config $(BIN_DIR)/iotcode/DoorlockActuator
-       cp DoorlockActuator/DoorlockActuator.tomoyo $(BIN_DIR)/iotcode/DoorlockActuator
        cd $(BIN_DIR)/iotcode/DoorlockActuator; $(JAR) $(JARFLAGS) DoorlockActuator.jar ../../iotcode/DoorlockActuator/*.class ../../iotcode/interfaces/SmartthingsActuator*.class ../../iotcode/interfaces/Camera*.class
 
 # Compile - with checker
@@ -164,7 +146,6 @@ PHONY += check-light
 check-light:
        $(JAVAC) $(JFLAGS) $(CHECKER_OPT) $(ASTUBS) LifxLightBulb/*.java
        cp LifxLightBulb/LifxLightBulb.config $(BIN_DIR)/iotcode/LifxLightBulb
-       cp LifxLightBulb/LifxLightBulb.tomoyo $(BIN_DIR)/iotcode/LifxLightBulb
        cd $(BIN_DIR)/iotcode/LifxLightBulb; $(JAR) $(JARFLAGS) LifxLightBulb.jar ../../iotcode/LifxLightBulb/*.class ../../iotcode/interfaces/LightBulb*.class
 
 PHONY += check-camera
@@ -178,35 +159,30 @@ PHONY += check-labroom
 check-labroom:
        $(JAVAC) $(JFLAGS) $(CHECKER_OPT) $(ASTUBS) LabRoom/*.java
        cp LabRoom/LabRoom.config $(BIN_DIR)/iotcode/LabRoom
-       cp LabRoom/LabRoom.tomoyo $(BIN_DIR)/iotcode/LabRoom
        cd $(BIN_DIR)/iotcode/LabRoom; $(JAR) $(JARFLAGS) LabRoom.jar ../../iotcode/LabRoom/*.class ../../iotcode/interfaces/Room*.class
 
 PHONY += check-greenlawn
 check-greenlawn:
        $(JAVAC) $(JFLAGS) $(CHECKER_OPT) $(ASTUBS) GreenLawn/*.java
        cp GreenLawn/GreenLawn.config $(BIN_DIR)/iotcode/GreenLawn
-       cp GreenLawn/GreenLawn.tomoyo $(BIN_DIR)/iotcode/GreenLawn
        cd $(BIN_DIR)/iotcode/GreenLawn; $(JAR) $(JARFLAGS) GreenLawn.jar ../../iotcode/GreenLawn/*.class ../../iotcode/interfaces/Lawn*.class
 
 PHONY += check-sprinkler
 check-sprinkler:
        $(JAVAC) $(JFLAGS) $(CHECKER_OPT) $(ASTUBS) EspSprinkler/*.java
        cp EspSprinkler/EspSprinkler.config $(BIN_DIR)/iotcode/EspSprinkler
-       cp EspSprinkler/EspSprinkler.tomoyo $(BIN_DIR)/iotcode/EspSprinkler
        cd $(BIN_DIR)/iotcode/EspSprinkler; $(JAR) $(JARFLAGS) EspSprinkler.jar ../../iotcode/EspSprinkler/*.class ../../iotcode/interfaces/Sprinkler*.class ../../iotcode/interfaces/ZoneState*.class
        
 PHONY += check-blossomsprinkler
 check-blossomsprinkler:
        $(JAVAC) $(JFLAGS) $(CHECKER_OPT) $(ASTUBS) BlossomSprinkler/*.java
        cp BlossomSprinkler/BlossomSprinkler.config $(BIN_DIR)/iotcode/BlossomSprinkler
-       cp BlossomSprinkler/BlossomSprinkler.tomoyo $(BIN_DIR)/iotcode/BlossomSprinkler
        cd $(BIN_DIR)/iotcode/BlossomSprinkler; $(JAR) $(JARFLAGS) BlossomSprinkler.jar ../../iotcode/BlossomSprinkler/*.class ../../iotcode/interfaces/Sprinkler*.class ../../iotcode/interfaces/ZoneState*.class
 
 PHONY += check-moisture
 check-moisture:
        $(JAVAC) $(JFLAGS) $(CHECKER_OPT) $(ASTUBS) SpruceSensor/*.java
        cp SpruceSensor/SpruceSensor.config $(BIN_DIR)/iotcode/SpruceSensor
-       cp SpruceSensor/SpruceSensor.tomoyo $(BIN_DIR)/iotcode/SpruceSensor
        #cd $(BIN_DIR)/iotcode/SpruceSensor; $(JAR) $(JARFLAGS) SpruceSensor.jar ../../iotcode/SpruceSensor/*.class ../../iotcode/interfaces/MoistureSensor*.class ../../iotcode/interfaces/Camera*.class ../../IrrigationController/MotionDetection*.class
        cd $(BIN_DIR)/iotcode/SpruceSensor; $(JAR) $(JARFLAGS) SpruceSensor.jar ../../iotcode/SpruceSensor/*.class ../../iotcode/interfaces/MoistureSensor*.class ../../iotcode/interfaces/Camera*.class
 
@@ -214,84 +190,72 @@ PHONY += check-weathergateway
 check-weathergateway:
        $(JAVAC) $(JFLAGS) $(CHECKER_OPT) $(ASTUBS) WeatherPhoneGateway/*.java
        cp WeatherPhoneGateway/WeatherPhoneGateway.config $(BIN_DIR)/iotcode/WeatherPhoneGateway
-       cp WeatherPhoneGateway/WeatherPhoneGateway.tomoyo $(BIN_DIR)/iotcode/WeatherPhoneGateway
        cd $(BIN_DIR)/iotcode/WeatherPhoneGateway; $(JAR) $(JARFLAGS) WeatherPhoneGateway.jar ../../iotcode/WeatherPhoneGateway/*.class ../../iotcode/interfaces/WeatherGateway*.class
 
 PHONY += check-audioroom
 check-audioroom:
        $(JAVAC) $(JFLAGS) $(CHECKER_OPT) $(ASTUBS) AudioRoom/*.java
        cp AudioRoom/AudioRoom.config $(BIN_DIR)/iotcode/AudioRoom
-       cp AudioRoom/AudioRoom.tomoyo $(BIN_DIR)/iotcode/AudioRoom
        cd $(BIN_DIR)/iotcode/AudioRoom; $(JAR) $(JARFLAGS) AudioRoom.jar ../../iotcode/AudioRoom/*.class ../../iotcode/interfaces/Room*.class
 
 PHONY += check-gpsgateway
 check-gpsgateway:
        $(JAVAC) $(JFLAGS) $(CHECKER_OPT) $(ASTUBS) GPSPhoneGateway/*.java
        cp GPSPhoneGateway/GPSPhoneGateway.config $(BIN_DIR)/iotcode/GPSPhoneGateway
-       cp GPSPhoneGateway/GPSPhoneGateway.tomoyo $(BIN_DIR)/iotcode/GPSPhoneGateway
        cd $(BIN_DIR)/iotcode/GPSPhoneGateway; $(JAR) $(JARFLAGS) GPSPhoneGateway.jar ../../iotcode/GPSPhoneGateway/*.class ../../iotcode/interfaces/GPSGateway*.class
 
 PHONY += check-ihome
 check-ihome:
        $(JAVAC) $(JFLAGS) $(CHECKER_OPT) $(ASTUBS) IHome/*.java
        cp IHome/IHome.config $(BIN_DIR)/iotcode/IHome
-       cp IHome/IHome.tomoyo $(BIN_DIR)/iotcode/IHome
        cd $(BIN_DIR)/iotcode/IHome; $(JAR) $(JARFLAGS) IHome.jar ../../iotcode/IHome/*.class ../../iotcode/interfaces/Speaker*.class
 
 PHONY += check-homeroom
 check-homeroom:
        $(JAVAC) $(JFLAGS) $(CHECKER_OPT) $(ASTUBS) HomeRoom/*.java
        cp HomeRoom/HomeRoom.config $(BIN_DIR)/iotcode/HomeRoom
-       cp HomeRoom/HomeRoom.tomoyo $(BIN_DIR)/iotcode/HomeRoom
        cd $(BIN_DIR)/iotcode/HomeRoom; $(JAR) $(JARFLAGS) HomeRoom.jar ../../iotcode/HomeRoom/*.class ../../iotcode/interfaces/Room*.class
 
 PHONY += check-alarm
 check-alarm:
        $(JAVAC) $(JFLAGS) $(CHECKER_OPT) $(ASTUBS) EspAlarm/*.java
        cp DlinkAlarm/EspAlarm.config $(BIN_DIR)/iotcode/EspAlarm
-       cp DlinkAlarm/EspAlarm.tomoyo $(BIN_DIR)/iotcode/EspAlarm
        cd $(BIN_DIR)/iotcode/EspAlarm; $(JAR) $(JARFLAGS) EspAlarm.jar ../../iotcode/EspAlarm/*.class ../../iotcode/interfaces/Alarm*.class ../../iotcode/interfaces/ZoneState*.class
 
 PHONY += check-dlink-alarm
 check-dlink-alarm:
        $(JAVAC) $(JFLAGS) $(CHECKER_OPT) $(ASTUBS) DlinkAlarm/*.java
        cp EspAlarm/DlinkAlarm.config $(BIN_DIR)/iotcode/DlinkAlarm
-       cp EspAlarm/DlinkAlarm.tomoyo $(BIN_DIR)/iotcode/DlinkAlarm
        cd $(BIN_DIR)/iotcode/DlinkAlarm; $(JAR) $(JARFLAGS) DlinkAlarm.jar ../../iotcode/DlinkAlarm/*.class ../../iotcode/interfaces/Alarm*.class ../../iotcode/interfaces/ZoneState*.class
 
 PHONY += check-motion
 check-motion:
        $(JAVAC) $(JFLAGS) $(CHECKER_OPT) $(ASTUBS) MotionSensor/*.java
        cp MotionSensor/MotionSensor.config $(BIN_DIR)/iotcode/MotionSensor
-       cp MotionSensor/MotionSensor.tomoyo $(BIN_DIR)/iotcode/MotionSensor
        cd $(BIN_DIR)/iotcode/MotionSensor; $(JAR) $(JARFLAGS) MotionSensor.jar ../../iotcode/MotionSensor/*.class ../../iotcode/interfaces/SmartthingsSensor*.class ../../iotcode/interfaces/Camera*.class ../../IrrigationController/MotionDetection*.class
 
 PHONY += check-multipurpose
 check-multipurpose:
        $(JAVAC) $(JFLAGS) $(CHECKER_OPT) $(ASTUBS) MultipurposeSensor/*.java
        cp MultipurposeSensor/MultipurposeSensor.config $(BIN_DIR)/iotcode/MultipurposeSensor
-       cp MultipurposeSensor/MultipurposeSensor.tomoyo $(BIN_DIR)/iotcode/MultipurposeSensor
        cd $(BIN_DIR)/iotcode/MultipurposeSensor; $(JAR) $(JARFLAGS) MultipurposeSensor.jar ../../iotcode/MultipurposeSensor/*.class ../../iotcode/interfaces/SmartthingsSensor*.class ../../iotcode/interfaces/Camera*.class ../../IrrigationController/MotionDetection*.class
 
 PHONY += check-waterleak
 check-waterleak:
        $(JAVAC) $(JFLAGS) $(CHECKER_OPT) $(ASTUBS) WaterLeakSensor/*.java
        cp WaterLeakSensor/WaterLeakSensor.config $(BIN_DIR)/iotcode/WaterLeakSensor
-       cp WaterLeakSensor/WaterLeakSensor.tomoyo $(BIN_DIR)/iotcode/WaterLeakSensor
        cd $(BIN_DIR)/iotcode/WaterLeakSensor; $(JAR) $(JARFLAGS) WaterLeakSensor.jar ../../iotcode/WaterLeakSensor/*.class ../../iotcode/interfaces/SmartthingsSensor*.class ../../iotcode/interfaces/Camera*.class ../../IrrigationController/MotionDetection*.class
 
 PHONY += check-doorlock
 check-doorlock:
        $(JAVAC) $(JFLAGS) $(CHECKER_OPT) $(ASTUBS) DoorlockSensor/*.java
        cp DoorlockSensor/DoorlockSensor.config $(BIN_DIR)/iotcode/DoorlockSensor
-       cp DoorlockSensor/DoorlockSensor.tomoyo $(BIN_DIR)/iotcode/DoorlockSensor
        cd $(BIN_DIR)/iotcode/DoorlockSensor; $(JAR) $(JARFLAGS) DoorlockSensor.jar ../../iotcode/DoorlockSensor/*.class ../../iotcode/interfaces/SmartthingsSensor*.class ../../iotcode/interfaces/Camera*.class
 
 PHONY += check-doorlockactuator
 check-doorlockactuator:
        $(JAVAC) $(JFLAGS) $(CHECKER_OPT) $(ASTUBS) DoorlockActuator/*.java
        cp DoorlockActuator/DoorlockActuator.config $(BIN_DIR)/iotcode/DoorlockActuator
-       cp DoorlockActuator/DoorlockActuator.tomoyo $(BIN_DIR)/iotcode/DoorlockActuator
        cd $(BIN_DIR)/iotcode/DoorlockActuator; $(JAR) $(JARFLAGS) DoorlockActuator.jar ../../iotcode/DoorlockActuator/*.class ../../iotcode/interfaces/SmartthingsActuator*.class ../../iotcode/interfaces/Camera*.class
 
 .PHONY: $(PHONY)

diff --git a/localconfig/mysql/lifx_light_bulb.config b/localconfig/mysql/lifx_light_bulb.config
index f5a89aa6f9110ee0aa4365571ada3ff40b92f88e..eb128f20a091f9a17822850bb99928dd4b01ae79 100644 (file)
--- a/localconfig/mysql/lifx_light_bulb.config
+++ b/localconfig/mysql/lifx_light_bulb.config
@@ -3,3 +3,4 @@ LightBulb
 WHERE
 ID='LB1'
 ;
+