Skip to content

Commit 9ab548b

Browse files
woheller69woheller69
committed
V2.5
fixes #24
1 parent 5337da4 commit 9ab548b

File tree

11 files changed

+39
-31
lines changed

11 files changed

+39
-31
lines changed

‎README.md‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,14 @@ Specify the average albedo for your environment to take reflections into account
7272
Examples: Fresh snow: 0.8, green gras: 0.25, asphalt: 0.1
7373
You probably need to optimize this parameter.
7474

75+
#### Inverter efficiency [%]
76+
Enter the efficiency of your inverter.
77+
7578
#### Inverter power [W]
7679
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.
7780

78-
#### Inverter efficiency [%]
79-
Enter the efficiency of your inverter.
81+
#### Central inverter
82+
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.
8083

8184
#### Shading
8285
In this section you can define the shading on your solar panels.

‎app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ android {
88
applicationId "org.woheller69.solxpect"
99
minSdkVersion 26
1010
targetSdk 34
11-
versionCode 24
12-
versionName "2.4"
11+
versionCode 25
12+
versionName "2.5"
1313

1414
buildConfigField "String", "BASE_URL", "\"https://api.open-meteo.com/v1/\""
1515
buildConfigField "String", "TILES_URL","\"https://tile.openstreetmap.org/\""

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,14 @@ <h3>Albedo [0..1]</h3>
5050
Beispiele: Frischer Schnee: 0.8, grünes Gras: 0.25, Asphalt: 0.1
5151
Sie müssen diesen Parameter wahrscheinlich optimieren.
5252

53+
<h3>Wechselrichtereffizienz [%]</h3>
54+
Geben Sie den Wirkungsgrad Ihres Wechselrichters ein.
55+
5356
<h3>Wechselrichterleistung [W]</h3>
5457
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.
5558

56-
<h3>Wechselrichtereffizienz [%]</h3>
57-
Geben Sie den Wirkungsgrad Ihres Wechselrichters ein.
59+
<h3>Zentralwechselrichter</h3>
60+
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.
5861

5962
<h3>Abschattung</h3>
6063
In diesem Abschnitt können Sie die Beschattung Ihrer Solarmodule definieren.

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,14 @@ <h3>Albedo [0..1]</h3>
5050
Examples: Fresh snow: 0.8, green gras: 0.25, asphalt: 0.1
5151
You probably need to optimize this parameter.
5252

53+
<h3>Inverter efficiency [%]</h3>
54+
Enter the efficiency of your inverter.
55+
5356
<h3>Inverter power [W]</h3>
5457
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.
5558

56-
<h3>Inverter efficiency [%]</h3>
57-
Enter the efficiency of your inverter.
59+
<h3>Central Inverter</h3>
60+
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.
5861

5962
<h3>Shading</h3>
6063
In this section you can define the shading on your solar panels.

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,14 @@ <h3>Albedo [0..1]</h3>
4848
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).
4949
Esempi: neve fresca: 0,8 ; erba verde: 0,25 ; asfalto: 0,1 .
5050

51+
<h3>Efficienza dell’inverter [%]</h3>
52+
Indica l’efficienza di conversione dell’inverter.
53+
5154
<h3>Potenza dell’inverter [W]</h3>
5255
Indica la potenza massima gestita dall’inverter. Se è minore della potenza massima dei pannelli, la produzione dell’impianto verrà limitata da questo parametro.
5356

54-
<h3>Efficienza dell’inverter [%]</h3>
55-
Indica l’efficienza di conversione dell’inverter.
57+
<h3>Invertitore centrale</h3>
58+
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.
5659

5760
<h3>Ombreggiamenti</h3>
5861
In questa sezione puoi definire gli ombreggiamenti dei pannelli.

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,14 @@ <h3>Yansıtabilirlik [0..1]</h3>
4949
Örnek: Taze kar: 0.8, yeşil ot: 0.25, asfalt: 0.1
5050
Muhtemelen bu parametreyi optimize etmeniz gerekir.
5151

