Merge branch 'master' of https://git.van-halteren.net/smartmeter

app/helpers/InSyncState.rb

@@ -97,7 +97,7 @@ class InSyncState < StatePattern::State
 
 	# Write to EmonHub
         begin
-	 TCPSocket.open("10.0.0.154",5050){|s|
+		TCPSocket.open("printserver.home.local",5050){|s|
 	  s.write(sprintf("8 %d %d\r\n", reading.current_kw_consumed*1000, reading.current_kw_produced*1000))
 	 }
 	rescue

daemonize.rb

@@ -1,7 +1,8 @@
 #require 'rubygems'
 require 'daemons'
  
-pwd = Dir.pwd
+#pwd = Dir.pwd
+pwd = '/home/pcog/smartmeter' 
 Daemons.run_proc('smartmeter', {:dir_mode => :normal, :dir => pwd+"/pids"}) do
   Dir.chdir(pwd)
   exec "ruby smartmeter.rb"

docker-compose.yml

@@ -3,7 +3,9 @@ services:
   db:
     container_name: smartmeter_db
     restart: unless-stopped
-    image: mysql 
+    image: mysql
+    volumes:
+      - /home/pcog/smartmeter/data:/var/lib/mysql
     environment:
       MYSQL_ROOT_PASSWORD: rootme
       MYSQL_DATABASE: smartmeter
@@ -13,7 +15,7 @@ services:
     build: .
     command: 'ruby ./smartmeter.rb'
     devices:
-      - "/dev/ttyUSB0:/dev/ttyUSB0"
+      - "/dev/ttyUSB1:/dev/ttyUSB0"
     volumes:
       - .:/usr/src/app
     depends_on:

test-serial.rb

@@ -17,7 +17,7 @@ ActiveRecord::Base.establish_connection(connection_details)
 if __FILE__ == $0
 
   #params for serial port
-  port_str = "/dev/ttyUSB0"  #may be different for you
+  port_str = "/dev/ttyUSB1"  #may be different for you
   baud_rate = 9600
   data_bits = 7
   stop_bits = 1