From 73da709bb18f90b8933aeaf2c508d733dae330e4 Mon Sep 17 00:00:00 2001 From: andrekir Date: Sun, 12 Jun 2022 00:23:45 -0300 Subject: [PATCH] Revert "fix isESP32 logic" This reverts commit d939f9784b8872188634bf6e5a4d09572f9756fa. --- app/src/main/java/com/geeksville/mesh/model/UIState.kt | 7 ++----- .../com/geeksville/mesh/ui/AdvancedSettingsFragment.kt | 6 +++--- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/geeksville/mesh/model/UIState.kt b/app/src/main/java/com/geeksville/mesh/model/UIState.kt index 2a347491c..3ed0861e0 100644 --- a/app/src/main/java/com/geeksville/mesh/model/UIState.kt +++ b/app/src/main/java/com/geeksville/mesh/model/UIState.kt @@ -201,11 +201,8 @@ class UIViewModel @Inject constructor( meshService?.region = value.number } - fun isESP32(): Boolean { - // List of 'HardwareModel' enum values for ESP32 devices from mesh.proto - val hwModelESP32 = listOf(1, 2, 3, 4, 5, 6, 8, 10, 11, 32, 35, 39, 40, 41, 43, 44) - return hwModelESP32.contains(nodeDB.ourNodeInfo?.user?.hwModel?.number) - } + // We consider hasWifi = ESP32 + var isESP32: Boolean = _localConfig.value?.hasWifi() == true /// hardware info about our local device (can be null) private val _myNodeInfo = MutableLiveData() diff --git a/app/src/main/java/com/geeksville/mesh/ui/AdvancedSettingsFragment.kt b/app/src/main/java/com/geeksville/mesh/ui/AdvancedSettingsFragment.kt index d7982ff72..83ccda1c5 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/AdvancedSettingsFragment.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/AdvancedSettingsFragment.kt @@ -43,8 +43,8 @@ class AdvancedSettingsFragment : ScreenFragment("Advanced Settings"), Logging { binding.lsSleepEditText.setText(model.lsSleepSecs.toString()) binding.positionBroadcastPeriodView.isEnabled = !model.gpsDisabled binding.positionBroadcastSwitch.isChecked = !model.gpsDisabled - binding.lsSleepView.isEnabled = model.isPowerSaving ?: false && model.isESP32() - binding.lsSleepSwitch.isChecked = model.isPowerSaving ?: false && model.isESP32() + binding.lsSleepView.isEnabled = model.isPowerSaving ?: false && model.isESP32 + binding.lsSleepSwitch.isChecked = model.isPowerSaving ?: false && model.isESP32 } model.connectionState.observe(viewLifecycleOwner) { connectionState -> @@ -52,7 +52,7 @@ class AdvancedSettingsFragment : ScreenFragment("Advanced Settings"), Logging { binding.positionBroadcastPeriodView.isEnabled = connected && !model.gpsDisabled binding.lsSleepView.isEnabled = connected && model.isPowerSaving ?: false binding.positionBroadcastSwitch.isEnabled = connected - binding.lsSleepSwitch.isEnabled = connected && model.isESP32() + binding.lsSleepSwitch.isEnabled = connected && model.isESP32 binding.shutdownButton.isEnabled = connected binding.rebootButton.isEnabled = connected }