Commit graph

2025 commits

Author SHA1 Message Date
lumapu
d8feaf02ac changed to generic packet_t 2023-09-30 00:10:49 +02:00
lumapu
09896fbe6b first comparison, compiles fine 2023-09-29 23:54:29 +02:00
lumapu
963e618c5c 0.7.60
* fixed typos in changelog #1172
* fixed MqTT manual clientId storage #1174
* fixed inverter name length in setup #1181
* added inverter name to the header of alarm list #1181
* improved code to avoid warning during compilation #1182
* fix scheduler #1188, #1179
2023-09-27 21:17:14 +02:00
lumapu
640bfc6d7a Merge branch 'LeSpocky-changelog' into development03 2023-09-27 20:15:23 +02:00
lumapu
9e21fd470d Merge branch 'changelog' of https://github.com/LeSpocky/ahoy into LeSpocky-changelog 2023-09-27 20:15:07 +02:00
lumapu
464ca62830 Merge branch 'martinriedel-development03' into development03 2023-09-27 20:13:55 +02:00
lumapu
18b09220b7 Merge branch 'development03' of https://github.com/martinriedel/ahoy into martinriedel-development03 2023-09-27 20:13:42 +02:00
lumapu
02c81003dc fix max length of inverter #1180 2023-09-27 20:13:14 +02:00
lumapu
4d65fd3789 Merge branch 'hpd96-devel03-alarm-list' into development03 2023-09-27 20:08:03 +02:00
lumapu
64a82770b9 Merge branch 'devel03-alarm-list' of https://github.com/hpd96/ahoy into hpd96-devel03-alarm-list 2023-09-27 20:07:46 +02:00
lumapu
44399bd483 added more paranthesis 2023-09-27 20:06:33 +02:00
lumapu
6d71976a23 Merge branch 'hpd96-devel03-hm-mipayload-warning' into development03 2023-09-27 20:01:21 +02:00
lumapu
82440fba28 Merge branch 'devel03-hm-mipayload-warning' of https://github.com/hpd96/ahoy into hpd96-devel03-hm-mipayload-warning 2023-09-27 20:01:04 +02:00
lumapu
440732eaa9 Merge branch 'rejoe2-development03' into development03 2023-09-27 19:56:58 +02:00
rejoe2
6b5dfeec08
reset ticker
beegee3 proposal, https://github.com/lumapu/ahoy/issues/1179#issuecomment-1735071508
2023-09-27 05:07:30 +02:00
Peter H. Demus
7561044e23 correct parentheses now to understand the logic and avoid warning
add to alarm list :
if laststatus was not 3
if laststatus was 3 and currentstatus is 3

add?
currentStatusMi = mPayload[iv->id].sts[stschan];


WiP

In file included from app.h:21,
                 from app.cpp:8:
hm/miPayload.h: In instantiation of 'void MiPayload<HMSYSTEM, HMRADIO>::miStsConsolidate(Inverter<>*, uint8_t, record_t<>*, uint8_t, uint8_t, uint8_t, uint8_t) [with HMSYSTEM = HmSystem<4>; HMRADIO = HmRadio<>; uint8_t = unsigned char]':
hm/miPayload.h:451:13:   required from 'void MiPayload<HMSYSTEM, HMRADIO>::miStsDecode(Inverter<>*, packet_t*, uint8_t) [with HMSYSTEM = HmSystem<4>; HMRADIO = HmRadio<>; uint8_t = unsigned char]'
hm/miPayload.h:175:17:   required from 'void MiPayload<HMSYSTEM, HMRADIO>::add(Inverter<>*, packet_t*) [with HMSYSTEM = HmSystem<4>; HMRADIO = HmRadio<>]'
app.cpp:143:41:   required from here
hm/miPayload.h:481:99: warning: suggest parentheses around '&&' within '||' [-Wparentheses]
  481 |                                                 || mPayload[iv->id].sts[stschan] && statusMi == 3 && mPayload[iv->id].sts[stschan] != 3)


Signed-off-by: Peter H. Demus <peter@demus.de>
2023-09-25 21:48:59 +02:00
Peter H. Demus
9e09dc5530 web: alarm list: show inverter name
rename alarm table header "String" to "Event"

