Code

Update main from dev#15

Code

Open

stevebuk1 wants to merge 177 commits intomainstevebuk1/pv_opt:mainfrom devstevebuk1/pv_opt:devCopy head branch name to clipboard

+3,570-1,955

Commits

Commits on Sep 26, 2024

• Add "online" sensor to Solarman integration

  stevebuk1

  committed
  66bc149

Commits on Sep 29, 2024

• Add entry to config.yaml for Solarman sensor

  Show description for b433b05
  stevebuk1

  committed
  b433b05

Commits on Oct 4, 2024

• Solarman - updates to online and maximum_dod_percent

  Show description for bab7794
  stevebuk1

  committed
  bab7794

Commits on Oct 6, 2024

• Add debug logging for Solarman Integration

  Show description for 2508cc8
  stevebuk1

  committed
  2508cc8

• Update README.md for new Solarman integration

  Show description for e5119e1
  stevebuk1

  authored
  e5119e1

• Update README.md for new Solarman integration

  stevebuk1

  authored
  eaeb9bf

• Update README.md

  stevebuk1

  authored
  e0a9276

• Update README.md

  stevebuk1

  authored
  da9fbf6

• Add "SOLIS_SOLARMAN_V2" to INVERTER_DEFS

  Show description for f85519b
  stevebuk1

  committed
  f85519b

• Add "SOLIS_SOLARMAN_V2" as option throughout solis.py

  stevebuk1

  committed
  a49c65f

• Add SOLIS_SOLARMAN_V2 defaults to config.yaml.

  Show description for 85604a6
  stevebuk1

  committed
  85604a6

• Merge branch 'patch2' of https://github.com/stevebuk1/pv_opt into patch2

  stevebuk1

  committed
  79fb558

Commits on Oct 8, 2024

• Move id_soilar_power to within each integration

  Show description for 92fd0c7
  stevebuk1

  committed
  92fd0c7

Commits on Oct 9, 2024

• Fix indenting on comment.

  stevebuk1

  committed
  2533719

• Updates for SolarmanV2 integration

  Show description for 8734241
  stevebuk1

  committed
  8734241

• Add SOLARMAN_V2 to INVERTER_TYPES

  stevebuk1

  committed
  bf06f65

Commits on Oct 10, 2024

• Update solis.py to correct non-functioning "if" gate.

  stevebuk1

  authored
  2d7b4b0

• Bugfix on if gate for SOLARMAN_V2

  stevebuk1

  authored
  1764f97

• Change HA types in SolarmanV2

  Show description for 8297683
  stevebuk1

  committed
  8297683

• Config.yaml - change HA types for SolarmanV2

  Show description for a948fc7
  stevebuk1

  committed
  a948fc7

• Further fixes for Solarman V2

  Show description for 7ec391c
  stevebuk1

  committed
  7ec391c

• Add comments for things that require fixing

  stevebuk1

  committed
  1f78a14

• Remove incorrect comment

  stevebuk1

  committed
  a70fc64

Commits on Oct 11, 2024

• SOLVARMAN_V2 - correct default entity names

  stevebuk1

  authored
  c514edd

Commits on Oct 13, 2024

• Merge branch 'patch2' of https://github.com/stevebuk1/pv_opt into patch2

  stevebuk1

  committed
  4fc3e8a

Commits on Oct 14, 2024

• Fixes for Solarman_V2 integration

  Show description for 5df217c
  stevebuk1

  authored
  5df217c

• Solarman_V2 mods

  Show description for 4ea7f51
  stevebuk1

  authored
  4ea7f51

• Solarman_v2 - fixes

  Show description for 91765cb
  stevebuk1

  authored
  91765cb

• Merge branch 'patch2' of https://github.com/stevebuk1/pv_opt into patch2

  stevebuk1

  committed
  f340dfc

• Reinstantiate charge start/end ids in hours and minutes

  Show description for 92701af
  stevebuk1

  committed
  92701af

• SOLARMAN_V2 - comment out unused entities

  stevebuk1

  committed
  6f6eae1

Commits on Oct 15, 2024

• Add "solis_hybrid.yaml" for use with SOLARMAN_V2

  Show description for e251a2e
  stevebuk1

  committed
  e251a2e

Commits on Oct 16, 2024

• Fix mode comparison sense and fix logging

  stevebuk1

  committed
  2038ccf

• Debuggging - perform test write to Solarman register

  stevebuk1

  committed
  2c13887

Commits on Oct 18, 2024

• Remove ".host" from Solarman Write.

  stevebuk1

  authored
  35e0fe0

Commits on Oct 19, 2024

• Solarman integration - change modbus writes to entity writes

  Show description for 7a88d39
  stevebuk1

  committed
  7a88d39

Commits on Oct 20, 2024

