mirror/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-04-03 21:53:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

update configs to LocalConfig

Browse Source
This commit is contained in:
andrekir
2022-06-10 21:55:26 -03:00
parent d939f9784b
commit ce83c84723
5 changed files with 78 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/geeksville/mesh/MainActivity.kt
View File

@@ -655,7 +655,7 @@ class MainActivity : BaseActivity(), Logging,
else {
// If our app is too old/new, we probably don't understand the new DeviceConfig messages, so we don't read them until here
model.setDeviceConfig(ConfigProtos.Config.parseFrom(service.deviceConfig))
model.setLocalConfig(LocalOnlyProtos.LocalConfig.parseFrom(service.deviceConfig))
model.setChannels(ChannelSet(AppOnlyProtos.ChannelSet.parseFrom(service.channels)))

82
app/src/main/java/com/geeksville/mesh/model/UIState.kt
View File

@@ -58,7 +58,7 @@ fun getInitials(nameIn: String): String {
@HiltViewModel
class UIViewModel @Inject constructor(
private val app: Application,
private val repository: PacketRepository,
private val packetRepository: PacketRepository,
private val preferences: SharedPreferences
) : ViewModel(), Logging {
@@ -67,7 +67,7 @@ class UIViewModel @Inject constructor(
init {
viewModelScope.launch {
repository.getAllPackets().collect { packets ->
packetRepository.getAllPackets().collect { packets ->
_allPacketState.value = packets
}
}
@@ -75,7 +75,7 @@ class UIViewModel @Inject constructor(
}
fun deleteAllPacket() = viewModelScope.launch(Dispatchers.IO) {
repository.deleteAll()
packetRepository.deleteAll()
}
companion object {
@@ -101,8 +101,8 @@ class UIViewModel @Inject constructor(
}
/// various radio settings (including the channel)
private val _deviceConfig = MutableLiveData<ConfigProtos.Config?>()
val deviceConfig: LiveData<ConfigProtos.Config?> get() = _deviceConfig
private val _localConfig = MutableLiveData<LocalOnlyProtos.LocalConfig?>()
val localConfig: LiveData<LocalOnlyProtos.LocalConfig?> get() = _localConfig
private val _channels = MutableLiveData<ChannelSet?>()
val channels: LiveData<ChannelSet?> get() = _channels
@@ -123,57 +123,65 @@ class UIViewModel @Inject constructor(
var positionBroadcastSecs: Int?
get() {
_deviceConfig.value?.position?.positionBroadcastSecs?.let {
_localConfig.value?.position?.positionBroadcastSecs?.let {
// These default values are borrowed from the device code.
return if (it > 0) it else 15 * 60 // default 900 sec
}
return null
}
set(value) {
val config = _deviceConfig.value
val config = _localConfig.value
if (value != null && config != null) {
val builder = config.toBuilder()
builder.positionBuilder.positionBroadcastSecs = value
setDeviceConfig(builder.build())
val builder = config.position.toBuilder()
builder.positionBroadcastSecs = value
val newConfig = ConfigProtos.Config.newBuilder()
newConfig.position = builder.build()
setDeviceConfig(newConfig.build())
}
}
var lsSleepSecs: Int?
get() {
_deviceConfig.value?.power?.lsSecs?.let {
_localConfig.value?.power?.lsSecs?.let {
// These default values are borrowed from the device code.
return if (it > 0) return it else 5 * 60 // default 300 sec
}
return null
}
set(value) {
val config = _deviceConfig.value
val config = _localConfig.value
if (value != null && config != null) {
val builder = config.toBuilder()
builder.powerBuilder.lsSecs = value
setDeviceConfig(builder.build())
val builder = config.power.toBuilder()
builder.lsSecs = value
val newConfig = ConfigProtos.Config.newBuilder()
newConfig.power = builder.build()
setDeviceConfig(newConfig.build())
}
}
var gpsDisabled: Boolean
get() = _deviceConfig.value?.position?.gpsDisabled ?: false
get() = _localConfig.value?.position?.gpsDisabled ?: false
set(value) {
val config = _deviceConfig.value
val config = _localConfig.value
if (config != null) {
val builder = config.toBuilder()
builder.positionBuilder.gpsDisabled = value
setDeviceConfig(builder.build())
val builder = config.position.toBuilder()
builder.gpsDisabled = value
val newConfig = ConfigProtos.Config.newBuilder()
newConfig.position = builder.build()
setDeviceConfig(newConfig.build())
}
}
var isPowerSaving: Boolean?
get() = _deviceConfig.value?.power?.isPowerSaving
get() = _localConfig.value?.power?.isPowerSaving
set(value) {
val config = _deviceConfig.value
val config = _localConfig.value
if (value != null && config != null) {
val builder = config.toBuilder()
builder.powerBuilder.isPowerSaving = value
setDeviceConfig(builder.build())
val builder = config.power.toBuilder()
builder.isPowerSaving = value
val newConfig = ConfigProtos.Config.newBuilder()
newConfig.power = builder.build()
setDeviceConfig(newConfig.build())
}
}
@@ -227,11 +235,25 @@ class UIViewModel @Inject constructor(
val primaryChannel: Channel? get() = _channels.value?.primaryChannel
// Set the radio config (also updates our saved copy in preferences)
fun setDeviceConfig(c: ConfigProtos.Config) {
private fun setDeviceConfig(config: ConfigProtos.Config) {
debug("Setting new radio config!")
meshService?.deviceConfig = c.toByteArray()
_deviceConfig.value =
c // Must be done after calling the service, so we will will properly throw if the service failed (and therefore not cache invalid new settings)
meshService?.deviceConfig = config.toByteArray()
// Must be done after calling the service, so we will will properly throw if the service failed (and therefore not cache invalid new settings)
_localConfig.value?.let { localConfig ->
val builder = localConfig.toBuilder()
if (config.hasDevice()) builder.device = config.device
if (config.hasPosition()) builder.position = config.position
if (config.hasPower()) builder.power = config.power
if (config.hasWifi()) builder.wifi = config.wifi
if (config.hasDisplay()) builder.display = config.display
if (config.hasLora()) builder.lora = config.lora
_localConfig.value = builder.build()
}
}
fun setLocalConfig(localConfig: LocalOnlyProtos.LocalConfig) {
_localConfig.value = localConfig
}
/// Set the radio config (also updates our saved copy in preferences)
@@ -326,7 +348,7 @@ class UIViewModel @Inject constructor(
// Packets are ordered by time, we keep most recent position of
// our device in localNodePosition.
val dateFormat = SimpleDateFormat("yyyy-MM-dd,HH:mm:ss", Locale.getDefault())
repository.getAllPacketsInReceiveOrder(Int.MAX_VALUE).first().forEach { packet ->
packetRepository.getAllPacketsInReceiveOrder(Int.MAX_VALUE).first().forEach { packet ->
// If we get a NodeInfo packet, use it to update our position data (if valid)
packet.nodeInfo?.let { nodeInfo ->
positionToPos.invoke(nodeInfo.position)?.let { _ ->

59
app/src/main/java/com/geeksville/mesh/service/MeshService.kt
View File

@@ -490,15 +490,15 @@ class MeshService : Service(), Logging {
setChannel(it)
}
localConfig.let { currentConfig ->
val newConfig = ConfigProtos.Config.newBuilder()
val newConfig = ConfigProtos.Config.newBuilder()
val newPrefs = (value.loraConfig).toBuilder()
val newPrefs = currentConfig.lora.toBuilder()
newPrefs.modemPreset = value.loraConfig.modemPreset
newConfig.lora = newPrefs.build()
// We don't change the current region frequency band, unless Unset
if (curRegionValue != ConfigProtos.Config.LoRaConfig.RegionCode.Unset_VALUE)
newPrefs.regionValue = curRegionValue
sendDeviceConfig(newConfig.build())
}
newConfig.lora = newPrefs.build()
sendDeviceConfig(newConfig.build())
channels = fixupChannelList(asChannels)
}
@@ -739,19 +739,8 @@ class MeshService : Service(), Logging {
AdminProtos.AdminMessage.VariantCase.GET_CONFIG_RESPONSE -> {
val response = a.getConfigResponse
debug("Admin: received config ${response.payloadVariantCase}")
localConfig.let { currentConfig ->
val builder = currentConfig.toBuilder()
if (response.hasDevice()) builder.device = response.device
if (response.hasPosition()) builder.position = response.position
if (response.hasPower()) builder.power = response.power
if (response.hasWifi()) builder.wifi = response.wifi
if (response.hasDisplay()) builder.display = response.display
if (response.hasLora()) {
builder.lora = response.lora
requestChannel(0) // Now start reading channels
}
localConfig = builder.build()
}
setLocalConfig(response)
if (response.hasLora()) requestChannel(0) // Now start reading channels
}
AdminProtos.AdminMessage.VariantCase.GET_CHANNEL_RESPONSE -> {
@@ -1484,25 +1473,20 @@ class MeshService : Service(), Logging {
})
// Update our cached copy
localConfig.let { currentConfig ->
val builder = currentConfig.toBuilder()
if (c.hasDevice()) builder.device = c.device
if (c.hasPosition()) builder.position = c.position
if (c.hasPower()) builder.power = c.power
if (c.hasWifi()) builder.wifi = c.wifi
if (c.hasDisplay()) builder.display = c.display
if (c.hasLora()) builder.lora = c.lora
this@MeshService.localConfig = builder.build()
// debug("sendDeviceConfig: localConfig ${localConfig.toOneLineString()}")
}
setLocalConfig(c)
}
/** Set our radio config
/** Set our localConfig
*/
private fun setDeviceConfig(payload: ByteArray) {
val parsed = ConfigProtos.Config.parseFrom(payload)
sendDeviceConfig(parsed)
private fun setLocalConfig(config: ConfigProtos.Config) {
val builder = localConfig.toBuilder()
if (config.hasDevice()) builder.device = config.device
if (config.hasPosition()) builder.position = config.position
if (config.hasPower()) builder.power = config.power
if (config.hasWifi()) builder.wifi = config.wifi
if (config.hasDisplay()) builder.display = config.display
if (config.hasLora()) builder.lora = config.lora
localConfig = builder.build()
}
/**
@@ -1743,7 +1727,8 @@ class MeshService : Service(), Logging {
}
override fun setDeviceConfig(payload: ByteArray) = toRemoteExceptions {
this@MeshService.setDeviceConfig(payload)
val parsed = ConfigProtos.Config.parseFrom(payload)
sendDeviceConfig(parsed)
}
override fun getChannels(): ByteArray = toRemoteExceptions {

4
app/src/main/java/com/geeksville/mesh/ui/AdvancedSettingsFragment.kt
View File

@@ -38,7 +38,7 @@ class AdvancedSettingsFragment : ScreenFragment("Advanced Settings"), Logging {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
model.deviceConfig.observe(viewLifecycleOwner) {
model.localConfig.observe(viewLifecycleOwner) {
binding.positionBroadcastPeriodEditText.setText(model.positionBroadcastSecs.toString())
binding.lsSleepEditText.setText(model.lsSleepSecs.toString())
binding.positionBroadcastPeriodView.isEnabled = !model.gpsDisabled
@@ -61,7 +61,7 @@ class AdvancedSettingsFragment : ScreenFragment("Advanced Settings"), Logging {
val textEdit = binding.positionBroadcastPeriodEditText
val n = textEdit.text.toString().toIntOrNull()
val minBroadcastPeriodSecs =
ChannelOption.fromConfig(model.deviceConfig.value?.lora?.modemPreset)?.minBroadcastPeriodSecs
ChannelOption.fromConfig(model.localConfig.value?.lora?.modemPreset)?.minBroadcastPeriodSecs
?: ChannelOption.defaultMinBroadcastPeriod
if (n != null && n < MAX_INT_DEVICE && (n == 0 || n >= minBroadcastPeriodSecs)) {

2
app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt
View File

@@ -735,7 +735,7 @@ class SettingsFragment : ScreenFragment("Settings"), Logging {
updateDevicesButtons(scanModel.devices.value)
}
model.deviceConfig.observe(viewLifecycleOwner) {
model.localConfig.observe(viewLifecycleOwner) {
binding.provideLocationCheckbox.isEnabled =
isGooglePlayAvailable(requireContext()) && !model.gpsDisabled
if (model.gpsDisabled) {