From a6e4adc442bc4d6e0aacb361ea595d6f96f798b4 Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Thu, 2 Jan 2025 01:27:28 +0100
Subject: [PATCH] Marstek B2500: Fix setting pass-through mode

---
 CHANGELOG.md                                                  | 4 ++++
 .../devicesettings/DeviceSettingsPreferenceConst.java         | 2 +-
 .../res/xml/devicesettings_battery_allow_pass_through.xml     | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bf3a5e4fa..2651e9e19 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 ### Changelog
 
+#### NEXT
+* Marstek B2500: Fix setting pass-though mode
+* Marstek B2500: Display sensor temperature in Status Activity
+
 #### 0.83.1
 * Initial support for Garmin Fenix 6X Pro Solar
 * Initial support for Redmi Buds 4 Active
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
index 8120e4f34..52985d75e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
@@ -601,5 +601,5 @@ public class DeviceSettingsPreferenceConst {
     public static final String PREF_BATTERY_DISCHARGE_INTERVALS_SET = "battery_discharge_intervals_set";
     public static final String PREF_BATTERY_DISCHARGE_MANUAL = "battery_discharge_manual";
     public static final String PREF_BATTERY_MINIMUM_CHARGE = "battery_minimum_charge";
-    public static final String PREF_BATTERY_ALLOW_PASS_THROUGH = "battery_allow_pass_though";
+    public static final String PREF_BATTERY_ALLOW_PASS_THROUGH = "battery_allow_pass_through";
 }
diff --git a/app/src/main/res/xml/devicesettings_battery_allow_pass_through.xml b/app/src/main/res/xml/devicesettings_battery_allow_pass_through.xml
index 791d3f885..7edcd2070 100644
--- a/app/src/main/res/xml/devicesettings_battery_allow_pass_through.xml
+++ b/app/src/main/res/xml/devicesettings_battery_allow_pass_through.xml
@@ -2,7 +2,7 @@
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
     <SwitchPreferenceCompat
         android:defaultValue="false"
-        android:key="battery_charge_before_discharge"
+        android:key="battery_allow_pass_through"
         android:layout="@layout/preference_checkbox"
         android:summary="@string/battery_allow_pass_though_summary"
         android:title="@string/battery_allow_pass_through" />