From 1357ca978ef7c3cadb52c0fbb0f3132188801246 Mon Sep 17 00:00:00 2001
From: "ch.eick" <>
Date: Wed, 31 Jan 2024 06:44:46 +0000
Subject: [PATCH] ch.eick: EVU_aWATTar.txt um MwSt korrigiert

git-svn-id: https://svn.fhem.de/fhem/trunk@28443 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 .../EVU_aWATTar/RAW_EVU_aWATTar.txt           | 60 +++++++++----------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/fhem/contrib/ch.eick/Strombörse/EVU_aWATTar/RAW_EVU_aWATTar.txt b/fhem/contrib/ch.eick/Strombörse/EVU_aWATTar/RAW_EVU_aWATTar.txt
index 37ff97202..6f2d727d5 100644
--- a/fhem/contrib/ch.eick/Strombörse/EVU_aWATTar/RAW_EVU_aWATTar.txt
+++ b/fhem/contrib/ch.eick/Strombörse/EVU_aWATTar/RAW_EVU_aWATTar.txt
@@ -1,74 +1,74 @@
 defmod EVU_aWATTar_connect HTTPMOD https://api.awattar.de/v1/marketdata/current.yaml 0
 attr EVU_aWATTar_connect DbLogExclude .*
-attr EVU_aWATTar_connect comment Version 2024.01.23 13:00\
+attr EVU_aWATTar_connect comment Version 2024.01.31 07:00\
 \
 Achtung, momentan werden nur die Börsenpreise ohne die fix Kosten dargestellt.\
 \
 https://api.awattar.de/v1/marketdata
 attr EVU_aWATTar_connect enableControlSet 1
 attr EVU_aWATTar_connect get01-15Name fc_max
-attr EVU_aWATTar_connect get01-15OExpr round(($val+$val*0.03+1.785)*1.19,2)
+attr EVU_aWATTar_connect get01-15OExpr round(($val+0.03*abs($val)+1.785)*1.19,2)
 attr EVU_aWATTar_connect get01-1Name current_date
 attr EVU_aWATTar_connect get01-22Name fc_med
-attr EVU_aWATTar_connect get01-22OExpr round(($val+$val*0.03+1.785)*1.19,2)
+attr EVU_aWATTar_connect get01-22OExpr round(($val+0.03*abs($val)+1.785)*1.19,2)
 attr EVU_aWATTar_connect get01-29Name fc_avg
-attr EVU_aWATTar_connect get01-29OExpr round(($val+$val*0.03+1.785)*1.19,2)
+attr EVU_aWATTar_connect get01-29OExpr round(($val+0.03*abs($val)+1.785)*1.19,2)
 attr EVU_aWATTar_connect get01-36Name current_price
-attr EVU_aWATTar_connect get01-36OExpr round(($val+$val*0.03+1.785)*1.19,2)
+attr EVU_aWATTar_connect get01-36OExpr round(($val+0.03*abs($val)+1.785)*1.19,2)
 attr EVU_aWATTar_connect get01-8Name fc_min
-attr EVU_aWATTar_connect get01-8OExpr round(($val+$val*0.03+1.785)*1.19,2)
+attr EVU_aWATTar_connect get01-8OExpr round(($val+0.03*abs($val)+1.785)*1.19,2)
 attr EVU_aWATTar_connect get01Name 01_priceInfo
 attr EVU_aWATTar_connect get01RegOpt g
 attr EVU_aWATTar_connect get01Regex date_now: (\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2})|price_low: ([0-9]+[0-9\.]+)|price_high: ([0-9]+[0-9\.]+)|price_median: ([0-9]+[0-9\.]+)|price_average: ([0-9]+[0-9\.]+)|price_current: ([0-9]+[0-9\.]+)
 attr EVU_aWATTar_connect get01URL https://api.awattar.de/v1/marketdata/current.yaml
 attr EVU_aWATTar_connect get02-10Name fc0_09_total
