senec 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fafcc3312502159dab71fea097bf18148da6634d2c8207d6159e8edc5e44fe3e
-  data.tar.gz: ccdd4146beb87d69ad400a2018126aefc468c542d1ee4955915ef3cfdd6fba11
+  metadata.gz: 7cc66f87a694b567a5d255e80aeca2ce5bd6bc31bbdce717f991c0f4a4bb6cae
+  data.tar.gz: 6c2def742896e62ee42d475983b4285ecb3e7a0a0315d6fc5317f959831d4401
 SHA512:
-  metadata.gz: ffef52909f19a3ca27b341e0b3095c44ceece7799fb0e1839873451476a1cec559d41d0ed8bd3d07703019c8d74cbbcbf10b8875b79b3f747c7ec7a6a45551ba
-  data.tar.gz: e20e6df0a012ee9e72cfb7eca37dc0c71ed25b42063d0c169f5797548d98340645b0162ba847c61208973b2b3fc0e7afdbd518e777e213815f34223e85786b27
+  metadata.gz: c1006a948b5e0932fd9c1e675dbaec90f11e5c6a54b5899c239db0854f7e8623c03030dff72f4162acd716e60ae256526ceea2e883bf7b8f3ac8220ad93fb049
+  data.tar.gz: 3004661d438142e41e30c758d41e9f0b7ecf3e2f74f5533387689c215aa92e11346806651f413c7b76cb686a575a8f0188f9e03829c38ae1ca36496f074f20f0

data/.github/workflows/push.yml

@@ -0,0 +1,23 @@
+name: Continuous integration
+
+on: push
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout the code
+        uses: actions/checkout@v2
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+          ruby-version: '3.0'
+
+      - name: Lint with RuboCop
+        run: bundle exec rubocop
+
+      - name: Run tests
+        run: bundle exec rake

data/.rubocop.yml

@@ -1,115 +1,17 @@
 require:
   - rubocop-performance
   - rubocop-rspec
+  - rubocop-rake
 
 AllCops:
-  TargetRubyVersion: 2.5
-  EnabledByDefault: true
-
-### Metrics
-
-Metrics/MethodLength:
-  Max: 20
-
-### Bundler
-
-Bundler/OrderedGems:
-  Enabled: false
-
-### Style
-
-Style/FrozenStringLiteralComment:
-  Enabled: false
-
-Style/SymbolArray:
-  EnforcedStyle: brackets
-
-Style/MixinUsage:
-  Enabled: false
+  TargetRubyVersion: 2.6
+  NewCops: enable
 
 Style/Documentation:
   Enabled: false
 
-Style/ClassAndModuleChildren:
-  Enabled: false
-
-Style/Lambda:
-  EnforcedStyle: literal
-
-Style/LambdaCall:
-  Enabled: false
-
-Style/MethodCallWithArgsParentheses:
-  Enabled: false
-
-Style/MissingElse:
-  Enabled: false
-
-Style/Copyright:
-  Enabled: false
-
-Style/InlineComment:
-  Enabled: false
-
-Style/StringHashKeys:
-  Enabled: false
-
-Style/MethodCalledOnDoEndBlock:
-  Enabled: false
-
-Style/DocumentationMethod:
-  Enabled: false
-
-Style/DisableCopsWithinSourceCodeDirective:
-  Enabled: false
-
-Style/ConstantVisibility:
-  Enabled: false
-
-### Layout
-
-Layout/DotPosition:
-  EnforcedStyle: trailing
-
-Layout/EndAlignment:
-  EnforcedStyleAlignWith: variable
-
-Layout/SpaceInsideArrayLiteralBrackets:
-  Enabled: false
-
-Layout/HashAlignment:
-  Enabled: false
-
-Layout/MultilineMethodArgumentLineBreaks:
-  Enabled: false
-
-Layout/MultilineArrayLineBreaks:
-  Enabled: false
-
-Layout/MultilineAssignmentLayout:
-  Enabled: false
-
-# RSpec
-
-RSpec/MultipleExpectations:
-  Enabled: false
-
-RSpec/AlignRightLetBrace:
-  Enabled: false
-
-RSpec/MultipleDescribes:
-  Enabled: false
-
-RSpec/NestedGroups:
-  Enabled: false
-
-RSpec/ImplicitSubject:
-  Enabled: false
-
-# Lint
-
-Lint/ConstantResolution:
+Style/FrozenStringLiteralComment:
   Enabled: false
 