Signed-off-by: Peter H. Demus <peter@demus.de>
2023-09-25 21:13:37 +02:00
vendetta
921506d543 fixed None access 2023-09-21 20:33:42 +02:00
vendetta
b475c34878 fixed NoneType access 2023-09-21 20:32:00 +02:00
vendetta
a269edc03c fixed change in dependency 2023-09-21 20:32:00 +02:00
vendetta
a8343fdbb8 added venv to ignore
# Conflicts:
#	.gitignore
2023-09-21 20:32:00 +02:00
vendetta
ba7d3e8b8b fixed mqtt client usage with sun timings; fixed null pointer when sun times are disabled 2023-09-21 20:32:00 +02:00
vendetta
bf7b122cea added warning to detect unreachable NRF chip; added basic interrupt handler;added missing exception on timeout
# Conflicts:
#	tools/rpi/hoymiles/__init__.py
2023-09-21 20:32:00 +02:00
Martin Riedel
9751785dd4 Add clientId to jsonMqtt in settings.h 2023-09-21 09:42:49 +02:00
Alexander Dahl
2040682fa7 changes: Fix typos found by codespell
codespell -w -i 3 src/CHANGES.md
2023-09-21 08:22:07 +02:00
Alexander Dahl
0c3dbd2ab2 changes: Fix typo
The actual change here was done with 821ab96402 ("hm: Re-add Hardware
Number 10104000 for HM-400") and again without mention in commit message
with afa96506a3 ("MI - alarms and control and other").  The changelog
was updated with the merge commit cfd73906e4 ("Merge branch
'development03' of https://github.com/rejoe2/ahoy into
rejoe2-development03") but attributing the wrong model.
2023-09-21 08:21:06 +02:00
lumapu
3a29d6c258 0.7.59
small fix by rejoe2 #1170
2023-09-20 23:11:37 +02:00
lumapu
eaa69c5f89 0.7.59
* add another HM-600 hardware serial number #1169
* merge PR #1170
* reduce last_success MQTT messages (#1124)
* add re-request if inverter is known to be online and first try fails
* add alarm reporting to MI (might need review!)
* rebuild MI limiting code closer to DTUSimMI example
* round APC in `W` to an integer #1171
2023-09-20 22:53:02 +02:00
lumapu
0ff6c72a8e Merge branch 'rejoe2-development03' into development03 2023-09-20 22:52:29 +02:00
lumapu
cfd73906e4 Merge branch 'development03' of https://github.com/rejoe2/ahoy into rejoe2-development03 2023-09-20 22:40:55 +02:00
lumapu
923620f8de Merge branch 'LeSpocky-hm-400' into development03 2023-09-20 22:06:29 +02:00
lumapu
f79bcd838a Merge branch 'hm-400' of https://github.com/LeSpocky/ahoy into LeSpocky-hm-400 2023-09-20 22:05:44 +02:00
lumapu
5a0ed9ef02 fix wrong version in CHANGES.md 2023-09-20 22:05:24 +02:00
rejoe2
a9dc7a1be5
fix typos 2023-09-20 19:31:20 +02:00
rejoe2
06553d10ba
fix typos 2023-09-20 19:24:08 +02:00
rejoe2
afa96506a3
MI - alarms and control and other
* reduce last_success MQTT messages (#1124)
* add re-request if inverter is known to be online and first try fails
* add alarm reporting to MI (might need review!)
* rebuild MI limiting code closer to DTUSimMI example
2023-09-20 19:16:53 +02:00
Alexander Dahl
821ab96402 hm: Re-add Hardware Number 10104000 for HM-400
This was probably removed by accident?  Resulted in no Max. Power shown
for this device in live view.

References: #1111
Fixes: 201098ae0b ("0.7.45 * change ePaper text to symbols PR #1131 * added some invertes to dev info list #1111")
Signed-off-by: Alexander Dahl <post@lespocky.de>
2023-09-19 22:16:21 +02:00
lumapu
d0c834f17a 0.5.58
* fix ESP8266 save settings issue #1166
2023-09-19 21:35:17 +02:00
lumapu
ff63f5236d 0.7.57
* fix Alarms are always in queue (since 0.7.56)
* fix display active power control to long for small devices #1165
2023-09-18 22:52:02 +02:00
lumapu
3b4365a697 0.7.56
* merge PR #1163
2023-09-17 22:14:48 +02:00
lumapu
f03ec52935 Merge branch 'development03' of https://github.com/fsck-block/ahoy into development03 2023-09-17 22:12:17 +02:00
lumapu
cefcc9c8c3 0.7.56
* only request alarms which were not received before #1113
* added flag if alarm was requested but not received and re-request it #1105
2023-09-17 22:11:12 +02:00
lumapu
882e96b93b fix patch for fusion-dev 2023-09-17 20:57:43 +02:00
Frank
ff5888a374 Remove obsolete #define MIDNIGHTTICKER_OFFSET 2023-09-17 14:46:19 +02:00
lumapu
a18a738a0a 0.7.55
* fix prometheus builds
* fix ESP32 default pinout #1159
* added `opendtufusion-dev` because of anoying `-DARDUINO_USB_CDC_ON_BOOT=1` flag
* fix display of current power on `index`
* fix OTA, was damaged by version `0.7.51`, need to use webinstaller (from `0.7.51` to `0.7.54`)
2023-09-17 12:20:58 +02:00
lumapu
9a09b5f4f8 0.7.54
* added active power control in `W` to live view #201, #673
* updated docu, active power control related #706
* added current AC-Power to `index` page and removed version #763
* improved statistic data, moved to entire struct
* removed `/api/statistics` endpoint from REST-API
2023-09-17 01:55:45 +02:00
lumapu
181cc6fc24 0.7.53
* fix ePaper / display night behaviour #1151
* fix ESP8266 compile error
2023-09-16 23:15:13 +02:00
lumapu
9216cdce9e 0.7.52
* fix CMT configureable pins #1150, #1159
* update MqTT lib to version `1.4.5`
2023-09-16 22:53:31 +02:00
lumapu
77ba2783a6 0.7.51
* fix opendtufusion start
2023-09-16 01:31:23 +02:00
lumapu
9521cf756a 0.7.51
* fix CMT configureable pins #1150
* fix default CMT pins for opendtufusion
* beautified `system`
* changed main loops, fix resets #1125, #1135
2023-09-16 01:29:17 +02:00