-attr EVU_aWATTar_connect get02-10OExpr round(($val+$val*0.03+1.785)*1.19/100,4)
+attr EVU_aWATTar_connect get02-10OExpr round(($val+0.03*abs($val)+1.785)*1.19/100,4)
 attr EVU_aWATTar_connect get02-11Name fc0_10_total
-attr EVU_aWATTar_connect get02-11OExpr round(($val+$val*0.03+1.785)*1.19/100,4)
+attr EVU_aWATTar_connect get02-11OExpr round(($val+0.03*abs($val)+1.785)*1.19/100,4)
 attr EVU_aWATTar_connect get02-12Name fc0_11_total
-attr EVU_aWATTar_connect get02-12OExpr round(($val+$val*0.03+1.785)*1.19/100,4)
+attr EVU_aWATTar_connect get02-12OExpr round(($val+0.03*abs($val)+1.785)*1.19/100,4)
 attr EVU_aWATTar_connect get02-13Name fc0_12_total
-attr EVU_aWATTar_connect get02-13OExpr round(($val+$val*0.03+1.785)*1.19/100,4)
+attr EVU_aWATTar_connect get02-13OExpr round(($val+0.03*abs($val)+1.785)*1.19/100,4)
 attr EVU_aWATTar_connect get02-14Name fc0_13_total
-attr EVU_aWATTar_connect get02-14OExpr round(($val+$val*0.03+1.785)*1.19/100,4)
+attr EVU_aWATTar_connect get02-14OExpr round(($val+0.03*abs($val)+1.785)*1.19/100,4)
 attr EVU_aWATTar_connect get02-15Name fc0_14_total
-attr EVU_aWATTar_connect get02-15OExpr round(($val+$val*0.03+1.785)*1.19/100,4)
+attr EVU_aWATTar_connect get02-15OExpr round(($val+0.03*abs($val)+1.785)*1.19/100,4)
 attr EVU_aWATTar_connect get02-16Name fc0_15_total
-attr EVU_aWATTar_connect get02-16OExpr round(($val+$val*0.03+1.785)*1.19/100,4)
+attr EVU_aWATTar_connect get02-16OExpr round(($val+0.03*abs($val)+1.785)*1.19/100,4)
 attr EVU_aWATTar_connect get02-17Name fc0_16_total
-attr EVU_aWATTar_connect get02-17OExpr round(($val+$val*0.03+1.785)*1.19/100,4)
+attr EVU_aWATTar_connect get02-17OExpr round(($val+0.03*abs($val)+1.785)*1.19/100,4)
 attr EVU_aWATTar_connect get02-18Name fc0_17_total
-attr EVU_aWATTar_connect get02-18OExpr round(($val+$val*0.03+1.785)*1.19/100,4)
+attr EVU_aWATTar_connect get02-18OExpr round(($val+0.03*abs($val)+1.785)*1.19/100,4)
 attr EVU_aWATTar_connect get02-19Name fc0_18_total
-attr EVU_aWATTar_connect get02-19OExpr round(($val+$val*0.03+1.785)*1.19/100,4)
+attr EVU_aWATTar_connect get02-19OExpr round(($val+0.03*abs($val)+1.785)*1.19/100,4)
 attr EVU_aWATTar_connect get02-1Name fc0_00_total
-attr EVU_aWATTar_connect get02-1OExpr round(($val+$val*0.03+1.785)*1.19/100,4)
+attr EVU_aWATTar_connect get02-1OExpr round(($val+0.03*abs($val)+1.785)*1.19/100,4)
 attr EVU_aWATTar_connect get02-20Name fc0_19_total
-attr EVU_aWATTar_connect get02-20OExpr round(($val+$val*0.03+1.785)*1.19/100,4)
+attr EVU_aWATTar_connect get02-20OExpr round(($val+0.03*abs($val)+1.785)*1.19/100,4)
 attr EVU_aWATTar_connect get02-21Name fc0_20_total
