diff --git a/README.md b/README.md index 620d3e4..e805225 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ _Language versions:_\ -[![EN](https://github.com/rjaros87/pm-station-usb/raw/master/www/flags/lang-US.png)](https://github.com/rjaros87/pm-station-usb) -[![PL](https://github.com/rjaros87/pm-station-usb/raw/master/www/flags/lang-PL.png)](https://translate.googleusercontent.com/translate_c?sl=en&tl=pl&u=https://github.com/rjaros87/pm-station-usb) -[![DE](https://github.com/rjaros87/pm-station-usb/raw/master/www/flags/lang-DE.png)](https://translate.googleusercontent.com/translate_c?sl=en&tl=de&u=https://github.com/rjaros87/pm-station-usb) +[![EN](https://github.com/rjaros87/pm-home-station/raw/master/www/flags/lang-US.png)](https://github.com/rjaros87/pm-home-station) +[![PL](https://github.com/rjaros87/pm-home-station/raw/master/www/flags/lang-PL.png)](https://translate.googleusercontent.com/translate_c?sl=en&tl=pl&u=https://github.com/rjaros87/pm-home-station) +[![DE](https://github.com/rjaros87/pm-home-station/raw/master/www/flags/lang-DE.png)](https://translate.googleusercontent.com/translate_c?sl=en&tl=de&u=https://github.com/rjaros87/pm-home-station) # Home use particulate matter sensor on USB @@ -71,6 +71,18 @@ Suggested printing parameters: > Caution! Make sure the soldered ends of the USB-UART pins (at the bottom of the adapter) are properly insulated from the sensor's metal case! Some adapters have them so long that they become too close to the sensor and may short-circuit the adapter. It's best to sand them off and use insulation tape. +## Assembly photos + +The photo gallery of assembly can be found [here](https://rjaros87.github.io/pm-home-station-project/assembly/index.html "Assembly of pm-station-usb") and [here](https://rjaros87.github.io/pm-home-station-project/assembly-bt/index.html "Assembly of pm-station-usb over Bluetooth") for Bluetooth version. + +## Enclosure photos + +The photo gallery of assembled device in 3d printed enclosure can be found [here](https://rjaros87.github.io/pm-home-station-project/enclosure/index.html "3d printed enclosure of pm-station-usb"). + +## App Screenshots + +The app screenshots gallery can be found [here](https://rjaros87.github.io/pm-home-station-project/screenshots/index.html "App screenshots of pm-station-usb apps"). + ## Tested platforms - Android APK @@ -123,7 +135,7 @@ Suggested printing parameters: ## TODOs -- [Release 1.0.0](https://github.com/rjaros87/pm-station-usb/projects/1) +- [Release 1.0.0](https://github.com/rjaros87/pm-home-station/projects/1) ## Disclaimer diff --git a/core/src/main/java/pmstation/core/plantower/IPlanTowerObserver.java b/core/src/main/java/pmstation/core/plantower/IPlanTowerObserver.java index e72d9c9..df8aacc 100644 --- a/core/src/main/java/pmstation/core/plantower/IPlanTowerObserver.java +++ b/core/src/main/java/pmstation/core/plantower/IPlanTowerObserver.java @@ -1,6 +1,6 @@ /* - * pm-station-usb - * 2017 (C) Copyright - https://github.com/rjaros87/pm-station-usb + * pm-home-station + * 2017 (C) Copyright - https://github.com/rjaros87/pm-home-station * License: GPL 3.0 */ package pmstation.core.plantower; diff --git a/desktop/src/main/java/pmstation/Start.java b/desktop/src/main/java/pmstation/Start.java index 2d0ea5a..accc26c 100644 --- a/desktop/src/main/java/pmstation/Start.java +++ b/desktop/src/main/java/pmstation/Start.java @@ -1,6 +1,6 @@ /* - * pm-station-usb - * 2017 (C) Copyright - https://github.com/rjaros87/pm-station-usb + * pm-home-station + * 2017 (C) Copyright - https://github.com/rjaros87/pm-home-station * License: GPL 3.0 */ @@ -39,7 +39,7 @@ public static void main(String[] args) { } else if (line.hasOption("version")) { System.out.println("version: " + Constants.VERSION); } else { - logger.info("Starting pm-station-usb ({} v.{})...", Constants.PROJECT_URL, Constants.VERSION); + logger.info("Starting pm-home-station ({} v.{})...", Constants.PROJECT_URL, Constants.VERSION); setLookAndFeel(); PlanTowerSensor planTowerSensor = new PlanTowerSensor(); Station station = new Station(planTowerSensor); diff --git a/desktop/src/main/java/pmstation/Station.java b/desktop/src/main/java/pmstation/Station.java index 1c0ac97..80cae02 100644 --- a/desktop/src/main/java/pmstation/Station.java +++ b/desktop/src/main/java/pmstation/Station.java @@ -1,6 +1,6 @@ /* - * pm-station-usb - * 2017 (C) Copyright - https://github.com/rjaros87/pm-station-usb + * pm-home-station + * 2017 (C) Copyright - https://github.com/rjaros87/pm-home-station * License: GPL 3.0 */ diff --git a/desktop/src/main/java/pmstation/configuration/Config.java b/desktop/src/main/java/pmstation/configuration/Config.java index 6e2e93e..80981ff 100644 --- a/desktop/src/main/java/pmstation/configuration/Config.java +++ b/desktop/src/main/java/pmstation/configuration/Config.java @@ -1,6 +1,6 @@ /* - * pm-station-usb - * 2017 (C) Copyright - https://github.com/rjaros87/pm-station-usb + * pm-home-station + * 2017 (C) Copyright - https://github.com/rjaros87/pm-home-station * License: GPL 3.0 */ package pmstation.configuration; diff --git a/desktop/src/main/java/pmstation/configuration/Constants.java b/desktop/src/main/java/pmstation/configuration/Constants.java index 3d73c13..64918b4 100644 --- a/desktop/src/main/java/pmstation/configuration/Constants.java +++ b/desktop/src/main/java/pmstation/configuration/Constants.java @@ -1,6 +1,6 @@ /* - * pm-station-usb - * 2017 (C) Copyright - https://github.com/rjaros87/pm-station-usb + * pm-home-station + * 2017 (C) Copyright - https://github.com/rjaros87/pm-home-station * License: GPL 3.0 */ @@ -12,9 +12,9 @@ public class Constants { - public static final String PROJECT_NAME = "pm-station-usb"; + public static final String PROJECT_NAME = "pm-home-station"; public static final String VERSION = "1.0.0"; - public static final String PROJECT_URL = "https://github.com/rjaros87/pm-station-usb"; + public static final String PROJECT_URL = "https://github.com/rjaros87/pm-home-station"; public static final Locale DEFAULT_LOCALE = Locale.getDefault(); public static final String DEFAULT_ICON = "app-icon.png"; diff --git a/desktop/src/main/java/pmstation/dialogs/AboutDlg.java b/desktop/src/main/java/pmstation/dialogs/AboutDlg.java index 308d6e0..bf2fd28 100644 --- a/desktop/src/main/java/pmstation/dialogs/AboutDlg.java +++ b/desktop/src/main/java/pmstation/dialogs/AboutDlg.java @@ -1,6 +1,6 @@ /* - * pm-station-usb - * 2017 (C) Copyright - https://github.com/rjaros87/pm-station-usb + * pm-home-station + * 2017 (C) Copyright - https://github.com/rjaros87/pm-home-station * License: GPL 3.0 */ package pmstation.dialogs; diff --git a/desktop/src/main/java/pmstation/dialogs/ConfigurationDlg.java b/desktop/src/main/java/pmstation/dialogs/ConfigurationDlg.java index a0342ee..6b7c175 100644 --- a/desktop/src/main/java/pmstation/dialogs/ConfigurationDlg.java +++ b/desktop/src/main/java/pmstation/dialogs/ConfigurationDlg.java @@ -1,6 +1,6 @@ /* - * pm-station-usb - * 2017 (C) Copyright - https://github.com/rjaros87/pm-station-usb + * pm-home-station + * 2017 (C) Copyright - https://github.com/rjaros87/pm-home-station * License: GPL 3.0 */ package pmstation.dialogs; diff --git a/desktop/src/main/java/pmstation/helpers/MacOSIntegration.java b/desktop/src/main/java/pmstation/helpers/MacOSIntegration.java index 2a10a1d..96f49bb 100644 --- a/desktop/src/main/java/pmstation/helpers/MacOSIntegration.java +++ b/desktop/src/main/java/pmstation/helpers/MacOSIntegration.java @@ -1,6 +1,6 @@ /* - * pm-station-usb - * 2017 (C) Copyright - https://github.com/rjaros87/pm-station-usb + * pm-home-station + * 2017 (C) Copyright - https://github.com/rjaros87/pm-home-station * License: GPL 3.0 */ package pmstation.helpers; diff --git a/desktop/src/main/java/pmstation/helpers/NativeTrayIntegration.java b/desktop/src/main/java/pmstation/helpers/NativeTrayIntegration.java index a8e009e..ae375ec 100644 --- a/desktop/src/main/java/pmstation/helpers/NativeTrayIntegration.java +++ b/desktop/src/main/java/pmstation/helpers/NativeTrayIntegration.java @@ -1,6 +1,6 @@ /* - * pm-station-usb - * 2017 (C) Copyright - https://github.com/rjaros87/pm-station-usb + * pm-home-station + * 2017 (C) Copyright - https://github.com/rjaros87/pm-home-station * License: GPL 3.0 */ package pmstation.helpers; @@ -76,7 +76,7 @@ public void integrate() { try { SystemTray tray = SystemTray.getSystemTray(); - TrayIcon menuBarIcon = new TrayIcon(defaultIcon, "pm-station-usb", menu); + TrayIcon menuBarIcon = new TrayIcon(defaultIcon, "pm-home-station", menu); station.addObserver(new IPlanTowerObserver() { @Override diff --git a/desktop/src/main/java/pmstation/helpers/ResourceHelper.java b/desktop/src/main/java/pmstation/helpers/ResourceHelper.java index 5a7d0dd..fce0613 100644 --- a/desktop/src/main/java/pmstation/helpers/ResourceHelper.java +++ b/desktop/src/main/java/pmstation/helpers/ResourceHelper.java @@ -1,6 +1,6 @@ /* - * pm-station-usb - * 2017 (C) Copyright - https://github.com/rjaros87/pm-station-usb + * pm-home-station + * 2017 (C) Copyright - https://github.com/rjaros87/pm-home-station * License: GPL 3.0 */ package pmstation.helpers; diff --git a/desktop/src/main/java/pmstation/observers/AQIColor.java b/desktop/src/main/java/pmstation/observers/AQIColor.java index 6fdbf4f..4d98e82 100644 --- a/desktop/src/main/java/pmstation/observers/AQIColor.java +++ b/desktop/src/main/java/pmstation/observers/AQIColor.java @@ -1,13 +1,13 @@ /* - * pm-station-usb - * 2017 (C) Copyright - https://github.com/rjaros87/pm-station-usb + * pm-home-station + * 2017 (C) Copyright - https://github.com/rjaros87/pm-home-station * License: GPL 3.0 */ package pmstation.observers; import java.awt.Color; -// taken from Android version of pm-station-usb and slightly modified - kept levels the same though +// taken from Android version of pm-home-station and slightly modified - kept levels the same though public enum AQIColor { VERY_GOOD(Color.decode("#00ccff"), "Very good", 0), GOOD(Color.decode("#00e400"), "Good", 1), diff --git a/desktop/src/main/java/pmstation/observers/ChartObserver.java b/desktop/src/main/java/pmstation/observers/ChartObserver.java index 6ca9d4c..9bfd6f1 100644 --- a/desktop/src/main/java/pmstation/observers/ChartObserver.java +++ b/desktop/src/main/java/pmstation/observers/ChartObserver.java @@ -1,6 +1,6 @@ /* - * pm-station-usb - * 2017 (C) Copyright - https://github.com/rjaros87/pm-station-usb + * pm-home-station + * 2017 (C) Copyright - https://github.com/rjaros87/pm-home-station * License: GPL 3.0 */ package pmstation.observers; diff --git a/desktop/src/main/java/pmstation/observers/ConsoleObserver.java b/desktop/src/main/java/pmstation/observers/ConsoleObserver.java index 064d713..eda79e9 100644 --- a/desktop/src/main/java/pmstation/observers/ConsoleObserver.java +++ b/desktop/src/main/java/pmstation/observers/ConsoleObserver.java @@ -1,6 +1,6 @@ /* - * pm-station-usb - * 2017 (C) Copyright - https://github.com/rjaros87/pm-station-usb + * pm-home-station + * 2017 (C) Copyright - https://github.com/rjaros87/pm-home-station * License: GPL 3.0 */ package pmstation.observers; diff --git a/desktop/src/main/java/pmstation/observers/LabelObserver.java b/desktop/src/main/java/pmstation/observers/LabelObserver.java index 6d632c5..2c5b621 100644 --- a/desktop/src/main/java/pmstation/observers/LabelObserver.java +++ b/desktop/src/main/java/pmstation/observers/LabelObserver.java @@ -1,6 +1,6 @@ /* - * pm-station-usb - * 2017 (C) Copyright - https://github.com/rjaros87/pm-station-usb + * pm-home-station + * 2017 (C) Copyright - https://github.com/rjaros87/pm-home-station * License: GPL 3.0 */ package pmstation.observers; @@ -122,4 +122,4 @@ private void loadIcons() { } } -} \ No newline at end of file +} diff --git a/desktop/src/main/java/pmstation/plantower/PlanTowerSensor.java b/desktop/src/main/java/pmstation/plantower/PlanTowerSensor.java index 9ef60d3..0a6dd20 100644 --- a/desktop/src/main/java/pmstation/plantower/PlanTowerSensor.java +++ b/desktop/src/main/java/pmstation/plantower/PlanTowerSensor.java @@ -1,6 +1,6 @@ /* - * pm-station-usb - * 2017 (C) Copyright - https://github.com/rjaros87/pm-station-usb + * pm-home-station + * 2017 (C) Copyright - https://github.com/rjaros87/pm-home-station * License: GPL 3.0 */ package pmstation.plantower; diff --git a/desktop/src/main/resources/pmstation/html/about.html b/desktop/src/main/resources/pmstation/html/about.html index 88dd318..d50239c 100644 --- a/desktop/src/main/resources/pmstation/html/about.html +++ b/desktop/src/main/resources/pmstation/html/about.html @@ -5,7 +5,7 @@

Particulate Matter Sensor

-

{project-name} v.{version}

+

{project-name} v.{version}

Authors

diff --git a/desktop/src/main/resources/pmstation/license.txt b/desktop/src/main/resources/pmstation/license.txt index ad2513b..1f07e1e 100644 --- a/desktop/src/main/resources/pmstation/license.txt +++ b/desktop/src/main/resources/pmstation/license.txt @@ -9,6 +9,6 @@ Free for commercial use (http://bogdanrosu.com/) app-icon.png (copy of ic_launcher-web.png): -https://github.com/rjaros87/pm-station-usb +https://github.com/rjaros87/pm-home-station