-Lint/NumberConversion:
-  Enabled: false
+Metrics/MethodLength:
+  Max: 15

data/Gemfile

@@ -9,11 +9,14 @@ gem 'rake'
 # rspec-3.10.0 (http://github.com/rspec)
 gem 'rspec'
 
-# Automatic Ruby code style checking tool. (https://github.com/rubocop-hq/rubocop)
+# Automatic Ruby code style checking tool. (https://github.com/rubocop/rubocop)
 gem 'rubocop'
 
-# Automatic performance checking tool for Ruby code. (https://github.com/rubocop-hq/rubocop-performance)
+# Automatic performance checking tool for Ruby code. (https://github.com/rubocop/rubocop-performance)
 gem 'rubocop-performance'
 
-# Code style checking for RSpec files (https://github.com/rubocop-hq/rubocop-rspec)
+# Code style checking for RSpec files (https://github.com/rubocop/rubocop-rspec)
 gem 'rubocop-rspec'
+
+# A RuboCop plugin for Rake (https://github.com/rubocop/rubocop-rake)
+gem 'rubocop-rake'

data/README.md

@@ -35,6 +35,7 @@ puts "Wallbox charge power: [ #{request.wallbox_charge_power.join(',')} ] W"
 puts "\n"
 puts "Grid power: #{request.grid_power} W"
 puts "Current state of the system: #{request.current_state}"
+puts "Measure time: #{Time.at request.measure_time}"
 
 # Example result:
 #
@@ -50,6 +51,7 @@ puts "Current state of the system: #{request.current_state}"
 #
 # Grid power: 315 W
 # Current state of the system: CHARGE
