diff --git a/bin/.gitignore b/bin/.gitignore deleted file mode 100644 index 6217ab2..0000000 --- a/bin/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -/UML.cld -/Use_Cases.ucd -/main/ -/networking/ -/server/ -/testing/ -/thermostat/ -/user_interface/ diff --git a/bin/UML.cld b/bin/UML.cld new file mode 100644 index 0000000..e39ee6c --- /dev/null +++ b/bin/UML.cld @@ -0,0 +1,2079 @@ + + + + 255 + 255 + 206 + + + 0 + 0 + 0 + + true + + + + + 2 + + + + + + + + + + + true + + + + + + 2 + + + + + + -1 + -1 + 351 + 6 + + + + + true + + + + + 2 + + + + + + + + true + + + + + + 2 + + + + + + -1 + -1 + 732 + 52 + + + + + + + + + + true + + + + + + 2 + + + + + + + thermostatList ArrayList<Thermostat> + false + + + + + true + + + + + + 2 + + + + + + accountList + ArrayList<Account> + false + + + + + true + + + + + + 2 + + + + + + login + void + + + String email + int + + + String password + int + + + false + false + + + + + true + + + + + + 2 + + + + + + getThermostatListForAccount + ArrayList<Thermostat> + + false + false + + + + + true + + + + + + 2 + + + + + + setUserAccess + void + + + Account account + int + + + Thermostat thermostat + int + + + false + false + + + + + + _stereo_type + Stereo Type + false + + + _simpleEntityName + Simple Name + false + + + _entityName + Name + false + + + _background + Background Color + false + + + _attrs + Attributes... + false + + + _operations + Operations... + false + + + _abstract + abstract + false + + + + Server + false + + + + + + + + + + true + + + + + + 2 + + + + + + receiveCurrentTempPORT + int + false + + + + + true + + + + + + 2 + + + + + + receiveCurrentTemp + void + + false + false + + + + + true + + + + + + 2 + + + + + + receiveDesiredTemp + void + + false + false + + + + + true + + + + + + 2 + + + + + + sendCurrentTemp + void + + false + false + + + + + true + + + + + + 2 + + + + + + sendDesiredTemp + void + + false + false + + + + + true + + + + + + 2 + + + + + + receiveDesiredTempPORT + int + false + + + + + true + + + + + + 2 + + + + + + sendCurrentTempPORT + int + false + + + + + true + + + + + + 2 + + + + + + sendDesiredTempPORT + int + false + + + + + + _stereo_type + Stereo Type + false + + + _simpleEntityName + Simple Name + false + + + _entityName + Name + false + + + _background + Background Color + false + + + _attrs + Attributes... + false + + + _operations + Operations... + false + + + + Network + + + + + true + + + + + + 2 + + + + + + -1 + -1 + 472 + 292 + + + + true + + + + + 2 + + + + + + + + + true + + + + + + 2 + + + + + + -1 + -1 + 261 + 417 + + + + true + + + + + 2 + + + + + + + + + true + + + + + + 2 + + + + + + -1 + -1 + 13 + 316 + + + + + + + + + + true + + + + + + 2 + + + + + + sensorUpdateEvent + void + + + sensor + Sensorable + + + false + false + + + + + + _stereo_type + Stereo Type + false + + + _simpleEntityName + Simple Name + false + + + _entityName + Name + false + + + _background + Background Color + false + + + _attrs + Attributes... + false + + + _operations + Operations... + false + + + + thermostat.Deviceable + + + + + + + true + + + + + 2 + + + + + + + + true + + + + + + 2 + + + + + + -1 + -1 + 409 + 690 + + + + + true + + + + + 2 + + + + + + + + + + + + + true + + + + + 2 + + + + + + + + + + + + + true + + + + + 2 + + + + + + + + + + + + + true + + + + + 2 + + + + + + + + + + + + + true + + + + + 2 + + + + + + + + + + + + + true + + + + + 2 + + + + + + + + + + + + + true + + + + + 2 + + + + + + + + + + + + + + + true + + + + + 2 + + + + + + + + true + + + + + + 2 + + + + + + -1 + -1 + 33 + 661 + + + + + true + + + + + 2 + + + + + + + + + + true + + + + + 2 + + + + + + + + + + true + + + + + 2 + + + + + + + + + + true + + + + + 2 + + + + + + + + + + true + + + + + 2 + + + + + + + + + + true + + + + + 2 + + + + + + + + + + true + + + + + 2 + + + + + + + + + + true + + + + + 2 + + + + + + + + + + + + + + + true + + + + + + 2 + + + + + + owner + Device + false + + + + + true + + + + + + 2 + + + + + + TemperatureSensor + void + + + owner + Device + + + false + false + + + + + true + + + + + + 2 + + + + + + getValue + DataObject + + false + false + + + + + true + + + + + + 2 + + + + + + newDataEvent + void + + false + false + + + + + true + + + + + + 2 + + + + + + generateFakeTemperature + DataObject<Integer> + + false + false + + + + + + _stereo_type + Stereo Type + false + + + _simpleEntityName + Simple Name + false + + + _entityName + Name + false + + + _background + Background Color + false + + + _attrs + Attributes... + false + + + _operations + Operations... + false + + + _abstract + abstract + false + + + + thermostat.TemperatureSensor + false + + + + + + + + + + + + + + + + + + true + + + + + + 2 + + + + + + getValue + DataObject + + false + false + + + + + true + + + + + + 2 + + + + + + newDataEvent + void + + false + false + + + + + + _stereo_type + Stereo Type + false + + + _simpleEntityName + Simple Name + false + + + _entityName + Name + false + + + _background + Background Color + false + + + _attrs + Attributes... + false + + + _operations + Operations... + false + + + + thermostat.Sensorable + + + + + + + + + + + true + + + + + 2 + + + + + + + + + + + + + + true + + + + + 2 + + + + + + + + + + + + + + true + + + + + 2 + + + + + + + + + + + + + + true + + + + + 2 + + + + + + + + + + + + + + true + + + + + 2 + + + + + + + + + + + + + + true + + + + + 2 + + + + + + + + + + + + + + true + + + + + 2 + + + + + + + + + + + + + + + + + true + + + + + + 2 + + + + + + sensorList + List<Sensorable> + false + + + + + true + + + + + + 2 + + + + + + actuatorList + List<Actuatorable> + false + + + + + true + + + + + + 2 + + + + + + ThermostatDevice + void + + false + false + + + + + true + + + + + + 2 + + + + + + sensorUpdateEvent + void + + + sensor + Sensorable + + + false + false + + + + + + _stereo_type + Stereo Type + false + + + _simpleEntityName + Simple Name + false + + + _entityName + Name + false + + + _background + Background Color + false + + + _attrs + Attributes... + false + + + _operations + Operations... + false + + + _abstract + abstract + false + + + + thermostat.ThermostatDevice + false + + + + + + + + + + + + + + + + + true + + + + + 2 + + + + + + + + true + + + + + + 2 + + + + + + -1 + -1 + 615 + 509 + + + + + true + + + + + 2 + + + + + + + + + + + + + + + true + + + + + + 2 + + + + + + gpio + GpioController + false + + + + + true + + + + + + 2 + + + + + + temperatureCoolControlActuator + GpioPinDigitalOutput + false + + + + + true + + + + + + 2 + + + + + + temperatureHeatControlActuator + GpioPinDigitalOutput + false + + + + + true + + + + + + 2 + + + + + + TemperatureActuator + void + + false + false + + + + + true + + + + + + 2 + + + + + + setActuatorPowerPercentage + void + + + percentage + DataObject<Float> + + + false + false + + + + + true + + + + + + 2 + + + + + + setActuatorValue + void + + + value + DataObject<Float> + + + false + false + + + + + true + + + + + + 2 + + + + + + enterCoolingMode + void + + false + false + + + + + true + + + + + + 2 + + + + + + enterHeatingMode + void + + false + false + + + + + + _stereo_type + Stereo Type + false + + + _simpleEntityName + Simple Name + false + + + _entityName + Name + false + + + _background + Background Color + false + + + _attrs + Attributes... + false + + + _operations + Operations... + false + + + _abstract + abstract + false + + + + thermostat.TemperatureActuator + false + + + + + + + + + + + true + + + + + + 2 + + + + + + setActuatorPowerPercentage + void + + + percentage + DataObject<Float> + + + false + false + + + + + true + + + + + + 2 + + + + + + setActuatorValue + void + + + value + DataObject<Float> + + + false + false + + + + + + _stereo_type + Stereo Type + false + + + _simpleEntityName + Simple Name + false + + + _entityName + Name + false + + + _background + Background Color + false + + + _attrs + Attributes... + false + + + _operations + Operations... + false + + + + thermostat.Actuatorable + + + + + true + + + + + + 2 + + + + + + -1 + -1 + 37 + 152 + + + + + + + + true + + + + + + 2 + + + + + + value + T + false + + + + + true + + + + + + 2 + + + + + + DataObject + void + + + intialValue + T + + + false + false + + + + + true + + + + + + 2 + + + + + + setValue + void + + + value + T + + + false + false + + + + + true + + + + + + 2 + + + + + + getValue + T + + false + false + + + + + + _stereo_type + Stereo Type + false + + + _simpleEntityName + Simple Name + false + + + _entityName + Name + false + + + _background + Background Color + false + + + _attrs + Attributes... + false + + + _operations + Operations... + false + + + _abstract + abstract + false + + + + thermostat.DataObject<T> + false + + + + + + + + + true + + + + + + 2 + + + + + + -1 + -1 + 342 + 110 + + + + + + + + true + + + + + + 2 + + + + + + getValue + DataObject + + false + false + + + + + true + + + + + + 2 + + + + + + newDataEvent + void + + false + false + + + + + + _stereo_type + Stereo Type + false + + + _simpleEntityName + Simple Name + false + + + _entityName + Name + false + + + _background + Background Color + false + + + _attrs + Attributes... + false + + + _operations + Operations... + false + + + + thermostat.Sensorable + + + + + + \ No newline at end of file diff --git a/bin/main/Main.class b/bin/main/Main.class index 680d226..430c2ba 100644 Binary files a/bin/main/Main.class and b/bin/main/Main.class differ diff --git a/bin/networking/networking.class b/bin/networking/networking.class index f449552..89d986a 100644 Binary files a/bin/networking/networking.class and b/bin/networking/networking.class differ diff --git a/bin/server/server.class b/bin/server/server.class index 2cfaaba..581270c 100644 Binary files a/bin/server/server.class and b/bin/server/server.class differ diff --git a/bin/testing/JUnit_Test_Example.class b/bin/testing/JUnit_Test_Example.class index fb8834f..83428dd 100644 Binary files a/bin/testing/JUnit_Test_Example.class and b/bin/testing/JUnit_Test_Example.class differ diff --git a/bin/testing/Networking_Test.class b/bin/testing/Networking_Test.class index 1a6c010..536b4d6 100644 Binary files a/bin/testing/Networking_Test.class and b/bin/testing/Networking_Test.class differ diff --git a/bin/testing/ThermostatTest.class b/bin/testing/ThermostatTest.class new file mode 100644 index 0000000..1c1ab69 Binary files /dev/null and b/bin/testing/ThermostatTest.class differ diff --git a/bin/thermostat/Actuatorable.class b/bin/thermostat/Actuatorable.class new file mode 100644 index 0000000..7946ceb Binary files /dev/null and b/bin/thermostat/Actuatorable.class differ diff --git a/bin/thermostat/DataObject.class b/bin/thermostat/DataObject.class new file mode 100644 index 0000000..24b4186 Binary files /dev/null and b/bin/thermostat/DataObject.class differ diff --git a/bin/thermostat/Deviceable.class b/bin/thermostat/Deviceable.class new file mode 100644 index 0000000..20bc31a Binary files /dev/null and b/bin/thermostat/Deviceable.class differ diff --git a/bin/thermostat/Sensorable.class b/bin/thermostat/Sensorable.class new file mode 100644 index 0000000..eb0dd27 Binary files /dev/null and b/bin/thermostat/Sensorable.class differ diff --git a/bin/thermostat/TemperatureActuator.class b/bin/thermostat/TemperatureActuator.class new file mode 100644 index 0000000..c876a2a Binary files /dev/null and b/bin/thermostat/TemperatureActuator.class differ diff --git a/bin/thermostat/TemperatureSensor.class b/bin/thermostat/TemperatureSensor.class new file mode 100644 index 0000000..3eb29fd Binary files /dev/null and b/bin/thermostat/TemperatureSensor.class differ diff --git a/bin/thermostat/ThermostatDevice.class b/bin/thermostat/ThermostatDevice.class new file mode 100644 index 0000000..ef5be94 Binary files /dev/null and b/bin/thermostat/ThermostatDevice.class differ diff --git a/bin/user_interface/user_interface.class b/bin/user_interface/user_interface.class index d785b01..f29c833 100644 Binary files a/bin/user_interface/user_interface.class and b/bin/user_interface/user_interface.class differ diff --git a/src/networking/networking.java b/src/networking/networking.java index c5de9e2..0649a82 100644 --- a/src/networking/networking.java +++ b/src/networking/networking.java @@ -123,7 +123,7 @@ public static void sendDesiredTemp(int desiredTemperature, // on the network, and updates the IP addresses accordingly // for the server and the thermostat public static void monitorServerIP() { - + } public static void monitorThermostatIP() {