Skip to content

Commit 513f4e4

Browse files
committed
Merge branch 'release/0.7.1'
2 parents c462b6d + da4a2c5 commit 513f4e4

6 files changed

Lines changed: 35 additions & 33 deletions

File tree

.github/workflows/automerge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
steps:
1313
- name: Dependabot metadata
1414
id: metadata
15-
uses: dependabot/fetch-metadata@v1.3.6
15+
uses: dependabot/fetch-metadata@v1.4.0
1616
with:
1717
github-token: '${{ secrets.PAT }}'
1818

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.2.1
1+
3.2.2

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ruby:3.2.1-alpine AS Builder
1+
FROM ruby:3.2.2-alpine AS Builder
22
RUN apk add --no-cache build-base
33

44
WORKDIR /senec-collector
@@ -8,7 +8,7 @@ RUN bundle config --local frozen 1 && \
88
bundle install -j4 --retry 3 && \
99
bundle clean --force
1010

11-
FROM ruby:3.2.1-alpine
11+
FROM ruby:3.2.2-alpine
1212
LABEL maintainer="georg@ledermann.dev"
1313

1414
# Decrease memory usage

Gemfile.lock

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
addressable (2.8.1)
4+
addressable (2.8.4)
55
public_suffix (>= 2.0.2, < 6.0)
66
ast (2.4.2)
77
crack (0.4.5)
@@ -16,36 +16,36 @@ GEM
1616
mini_mime (1.1.2)
1717
minitest (5.18.0)
1818
multi_xml (0.6.0)
19-
oj (3.14.2)
20-
parallel (1.22.1)
21-
parser (3.2.1.1)
19+
oj (3.14.3)
20+
parallel (1.23.0)
21+
parser (3.2.2.1)
2222
ast (~> 2.4.1)
2323
public_suffix (5.0.1)
2424
rainbow (3.1.1)
2525
rake (13.0.6)
26-
regexp_parser (2.7.0)
26+
regexp_parser (2.8.0)
2727
rexml (3.2.5)
28-
rubocop (1.48.1)
28+
rubocop (1.50.2)
2929
json (~> 2.3)
3030
parallel (~> 1.10)
3131
parser (>= 3.2.0.0)
3232
rainbow (>= 2.2.2, < 4.0)
3333
regexp_parser (>= 1.8, < 3.0)
3434
rexml (>= 3.2.5, < 4.0)
35-
rubocop-ast (>= 1.26.0, < 2.0)
35+
rubocop-ast (>= 1.28.0, < 2.0)
3636
ruby-progressbar (~> 1.7)
3737
unicode-display_width (>= 2.4.0, < 3.0)
38-
rubocop-ast (1.27.0)
38+
rubocop-ast (1.28.1)
3939
parser (>= 3.2.1.0)
40-
rubocop-minitest (0.29.0)
40+
rubocop-minitest (0.30.0)
4141
rubocop (>= 1.39, < 2.0)
42-
rubocop-performance (1.16.0)
42+
rubocop-performance (1.17.1)
4343
rubocop (>= 1.7.0, < 2.0)
4444
rubocop-ast (>= 0.4.0)
4545
rubocop-rake (0.6.0)
4646
rubocop (~> 1.0)
4747
ruby-progressbar (1.13.0)
48-
senec (0.7.1)
48+
senec (0.7.2)
4949
httparty
5050
unicode-display_width (2.4.2)
5151
vcr (6.1.0)
@@ -72,4 +72,4 @@ DEPENDENCIES
7272
webmock
7373

7474
BUNDLED WITH
75-
2.4.9
75+
2.4.12

src/solectrus_record.rb

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ def initialize(id, senec_data)
44
@senec_data = senec_data
55
end
66

7-
attr_reader :id
7+
attr_reader :id, :senec_data
88

99
def to_hash
1010
{
@@ -27,66 +27,66 @@ def to_hash
2727
end
2828

2929
def measure_time
30-
@senec_data.measure_time
30+
senec_data.measure_time
3131
end
3232

3333
def current_state
34-
@senec_data.current_state_name
34+
senec_data.current_state_name
3535
end
3636

3737
def case_temp
38-
@senec_data.case_temp
38+
senec_data.case_temp
3939
end
4040

4141
def inverter_power
42-
@senec_data.inverter_power.round
42+
senec_data.inverter_power.round
4343
end
4444

4545
def mpp1_power
46-
@senec_data.mpp_power[0]&.round
46+
senec_data.mpp_power[0]&.round
4747
end
4848

4949
def mpp2_power
50-
@senec_data.mpp_power[1]&.round
50+
senec_data.mpp_power[1]&.round
5151
end
5252

5353
def mpp3_power
54-
@senec_data.mpp_power[2]&.round
54+
senec_data.mpp_power[2]&.round
5555
end
5656

5757
def house_power
58-
@senec_data.house_power.round
58+
senec_data.house_power.round
5959
end
6060

6161
def bat_power_plus
62-
@senec_data.bat_power.positive? ? @senec_data.bat_power.round : 0
62+
senec_data.bat_power.positive? ? senec_data.bat_power.round : 0
6363
end
6464

6565
def bat_power_minus
66-
@senec_data.bat_power.negative? ? -@senec_data.bat_power.round : 0
66+
senec_data.bat_power.negative? ? -senec_data.bat_power.round : 0
6767
end
6868

6969
def bat_fuel_charge
70-
@senec_data.bat_fuel_charge
70+
senec_data.bat_fuel_charge
7171
end
7272

7373
def bat_charge_current
74-
@senec_data.bat_charge_current
74+
senec_data.bat_charge_current
7575
end
7676

7777
def bat_voltage
78-
@senec_data.bat_voltage
78+
senec_data.bat_voltage
7979
end
8080

8181
def wallbox_charge_power
82-
@senec_data.wallbox_charge_power.sum.round
82+
senec_data.wallbox_charge_power.sum.round
8383
end
8484

8585
def grid_power_plus
86-
@senec_data.grid_power.positive? ? @senec_data.grid_power.round : 0
86+
senec_data.grid_power.positive? ? senec_data.grid_power.round : 0
8787
end
8888

8989
def grid_power_minus
90-
@senec_data.grid_power.negative? ? -@senec_data.grid_power.round : 0
90+
senec_data.grid_power.negative? ? -senec_data.grid_power.round : 0
9191
end
9292
end

test/cassettes/senec_success.yml

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)