52+
<h3>İnvertör verimliliği [%]</h3>
53+
İnvertörünüzün verimliliğini girin.
54+
5255
<h3>İnvertör gücü [W]</h3>
5356
İ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.
5457

55-
<h3>İnvertör verimliliği [%]</h3>
56-
İnvertörünüzün verimliliğini girin.
58+
<h3>Merkezi invertör</h3>
59+
İ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.
5760

5861
<h3>Gölgelendirme</h3>
5962
Bu bölümde güneş panellerinizdeki gölgelendirmeyi tanımlayabilirsiniz.

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

Lines changed: 0 additions & 7 deletions
This file was deleted.

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,6 @@ public void updateForecastData(List<HourlyForecast> hourlyForecasts, List<WeekFo
101101
}
102102
}
103103

104-
Toast.makeText(context, "Central Inverter Limit: "+centralInverterLimit, Toast.LENGTH_SHORT).show();
105104
courseDayList = new ArrayList<>();
106105

107106
float energyCumulated=0;

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -150,24 +150,24 @@
150150
android:layout_width="match_parent"
151151
android:layout_height="wrap_content"
152152
android:textStyle="bold"
153-
android:hint="@string/edit_location_hint_inverter_power_limit"/>
153+
android:hint="@string/edit_location_hint_inverter_efficiency"/>
154154
<androidx.appcompat.widget.AppCompatEditText
155-
android:id="@+id/EditLocation_Inverter_Power_Limit"
155+
android:id="@+id/EditLocation_Inverter_Efficiency"
156156
android:layout_width="match_parent"
157157
android:layout_height="wrap_content"
158158
android:inputType="numberDecimal"
159-
android:hint="@string/edit_location_hint_inverter_power_limit"/>
159+
android:hint="@string/edit_location_hint_inverter_efficiency"/>
160160
<TextView
161161
android:layout_width="match_parent"
162162
android:layout_height="wrap_content"
163163
android:textStyle="bold"
164-
android:hint="@string/edit_location_hint_inverter_efficiency"/>
164+
android:hint="@string/edit_location_hint_inverter_power_limit"/>
165165
<androidx.appcompat.widget.AppCompatEditText
166-
android:id="@+id/EditLocation_Inverter_Efficiency"
166+
android:id="@+id/EditLocation_Inverter_Power_Limit"
167167
android:layout_width="match_parent"
168168
android:layout_height="wrap_content"
169169
android:inputType="numberDecimal"
170-
android:hint="@string/edit_location_hint_inverter_efficiency"/>
170+
android:hint="@string/edit_location_hint_inverter_power_limit"/>
171171
<TextView
172172
android:layout_width="match_parent"
173173
android:layout_height="wrap_content"

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,25 +89,25 @@
8989
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
9090
tools:visibility="visible" />
9191

92-
9392
<TextView
94-
android:id="@+id/city_inverter_power_limit"
93+
android:id="@+id/city_inverter_efficiency"
9594
android:layout_width="match_parent"
9695
android:layout_height="wrap_content"
9796
android:layout_gravity="center"
98-
android:text="@string/edit_location_hint_inverter_power_limit"
97+
android:text="@string/edit_location_hint_inverter_efficiency"
9998
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
10099
tools:visibility="visible" />
101100

102101
<TextView
103-
android:id="@+id/city_inverter_efficiency"
102+
android:id="@+id/city_inverter_power_limit"
104103
android:layout_width="match_parent"
105104
android:layout_height="wrap_content"
106105
android:layout_gravity="center"
107-
android:text="@string/edit_location_hint_inverter_efficiency"
106+
android:text="@string/edit_location_hint_inverter_power_limit"
108107
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
109108
tools:visibility="visible" />
110109

110+
111111
</LinearLayout>
112112

113113
</LinearLayout>

0 commit comments

Comments
 (0)