14 Jul, 2022 4 commits
- skip unit tests · 765b1132
  Jean Visagie authored 2 years ago
  
  765b1132
- skip unit test for now · 912fb7ea
  Jean Visagie authored 2 years ago
  
  912fb7ea
- revert test changes · e4e57070
  Jean Visagie authored 2 years ago
  
  e4e57070
- Super messy mocking · 6fea43aa
  Jean Visagie authored 2 years ago
  
  6fea43aa
11 Jul, 2022 9 commits
- fix build · b4b60397
  Jean Visagie authored 2 years ago
  
  b4b60397
- p1reader forwards data to metering · e3c28675
  Andreas Fenkart authored 2 years ago
  
  e3c28675
- open-metering-system: addMeasurement · 28b00481
  Andreas Fenkart authored 2 years ago
  
  28b00481
- open-metering-system · 896f1bdf
  Andreas Fenkart authored 2 years ago
  
  896f1bdf
- metering: add getSeriesValues using ds-model::MeteringOrigin as argument · a0496f23
  Andreas Fenkart authored 2 years ago
  
  a0496f23
- lightttpd-dss.conf: enable websocket through lighty · 29dfdece
  Andreas Fenkart authored 2 years ago
```
add debug pages form katarzyna / works

drop old lightddss-conf

makefile: fix install target for dss.conf

ws: avoid rewriting subscription route

ds-metering: open-metering-system: meteringValues
```
  29dfdece
- import lighttpd.conf and override package default · 94f0d6e9
  Andreas Fenkart authored 2 years ago
  
  94f0d6e9
- Merge branch 'MR_metering_prepare_oms' into 'master' · ca4d04b8
  andreas.fenkart authored 2 years ago
```
Mr metering prepare oms

See merge request !2722
```
  ca4d04b8
- metering/controller: also factor out expired from getInstantPower · 30caa9b0
  Andreas Fenkart authored 2 years ago
  
  30caa9b0
10 Jul, 2022 6 commits
- meteirng: test: in filepath mock calls just convert archiveId to string · c18ffd2f
  Andreas Fenkart authored 2 years ago
  
  c18ffd2f
- metering: drop createArchvieFilesname · 961e0f04
  Andreas Fenkart authored 2 years ago
  
  961e0f04
- archive: stand-alone filename(archiveId) function · b4f211af
  Andreas Fenkart authored 2 years ago
  
  b4f211af
- archives: rename filename to filepath since absolute path is returned · b78ea193
  Andreas Fenkart authored 2 years ago
  
  b78ea193
- meteroing/controller: merge getInstantVAlue with single user getInstantPower · 38c4bed5
  Andreas Fenkart authored 2 years ago
  
  38c4bed5
- metering/controller: getTotalPower -> getApartmentPpower · e8baa532
  Andreas Fenkart authored 2 years ago
  
  e8baa532
08 Jul, 2022 4 commits
- metering/metering: factor sensor expiration check into lambda · c8a1e226
  Andreas Fenkart authored 2 years ago
  
  c8a1e226
- metering: break out dsmeter archive logic to separate file · 50eac510
  Andreas Fenkart authored 2 years ago
  
  50eac510
- Merge branch 'MR_get_last_reading' into 'master' · 25fafdca
  andreas.fenkart authored 2 years ago
```
metering: replace bool by EnergyUnit enum

See merge request !2718
```
  25fafdca
- metering: gcc decltype respects const · ca82645d
  Andreas Fenkart authored 2 years ago
  
  ca82645d
07 Jul, 2022 11 commits
- getLatestReading(ApartmentOrigin) · 1bdb2f6c
  Andreas Fenkart authored 2 years ago
  
  1bdb2f6c
- metering-test: factor out createController · c0c6f717
  Andreas Fenkart authored 2 years ago
  
  c0c6f717
- trompeloeil: import any_of from cookbook · ae56378a
  Andreas Fenkart authored 2 years ago
  
  ae56378a
- metering-test: factor out addConsumption/addProduction helper function · 2e9c2e53
  Andreas Fenkart authored 2 years ago
  
  2e9c2e53
- metering-test: prepare extending getLastReading by ApartmentOrigin · 98e448f4
  Andreas Fenkart authored 2 years ago
  
  98e448f4
- metering: replace bool by EnergyUnit enum · b34df848
  Andreas Fenkart authored 2 years ago
```
ds-metering advertizes energy as Wh, but actually returns Ws which
is the raw value stored in rrd
```
  b34df848
- metering: add getLastReading supporting dsModel::ControllerMeteringOrigin as key · 2df805c8
  Andreas Fenkart authored 2 years ago
  
  2df805c8
- Merge branch 'MR_re-use_meterings_in_meterinValue' into 'master' · 5cd9bf4b
  andreas.fenkart authored 2 years ago
```
Mr re use meterings in meterin value

See merge request !2721
```
  5cd9bf4b
- ds-metering: use metering::meterings list when populating meteringValues response · c1331ae8
  Andreas Fenkart authored 2 years ago
  
  c1331ae8
- ds-metering: re-use metreings::meterings accumulate apartement sum · 379de0fd
  Andreas Fenkart authored 2 years ago
  
  379de0fd
- ds-metering-test: rename TAGS · ff45b3a9
  Andreas Fenkart authored 2 years ago
  
  ff45b3a9
06 Jul, 2022 6 commits
- Merge branch 'MR_metering_listing' into 'master' · 282c7f7a
  andreas.fenkart authored 2 years ago
```
Mr metering listing

See merge request !2720
```
  282c7f7a
- meterings: listing: no apartment consumption available without a ds meter · 64686ec8
  Andreas Fenkart authored 2 years ago
  
  64686ec8
- meterings::meterings: populate list of meters available based on meters sending values · cfbcf9e1
  Andreas Fenkart authored 2 years ago
  
  cfbcf9e1
- metering: keep reference to apartemnt to check controller presence · ca3d62e9
  Andreas Fenkart authored 2 years ago
  
  ca3d62e9
- Merge branch 'MR_encodeId' into 'master' · ee385d7e
  andreas.fenkart authored 2 years ago
```
ds-meterings: factor out encocdeId function

See merge request !2719
```
  ee385d7e
- ds-meterings: factor out encocdeId function · 19b95435
  Andreas Fenkart authored 2 years ago
  
  19b95435

Menu

Explore