Fixing misunderstood config files for the phone app.

diff --git a/iotjava/Makefile b/iotjava/Makefile
index d01c96b3a2837e62d85759a7590abe74bf6581fd..94c01f6acc16a75472e8f048ad066bb46c9dc508 100644 (file)
--- a/iotjava/Makefile
+++ b/iotjava/Makefile
@@ -47,8 +47,9 @@ installer:
        $(JAVAC)  -d $(BIN_DIR) iotinstaller/*.java
        cp ../localconfig/iotruntime/MySQLInterface.config $(BIN_DIR)/iotruntime/
        cp ../localconfig/iotruntime/MySQLInterface.config $(BIN_DIR)/iotinstaller/
        $(JAVAC)  -d $(BIN_DIR) iotinstaller/*.java
        cp ../localconfig/iotruntime/MySQLInterface.config $(BIN_DIR)/iotruntime/
        cp ../localconfig/iotruntime/MySQLInterface.config $(BIN_DIR)/iotinstaller/

-       cp -r ../localconfig/SupportedDevices/ $(BIN_DIR)/iotinstaller/
-       cp ../localconfig/iotinstaller_phone_app/*.config $(BIN_DIR)/iotinstaller/
+       cp -r ../localconfig/SupportedDevices/ $(BIN_DIR)/
+       cp ../localconfig/SupportedDevices/driversList.config $(BIN_DIR)/iotinstaller/
+       cp ../localconfig/SupportedDevices/AddressInformation.config $(BIN_DIR)/iotinstaller/

 
 PHONY += runtime
 runtime:
 
 PHONY += runtime
 runtime:

diff --git a/localconfig/iotinstaller_phone_app/AddressInformation.config b/localconfig/iotinstaller_phone_app/AddressInformation.config
deleted file mode 100644 (file)
index d108b4d..0000000
--- a/localconfig/iotinstaller_phone_app/AddressInformation.config
+++ /dev/null
@@ -1,242 +0,0 @@
-NUM_OF_TYPES=14
-
-TYPE_0=SmartthingsSensorSmart
-TAG_0=ST
-SUBTYPE_0=3
-TYPE_0_0=WaterLeakSensor
-TYPE_0_0_NUM_OF_ZBADDRESSES=1
-TYPE_0_0_ZBADDRESS_FIELDS=DEVICEADDRESS 
-ZBDEVICEADDRESS_0_0_ZBADD_0=USER
-TYPE_0_0_NUM_OF_ADDRESSES=1
-TYPE_0_0_ADDRESS_FIELDS=PORTNUMBER PROTOCOL DEVICEADDRESS 
-PORTNUMBER_0_0_ADD_0=5005
-PROTOCOL_0_0_ADD_0=udp
-DEVICEADDRESS_0_0_ADD_0=USER
-TYPE_0_0_NUM_OF_DEVICE_INFO=0
-TYPE_0_1=MultipurposeSensor
-TYPE_0_1_NUM_OF_ZBADDRESSES=1
-TYPE_0_1_ZBADDRESS_FIELDS=DEVICEADDRESS 
-ZBDEVICEADDRESS_0_1_ZBADD_0=USER
-TYPE_0_1_NUM_OF_ADDRESSES=1
-TYPE_0_1_ADDRESS_FIELDS=PORTNUMBER PROTOCOL DEVICEADDRESS 
-PORTNUMBER_0_1_ADD_0=5005
-PROTOCOL_0_1_ADD_0=udp
-DEVICEADDRESS_0_1_ADD_0=USER
-TYPE_0_1_NUM_OF_DEVICE_INFO=0
-TYPE_0_2=MotionSensor
-TYPE_0_2_NUM_OF_ZBADDRESSES=1
-TYPE_0_2_ZBADDRESS_FIELDS=DEVICEADDRESS 
-ZBDEVICEADDRESS_0_2_ZBADD_0=USER
-TYPE_0_2_NUM_OF_ADDRESSES=1
-TYPE_0_2_ADDRESS_FIELDS=PORTNUMBER PROTOCOL DEVICEADDRESS 
-PORTNUMBER_0_2_ADD_0=5005
-PROTOCOL_0_2_ADD_0=udp
-DEVICEADDRESS_0_2_ADD_0=USER
-TYPE_0_2_NUM_OF_DEVICE_INFO=0
-
-TYPE_1=SpeakerSmart
-TAG_1=SK
-SUBTYPE_1=1
-TYPE_1_0=IHome
-TYPE_1_0_NUM_OF_ZBADDRESSES=0
-TYPE_1_0_NUM_OF_ADDRESSES=5
-TYPE_1_0_ADDRESS_FIELDS=PORTNUMBER PROTOCOL DEVICEADDRESS SOURCEWILDCARD DESTWILDCARD 
-PORTNUMBER_1_0_ADD_0=1024
-PROTOCOL_1_0_ADD_0=tcp
-DEVICEADDRESS_1_0_ADD_0=USER
-SOURCEWILDCARD_1_0_ADD_0=false
-DESTWILDCARD_1_0_ADD_0=false
-PORTNUMBER_1_0_ADD_1=-1
-PROTOCOL_1_0_ADD_1=nopro
-DEVICEADDRESS_1_0_ADD_1=00:00:00:00:00:00
-SOURCEWILDCARD_1_0_ADD_1=false
-DESTWILDCARD_1_0_ADD_1=false
-PORTNUMBER_1_0_ADD_2=-1
-PROTOCOL_1_0_ADD_2=udp
-DEVICEADDRESS_1_0_ADD_2=USER
-SOURCEWILDCARD_1_0_ADD_2=false
-DESTWILDCARD_1_0_ADD_2=true
-PORTNUMBER_1_0_ADD_3=-1
-PROTOCOL_1_0_ADD_3=udp
-DEVICEADDRESS_1_0_ADD_3=USER
-SOURCEWILDCARD_1_0_ADD_3=false
-DESTWILDCARD_1_0_ADD_3=true
-PORTNUMBER_1_0_ADD_4=-1
-PROTOCOL_1_0_ADD_4=udp
-DEVICEADDRESS_1_0_ADD_4=USER
-SOURCEWILDCARD_1_0_ADD_4=false
-DESTWILDCARD_1_0_ADD_4=true
-TYPE_1_0_NUM_OF_DEVICE_INFO=0
-
-TYPE_2=LightBulbSmart
-TAG_2=LB
-SUBTYPE_2=1
-TYPE_2_0=LifxLightBulb
-TYPE_2_0_NUM_OF_ZBADDRESSES=0
-TYPE_2_0_NUM_OF_ADDRESSES=1
-TYPE_2_0_ADDRESS_FIELDS=PORTNUMBER PROTOCOL DEVICEADDRESS 
-PORTNUMBER_2_0_ADD_0=56700
-PROTOCOL_2_0_ADD_0=udp
-DEVICEADDRESS_2_0_ADD_0=USER
-TYPE_2_0_NUM_OF_DEVICE_INFO=0
-
-TYPE_3=RoomSmart
-TAG_3=RM
-SUBTYPE_3=3
-TYPE_3_0=LabRoom
-TYPE_3_0_NUM_OF_ZBADDRESSES=0
-TYPE_3_0_NUM_OF_ADDRESSES=0
-TYPE_3_0_NUM_OF_DEVICE_INFO=0
-TYPE_3_1=HomeRoom
-TYPE_3_1_NUM_OF_ZBADDRESSES=0
-TYPE_3_1_NUM_OF_ADDRESSES=0
-TYPE_3_1_NUM_OF_DEVICE_INFO=1
-TYPE_3_1_DEVICE_FIELDS=ROOMID 
-ROOMID_3_1=USER
-TYPE_3_2=AudioRoom
-TYPE_3_2_NUM_OF_ZBADDRESSES=0
-TYPE_3_2_NUM_OF_ADDRESSES=0
-TYPE_3_2_NUM_OF_DEVICE_INFO=1
-TYPE_3_2_DEVICE_FIELDS=ROOMID 
-ROOMID_3_2=USER
-
-TYPE_4=LightBulbTest
-TAG_4=LB
-SUBTYPE_4=1
-TYPE_4_0=LifxLightBulb
-TYPE_4_0_NUM_OF_ZBADDRESSES=0
-TYPE_4_0_NUM_OF_ADDRESSES=1
-TYPE_4_0_ADDRESS_FIELDS=PORTNUMBER PROTOCOL DEVICEADDRESS 
-PORTNUMBER_4_0_ADD_0=56700
-PROTOCOL_4_0_ADD_0=udp
-DEVICEADDRESS_4_0_ADD_0=USER
-TYPE_4_0_NUM_OF_DEVICE_INFO=0
-
-TYPE_5=SprinklerSmart
-TAG_5=SP
-SUBTYPE_5=2
-TYPE_5_0=EspSprinkler
-TYPE_5_0_NUM_OF_ZBADDRESSES=0
-TYPE_5_0_NUM_OF_ADDRESSES=1
-TYPE_5_0_ADDRESS_FIELDS=PORTNUMBER PROTOCOL DEVICEADDRESS 
-PORTNUMBER_5_0_ADD_0=5556
-PROTOCOL_5_0_ADD_0=udp
-DEVICEADDRESS_5_0_ADD_0=USER
-TYPE_5_0_NUM_OF_DEVICE_INFO=0
-TYPE_5_1=BlossomSprinkler
-TYPE_5_1_NUM_OF_ZBADDRESSES=0
-TYPE_5_1_NUM_OF_ADDRESSES=2
-TYPE_5_1_ADDRESS_FIELDS=PORTNUMBER PROTOCOL DEVICEADDRESS 
-PORTNUMBER_5_1_ADD_0=80
-PROTOCOL_5_1_ADD_0=tcpgw
-DEVICEADDRESS_5_1_ADD_0=USER
-PORTNUMBER_5_1_ADD_1=80
-PROTOCOL_5_1_ADD_1=nopro
-DEVICEADDRESS_5_1_ADD_1=00:00:00:00:00:00
-TYPE_5_1_NUM_OF_DEVICE_INFO=1
-TYPE_5_1_DEVICE_FIELDS=CHANNELID 
-CHANNELID_5_1=USER
-
-TYPE_6=GPSGatewaySmart
-TAG_6=GG
-SUBTYPE_6=1
-TYPE_6_0=GPSPhoneGateway
-TYPE_6_0_NUM_OF_ZBADDRESSES=0
-TYPE_6_0_NUM_OF_ADDRESSES=1
-TYPE_6_0_ADDRESS_FIELDS=PORTNUMBER PROTOCOL DEVICEADDRESS 
-PORTNUMBER_6_0_ADD_0=8000
-PROTOCOL_6_0_ADD_0=tcpgw
-DEVICEADDRESS_6_0_ADD_0=USER
-TYPE_6_0_NUM_OF_DEVICE_INFO=0
-
-TYPE_7=MoistureSensorSmart
-TAG_7=SS
-SUBTYPE_7=1
-TYPE_7_0=SpruceSensor
-TYPE_7_0_NUM_OF_ZBADDRESSES=1
-TYPE_7_0_ZBADDRESS_FIELDS=DEVICEADDRESS 
-ZBDEVICEADDRESS_7_0_ZBADD_0=USER
-TYPE_7_0_NUM_OF_ADDRESSES=1
-TYPE_7_0_ADDRESS_FIELDS=PORTNUMBER PROTOCOL DEVICEADDRESS 
-PORTNUMBER_7_0_ADD_0=5005
-PROTOCOL_7_0_ADD_0=udp
-DEVICEADDRESS_7_0_ADD_0=USER
-TYPE_7_0_NUM_OF_DEVICE_INFO=0
-
-TYPE_8=IoTAddress
-TAG_8=CL
-SUBTYPE_8=2
-TYPE_8_0=IoTCloudServerDC6
-TYPE_8_0_NUM_OF_ZBADDRESSES=0
-TYPE_8_0_NUM_OF_ADDRESSES=0
-TYPE_8_0_NUM_OF_DEVICE_INFO=1
-TYPE_8_0_DEVICE_FIELDS=ADDRESS 
-ADDRESS_8_0=USER
-TYPE_8_1=WeatherForecastAdd
-TYPE_8_1_NUM_OF_ZBADDRESSES=0
-TYPE_8_1_NUM_OF_ADDRESSES=0
-TYPE_8_1_NUM_OF_DEVICE_INFO=1
-TYPE_8_1_DEVICE_FIELDS=ADDRESS 
-ADDRESS_8_1=USER
-
-TYPE_9=AlarmSmart
-TAG_9=AL
-SUBTYPE_9=1
-TYPE_9_0=EspAlarm
-TYPE_9_0_NUM_OF_ZBADDRESSES=0
-TYPE_9_0_NUM_OF_ADDRESSES=1
-TYPE_9_0_ADDRESS_FIELDS=PORTNUMBER PROTOCOL DEVICEADDRESS 
-PORTNUMBER_9_0_ADD_0=5556
-PROTOCOL_9_0_ADD_0=udp
-DEVICEADDRESS_9_0_ADD_0=USER
-TYPE_9_0_NUM_OF_DEVICE_INFO=0
-
-TYPE_10=WeatherGatewaySmart
-TAG_10=GW
-SUBTYPE_10=1
-TYPE_10_0=WeatherPhoneGateway
-TYPE_10_0_NUM_OF_ZBADDRESSES=0
-TYPE_10_0_NUM_OF_ADDRESSES=1
-TYPE_10_0_ADDRESS_FIELDS=PORTNUMBER PROTOCOL DEVICEADDRESS 
-PORTNUMBER_10_0_ADD_0=8000
-PROTOCOL_10_0_ADD_0=tcpgw
-DEVICEADDRESS_10_0_ADD_0=USER
-TYPE_10_0_NUM_OF_DEVICE_INFO=0
-
-TYPE_11=SmartthingsActuatorSmart
-TAG_11=DR
-SUBTYPE_11=1
-TYPE_11_0=DoorlockActuator
-TYPE_11_0_NUM_OF_ZBADDRESSES=1
-TYPE_11_0_ZBADDRESS_FIELDS=DEVICEADDRESS 
-ZBDEVICEADDRESS_11_0_ZBADD_0=USER
-TYPE_11_0_NUM_OF_ADDRESSES=1
-TYPE_11_0_ADDRESS_FIELDS=PORTNUMBER PROTOCOL DEVICEADDRESS 
-PORTNUMBER_11_0_ADD_0=5005
-PROTOCOL_11_0_ADD_0=udp
-DEVICEADDRESS_11_0_ADD_0=USER
-TYPE_11_0_NUM_OF_DEVICE_INFO=0
-
-TYPE_12=CameraSmart
-TAG_12=CM
-SUBTYPE_12=1
-TYPE_12_0=AmcrestCamera
-TYPE_12_0_NUM_OF_ZBADDRESSES=0
-TYPE_12_0_NUM_OF_ADDRESSES=1
-TYPE_12_0_ADDRESS_FIELDS=PORTNUMBER PROTOCOL DEVICEADDRESS 
-PORTNUMBER_12_0_ADD_0=8
-PROTOCOL_12_0_ADD_0=utp
-DEVICEADDRESS_12_0_ADD_0=USER
-TYPE_12_0_NUM_OF_DEVICE_INFO=2
-TYPE_12_0_DEVICE_FIELDS=PASSWORD USERNAME 
-PASSWORD_12_0=USER
-USERNAME_12_0=USER
-
-TYPE_13=LawnSmart
-TAG_13=LW
-SUBTYPE_13=1
-TYPE_13_0=GreenLawn
-TYPE_13_0_NUM_OF_ZBADDRESSES=0
-TYPE_13_0_NUM_OF_ADDRESSES=0
-TYPE_13_0_NUM_OF_DEVICE_INFO=0
-

diff --git a/localconfig/iotinstaller_phone_app/IDSubtypeInformation.config b/localconfig/iotinstaller_phone_app/IDSubtypeInformation.config
deleted file mode 100644 (file)
index fbe268f..0000000
--- a/localconfig/iotinstaller_phone_app/IDSubtypeInformation.config
+++ /dev/null
@@ -1,77 +0,0 @@
-AmcrestCamera CM1
-AmcrestCamera CM2
-AmcrestCamera CM5
-AmcrestCamera CM6
-AmcrestCamera CM3
-AmcrestCamera CM4
-AmcrestCamera CM7
-
-LifxLightBulb LB1
-LifxLightBulb LB2
-LifxLightBulb LB1
-
-IHome SK1
-IHome SK2
-
-WeatherPhoneGateway GW1
-
-GPSPhoneGateway GG1
-
-EspAlarm AL1
-EspAlarm AL2
-EspAlarm AL3
-EspAlarm AL4
-EspAlarm AL5
-EspAlarm AL6
-EspAlarm AL7
-EspAlarm AL8
-EspAlarm AL9
-EspAlarm AL10
-EspAlarm AL11
-EspAlarm AL12
-EspAlarm AL13
-EspAlarm AL14
-EspAlarm AL15
-EspAlarm AL16
-EspAlarm AL17
-EspAlarm AL18
-EspAlarm AL19
-EspAlarm AL20
-EspAlarm AL21
-EspAlarm AL22
-EspAlarm AL23
-EspAlarm AL24
-EspAlarm AL25
-
-SpruceSensor SS1
-SpruceSensor SS2
-
-MotionSensor ST1
-WaterLeakSensor ST2
-MultipurposeSensor ST3
-MotionSensor ST2
-
-DoorlockActuator DR1
-
-EspSprinkler SP1
-BlossomSprinkler SP1
-BlossomSprinkler SP3
-
-LabRoom RM2
-AudioRoom RM3
-HomeRoom RM5
-HomeRoom RM6
-LabRoom RM3
-AudioRoom RM1
-LabRoom RM1
-
-GreenLawn LW1
-GreenLawn LW2
-
-WeatherForecastAdd WF1
-WeatherForecastAdd WF2
-IoTCloudServerDC6 CL1
-
-LifxLightBulb LB1
-LifxLightBulb LB2
-

diff --git a/localconfig/iotinstaller_phone_app/IoTDeviceAddress.config b/localconfig/iotinstaller_phone_app/IoTDeviceAddress.config
deleted file mode 100644 (file)
index f36dfae..0000000
--- a/localconfig/iotinstaller_phone_app/IoTDeviceAddress.config
+++ /dev/null
@@ -1,74 +0,0 @@
-START
-IoTDeviceAddress
-LifxLightBulbAdd LB1
-LifxLightBulbAdd LB2
-EspSprinklerAdd SP1
-SpruceSensorAdd SS1
-WeatherPhoneGatewayAdd GW1
-GPSPhoneGatewayAdd GG1
-IHomeAdd1 SK1
-IHomeAdd2 SK1
-IHomeAdd3 SK1
-IHomeAdd4 SK1
-IHomeAdd5 SK1
-IHomeAdd1 SK2
-IHomeAdd2 SK2
-IHomeAdd3 SK2
-IHomeAdd4 SK2
-IHomeAdd5 SK2
-EspAlarmAdd AL1
-MotionSensorAdd ST1
-WaterLeakSensorAdd ST2
-MultipurposeSensorAdd ST3
-DoorlockActuatorAdd DR1
-AmcrestCameraAdd CM1
-AmcrestCameraAdd CM2
-AmcrestCameraAdd CM5
-BlossomSprinklerAdd1 SP1
-BlossomSprinklerAdd1 SP1
-BlossomSprinklerAdd1 SP3
-BlossomSprinklerAdd2 SP3
-MotionSensorAdd ST2
-AmcrestCameraAdd CM6
-AmcrestCameraAdd CM3
-EspAlarmAdd AL2
-AmcrestCameraAdd CM4
-AmcrestCameraAdd CM7
-LifxLightBulbAdd LB1
-SpruceSensorAdd SS2
-EspAlarmAdd AL3
-EspAlarmAdd AL4
-EspAlarmAdd AL5
-EspAlarmAdd AL6
-EspAlarmAdd AL7
-EspAlarmAdd AL8
-EspAlarmAdd AL9
-EspAlarmAdd AL10
-EspAlarmAdd AL11
-EspAlarmAdd AL12
-EspAlarmAdd AL13
-EspAlarmAdd AL14
-EspAlarmAdd AL15
-EspAlarmAdd AL16
-EspAlarmAdd AL17
-EspAlarmAdd AL18
-EspAlarmAdd AL19
-EspAlarmAdd AL20
-EspAlarmAdd AL21
-EspAlarmAdd AL22
-EspAlarmAdd AL23
-EspAlarmAdd AL24
-EspAlarmAdd AL25
-END
-
-START
-IoTZigbeeAddress
-SpruceSensorZBAdd SS1
-MotionSensorZBAdd ST1
-WaterLeakSensorZBAdd ST2
-MultipurposeSensorZBAdd ST3
-DoorlockActuatorZBAdd DR1
-MotionSensorZBAdd ST2
-SpruceSensorZBAdd SS2
-END
-

diff --git a/localconfig/iotinstaller_phone_app/SetList.config b/localconfig/iotinstaller_phone_app/SetList.config
deleted file mode 100644 (file)
index 0eb6e0e..0000000
--- a/localconfig/iotinstaller_phone_app/SetList.config
+++ /dev/null
@@ -1,120 +0,0 @@
-START
-SmartthingsSensorSmart
-MotionSensor ST1
-WaterLeakSensor ST2
-MultipurposeSensor ST3
-MotionSensor ST2
-END
-
-START
-SpeakerSmart
-IHome SK1
-IHome SK2
-END
-
-START
-LightBulbSmart
-LifxLightBulb LB1
-LifxLightBulb LB2
-LifxLightBulb LB1
-END
-
-START
-RoomSmart
-LabRoom RM2
-AudioRoom RM3
-HomeRoom RM5
-HomeRoom RM6
-LabRoom RM3
-AudioRoom RM1
-LabRoom RM1
-END
-
-START
-LightBulbTest
-LifxLightBulb LB1
-LifxLightBulb LB2
-LifxLightBulb LB1
-END
-
-START
-SprinklerSmart
-EspSprinkler SP1
-BlossomSprinkler SP1
-BlossomSprinkler SP3
-END
-
-START
-GPSGatewaySmart
-GPSPhoneGateway GG1
-END
-
-START
-MoistureSensorSmart
-SpruceSensor SS1
-SpruceSensor SS2
-END
-
-START
-IoTAddress
-WeatherForecastAdd WF1
-WeatherForecastAdd WF2
-IoTCloudServerDC6 CL1
-END
-
-START
-AlarmSmart
-EspAlarm AL1
-EspAlarm AL2
-EspAlarm AL3
-EspAlarm AL4
-EspAlarm AL5
-EspAlarm AL6
-EspAlarm AL7
-EspAlarm AL8
-EspAlarm AL9
-EspAlarm AL10
-EspAlarm AL11
-EspAlarm AL12
-EspAlarm AL13
-EspAlarm AL14
-EspAlarm AL15
-EspAlarm AL16
-EspAlarm AL17
-EspAlarm AL18
-EspAlarm AL19
-EspAlarm AL20
-EspAlarm AL21
-EspAlarm AL22
-EspAlarm AL23
-EspAlarm AL24
-EspAlarm AL25
-END
-
-START
-WeatherGatewaySmart
-WeatherPhoneGateway GW1
-END
-
-START
-SmartthingsActuatorSmart
-DoorlockActuator DR1
-END
-
-START
-CameraSmart
-AmcrestCamera CM1
-AmcrestCamera CM2
-AmcrestCamera CM5
-AmcrestCamera CM6
-AmcrestCamera CM3
-AmcrestCamera CM4
-AmcrestCamera CM7
-END
-
-START
-LawnSmart
-GreenLawn LW1
-GreenLawn LW2
-END
-