From b67fbc21d1cabd0a8cc58529e3c010eebf959f99 Mon Sep 17 00:00:00 2001 From: Aart van Halteren Date: Sun, 9 Jan 2022 18:47:38 +0100 Subject: [PATCH 1/2] use fqdn --- app/helpers/InSyncState.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers/InSyncState.rb b/app/helpers/InSyncState.rb index aeda465..2c3d131 100644 --- a/app/helpers/InSyncState.rb +++ b/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 From 6867f5260e93757f985e8c21b4570bd2ecc4cfe1 Mon Sep 17 00:00:00 2001 From: Aart van Halteren Date: Sun, 9 Jan 2022 18:49:26 +0100 Subject: [PATCH 2/2] configuration updates --- daemonize.rb | 3 ++- docker-compose.yml | 6 ++++-- test-serial.rb | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/daemonize.rb b/daemonize.rb index 7d63480..06ec7ce 100644 --- a/daemonize.rb +++ b/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" diff --git a/docker-compose.yml b/docker-compose.yml index 1ce3989..1f513b7 100644 --- a/docker-compose.yml +++ b/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: diff --git a/test-serial.rb b/test-serial.rb index 59bf644..5d6cc2a 100644 --- a/test-serial.rb +++ b/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