• Add solis_hybrid.yaml for use with Solarman

  Show description for b257b50
  stevebuk1

  committed
  b257b50

• solis.py, change to INVERTER_DEFS for Solarman

  Show description for 1a7e636
  stevebuk1

  committed
  1a7e636

Commits on Oct 21, 2024

• Delete solis_hybrid.yaml

  Show description for 6d10e7e
  stevebuk1

  authored
  6d10e7e

Commits on Oct 22, 2024

• Add logging of kWh sensor data

  stevebuk1

  committed
  0d1b5a5

• Change name of register 43110

  Show description for 93bc813
  stevebuk1

  committed
  93bc813

• Update solis_hybrid.yaml

  stevebuk1

  authored
  be257f6

Commits on Oct 28, 2024

• Merge branch 'main' into patch2

  stevebuk1

  committed
  f3ce6f7

Commits on Oct 31, 2024

• Enable writing to inverter for Solarman_V2

  stevebuk1

  committed
  c60b5b5

Commits on Nov 4, 2024

• Add "write_and_poll_time" function to pv_opt.py for Solarman_v2 use

  stevebuk1

  committed
  e8c7fbe

Commits on Nov 5, 2024

• Bugfix: set value of value_pd before reading it

  stevebuk1

  authored
  17c7596

• Bugfix: extract time using strftime

  stevebuk1

  authored
  81be928

• Solarman_v2 - change service call type from number to time

  stevebuk1

  authored
  775f710

• SolarmanV2 - pass pd.TimeStamp to write_and_poll_time

  stevebuk1

  committed
  74e2e2c

Commits on Nov 6, 2024

• Bugfix, correct logging error.

  stevebuk1

  authored
  8f40516

• Bugfix: Fix error in logging

  stevebuk1

  authored
  1663588

• Bugfix: fix time comparisons for Solarman

  stevebuk1

  committed
  8fc0ece

Commits on Nov 7, 2024

• Bugfix: correct logging

  stevebuk1

  committed
  0c3be28

Commits on Nov 8, 2024

• Bugfix - set consistent date for time comparisons used in Solarman Write.

  stevebuk1

  authored
  6e325b2

• Bugfix - correct comparisons in write_and_poll_time

  stevebuk1

  committed
  0627866

Commits on Nov 9, 2024

• Bugfix - time setting for Solarman

  stevebuk1

  committed
  44be151

• Bugfix: Solarman, add logging

  stevebuk1

  committed
  7fa935a

Commits on Nov 10, 2024

• Bugfix: Solarman, correct call_service call, pass naive time.

  stevebuk1

  committed
  b277b1f

• Bugfix: Don't use "time" as a variable name

  stevebuk1

  committed
  90a344b

• Bugfix, discharge times different incorrectly calls charge routine

  stevebuk1

  committed
  f654186

• Solarman - increase wait time for time writes

  stevebuk1

  committed
  6b08749

Commits on Nov 11, 2024

• Merge branch 'fboundy:main' into patch2

  stevebuk1

  authored
  541f378

• Update README.md for new Solarman integration

  stevebuk1

  authored
  4128fbc

• Update README.md for Solarman integration

  stevebuk1

  authored
  adc3d72

• Update README.md

  stevebuk1

  authored
  e666e29

• Bugfix: correct logging in Solarman

  stevebuk1

  authored
  e9dff5e

• Bugfix: remove logging of 5 years of tariff

  stevebuk1

  authored
  49c06f2

• Solarman - tidy up debug logging

  Show description for f7978e3
  stevebuk1

  committed
  f7978e3

• Merge pull request fboundy#290 from stevebuk1/dev

  Show description for 22945ba
  stevebuk1

  authored
  22945ba

• Merge branch 'main' into patch2

  stevebuk1

  committed
  4296d88

Commits on Nov 12, 2024

• 13.7.2 - Tidy up log file

  fboundy

  committed
  41a6891

Commits on Nov 13, 2024

• Add Solis_Cloud as inverter type

  fboundy

  committed
  34afbf9

• Merge branch 'patch' into solis-cloud

  fboundy

  committed
  28def4e

• Pseudo code and variable name changes for multiple Zappi support

  stevebuk1

  committed
  62b9e18

Commits on Nov 14, 2024

• Add full support for SolisCloud

  fboundy

  committed
  a2a3a22

• Merge pull request fboundy#291 from fboundy/solis-cloud

  Show description for 96cc6fb
  fboundy

  authored
  96cc6fb

• Fix bugs when limited consumption history is available

  fboundy

  committed
  0120f6c

• Status debugging

  fboundy

  committed
  1b1f237

• Add retry to soliscloud read_code

  fboundy

  committed
  319457d

• Tidy up charge times when there are none

  fboundy

  committed
  1ef8b3d

