diff --git a/README.md b/README.md index 2349a4d..98e68e4 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ The easiest way to run the software on a hub is to download a pre-built SD card [hub_1.0.7.zip](https://cf.lanternpowermonitor.com/hub_1.0.7.zip)

Flash this to any micro sd card (4gig or larger) and you're good to go. Fire up the hub and the phone app should be able to connect to it via bluetooth to finish the configuration. The default password on this image is pi/LanternPowerMonitor

-When you add the hub to your configuration via the app, you can change where the hub posts data. If you use lanternsoftware.com (the default host), your data will be stored there securely and won't be shared with or sold to anyone. If you really want to run your own server, you're of course welcome to do that instead, instructions are located further down. +When you add the hub to your configuration via the app, you can change where the hub posts data. If you use lanternpowermonitor.com (the default host), your data will be stored there securely and won't be shared with or sold to anyone. If you really want to run your own server, you're of course welcome to do that instead, instructions are located further down. ## Now that the service is running on the pi, how do I configure everything in the android app? 1. Create your panel in the "Configure Panels" page from the main menu. Before you have your hub connected, there will be no place to select a hub and port for each breaker. Don't worry, we'll get to that later. @@ -82,9 +82,7 @@ Create a configuration file at /opt/currentmonitor/config.json
Use the format below to get started ``` { - "hub": 0, - "host": "https://lanternsoftware.com/currentmonitor", - "auto_calibration_voltage": 120.0, + "host": "https://lanternpowermonitor.com/currentmonitor", "needs_calibration": true } ``` diff --git a/case/3B+/LPM_Case_3B+.blend b/case/3B+/LPM_Case_3B+.blend index ba7d03e..845cece 100644 Binary files a/case/3B+/LPM_Case_3B+.blend and b/case/3B+/LPM_Case_3B+.blend differ diff --git a/case/3B+/LPM_Case_3B+_With_Flange.skp b/case/3B+/LPM_Case_3B+_With_Flange.skp deleted file mode 100644 index 595513a..0000000 Binary files a/case/3B+/LPM_Case_3B+_With_Flange.skp and /dev/null differ diff --git a/case/3B+/LPM_Case_3B+_With_Flange.stl b/case/3B+/LPM_Case_3B+_With_Flange.stl deleted file mode 100644 index b591d54..0000000 Binary files a/case/3B+/LPM_Case_3B+_With_Flange.stl and /dev/null differ diff --git a/case/3B+/LPM_Case_Flange_3B+.blend b/case/3B+/LPM_Case_Flange_3B+.blend new file mode 100644 index 0000000..a7f7bce Binary files /dev/null and b/case/3B+/LPM_Case_Flange_3B+.blend differ diff --git a/case/3B+/LPM_Case_Flange_3B+.stl b/case/3B+/LPM_Case_Flange_3B+.stl new file mode 100644 index 0000000..1e6d5f3 Binary files /dev/null and b/case/3B+/LPM_Case_Flange_3B+.stl differ diff --git a/case/3B+/LPM_Case_Lid_3B+.blend b/case/3B+/LPM_Case_Lid_3B+.blend index 8d44710..a56b80b 100644 Binary files a/case/3B+/LPM_Case_Lid_3B+.blend and b/case/3B+/LPM_Case_Lid_3B+.blend differ diff --git a/case/3B+/LPM_Case_Lid_3B+.stl b/case/3B+/LPM_Case_Lid_3B+.stl index 22ceed8..f5de212 100644 Binary files a/case/3B+/LPM_Case_Lid_3B+.stl and b/case/3B+/LPM_Case_Lid_3B+.stl differ diff --git a/case/4B/LPM_4B_case_with_flange.skp b/case/4B/LPM_4B_case_with_flange.skp deleted file mode 100644 index e2993ff..0000000 Binary files a/case/4B/LPM_4B_case_with_flange.skp and /dev/null differ diff --git a/case/4B/LPM_Case_4B_with_Flange.stl b/case/4B/LPM_Case_4B_with_Flange.stl deleted file mode 100644 index cbd8f04..0000000 Binary files a/case/4B/LPM_Case_4B_with_Flange.stl and /dev/null differ diff --git a/case/4B/LPM_Case_Flange_4B.blend b/case/4B/LPM_Case_Flange_4B.blend index e3cdd2f..393d624 100644 Binary files a/case/4B/LPM_Case_Flange_4B.blend and b/case/4B/LPM_Case_Flange_4B.blend differ diff --git a/case/4B/LPM_Case_Flange_4B.stl b/case/4B/LPM_Case_Flange_4B.stl index f8fcde5..e33a69b 100644 Binary files a/case/4B/LPM_Case_Flange_4B.stl and b/case/4B/LPM_Case_Flange_4B.stl differ diff --git a/currentmonitor/lantern-service-currentmonitor/src/main/java/com/lanternsoftware/currentmonitor/servlet/ResetPasswordServlet.java b/currentmonitor/lantern-service-currentmonitor/src/main/java/com/lanternsoftware/currentmonitor/servlet/ResetPasswordServlet.java index 6004e0c..7cb15e7 100644 --- a/currentmonitor/lantern-service-currentmonitor/src/main/java/com/lanternsoftware/currentmonitor/servlet/ResetPasswordServlet.java +++ b/currentmonitor/lantern-service-currentmonitor/src/main/java/com/lanternsoftware/currentmonitor/servlet/ResetPasswordServlet.java @@ -65,10 +65,10 @@ public class ResetPasswordServlet extends FreemarkerServlet { String email = DaoSerializer.getString(payload, "email"); if (EmailValidator.getInstance().isValid(email)) { String key = Globals.dao.addPasswordResetKey(email); - Email from = new Email("info@lanternsoftware.com"); + Email from = new Email("mark.milligan@lanternsoftware.com"); String subject = "Password Reset - Lantern Power Monitor"; Email to = new Email(email); - Content content = new Content("text/plain", "Reset your password using this link:\nhttps://lanternsoftware.com/currentmonitor/resetPassword/" + key); + Content content = new Content("text/plain", "Reset your password using this link:\nhttps://lanternpowermonitor.com/currentmonitor/resetPassword/" + key); Mail mail = new Mail(from, subject, to, content); SendGrid sg = new SendGrid(api_key); Request request = new Request();