Merge branch 'omnipod_eros_dev' into omnipod_eros_dev_upstream_merge
This commit is contained in:
commit
4f09698d70
|
@ -9,6 +9,7 @@ import info.nightscout.androidaps.R
|
|||
import info.nightscout.androidaps.db.CareportalEvent
|
||||
import info.nightscout.androidaps.interfaces.ActivePluginProvider
|
||||
import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
|
||||
import info.nightscout.androidaps.plugins.pump.omnipod.OmnipodPumpPlugin
|
||||
import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.OmnipodConstants
|
||||
import info.nightscout.androidaps.utils.DecimalFormatter
|
||||
import info.nightscout.androidaps.utils.WarnColors
|
||||
|
@ -49,8 +50,14 @@ class StatusLightHandler @Inject constructor(
|
|||
else
|
||||
careportal_sensorbatterylevel?.text = ""
|
||||
}
|
||||
if (!config.NSCLIENT && pump.model() != PumpType.AccuChekCombo)
|
||||
handleLevel(careportal_batterylevel, R.string.key_statuslights_bat_critical, 26.0, R.string.key_statuslights_bat_warning, 51.0, pump.batteryLevel.toDouble(), "%")
|
||||
|
||||
if (!config.NSCLIENT) {
|
||||
if (pump.model() == PumpType.Insulet_Omnipod) {
|
||||
handleOmnipodBatteryLevel(careportal_batterylevel, R.string.key_statuslights_bat_critical, 26.0, R.string.key_statuslights_bat_warning, 51.0, pump.batteryLevel.toDouble(), "%", (pump as OmnipodPumpPlugin).isUseRileyLinkBatteryLevel)
|
||||
} else if (pump.model() != PumpType.AccuChekCombo) {
|
||||
handleLevel(careportal_batterylevel, R.string.key_statuslights_bat_critical, 26.0, R.string.key_statuslights_bat_warning, 51.0, pump.batteryLevel.toDouble(), "%")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private fun handleAge(view: TextView?, eventName: String, @StringRes warnSettings: Int, defaultWarnThreshold: Double, @StringRes urgentSettings: Int, defaultUrgentThreshold: Double) {
|
||||
|
@ -75,16 +82,21 @@ class StatusLightHandler @Inject constructor(
|
|||
|
||||
// Omnipod only reports reservoir level when it's 50 units or less, so we display "50+U" for any value > 50
|
||||
private fun handleOmnipodReservoirLevel(view: TextView?, criticalSetting: Int, criticalDefaultValue: Double, warnSetting: Int, warnDefaultValue: Double, level: Double, units: String) {
|
||||
val resUrgent = sp.getDouble(criticalSetting, criticalDefaultValue)
|
||||
val resWarn = sp.getDouble(warnSetting, warnDefaultValue)
|
||||
if (level > OmnipodConstants.MAX_RESERVOIR_READING) {
|
||||
@Suppress("SetTextI18n")
|
||||
view?.text = " 50+$units"
|
||||
view?.setTextColor(Color.WHITE)
|
||||
} else {
|
||||
@Suppress("SetTextI18n")
|
||||
view?.text = " " + DecimalFormatter.to0Decimal(level) + units
|
||||
warnColors.setColorInverse(view, level, resWarn, resUrgent)
|
||||
handleLevel(view, criticalSetting, criticalDefaultValue, warnSetting, warnDefaultValue, level, units)
|
||||
}
|
||||
}
|
||||
|
||||
private fun handleOmnipodBatteryLevel(view: TextView?, criticalSetting: Int, criticalDefaultValue: Double, warnSetting: Int, warnDefaultValue: Double, level: Double, units: String, useRileyLinkBatteryLevel: Boolean) {
|
||||
if (useRileyLinkBatteryLevel) {
|
||||
handleLevel(view, criticalSetting, criticalDefaultValue, warnSetting, warnDefaultValue, level, units)
|
||||
} else {
|
||||
view?.text = resourceHelper.gs(R.string.notavailable)
|
||||
view?.setTextColor(Color.WHITE)
|
||||
}
|
||||
}
|
||||
}
|
|
@ -311,7 +311,8 @@ public class OmnipodPumpPlugin extends PumpPluginBase implements PumpInterface,
|
|||
event.isChanged(getResourceHelper(), OmnipodStorageKeys.Preferences.SMB_BEEPS_ENABLED) ||
|
||||
event.isChanged(getResourceHelper(), OmnipodStorageKeys.Preferences.SUSPEND_DELIVERY_BUTTON_ENABLED) ||
|
||||
event.isChanged(getResourceHelper(), OmnipodStorageKeys.Preferences.PULSE_LOG_BUTTON_ENABLED) ||
|
||||
event.isChanged(getResourceHelper(), OmnipodStorageKeys.Preferences.RILEYLINK_STATS_BUTTON_ENABLED) ||
|
||||
event.isChanged(getResourceHelper(), OmnipodStorageKeys.Preferences.RILEY_LINK_STATS_BUTTON_ENABLED) ||
|
||||
event.isChanged(getResourceHelper(), OmnipodStorageKeys.Preferences.USE_RILEY_LINK_BATTERY_LEVEL) ||
|
||||
event.isChanged(getResourceHelper(), OmnipodStorageKeys.Preferences.TIME_CHANGE_EVENT_ENABLED) ||
|
||||
event.isChanged(getResourceHelper(), OmnipodStorageKeys.Preferences.NOTIFICATION_UNCERTAIN_TBR_SOUND_ENABLED) ||
|
||||
event.isChanged(getResourceHelper(), OmnipodStorageKeys.Preferences.NOTIFICATION_UNCERTAIN_SMB_SOUND_ENABLED) ||
|
||||
|
@ -611,10 +612,11 @@ public class OmnipodPumpPlugin extends PumpPluginBase implements PumpInterface,
|
|||
|
||||
@Override
|
||||
public int getBatteryLevel() {
|
||||
if (!podStateManager.isPodRunning()) {
|
||||
return 0;
|
||||
if (aapsOmnipodManager.isUseRileyLinkBatteryLevel()) {
|
||||
return rileyLinkServiceData.batteryLevel == null ? 0 : rileyLinkServiceData.batteryLevel;
|
||||
}
|
||||
return 75;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@NonNull @Override
|
||||
|
@ -738,9 +740,9 @@ public class OmnipodPumpPlugin extends PumpPluginBase implements PumpInterface,
|
|||
|
||||
status.put("timestamp", DateUtil.toISOString(new Date()));
|
||||
|
||||
// BS: Leave battery level out for now as we only have a fixed bogus value
|
||||
// TODO use RL battery level
|
||||
//pump.put("battery", battery);
|
||||
if (isUseRileyLinkBatteryLevel()) {
|
||||
pump.put("battery", battery);
|
||||
}
|
||||
|
||||
pump.put("status", status);
|
||||
pump.put("extended", extended);
|
||||
|
@ -778,37 +780,34 @@ public class OmnipodPumpPlugin extends PumpPluginBase implements PumpInterface,
|
|||
return pumpDescription;
|
||||
}
|
||||
|
||||
// FIXME i18n, null checks: iob, TDD
|
||||
@NonNull @Override
|
||||
public String shortStatus(boolean veryShort) {
|
||||
if (!podStateManager.isPodActivationCompleted()) {
|
||||
return "No active pod";
|
||||
return resourceHelper.gs(R.string.omnipod_short_status_no_active_pod);
|
||||
}
|
||||
String ret = "";
|
||||
if (lastConnectionTimeMillis != 0) {
|
||||
long agoMsec = System.currentTimeMillis() - lastConnectionTimeMillis;
|
||||
int agoMin = (int) (agoMsec / 60d / 1000d);
|
||||
ret += "LastConn: " + agoMin + " min ago\n";
|
||||
ret += resourceHelper.gs(R.string.omnipod_short_status_last_connection, agoMin) + "\n";
|
||||
}
|
||||
if (podStateManager.getLastBolusStartTime() != null) {
|
||||
ret += "LastBolus: " + DecimalFormatter.to2Decimal(podStateManager.getLastBolusAmount()) + "U @" + //
|
||||
android.text.format.DateFormat.format("HH:mm", podStateManager.getLastBolusStartTime().toDate()) + "\n";
|
||||
ret += resourceHelper.gs(R.string.omnipod_short_status_last_bolus, DecimalFormatter.to2Decimal(podStateManager.getLastBolusAmount()),
|
||||
android.text.format.DateFormat.format("HH:mm", podStateManager.getLastBolusStartTime().toDate())) + "\n";
|
||||
}
|
||||
TemporaryBasal activeTemp = activePlugin.getActiveTreatments().getRealTempBasalFromHistory(System.currentTimeMillis());
|
||||
if (activeTemp != null) {
|
||||
ret += "Temp: " + activeTemp.toStringFull() + "\n";
|
||||
ret += resourceHelper.gs(R.string.omnipod_short_status_temp_basal, activeTemp.toStringFull()) + "\n";
|
||||
}
|
||||
ExtendedBolus activeExtendedBolus = activePlugin.getActiveTreatments().getExtendedBolusFromHistory(
|
||||
System.currentTimeMillis());
|
||||
if (activeExtendedBolus != null) {
|
||||
ret += "Extended: " + activeExtendedBolus.toString() + "\n";
|
||||
ret += resourceHelper.gs(R.string.omnipod_short_status_extended_bolus, activeExtendedBolus.toString()) + "\n";
|
||||
}
|
||||
ret += resourceHelper.gs(R.string.omnipod_short_status_reservoir, (getReservoirLevel() > OmnipodConstants.MAX_RESERVOIR_READING ? "50+" : DecimalFormatter.to0Decimal(getReservoirLevel()))) + "\n";
|
||||
if (isUseRileyLinkBatteryLevel()) {
|
||||
ret += resourceHelper.gs(R.string.omnipod_short_status_rl_battery, getBatteryLevel()) + "\n";
|
||||
}
|
||||
ret += "Reserv: " + (getReservoirLevel() > OmnipodConstants.MAX_RESERVOIR_READING ? "50+U" : DecimalFormatter.to0Decimal(getReservoirLevel()) + "U") + "\n";
|
||||
|
||||
// BS leave out for now as we only have a bogus default value
|
||||
// TODO use RL battery
|
||||
// ret += "Batt: " + getBatteryLevel();
|
||||
|
||||
return ret.trim();
|
||||
}
|
||||
|
||||
|
@ -1044,6 +1043,10 @@ public class OmnipodPumpPlugin extends PumpPluginBase implements PumpInterface,
|
|||
return getOperationNotSupportedWithCustomText(info.nightscout.androidaps.core.R.string.pump_operation_not_supported_by_pump_driver);
|
||||
}
|
||||
|
||||
public boolean isUseRileyLinkBatteryLevel() {
|
||||
return aapsOmnipodManager.isUseRileyLinkBatteryLevel();
|
||||
}
|
||||
|
||||
private void initializeAfterRileyLinkConnection() {
|
||||
if (podStateManager.getActivationProgress().isAtLeast(ActivationProgress.PAIRING_COMPLETED)) {
|
||||
boolean success = false;
|
||||
|
|
|
@ -21,7 +21,8 @@ public class OmnipodStorageKeys {
|
|||
public static final int NOTIFICATION_UNCERTAIN_SMB_SOUND_ENABLED = R.string.key_omnipod_notification_uncertain_smb_sound_enabled;
|
||||
public static final int NOTIFICATION_UNCERTAIN_BOLUS_SOUND_ENABLED = R.string.key_omnipod_notification_uncertain_bolus_sound_enabled;
|
||||
public static final int AUTOMATICALLY_ACKNOWLEDGE_ALERTS_ENABLED = R.string.key_omnipod_automatically_acknowledge_alerts_enabled;
|
||||
public static final int RILEYLINK_STATS_BUTTON_ENABLED = R.string.key_omnipod_rileylink_stats_button_enabled;
|
||||
public static final int RILEY_LINK_STATS_BUTTON_ENABLED = R.string.key_omnipod_riley_link_stats_button_enabled;
|
||||
public static final int USE_RILEY_LINK_BATTERY_LEVEL = R.string.key_omnipod_use_riley_link_battery_level;
|
||||
}
|
||||
|
||||
public static class Statistics {
|
||||
|
|
|
@ -120,8 +120,8 @@ public class AapsOmnipodManager {
|
|||
private boolean notificationUncertainSmbSoundEnabled;
|
||||
private boolean notificationUncertainBolusSoundEnabled;
|
||||
private boolean automaticallyAcknowledgeAlertsEnabled;
|
||||
private boolean testBeepButtonEnabled;
|
||||
private boolean rileylinkStatsButtonEnabled;
|
||||
private boolean useRileyLinkBatteryLevel;
|
||||
|
||||
@Inject
|
||||
public AapsOmnipodManager(OmnipodRileyLinkCommunicationManager communicationService,
|
||||
|
@ -165,7 +165,8 @@ public class AapsOmnipodManager {
|
|||
tbrBeepsEnabled = sp.getBoolean(OmnipodStorageKeys.Preferences.TBR_BEEPS_ENABLED, false);
|
||||
suspendDeliveryButtonEnabled = sp.getBoolean(OmnipodStorageKeys.Preferences.SUSPEND_DELIVERY_BUTTON_ENABLED, false);
|
||||
pulseLogButtonEnabled = sp.getBoolean(OmnipodStorageKeys.Preferences.PULSE_LOG_BUTTON_ENABLED, false);
|
||||
rileylinkStatsButtonEnabled = sp.getBoolean(OmnipodStorageKeys.Preferences.RILEYLINK_STATS_BUTTON_ENABLED, false);
|
||||
rileylinkStatsButtonEnabled = sp.getBoolean(OmnipodStorageKeys.Preferences.RILEY_LINK_STATS_BUTTON_ENABLED, false);
|
||||
useRileyLinkBatteryLevel = sp.getBoolean(OmnipodStorageKeys.Preferences.USE_RILEY_LINK_BATTERY_LEVEL, false);
|
||||
timeChangeEventEnabled = sp.getBoolean(OmnipodStorageKeys.Preferences.TIME_CHANGE_EVENT_ENABLED, true);
|
||||
notificationUncertainTbrSoundEnabled = sp.getBoolean(OmnipodStorageKeys.Preferences.NOTIFICATION_UNCERTAIN_TBR_SOUND_ENABLED, false);
|
||||
notificationUncertainSmbSoundEnabled = sp.getBoolean(OmnipodStorageKeys.Preferences.NOTIFICATION_UNCERTAIN_SMB_SOUND_ENABLED, true);
|
||||
|
@ -655,14 +656,14 @@ public class AapsOmnipodManager {
|
|||
return pulseLogButtonEnabled;
|
||||
}
|
||||
|
||||
public boolean isTestBeepButtonEnabled() {
|
||||
return testBeepButtonEnabled;
|
||||
}
|
||||
|
||||
public boolean isRileylinkStatsButtonEnabled() {
|
||||
return rileylinkStatsButtonEnabled;
|
||||
}
|
||||
|
||||
public boolean isUseRileyLinkBatteryLevel() {
|
||||
return useRileyLinkBatteryLevel;
|
||||
}
|
||||
|
||||
public boolean isTimeChangeEventEnabled() {
|
||||
return timeChangeEventEnabled;
|
||||
}
|
||||
|
|
|
@ -10,7 +10,8 @@
|
|||
<string name="key_omnipod_tbr_beeps_enabled" translatable="false">AAPS.Omnipod.tbr_beeps_enabled</string>
|
||||
<string name="key_omnipod_suspend_delivery_button_enabled" translatable="false">AAPS.Omnipod.suspend_delivery_button_enabled</string>
|
||||
<string name="key_omnipod_pulse_log_button_enabled" translatable="false">AAPS.Omnipod.pulse_log_button_enabled</string>
|
||||
<string name="key_omnipod_rileylink_stats_button_enabled" translatable="false">AAPS.Omnipod.rileylink_stats_button_enabled</string>
|
||||
<string name="key_omnipod_riley_link_stats_button_enabled" translatable="false">AAPS.Omnipod.rileylink_stats_button_enabled</string>
|
||||
<string name="key_omnipod_use_riley_link_battery_level" translatable="false">AAPS.Omnipod.use_riley_link_battery_level</string>
|
||||
<string name="key_omnipod_time_change_event_enabled" translatable="false">AAPS.Omnipod.time_change_enabled</string>
|
||||
<string name="key_omnipod_expiration_reminder_enabled" translatable="false">AAPS.Omnipod.expiration_reminder_enabled</string>
|
||||
<string name="key_omnipod_expiration_reminder_hours_before_shutdown" translatable="false">AAPS.Omnipod.expiration_reminder_hours_before_shutdown</string>
|
||||
|
@ -43,6 +44,8 @@
|
|||
<string name="omnipod_config_suspend_delivery_button_enabled">Show Suspend Delivery button in Omnipod tab</string>
|
||||
<string name="omnipod_config_pulse_log_button_enabled">Show Pulse Log button in Pod Management menu</string>
|
||||
<string name="omnipod_config_rileylink_stats_button_enabled">Show RileyLink Stats button in Pod Management menu</string>
|
||||
<string name="omnipod_config_use_riley_link_battery_level">Use battery level reported by RileyLink</string>
|
||||
<string name="omnipod_config_use_riley_link_battery_level_summary">Works with EmaLink and OrangeLink.\nDOES NOT work with the original RileyLink: it will not report the actual battery level. Might also not work with other RileyLink alternatives.</string>
|
||||
<string name="omnipod_config_time_change_enabled">DST/Time zone detection enabled</string>
|
||||
<string name="omnipod_config_expiration_reminder_enabled">Expiration reminder enabled</string>
|
||||
<string name="omnipod_config_expiration_reminder_hours_before_shutdown">Hours before shutdown</string>
|
||||
|
@ -88,6 +91,15 @@
|
|||
<string name="omnipod_history_bolus_value_with_carbs">%1$.2f U, CH=%2$.1f g</string>
|
||||
<string name="omnipod_history_tbr_value">Rate: %1$.2f U, duration: %2$d minutes</string>
|
||||
|
||||
<!-- Omnipod - Short status -->
|
||||
<string name="omnipod_short_status_no_active_pod">No active Pod</string>
|
||||
<string name="omnipod_short_status_last_connection">LastConn: %1$d min ago</string>
|
||||
<string name="omnipod_short_status_last_bolus">LastBolus: %1$s @ %2$s</string>
|
||||
<string name="omnipod_short_status_temp_basal">Temp: %1$s</string>
|
||||
<string name="omnipod_short_status_extended_bolus">Extended: %1$s</string>
|
||||
<string name="omnipod_short_status_reservoir">Reserv: %1$sU</string>
|
||||
<string name="omnipod_short_status_rl_battery">RLBatt: %1$d</string>
|
||||
|
||||
<!-- Omnipod - Error -->
|
||||
<string name="omnipod_warning">Warning</string>
|
||||
<string name="omnipod_error_rileylink_address_invalid">RileyLink address invalid.</string>
|
||||
|
|
|
@ -112,9 +112,15 @@
|
|||
|
||||
<SwitchPreference
|
||||
android:defaultValue="false"
|
||||
android:key="@string/key_omnipod_rileylink_stats_button_enabled"
|
||||
android:key="@string/key_omnipod_riley_link_stats_button_enabled"
|
||||
android:title="@string/omnipod_config_rileylink_stats_button_enabled" />
|
||||
|
||||
<SwitchPreference
|
||||
android:defaultValue="false"
|
||||
android:key="@string/key_omnipod_use_riley_link_battery_level"
|
||||
android:summary="@string/omnipod_config_use_riley_link_battery_level_summary"
|
||||
android:title="@string/omnipod_config_use_riley_link_battery_level" />
|
||||
|
||||
<SwitchPreference
|
||||
android:defaultValue="true"
|
||||
android:key="@string/key_omnipod_time_change_event_enabled"
|
||||
|
|
|
@ -81,6 +81,8 @@ public abstract class RileyLinkCommunicationManager<T extends RLMessage> {
|
|||
RadioResponse radioResponse = rfSpyResponse.getRadioResponse(injector);
|
||||
T response = createResponseMessage(radioResponse.getPayload());
|
||||
|
||||
updateBatteryLevel();
|
||||
|
||||
if (response.isValid()) {
|
||||
// Mark this as the last time we heard from the pump.
|
||||
rememberLastGoodDeviceCommunicationTime();
|
||||
|
@ -116,6 +118,10 @@ public abstract class RileyLinkCommunicationManager<T extends RLMessage> {
|
|||
return response;
|
||||
}
|
||||
|
||||
private void updateBatteryLevel() {
|
||||
rileyLinkServiceData.batteryLevel = rfspy.getBatteryLevel();
|
||||
}
|
||||
|
||||
|
||||
public abstract T createResponseMessage(byte[] payload);
|
||||
|
||||
|
|
|
@ -57,6 +57,8 @@ public class RFSpy {
|
|||
private final UUID radioServiceUUID = UUID.fromString(GattAttributes.SERVICE_RADIO);
|
||||
private final UUID radioDataUUID = UUID.fromString(GattAttributes.CHARA_RADIO_DATA);
|
||||
private final UUID radioVersionUUID = UUID.fromString(GattAttributes.CHARA_RADIO_VERSION);
|
||||
private final UUID batteryServiceUUID = UUID.fromString(GattAttributes.SERVICE_BATTERY);
|
||||
private final UUID batteryLevelUUID = UUID.fromString(GattAttributes.CHARA_BATTERY_UNK);
|
||||
//private UUID responseCountUUID = UUID.fromString(GattAttributes.CHARA_RADIO_RESPONSE_COUNT);
|
||||
private RileyLinkFirmwareVersion firmwareVersion;
|
||||
private String bleVersion; // We don't use it so no need of sofisticated logic
|
||||
|
@ -111,6 +113,19 @@ public class RFSpy {
|
|||
}
|
||||
|
||||
|
||||
public Integer getBatteryLevel() {
|
||||
BLECommOperationResult result = rileyLinkBle.readCharacteristic_blocking(batteryServiceUUID, batteryLevelUUID);
|
||||
if (result.resultCode == BLECommOperationResult.RESULT_SUCCESS) {
|
||||
int value = result.value[0];
|
||||
aapsLogger.debug(LTag.PUMPBTCOMM, "BLE battery level: {}", value);
|
||||
return value;
|
||||
} else {
|
||||
aapsLogger.error(LTag.PUMPBTCOMM, "getBatteryLevel failed with code: " + result.resultCode);
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// This gets the version from the BLE113, not from the CC1110.
|
||||
// I.e., this gets the version from the BLE interface, not from the radio.
|
||||
public String getVersion() {
|
||||
|
|
|
@ -17,7 +17,6 @@ import info.nightscout.androidaps.interfaces.ActivePluginProvider;
|
|||
import info.nightscout.androidaps.logging.AAPSLogger;
|
||||
import info.nightscout.androidaps.plugins.pump.common.R;
|
||||
import info.nightscout.androidaps.plugins.pump.common.dialog.RefreshableInterface;
|
||||
import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.defs.RileyLinkFirmwareVersion;
|
||||
import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkPumpDevice;
|
||||
import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkPumpInfo;
|
||||
import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkTargetDevice;
|
||||
|
@ -49,6 +48,7 @@ public class RileyLinkStatusGeneralFragment extends DaggerFragment implements Re
|
|||
TextView lastUsedFrequency;
|
||||
TextView lastDeviceContact;
|
||||
TextView firmwareVersion;
|
||||
TextView batteryLevel;
|
||||
|
||||
boolean first = false;
|
||||
|
||||
|
@ -76,12 +76,14 @@ public class RileyLinkStatusGeneralFragment extends DaggerFragment implements Re
|
|||
this.lastUsedFrequency = getActivity().findViewById(R.id.rls_t1_last_used_frequency);
|
||||
this.lastDeviceContact = getActivity().findViewById(R.id.rls_t1_last_device_contact);
|
||||
this.firmwareVersion = getActivity().findViewById(R.id.rls_t1_firmware_version);
|
||||
this.batteryLevel = getActivity().findViewById(R.id.rls_t1_battery_level);
|
||||
|
||||
if (!first) {
|
||||
|
||||
// 7-12
|
||||
// 7-14
|
||||
int[] ids = {R.id.rls_t1_tv02, R.id.rls_t1_tv03, R.id.rls_t1_tv04, R.id.rls_t1_tv05, R.id.rls_t1_tv07, //
|
||||
R.id.rls_t1_tv08, R.id.rls_t1_tv09, R.id.rls_t1_tv10, R.id.rls_t1_tv11, R.id.rls_t1_tv12, R.id.rls_t1_tv13};
|
||||
R.id.rls_t1_tv08, R.id.rls_t1_tv09, R.id.rls_t1_tv10, R.id.rls_t1_tv11, R.id.rls_t1_tv12, R.id.rls_t1_tv13,
|
||||
R.id.rls_t1_tv14};
|
||||
|
||||
for (int id : ids) {
|
||||
|
||||
|
@ -114,6 +116,12 @@ public class RileyLinkStatusGeneralFragment extends DaggerFragment implements Re
|
|||
this.firmwareVersion.setText("BLE113: " + rileyLinkServiceData.versionBLE113 +
|
||||
"\nCC110: " + rileyLinkServiceData.versionCC110);
|
||||
}
|
||||
Integer batteryLevel = rileyLinkServiceData.batteryLevel;
|
||||
if (batteryLevel == null) {
|
||||
this.batteryLevel.setText("???");
|
||||
} else {
|
||||
this.batteryLevel.setText(batteryLevel + "%");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -43,6 +43,7 @@ public class RileyLinkServiceData {
|
|||
// radio version
|
||||
public String versionCC110;
|
||||
|
||||
public Integer batteryLevel;
|
||||
|
||||
public RileyLinkTargetDevice targetDevice;
|
||||
|
||||
|
|
|
@ -134,6 +134,31 @@
|
|||
android:text=" " />
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="16pt"
|
||||
android:gravity="center_vertical"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/rls_t1_tv14"
|
||||
android:layout_width="58dp"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_marginLeft="30dp"
|
||||
android:layout_weight="35"
|
||||
android:gravity="center_vertical"
|
||||
android:text="@string/rileylink_battery_level" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/rls_t1_battery_level"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_marginLeft="10dp"
|
||||
android:layout_weight="65"
|
||||
android:textAlignment="center"
|
||||
android:gravity="center_vertical"
|
||||
android:text=" " />
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
|
|
|
@ -29,7 +29,8 @@
|
|||
<string name="rileylink_device_model">Device Model</string>
|
||||
<string name="rileylink_last_used_frequency">Last used frequency</string>
|
||||
<string name="rileylink_last_device_contact">Last device contact</string>
|
||||
<string name="rileylink_firmware_version">RL Firmware</string>
|
||||
<string name="rileylink_firmware_version">Firmware</string>
|
||||
<string name="rileylink_battery_level">Battery level</string>
|
||||
|
||||
|
||||
<!-- RL State -->
|
||||
|
|
Loading…
Reference in a new issue