• Merge branch 'patch2' into patch2

  stevebuk1

  authored
  116c602

• Merge pull request fboundy#292 from stevebuk1/patch2

  Show description for 649a797
  stevebuk1

  authored
  649a797

• Merge branch 'main' into dev

  stevebuk1

  committed
  4e9c900

• Merge branch 'fboundy:dev' into dev

  stevebuk1

  authored
  a186b27

Commits on Nov 15, 2024

• Return 0 from is_online if no network

  fboundy

  committed
  4a80957

• Merge pull request fboundy#294 from fboundy/solis-cloud

  Show description for 9c11da3
  fboundy

  authored
  9c11da3

Commits on Nov 16, 2024

• Bugfixes: copyonwrite warnings, Prevent Dishcharge

  Show description for 1cf8908
  stevebuk1

  committed
  1cf8908

• 3.19.0 Beta-16 Release

  Show description for cc3fbbc
  stevebuk1

  committed
  cc3fbbc

• Release 3.19.0 Beta-16

  Show description for dfbdaa7
  stevebuk1

  committed
  dfbdaa7

• Load consumption data from multiple zappis

  stevebuk1

  committed
  0099ceb

• Updated license to acknowldeg soliscontrol

  fboundy

  committed
  7bdc059

• Merge pull request fboundy#295 from fboundy/solis-cloud

  Show description for 8e31ca5
  fboundy

  authored
  8e31ca5

Commits on Nov 17, 2024

• Add Multiple Zappi support, tidy up logging

  stevebuk1

  committed
  21959e1

• Merge pull request fboundy#297 from stevebuk1/dev

  Show description for 9f098a1
  stevebuk1

  authored
  9f098a1

• Merge pull request fboundy#298 from fboundy/main

  Show description for b62693e
  stevebuk1

  authored
  b62693e

Commits on Nov 18, 2024

• Merge branch 'main' into dev

  stevebuk1

  committed
  bc72b06

• Merge branch 'patch2' into dev

  stevebuk1

  committed
  9158047

• Merge pull request fboundy#303 from stevebuk1/dev

  Show description for 5e3ce8b
  stevebuk1

  authored
  5e3ce8b

• Fix after Patch2 merge into Dev - remove logging.

  stevebuk1

  committed
  35c91f8

Commits on Nov 19, 2024

• Merge branch 'main' into patch

  fboundy

  committed
  18184d3

• Merge branch 'main' into patch

  fboundy

  committed
  358772d

• 3.18.3 - Temporarily Disable Solis Cloud

  fboundy

  committed
  0077d8e

• Merge pull request fboundy#304 from fboundy/patch

  Show description for 0e41f94
  fboundy

  authored
  0e41f94

• Tidy up logging

  stevebuk1

  committed
  606e8a2

• Tidy up logging

  stevebuk1

  committed
  e9bb122

• Logging fixes

  stevebuk1

  committed
  16f505c

• Merge branch 'main' into dev

  stevebuk1

  committed
  d59edae

Commits on Nov 21, 2024

• Tidy up logging, round amps to integer for Solarman V2 writes

  stevebuk1

  committed
  5000c8e

• Roll version to 3.19.0-Beta-17

  stevebuk1

  committed
  4212a21

Commits on Nov 22, 2024

• Update README.md to increase number of log files and log file size.

  stevebuk1

  authored
  646efe3

• Update README.md - add id_zappi_plug_status entry

  stevebuk1

  authored
  71c65dd

• Update README.md for Prevent_discharge entity

  stevebuk1

  authored
  3e025b2

• README fixes, bugfixes

  Show description for c9a17bc
  stevebuk1

  committed
  c9a17bc

Commits on Nov 25, 2024

• 3.19.0-Beta-18 - fix multiple optimiser runs on state changes

  Show description for b0f9912
  stevebuk1

  committed
  b0f9912

Commits on Nov 26, 2024

• 3.19.0-Beta-18

  Show description for 88e3d08
  stevebuk1

  committed
  88e3d08

• Bugfix - correct error in last commit

  stevebuk1

  committed
  af53cde

• Commented out all unused partial slot code

  Show description for 5915f61
  stevebuk1

  committed
  5915f61

• Tidy up comments ( no code changes)

  stevebuk1

  committed
  054e8a3

Commits on Dec 2, 2024

• refactor solis.py

  fboundy

  committed
  d57162f

• Fix for fboundy#311

  fboundy

  committed
  1e2a395

• Merge branch 'patch2' into patch

  fboundy

  committed
  7df925c

• 3.19.0-Beta-19: Add version to Optimiser run, tidy up comments

  stevebuk1

  committed
  6bb2d1a

• Manually incorporate Pull request fboundy#312

  stevebuk1

  committed
  2f85f71

• Update README.md

  stevebuk1

  authored
  4b47ae4

