V2.5

fixes #24

README.md

@@ -72,11 +72,14 @@ Specify the average albedo for your environment to take reflections into account
 Examples: Fresh snow: 0.8, green gras: 0.25, asphalt: 0.1
 You probably need to optimize this parameter.
 
+#### Inverter efficiency  [%]
+Enter the efficiency of your inverter.
+
 #### Inverter power  [W]
 Specify the maximum power of your inverter. If it is lower than the maximum power of your panels, the output power of your system will be limited by this parameter.
 
-#### Inverter efficiency  [%] 
+#### Central inverter
-Enter the efficiency of your inverter.
+Select this checkbox to apply the inverter limit to the entire system. When in 'show sum' mode, the power limits of all inverters with this checkbox enabled will be aggregated and used as the system-wide power limit.
 
 #### Shading
 In this section you can define the shading on your solar panels.

app/build.gradle

@@ -8,8 +8,8 @@ android {
         applicationId "org.woheller69.solxpect"
         minSdkVersion 26
         targetSdk 34
-        versionCode 24
+        versionCode 25
-        versionName "2.4"
+        versionName "2.5"
 
         buildConfigField "String", "BASE_URL", "\"https://api.open-meteo.com/v1/\""
         buildConfigField "String", "TILES_URL","\"https://tile.openstreetmap.org/\""

app/src/main/assets/help/help-de.html

@@ -50,11 +50,14 @@ Geben Sie die durchschnittliche Albedo für Ihre Umgebung an, um Reflexionen zu
 Beispiele: Frischer Schnee: 0.8, grünes Gras: 0.25, Asphalt: 0.1
 Sie müssen diesen Parameter wahrscheinlich optimieren.
 
+<h3>Wechselrichtereffizienz [%]</h3>
+Geben Sie den Wirkungsgrad Ihres Wechselrichters ein.
+
 <h3>Wechselrichterleistung [W]</h3>
 Geben Sie die maximale Leistung Ihres Wechselrichters an. Wenn diese geringer ist als die maximale Leistung Ihrer Module, wird die Ausgangsleistung Ihres Systems durch diesen Parameter begrenzt.
 
-<h3>Wechselrichtereffizienz [%]</h3>
+<h3>Zentralwechselrichter</h3>
-Geben Sie den Wirkungsgrad Ihres Wechselrichters ein.
+Wählen Sie dieses Kontrollkästchen, um die Wechselrichter-Begrenzung auf das gesamte System anzuwenden. Im "Summe anzeigen"-Modus, werden die Leistungsbegrenzungen aller Wechselrichter mit gesetztem Kontrollkästchen aggregiert und als systemweite Leistungsbegrenzung verwendet.
 
 <h3>Abschattung</h3>
 In diesem Abschnitt können Sie die Beschattung Ihrer Solarmodule definieren.

app/src/main/assets/help/help-en.html

@@ -50,11 +50,14 @@ Specify the average albedo for your environment to take reflections into account
 Examples: Fresh snow: 0.8, green gras: 0.25, asphalt: 0.1
 You probably need to optimize this parameter.
 
+<h3>Inverter efficiency  [%]</h3>
+Enter the efficiency of your inverter.
+
 <h3>Inverter power  [W]</h3>
 Specify the maximum power of your inverter. If it is lower than the maximum power of your panels, the output power of your system will be limited by this parameter.
 
-<h3>Inverter efficiency  [%]</h3>
+<h3>Central Inverter</h3>
-Enter the efficiency of your inverter.
+Select this checkbox to apply the inverter limit to the entire system. When in 'show sum' mode, the power limits of all inverters with this checkbox enabled will be aggregated and used as the system-wide power limit.
 
 <h3>Shading</h3>
 In this section you can define the shading on your solar panels.

app/src/main/assets/help/help-it.html

@@ -48,11 +48,14 @@ Indica la capacità di catturare la radiazione diffusa. Per impianti poco inclin
 Indica la capacità dell’ambiente circostante il tuo impianto di riflettere la luce solare. I valori variano da 0 (tutta la luce viene assorbita), a 1 (tutta la radiazione viene riflessa).
 Esempi: neve fresca: 0,8 ; erba verde: 0,25 ; asfalto: 0,1 .
 
+<h3>Efficienza dell’inverter [%]</h3>
+Indica l’efficienza di conversione dell’inverter.
+
 <h3>Potenza dell’inverter [W]</h3>
 Indica la potenza massima gestita dall’inverter. Se è minore della potenza massima dei pannelli, la produzione dell’impianto verrà limitata da questo parametro.
 
-<h3>Efficienza dell’inverter [%]</h3>
+<h3>Invertitore centrale</h3>
-Indica l’efficienza di conversione dell’inverter.
+Seleziona questa casella di controllo per applicare il limite dell'invertitore all'intero sistema. Quando si è in modalità "mostra totale", i limiti di potenza di tutti gli invertitori con questa casella di controllo abilitata verranno aggregati e utilizzati come limite di potenza dell'intero sistema.
 
 <h3>Ombreggiamenti</h3>
 In questa sezione puoi definire gli ombreggiamenti dei pannelli.

app/src/main/assets/help/help-tr.html

@@ -49,11 +49,14 @@ Yansımaları hesaba katmak için ortamınız için ortalama albedoyu belirtin.
 Örnek: Taze kar: 0.8, yeşil ot: 0.25, asfalt: 0.1
 Muhtemelen bu parametreyi optimize etmeniz gerekir.
 
+<h3>İnvertör verimliliği  [%]</h3>
+İnvertörünüzün verimliliğini girin.
+
 <h3>İnvertör gücü  [W]</h3>
 İnvertörünüzün maksimum gücünü belirtin. Panellerinizin maksimum gücünden daha düşükse, sisteminizin çıkış gücü bu parametre ile sınırlandırılacaktır.
 
-<h3>İnvertör verimliliği  [%]</h3>
+<h3>Merkezi invertör</h3>
-İnvertörünüzün verimliliğini girin.
+İnvertör limitini tüm sisteme uygulamak için bu onay kutusunu seçin. "Toplamı göster" modundayken, bu onay kutusu etkinleştirilmiş olan tüm invertörlerin güç limitleri toplanacak ve tüm sistemin güç limiti olarak kullanılacaktır.
 
 <h3>Gölgelendirme</h3>
 Bu bölümde güneş panellerinizdeki gölgelendirmeyi tanımlayabilirsiniz.

app/src/main/assets/leaflet-tilelayer-colorfilter.min.js

@@ -1,7 +0,0 @@
-/*
-  Leaflet.TileLayer.ColorFilter
-  (c) 2018, Claudio T. Kawakani
-  A simple and lightweight Leaflet plugin to apply CSS filters on map tiles.
-  https://github.com/xtk93x/Leaflet.TileLayer.ColorFilter
-*/
-"use strict";L.TileLayer.ColorFilter=L.TileLayer.extend({intialize:function(t,i){L.TileLayer.prototype.initialize.call(this,t,i)},colorFilter:function(){var r=["blur:px","brightness:%","bright:brightness:%","bri:brightness:%","contrast:%","con:contrast:%","grayscale:%","gray:grayscale:%","hue-rotate:deg","hue:hue-rotate:deg","hue-rotation:hue-rotate:deg","invert:%","inv:invert:%","opacity:%","op:opacity:%","saturate:%","saturation:saturate:%","sat:saturate:%","sepia:%","sep:sepia:%"];return(this.options.filter?this.options.filter:[]).map(function(t){var i=t.toLowerCase().split(":");if(2===i.length){var e=r.find(function(t){return t.split(":")[0]===i[0]});if(e)return e=e.split(":"),i[1]+=/^\d+$/.test(i[1])?e[e.length-1]:"","".concat(e[e.length-2],"(").concat(i[1],")")}return""}).join(" ")},_initContainer:function(){L.TileLayer.prototype._initContainer.call(this);this._container.style.filter=this.colorFilter()},updateFilter:function(t){this.options.filter=t,this._container&&(this._container.style.filter=this.colorFilter())}}),L.tileLayer.colorFilter=function(t,i){return new L.TileLayer.ColorFilter(t,i)};

app/src/main/java/org/woheller69/weather/ui/RecycleList/CityWeatherAdapter.java

@@ -101,7 +101,6 @@ public class CityWeatherAdapter extends RecyclerView.Adapter<CityWeatherAdapter.
             }
         }
 
