demus/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge.git synced 2025-01-10 09:01:55 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

Marstek B2500: decode more values and show debug in dashboard, improve colors for gauge

Browse Source
This commit is contained in:
Andreas Shimokawa 2025-01-10 00:37:59 +01:00
parent 7893ace986
commit 038bada484
3 changed files with 88 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/marstek/SolarEquipmentStatusActivity.java
View File

@ -55,6 +55,7 @@ public class SolarEquipmentStatusActivity extends AbstractGBActivity {
public static String EXTRA_OUTPUT2_WATT = "output2_watt"; public static String EXTRA_OUTPUT2_WATT = "output2_watt";
public static String EXTRA_TEMP1 = "temp1"; public static String EXTRA_TEMP1 = "temp1";
public static String EXTRA_TEMP2 = "temp2"; public static String EXTRA_TEMP2 = "temp2";
public static String EXTRA_DEBUG = "debug";
private final Map<String, View> widgetMap = new HashMap<>(); private final Map<String, View> widgetMap = new HashMap<>();
private GridLayout gridLayout; private GridLayout gridLayout;
@ -74,14 +75,15 @@ public class SolarEquipmentStatusActivity extends AbstractGBActivity {
int temp2 = extras.getInt(EXTRA_TEMP2); int temp2 = extras.getInt(EXTRA_TEMP2);
int output1_watt = extras.getInt(EXTRA_OUTPUT1_WATT); int output1_watt = extras.getInt(EXTRA_OUTPUT1_WATT);
int output2_watt = extras.getInt(EXTRA_OUTPUT2_WATT); int output2_watt = extras.getInt(EXTRA_OUTPUT2_WATT);
updateWidget("battery", battery_pct + "%\n" + battery_wh + "Wh", (float) (battery_pct / 100.0)); String debug = extras.getString(EXTRA_DEBUG);
updateWidget("panel1", panel1_watt + "W", (float) (panel1_watt / 380.0)); updateGaugeWidget("battery", battery_pct + "%\n" + battery_wh + "Wh", (float) (battery_pct / 100.0));
updateWidget("panel2", panel2_watt + "W", (float) (panel2_watt / 380.0)); updateGaugeWidget("panel1", panel1_watt + "W", (float) (panel1_watt / 380.0));
updateWidget("temp1", temp1 + "°C", (float) ((temp1 + 20) / 100.0)); updateGaugeWidget("panel2", panel2_watt + "W", (float) (panel2_watt / 380.0));
updateWidget("temp2", temp2 + "°C", (float) ((temp2 + 20) / 100.0)); updateGaugeWidget("temp1", temp1 + "°C", (float) ((temp1 + 20) / 100.0));
updateWidget("output1", output1_watt + "W", (float) (output1_watt / 400.0)); updateGaugeWidget("temp2", temp2 + "°C", (float) ((temp2 + 20) / 100.0));
updateWidget("output2", output2_watt + "W", (float) (output2_watt / 400.0)); updateGaugeWidget("output1", output1_watt + "W", (float) (output1_watt / 400.0));
updateGaugeWidget("output2", output2_watt + "W", (float) (output2_watt / 400.0));
updateTextWidget("debug",debug);
swipeLayout.setRefreshing(false); swipeLayout.setRefreshing(false);
} }
} }
@ -94,7 +96,7 @@ public class SolarEquipmentStatusActivity extends AbstractGBActivity {
ContextCompat.getColor(GBApplication.getContext(), R.color.chart_stress_unknown), ContextCompat.getColor(GBApplication.getContext(), R.color.chart_stress_unknown),
ContextCompat.getColor(GBApplication.getContext(), R.color.vo2max_value_poor_color), ContextCompat.getColor(GBApplication.getContext(), R.color.vo2max_value_poor_color),
ContextCompat.getColor(GBApplication.getContext(), R.color.vo2max_value_fair_color), ContextCompat.getColor(GBApplication.getContext(), R.color.vo2max_value_fair_color),
ContextCompat.getColor(GBApplication.getContext(), R.color.vo2max_value_good_color), ContextCompat.getColor(GBApplication.getContext(), R.color.body_energy_level_color),
}; };
} }
@ -111,7 +113,7 @@ public class SolarEquipmentStatusActivity extends AbstractGBActivity {
public static int[] getColorsOutput() { public static int[] getColorsOutput() {
return new int[]{ return new int[]{
ContextCompat.getColor(GBApplication.getContext(), R.color.chart_stress_unknown), ContextCompat.getColor(GBApplication.getContext(), R.color.chart_stress_unknown),
ContextCompat.getColor(GBApplication.getContext(), R.color.vo2max_value_good_color), ContextCompat.getColor(GBApplication.getContext(), R.color.body_energy_level_color),
ContextCompat.getColor(GBApplication.getContext(), R.color.vo2max_value_fair_color), ContextCompat.getColor(GBApplication.getContext(), R.color.vo2max_value_fair_color),
ContextCompat.getColor(GBApplication.getContext(), R.color.vo2max_value_poor_color), ContextCompat.getColor(GBApplication.getContext(), R.color.vo2max_value_poor_color),
}; };
@ -145,7 +147,15 @@ public class SolarEquipmentStatusActivity extends AbstractGBActivity {
}; };
} }
private void updateWidget(String name, String value, float gaugeFill) { private void updateTextWidget(String name, String value) {
View view = widgetMap.get(name);
if (view != null) {
TextView debugValue = view.findViewById(R.id.text_value);
debugValue.setText(value);
}
}
private void updateGaugeWidget(String name, String value, float gaugeFill) {
View view = widgetMap.get(name); View view = widgetMap.get(name);
if (view != null) { if (view != null) {
TextView gaugeValue = view.findViewById(R.id.gauge_value); TextView gaugeValue = view.findViewById(R.id.gauge_value);
@ -178,6 +188,7 @@ public class SolarEquipmentStatusActivity extends AbstractGBActivity {
createWidget("temp2", "Temp 2", 1); createWidget("temp2", "Temp 2", 1);
createWidget("output1", "Output 1", 1); createWidget("output1", "Output 1", 1);
createWidget("output2", "Output 2", 1); createWidget("output2", "Output 2", 1);
createWidget("debug", "Debug", 2);
// Set pull-down-to-refresh action // Set pull-down-to-refresh action
swipeLayout = findViewById(R.id.solarequipmentview_swipe_layout); swipeLayout = findViewById(R.id.solarequipmentview_swipe_layout);
@ -214,12 +225,16 @@ public class SolarEquipmentStatusActivity extends AbstractGBActivity {
card.setLayoutParams(layoutParams); card.setLayoutParams(layoutParams);
LayoutInflater inflater = getLayoutInflater(); LayoutInflater inflater = getLayoutInflater();
final View gaugeView = inflater.inflate(R.layout.dashboard_widget_generic_gauge, card, false); View view;
final TextView gaugeLabel = gaugeView.findViewById(R.id.gauge_label); if (name.equals("debug")) {
gaugeLabel.setText(label); view = inflater.inflate(R.layout.dashboard_widget_text, card, false);
} else {
card.addView(gaugeView); view = inflater.inflate(R.layout.dashboard_widget_generic_gauge, card, false);
widgetMap.put(name, gaugeView); final TextView gaugeLabel = view.findViewById(R.id.gauge_label);
gaugeLabel.setText(label);
}
card.addView(view);
widgetMap.put(name, view);
gridLayout.addView(card); gridLayout.addView(card);
} }

41
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/marstek/MarstekB2500DeviceSupport.java
View File

@ -66,8 +66,8 @@ public class MarstekB2500DeviceSupport extends AbstractBTLEDeviceSupport {
private static final byte[] COMMAND_SET_BATTERY_ALLOW_PASS_THOUGH = new byte[]{COMMAND_PREFIX, 0x06, COMMAND, 0x0d, 0x00, 0x5b}; private static final byte[] COMMAND_SET_BATTERY_ALLOW_PASS_THOUGH = new byte[]{COMMAND_PREFIX, 0x06, COMMAND, 0x0d, 0x00, 0x5b};
private static final byte[] COMMAND_SET_BATTERY_DISALLOW_PASS_THOUGH = new byte[]{COMMAND_PREFIX, 0x06, COMMAND, 0x0d, 0x01, 0x5a}; private static final byte[] COMMAND_SET_BATTERY_DISALLOW_PASS_THOUGH = new byte[]{COMMAND_PREFIX, 0x06, COMMAND, 0x0d, 0x01, 0x5a};
private static final Logger LOG = LoggerFactory.getLogger(MarstekB2500DeviceSupport.class); private static final Logger LOG = LoggerFactory.getLogger(MarstekB2500DeviceSupport.class);
public int firmware_major;
private boolean is_initialized = false; private boolean is_initialized = false;
private int firmwareVersion;
public MarstekB2500DeviceSupport() { public MarstekB2500DeviceSupport() {
super(LOG); super(LOG);
@ -190,10 +190,10 @@ public class MarstekB2500DeviceSupport extends AbstractBTLEDeviceSupport {
int p1_watt = buf.getShort(); int p1_watt = buf.getShort();
int p2_watt = buf.getShort(); int p2_watt = buf.getShort();
int battery_pct = buf.getShort() / 10; int battery_pct = buf.getShort() / 10;
firmwareVersion = buf.get() & 0xff; firmware_major = buf.get() & 0xff;
boolean battery_allow_passthrough = buf.get() != 0x01; boolean battery_allow_passthrough = buf.get() != 0x01;
boolean battery_manual_discharge_intervals = buf.get() != 0x01; boolean battery_manual_discharge_intervals = buf.get() != 0x01;
buf.position(buf.position() + 1); // skip unknown int network_status = buf.get() & 0x0ff; // bit 0 wifi, bit 1 mqtt
boolean output1_active = buf.get() != 0x00; boolean output1_active = buf.get() != 0x00;
boolean output2_active = buf.get() != 0x00; boolean output2_active = buf.get() != 0x00;
byte battery_max_use_pct = buf.get(); byte battery_max_use_pct = buf.get();
@ -202,24 +202,40 @@ public class MarstekB2500DeviceSupport extends AbstractBTLEDeviceSupport {
int battery_wh = buf.getShort(); int battery_wh = buf.getShort();
int output_to_inverter_1_watt = buf.getShort(); int output_to_inverter_1_watt = buf.getShort();
int output_to_inverter_2_watt = buf.getShort(); int output_to_inverter_2_watt = buf.getShort();
buf.position(buf.position() + 3); // skip unknown boolean expansion_battery_1_present = buf.get() != 0x00;
boolean expansion_battery_2_present = buf.get() != 0x00;
int region_code = buf.get();
int hour_utc = buf.get(); int hour_utc = buf.get();
int minute_utc = buf.get(); int minute_utc = buf.get();
int temperature_sensor_1 = buf.getShort(); int temperature_sensor_1 = buf.getShort();
int temperature_sensor_2 = buf.getShort(); int temperature_sensor_2 = buf.getShort();
buf.position(buf.position() + 3); // skip unknown buf.position(buf.position() + 2); // skip unknown
int firmware_minor = buf.get() & 0xff;
int battery_charging_wh_24h = buf.getInt(); int battery_charging_wh_24h = buf.getInt();
int battery_discharging_wh_24h = buf.getInt(); int battery_discharging_wh_24h = buf.getInt();
int input_wh_last_24h = buf.getInt(); int input_wh_24h = buf.getInt();
int output_wh_last_24h = buf.getInt(); int output_wh_24h = buf.getInt();
int battery_minimum_charge_pct = 100 - battery_max_use_pct; int battery_minimum_charge_pct = 100 - battery_max_use_pct;
int output_to_inverter_sum_watt = output_to_inverter_1_watt + output_to_inverter_2_watt;
LOG.info("p1_active: {}, p2_active: {}, p1_watt: {}W, p2_watt: {}W, battery_wh: {}Wh, battery_minimum_charge_pct: {}%, battery_allow_passthrough: {}, battery_manual_discharge_intervals: {}, output_to_inverter_target: {}W, output_to_inverter: {}W+{}W={}W, firmwareVersion: V{}, ", String firmwareVersion = "V" + firmware_major + "." + firmware_minor;
p1_active, p2_active, p1_watt, p2_watt, battery_wh, battery_minimum_charge_pct, battery_allow_passthrough, battery_manual_discharge_intervals, output_to_inverter_target, output_to_inverter_1_watt, output_to_inverter_2_watt, output_to_inverter_sum_watt, firmwareVersion); String debug = "p1_active: " + p1_active + "\n" +
"p2_active: " + p2_active + "\n" +
"output1_active: " + output1_active + "\n" +
"output2_active: " + output2_active + "\n" +
"output_to_inverter_target: " + output_to_inverter_target + " W\n" +
"light_condition: " + (light_condition == 0 ? "good" : (light_condition == 1 ? "bad" : "fair")) + "\n" +
"battery_charging_24h: " + battery_charging_wh_24h + " Wh\n" +
"battery_discharging_24h: " + battery_discharging_wh_24h + " Wh\n" +
"input_24h: " + input_wh_24h + " Wh\n" +
"output_24h: " + output_wh_24h + " Wh\n" +
"time_utc: " + DateTimeUtils.formatTime(hour_utc, minute_utc) + "\n" +
"region: " + (region_code == 0 ? "EU" : (region_code == 1 ? "CN" : (region_code == 2 ? "OTHER" : "UNKNOWN"))) + "\n" +
"network_status: " + (network_status == 0 ? "connected" : "disconnected") + "\n" +
"expansion_battery1: " + expansion_battery_1_present + "\n" +
"expansion_battery2: " + expansion_battery_2_present;
getDevice().setFirmwareVersion("V" + firmwareVersion); getDevice().setFirmwareVersion(firmwareVersion);
getDevice().sendDeviceUpdateIntent(getContext()); getDevice().sendDeviceUpdateIntent(getContext());
devicePrefsEdit.putString(PREF_BATTERY_MINIMUM_CHARGE, String.valueOf(battery_minimum_charge_pct)); devicePrefsEdit.putString(PREF_BATTERY_MINIMUM_CHARGE, String.valueOf(battery_minimum_charge_pct));
@ -240,6 +256,7 @@ public class MarstekB2500DeviceSupport extends AbstractBTLEDeviceSupport {
intent.putExtra(SolarEquipmentStatusActivity.EXTRA_TEMP2, temperature_sensor_2); intent.putExtra(SolarEquipmentStatusActivity.EXTRA_TEMP2, temperature_sensor_2);
intent.putExtra(SolarEquipmentStatusActivity.EXTRA_OUTPUT1_WATT, output_to_inverter_1_watt); intent.putExtra(SolarEquipmentStatusActivity.EXTRA_OUTPUT1_WATT, output_to_inverter_1_watt);
intent.putExtra(SolarEquipmentStatusActivity.EXTRA_OUTPUT2_WATT, output_to_inverter_2_watt); intent.putExtra(SolarEquipmentStatusActivity.EXTRA_OUTPUT2_WATT, output_to_inverter_2_watt);
intent.putExtra(SolarEquipmentStatusActivity.EXTRA_DEBUG, debug);
LocalBroadcastManager.getInstance(getContext()).sendBroadcast(intent); LocalBroadcastManager.getInstance(getContext()).sendBroadcast(intent);
getContext().sendBroadcast(intent); getContext().sendBroadcast(intent);
} }
@ -320,7 +337,7 @@ public class MarstekB2500DeviceSupport extends AbstractBTLEDeviceSupport {
private byte[] encodeDischargeIntervalsFromPreferences() { private byte[] encodeDischargeIntervalsFromPreferences() {
Prefs devicePrefs = new Prefs(GBApplication.getDeviceSpecificSharedPrefs(getDevice().getAddress())); Prefs devicePrefs = new Prefs(GBApplication.getDeviceSpecificSharedPrefs(getDevice().getAddress()));
if (devicePrefs.getBoolean(PREF_BATTERY_DISCHARGE_MANUAL, true)) { if (devicePrefs.getBoolean(PREF_BATTERY_DISCHARGE_MANUAL, true)) {
int nr_invervals = (firmwareVersion >= 220) ? 5 : 3; // old firmware V210 only had 3 intervals it seems, so set only 3 int nr_invervals = (firmware_major >= 218) ? 5 : 3;
int length = 5 + nr_invervals * 7; int length = 5 + nr_invervals * 7;
ByteBuffer buf = ByteBuffer.allocate(length); ByteBuffer buf = ByteBuffer.allocate(length);

27
app/src/main/res/layout/dashboard_widget_text.xml Normal file
View File

@ -0,0 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_vertical"
tools:context=".activities.dashboard.AbstractDashboardWidget">
<RelativeLayout
android:id="@+id/card_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="8dp"
android:orientation="vertical"
tools:ignore="UselessParent">
<TextView
android:id="@+id/text_value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="start"
android:text="@string/stats_empty_value"
android:textSize="16sp" />
</RelativeLayout>
</LinearLayout>