+# Measure time: 2021-10-06 17:50:22 +0200
 ```
 
 ## Development
@@ -60,7 +62,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/ledermann/senec. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/ledermann/senec/blob/master/CODE_OF_CONDUCT.md).
+Bug reports and pull requests are welcome on GitHub at https://github.com/solectrus/senec. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/solectrus/senec/blob/master/CODE_OF_CONDUCT.md).
 
 
 ## License
@@ -69,4 +71,4 @@ The gem is available as open source under the terms of the [MIT License](https:/
 
 ## Code of Conduct
 
-Everyone interacting in this project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/ledermann/senec/blob/master/CODE_OF_CONDUCT.md).
+Everyone interacting in this project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/solectrus/senec/blob/master/CODE_OF_CONDUCT.md).

data/lib/senec/constants.rb

@@ -1,16 +1,16 @@
 module Senec # rubocop:disable Metrics/ModuleLength
   # Taken from https://github.com/mchwalisz/pysenec
   STATE_NAMES = {
-    0  => 'INITIAL STATE',
-    1  => 'ERROR INVERTER COMMUNICATION',
-    2  => 'ERROR ELECTRICY METER',
-    3  => 'RIPPLE CONTROL RECEIVER',
-    4  => 'INITIAL CHARGE',
-    5  => 'MAINTENANCE CHARGE',
-    6  => 'MAINTENANCE READY',
-    7  => 'MAINTENANCE REQUIRED',
-    8  => 'MAN. SAFETY CHARGE',
-    9  => 'SAFETY CHARGE READY',
+    0 => 'INITIAL STATE',
+    1 => 'ERROR INVERTER COMMUNICATION',
+    2 => 'ERROR ELECTRICY METER',
+    3 => 'RIPPLE CONTROL RECEIVER',
+    4 => 'INITIAL CHARGE',
+    5 => 'MAINTENANCE CHARGE',
+    6 => 'MAINTENANCE READY',
+    7 => 'MAINTENANCE REQUIRED',
+    8 => 'MAN. SAFETY CHARGE',
+    9 => 'SAFETY CHARGE READY',
     10 => 'FULL CHARGE',
     11 => 'EQUALIZATION: CHARGE',
     12 => 'DESULFATATION: CHARGE',
@@ -97,37 +97,37 @@ module Senec # rubocop:disable Metrics/ModuleLength
 
   # Taken from https://gist.github.com/smashnet/82ad0b9d7f0ba2e5098e6649ba08f88a
   BASIC_REQUEST = {
-    'STATISTIC': {
-      'CURRENT_STATE': '',                # Current state of the system (int, see SYSTEM_STATE_NAME)
-      'LIVE_BAT_CHARGE_MASTER': '',       # Battery charge amount since installation (kWh)
-      'LIVE_BAT_DISCHARGE_MASTER': '',    # Battery discharge amount since installation (kWh)
-      'LIVE_GRID_EXPORT': '',             # Grid export amount since installation (kWh)
-      'LIVE_GRID_IMPORT': '',             # Grid import amount since installation (kWh)
-      'LIVE_HOUSE_CONS': '',              # House consumption since installation (kWh)
-      'LIVE_PV_GEN': '',                  # PV generated power since installation (kWh)
-      'MEASURE_TIME': ''                  # Unix timestamp for above values (ms)
+    STATISTIC: {
+      CURRENT_STATE: '',                # Current state of the system (int, see SYSTEM_STATE_NAME)
+      LIVE_BAT_CHARGE_MASTER: '',       # Battery charge amount since installation (kWh)
+      LIVE_BAT_DISCHARGE_MASTER: '',    # Battery discharge amount since installation (kWh)
+      LIVE_GRID_EXPORT: '',             # Grid export amount since installation (kWh)
+      LIVE_GRID_IMPORT: '',             # Grid import amount since installation (kWh)
+      LIVE_HOUSE_CONS: '',              # House consumption since installation (kWh)
+      LIVE_PV_GEN: '',                  # PV generated power since installation (kWh)
+      MEASURE_TIME: ''                  # Unix timestamp for above values (ms)
     },
-    'ENERGY': {
-      'GUI_BAT_DATA_CURRENT': '',         # Battery charge current: negative if discharging, positiv if charging (A)
-      'GUI_BAT_DATA_FUEL_CHARGE': '',     # Remaining battery (percent)
-      'GUI_BAT_DATA_POWER': '',           # Battery charge power: negative if discharging, positiv if charging (W)
-      'GUI_BAT_DATA_VOLTAGE': '',         # Battery voltage (V)
-      'GUI_GRID_POW': '',                 # Grid power: negative if exporting, positiv if importing (W)
-      'GUI_HOUSE_POW': '',                # House power consumption (W)
-      'GUI_INVERTER_POWER': '',           # PV production (W)
-      'STAT_HOURS_OF_OPERATION': ''       # Appliance hours of operation
+    ENERGY: {
+      GUI_BAT_DATA_CURRENT: '',         # Battery charge current: negative if discharging, positiv if charging (A)
+      GUI_BAT_DATA_FUEL_CHARGE: '',     # Remaining battery (percent)
+      GUI_BAT_DATA_POWER: '',           # Battery charge power: negative if discharging, positiv if charging (W)
+      GUI_BAT_DATA_VOLTAGE: '',         # Battery voltage (V)
+      GUI_GRID_POW: '',                 # Grid power: negative if exporting, positiv if importing (W)
+      GUI_HOUSE_POW: '',                # House power consumption (W)
+      GUI_INVERTER_POWER: '',           # PV production (W)
+      STAT_HOURS_OF_OPERATION: ''       # Appliance hours of operation
     },
-    'BMS': {
-      'CHARGED_ENERGY': '',               # List: Charged energy per battery
-      'DISCHARGED_ENERGY': '',            # List: Discharged energy per battery
-      'CYCLES': ''                        # List: Cycles per battery
+    BMS: {
+      CHARGED_ENERGY: '',               # List: Charged energy per battery
+      DISCHARGED_ENERGY: '',            # List: Discharged energy per battery
+      CYCLES: ''                        # List: Cycles per battery
     },
-    'PV1': {
-      'POWER_RATIO': '',                  # Grid export limit (percent)
-      'P_TOTAL': ''                       # ?
+    PV1: {
+      POWER_RATIO: '',                  # Grid export limit (percent)
+      P_TOTAL: ''                       # ?
     },
-    'WALLBOX': {
-      'APPARENT_CHARGING_POWER': ''
+    WALLBOX: {
+      APPARENT_CHARGING_POWER: ''
     }
   }.freeze
 end

data/lib/senec/request.rb

@@ -57,6 +57,11 @@ module Senec
       STATE_NAMES[state]
     end
 
+    def measure_time
+      value = response.dig('STATISTIC', 'MEASURE_TIME')
+      Senec::Value.new(value).to_i
+    end
+
     private
 
     def response

data/lib/senec/value.rb

@@ -31,10 +31,7 @@ module Senec
     end
 
     def hex2float(hex)
-      [ "0x#{hex}".to_i(16) ].
-        pack('L').
-        unpack1('F').
-        round(1)
+      ["0x#{hex}".to_i(16)].pack('L').unpack1('F').round(1)
     end
 
     def hex2int(hex)

data/lib/senec/version.rb

@@ -1,3 +1,3 @@
 module Senec
-  VERSION = '0.3.0'.freeze
+  VERSION = '0.4.0'.freeze
 end

data/lib/senec.rb

@@ -3,5 +3,4 @@ require 'senec/request'
 
 module Senec
   class Error < StandardError; end
-  # Your code goes here...
 end

data/senec.gemspec

@@ -8,13 +8,13 @@ Gem::Specification.new do |spec|
 
   spec.summary       = 'Unofficial Ruby Client for SENEC Home'
   spec.description   = 'Access your local SENEC Solar Battery Storage System'
-  spec.homepage      = 'https://github.com/ledermann/senec'
+  spec.homepage      = 'https://github.com/solectrus/senec'
   spec.license       = 'MIT'
-  spec.required_ruby_version = Gem::Requirement.new('>= 2.5.0')
+  spec.required_ruby_version = Gem::Requirement.new('>= 2.6.0')
 
   spec.metadata['homepage_uri'] = spec.homepage
-  spec.metadata['source_code_uri'] = 'https://github.com/ledermann/senec'
-  spec.metadata['changelog_uri'] = 'https://github.com/ledermann/releases'
+  spec.metadata['source_code_uri'] = 'https://github.com/solectrus/senec'
+  spec.metadata['changelog_uri'] = 'https://github.com/solectrus/senec/releases'
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: senec
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Georg Ledermann
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-13 00:00:00.000000000 Z
+date: 2021-10-06 00:00:00.000000000 Z
 dependencies: []
 description: Access your local SENEC Solar Battery Storage System
 email:
@@ -17,10 +17,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/push.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -34,13 +34,13 @@ files:
 - lib/senec/value.rb
 - lib/senec/version.rb
 - senec.gemspec
-homepage: https://github.com/ledermann/senec
+homepage: https://github.com/solectrus/senec
 licenses:
 - MIT
 metadata:
-  homepage_uri: https://github.com/ledermann/senec
-  source_code_uri: https://github.com/ledermann/senec
-  changelog_uri: https://github.com/ledermann/releases
+  homepage_uri: https://github.com/solectrus/senec
+  source_code_uri: https://github.com/solectrus/senec
+  changelog_uri: https://github.com/solectrus/senec/releases
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -49,14 +49,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.5
+rubygems_version: 3.2.28
 signing_key:
 specification_version: 4
 summary: Unofficial Ruby Client for SENEC Home

data/.travis.yml

@@ -1,6 +0,0 @@
----
-language: ruby
-cache: bundler
-rvm:
-  - 2.7.2
-before_install: gem install bundler -v 2.1.4