-        Toast.makeText(context, "Central Inverter Limit: "+centralInverterLimit, Toast.LENGTH_SHORT).show();
         courseDayList = new ArrayList<>();
 
         float energyCumulated=0;

app/src/main/res/layout/dialog_edit_location.xml

@@ -146,17 +146,6 @@
         android:layout_height="wrap_content"
         android:inputType="numberDecimal"
         android:hint="@string/edit_location_hint_albedo"/>
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textStyle="bold"
-        android:hint="@string/edit_location_hint_inverter_power_limit"/>
-    <androidx.appcompat.widget.AppCompatEditText
-        android:id="@+id/EditLocation_Inverter_Power_Limit"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:inputType="numberDecimal"
-        android:hint="@string/edit_location_hint_inverter_power_limit"/>
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -168,6 +157,17 @@
         android:layout_height="wrap_content"
         android:inputType="numberDecimal"
         android:hint="@string/edit_location_hint_inverter_efficiency"/>
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textStyle="bold"
+        android:hint="@string/edit_location_hint_inverter_power_limit"/>
+    <androidx.appcompat.widget.AppCompatEditText
+        android:id="@+id/EditLocation_Inverter_Power_Limit"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:inputType="numberDecimal"
+        android:hint="@string/edit_location_hint_inverter_power_limit"/>
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"

app/src/main/res/layout/list_item_city_list.xml

@@ -89,6 +89,14 @@
                 android:textAppearance="@style/TextAppearance.AppCompat.Medium"
                 tools:visibility="visible" />
 
+            <TextView
+                android:id="@+id/city_inverter_efficiency"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:text="@string/edit_location_hint_inverter_efficiency"
+                android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+                tools:visibility="visible" />
 
             <TextView
                 android:id="@+id/city_inverter_power_limit"
@@ -99,14 +107,6 @@
                 android:textAppearance="@style/TextAppearance.AppCompat.Medium"
                 tools:visibility="visible" />
 
-            <TextView
-                android:id="@+id/city_inverter_efficiency"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:text="@string/edit_location_hint_inverter_efficiency"
-                android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-                tools:visibility="visible" />
 
         </LinearLayout>
 

fastlane/metadata/android/en-US/changelogs/25.txt

@@ -0,0 +1 @@
+Add option for central inverter