-attr EVU_aWATTar_connect get02-21OExpr round(($val+$val*0.03+1.785)*1.19/100,4)
+attr EVU_aWATTar_connect get02-21OExpr round(($val+0.03*abs($val)+1.785)*1.19/100,4)
 attr EVU_aWATTar_connect get02-22Name fc0_21_total
-attr EVU_aWATTar_connect get02-22OExpr round(($val+$val*0.03+1.785)*1.19/100,4)
+attr EVU_aWATTar_connect get02-22OExpr round(($val+0.03*abs($val)+1.785)*1.19/100,4)
 attr EVU_aWATTar_connect get02-23Name fc0_22_total
-attr EVU_aWATTar_connect get02-23OExpr round(($val+$val*0.03+1.785)*1.19/100,4)
+attr EVU_aWATTar_connect get02-23OExpr round(($val+0.03*abs($val)+1.785)*1.19/100,4)
 attr EVU_aWATTar_connect get02-24Name fc0_23_total
-attr EVU_aWATTar_connect get02-24OExpr round(($val+$val*0.03+1.785)*1.19/100,4)
+attr EVU_aWATTar_connect get02-24OExpr round(($val+0.03*abs($val)+1.785)*1.19/100,4)
 attr EVU_aWATTar_connect get02-2Name fc0_01_total
-attr EVU_aWATTar_connect get02-2OExpr round(($val+$val*0.03+1.785)*1.19/100,4)
+attr EVU_aWATTar_connect get02-2OExpr round(($val+0.03*abs($val)+1.785)*1.19/100,4)
 attr EVU_aWATTar_connect get02-3Name fc0_02_total
-attr EVU_aWATTar_connect get02-3OExpr round(($val+$val*0.03+1.785)*1.19/100,4)
+attr EVU_aWATTar_connect get02-3OExpr round(($val+0.03*abs($val)+1.785)*1.19/100,4)
 attr EVU_aWATTar_connect get02-4Name fc0_03_total
-attr EVU_aWATTar_connect get02-4OExpr round(($val+$val*0.03+1.785)*1.19/100,4)
+attr EVU_aWATTar_connect get02-4OExpr round(($val+0.03*abs($val)+1.785)*1.19/100,4)
 attr EVU_aWATTar_connect get02-5Name fc0_04_total
-attr EVU_aWATTar_connect get02-5OExpr round(($val+$val*0.03+1.785)*1.19/100,4)
+attr EVU_aWATTar_connect get02-5OExpr round(($val+0.03*abs($val)+1.785)*1.19/100,4)
 attr EVU_aWATTar_connect get02-6Name fc0_05_total
-attr EVU_aWATTar_connect get02-6OExpr round(($val+$val*0.03+1.785)*1.19/100,4)
+attr EVU_aWATTar_connect get02-6OExpr round(($val+0.03*abs($val)+1.785)*1.19/100,4)
 attr EVU_aWATTar_connect get02-7Name fc0_06_total
-attr EVU_aWATTar_connect get02-7OExpr round(($val+$val*0.03+1.785)*1.19/100,4)
+attr EVU_aWATTar_connect get02-7OExpr round(($val+0.03*abs($val)+1.785)*1.19/100,4)
 attr EVU_aWATTar_connect get02-8Name fc0_07_total
-attr EVU_aWATTar_connect get02-8OExpr round(($val+$val*0.03+1.785)*1.19/100,4)
+attr EVU_aWATTar_connect get02-8OExpr round(($val+0.03*abs($val)+1.785)*1.19/100,4)
 attr EVU_aWATTar_connect get02-9Name fc0_08_total
-attr EVU_aWATTar_connect get02-9OExpr round(($val+$val*0.03+1.785)*1.19/100,4)
+attr EVU_aWATTar_connect get02-9OExpr round(($val+0.03*abs($val)+1.785)*1.19/100,4)
 attr EVU_aWATTar_connect get02FollowGet 01_priceInfo
 attr EVU_aWATTar_connect get02Name 02_priceDay
 attr EVU_aWATTar_connect get02RegOpt g