• 3.19.0-Beta-20

  Show description for 3d87e9f
  stevebuk1

  authored
  3d87e9f

• Update README.md

  stevebuk1

  authored
  8741c6e

Commits on Dec 3, 2024

• Refactor solis.py

  fboundy

  committed
  8954501

Commits on Dec 4, 2024

• Refactor solis.py

  fboundy

  committed
  3ea6937

Commits on Dec 7, 2024

• Solis.py refactor

  fboundy

  committed
  4fb500a

Commits on Dec 8, 2024

• 3.19.0-Beta-21: Bugfixes and enhancements - see description

  Show description for 2bd9d03
  stevebuk1

  committed
  2bd9d03

Commits on Dec 9, 2024

• Merge pull request #16 from fboundy/dev

  Show description for db33bb3
  stevebuk1

  authored
  db33bb3

Commits on Dec 13, 2024

• Imrove optimiser efficiency

  fboundy

  committed
  9b9199d

• Set intial SOC = current SOC if not found

  fboundy

  committed
  2524720

• Add SolarMan_V2

  fboundy

  committed
  fc9bf93

• 3.19.0-beta-1

  fboundy

  committed
  fabc152

• Merge branch 'patch' into dev

  fboundy

  committed
  f249328

• Import chnages from 3.19.0 Production + Bug Fixes

  fboundy

  committed
  e2f6218

Commits on Dec 15, 2024

• Fix current sign bug

  fboundy

  committed
  ef176d3

• Fix too high discharge power limit

  fboundy

  committed
  77bd0d5

• Update comments (no code changes)

  stevebuk1

  committed
  7864feb

• Bug fix

  fboundy

  committed
  b2fb8df

• Merge branch 'dev' of https://github.com/fboundy/pv_opt into dev

  fboundy

  committed
  abb0d26

Commits on Dec 16, 2024

• Improve debug logging

  stevebuk1

  committed
  7d87f11

Commits on Dec 17, 2024

• 3.19.0-Beta-22: # Added self.ev switch to _check_for_Zappi

  Show description for 9418948
  stevebuk1

  committed
  9418948

Commits on Dec 18, 2024

• Tidy up optimiser

  fboundy

  committed
  dbfc30a

• Merge branch 'dev' of https://github.com/fboundy/pv_opt into dev

  fboundy

  committed
  9995eea

• Tidy up optimiser

  fboundy

  committed
  9e9361d

• Refactor flows

  fboundy

  committed
  a613af3

• Merge branch 'dev' of https://github.com/fboundy/pv_opt into dev

  stevebuk1

  committed
  71958a9

• Dev: roll version to 3.20.0-Beta-22

  stevebuk1

  committed
  0a67b1b

• Merge branch 'fboundy:dev' into dev

  stevebuk1

  authored
  d2de36a

Commits on Dec 22, 2024

• Improved optimiser

  fboundy

  committed
  cbf36a3

• Merge pull request fboundy#324 from fboundy/opt

  Show description for f755c9d
  fboundy

  authored
  f755c9d

• Updated black formatter

  fboundy

  committed
  0e46660

• Update solis.py

  fboundy

  authored
  ce8bc02

• Updated black formatter

  fboundy

  committed
  4cb1059

• Merge branch 'dev' of https://github.com/fboundy/pv_opt into dev

  fboundy

  committed
  5e6f6bf

• Updated workflows

  fboundy

  committed
  344101a

• Updated workflow

  fboundy

  committed
  b7e1068

• Updated workflow

  fboundy

  committed
  b408e4a

• Updated workflow

  fboundy

  committed
  30b5885

• Test

  fboundy

  committed
  ec9b026

• Test workflow

  fboundy

  committed
  e6d3c07

• Test

  fboundy

  committed
  576da43

• Check and Diff

  fboundy

  committed
  d976171

• isort

  fboundy

  committed
  fc7388a

• Test

  fboundy

  committed
  f996566

• Test

  fboundy

  committed
  30ad911

• Auto-format code with Black and isort

  github-actions[bot]

  committed
  cf164e5

Commits on Dec 23, 2024

• Test optimiser mods

  fboundy

  committed
  de5c67d

• Fix optimiser bug

  fboundy

  committed
  55ff599

• Fix typos

  fboundy

  committed
  3f78f19

• FIx black workflow for dev

  fboundy

  committed
  9222e3f

• Auto-format code with Black and isort

  github-actions[bot]

  committed
  8245f0d

Commits on Dec 24, 2024

• Fix typo

  fboundy

  committed
  c9ebd30

• Merge branch 'dev' of https://github.com/fboundy/pv_opt into dev

  fboundy

  committed
  49490e5

Commits on Dec 30, 2024

• Merge branch 'fboundy:dev' into dev

  stevebuk1

  authored
  d950993