From 8e5eabec2955490a276967c69bcd85915991c12e Mon Sep 17 00:00:00 2001 From: andrekir Date: Thu, 9 Dec 2021 19:04:58 -0300 Subject: [PATCH 1/2] add LoRa channels (MediumFast, MediumSlow) --- .../java/com/geeksville/mesh/model/Channel.kt | 6 +++-- .../geeksville/mesh/model/ChannelOption.kt | 22 +++++-------------- app/src/main/res/values-pt-rBR/strings.xml | 10 +++++---- app/src/main/res/values-pt/strings.xml | 10 +++++---- app/src/main/res/values/strings.xml | 10 +++++---- 5 files changed, 28 insertions(+), 30 deletions(-) diff --git a/app/src/main/java/com/geeksville/mesh/model/Channel.kt b/app/src/main/java/com/geeksville/mesh/model/Channel.kt index fe66997cd..e131a15f6 100644 --- a/app/src/main/java/com/geeksville/mesh/model/Channel.kt +++ b/app/src/main/java/com/geeksville/mesh/model/Channel.kt @@ -35,9 +35,11 @@ data class Channel(val settings: ChannelProtos.ChannelSettings) { if (settings.bandwidth != 0) "Unset" else when (settings.modemConfig) { - ChannelProtos.ChannelSettings.ModemConfig.Bw125Cr45Sf128 -> "Medium" ChannelProtos.ChannelSettings.ModemConfig.Bw500Cr45Sf128 -> "ShortFast" - ChannelProtos.ChannelSettings.ModemConfig.Bw31_25Cr48Sf512 -> "LongAlt" + ChannelProtos.ChannelSettings.ModemConfig.Bw125Cr45Sf128 -> "ShortSlow" + ChannelProtos.ChannelSettings.ModemConfig.Bw250Cr47Sf1024 -> "MediumFast" + ChannelProtos.ChannelSettings.ModemConfig.Bw250Cr46Sf2048 -> "MediumSlow" + ChannelProtos.ChannelSettings.ModemConfig.Bw31_25Cr48Sf512 -> "LongFast" ChannelProtos.ChannelSettings.ModemConfig.Bw125Cr48Sf4096 -> "LongSlow" else -> "Invalid" } diff --git a/app/src/main/java/com/geeksville/mesh/model/ChannelOption.kt b/app/src/main/java/com/geeksville/mesh/model/ChannelOption.kt index cae6558bb..b6627409e 100644 --- a/app/src/main/java/com/geeksville/mesh/model/ChannelOption.kt +++ b/app/src/main/java/com/geeksville/mesh/model/ChannelOption.kt @@ -8,22 +8,12 @@ enum class ChannelOption( val configRes: Int, val minBroadcastPeriodSecs: Int ) { - SHORT(ChannelProtos.ChannelSettings.ModemConfig.Bw500Cr45Sf128, R.string.modem_config_short, 3), - MEDIUM( - ChannelProtos.ChannelSettings.ModemConfig.Bw125Cr45Sf128, - R.string.modem_config_medium, - 12 - ), - LONG( - ChannelProtos.ChannelSettings.ModemConfig.Bw31_25Cr48Sf512, - R.string.modem_config_long, - 240 - ), - VERY_LONG( - ChannelProtos.ChannelSettings.ModemConfig.Bw125Cr48Sf4096, - R.string.modem_config_very_long, - 375 - ); + SHORT(ChannelProtos.ChannelSettings.ModemConfig.Bw500Cr45Sf128,R.string.modem_config_short, 3), + MEDIUM(ChannelProtos.ChannelSettings.ModemConfig.Bw125Cr45Sf128, R.string.modem_config_slow_short, 12), + MED_FAST(ChannelProtos.ChannelSettings.ModemConfig.Bw250Cr47Sf1024,R.string.modem_config_medium, 66), + MED_SLOW(ChannelProtos.ChannelSettings.ModemConfig.Bw250Cr46Sf2048,R.string.modem_config_slow_medium, 66), + LONG(ChannelProtos.ChannelSettings.ModemConfig.Bw31_25Cr48Sf512, R.string.modem_config_long, 240), + VERY_LONG(ChannelProtos.ChannelSettings.ModemConfig.Bw125Cr48Sf4096, R.string.modem_config_very_long, 375); companion object { fun fromConfig(modemConfig: ChannelProtos.ChannelSettings.ModemConfig?): ChannelOption? { diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 149e16e27..815890b80 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -59,10 +59,10 @@ Atualização do aplicativo necessária Será necessário atualizar este aplicativo no Google Play (ou Github). Versão muito antiga para comunicar com o firmware do rádio. Favor consultar wiki. Nenhum (desabilitado) - Curto alcance (mais rápido) - Médio alcance (rápido) - Longo alcance (lento) - Muito longo alcance (mais lento) + Curto alcance / rápido + Médio alcance / rápido + Longo alcance / lento + Longo alcance / lento DESCONHECIDO Notificações do Serviço Meshtastic Você deve ativar o modo de alta precisão nas Configurações de Local do Android @@ -114,4 +114,6 @@ Fornecer localização para mesh Permissão da câmera Precisamos acessar a câmera para escanear códigos QR. Nenhuma foto ou video são armazenados. + Curto alcance / lento + Médio alcance / lento diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 61a6895a8..5f20a9401 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -58,10 +58,10 @@ A aplicação é muito antiga Tem de atualizar esta aplicação no Google Play (ou Github). A versão é muito antiga para ser possível falar com este rádio. Nenhum (desabilitado) - Curto alcance (mas rápido) - Médio alcance (mas rápido) - Longo alcance (mas lento) - Muito longo alcance (mas lento) + Curto alcance / rápido + Médio alcance / rápido + Longo alcance / lento + Longo alcance / lento DESCONHECIDO Notificações do Serviço Meshtastic Deve ativar os serviços de localização nas configurações do Android @@ -114,4 +114,6 @@ Fornecer localização para mesh Precisamos acessar a câmera para escanear códigos QR. Nenhuma foto ou video são armazenados. Permissão da câmera + Curto alcance / lento + Médio alcance / lento diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a40f0de64..4a9ebf837 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -63,10 +63,10 @@ Application update required You must update this application on the app store (or Github). It is too old to talk to this radio firmware. Please read our wiki on this topic. None (disable) - Short range (but fast) - Medium range (but fast) - Long range (but slower) - Very long range (but slow) + Short Range / Fast + Medium Range / Fast + Long Range / Slow + Long Range / Slow UNRECOGNIZED Meshtastic Service Notifications You must turn on (high accuracy) location services in Android Settings @@ -118,4 +118,6 @@ Provide location to mesh Camera permission We must be granted access to the camera to read QR codes. No pictures or videos will be saved. + Short Range / Slow + Medium Range / Slow \ No newline at end of file From 41e4c1284217e96e06f5142be2e6322276fe1a4b Mon Sep 17 00:00:00 2001 From: andrekir Date: Fri, 10 Dec 2021 18:37:02 -0300 Subject: [PATCH 2/2] fix typo & cap minBroadcastPeriodSecs 30s --- .../main/java/com/geeksville/mesh/model/ChannelOption.kt | 8 ++++---- app/src/main/res/values/strings.xml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/geeksville/mesh/model/ChannelOption.kt b/app/src/main/java/com/geeksville/mesh/model/ChannelOption.kt index b6627409e..1f7a85643 100644 --- a/app/src/main/java/com/geeksville/mesh/model/ChannelOption.kt +++ b/app/src/main/java/com/geeksville/mesh/model/ChannelOption.kt @@ -8,10 +8,10 @@ enum class ChannelOption( val configRes: Int, val minBroadcastPeriodSecs: Int ) { - SHORT(ChannelProtos.ChannelSettings.ModemConfig.Bw500Cr45Sf128,R.string.modem_config_short, 3), - MEDIUM(ChannelProtos.ChannelSettings.ModemConfig.Bw125Cr45Sf128, R.string.modem_config_slow_short, 12), - MED_FAST(ChannelProtos.ChannelSettings.ModemConfig.Bw250Cr47Sf1024,R.string.modem_config_medium, 66), - MED_SLOW(ChannelProtos.ChannelSettings.ModemConfig.Bw250Cr46Sf2048,R.string.modem_config_slow_medium, 66), + SHORT(ChannelProtos.ChannelSettings.ModemConfig.Bw500Cr45Sf128,R.string.modem_config_short, 30), + MEDIUM(ChannelProtos.ChannelSettings.ModemConfig.Bw125Cr45Sf128, R.string.modem_config_slow_short, 30), + MED_FAST(ChannelProtos.ChannelSettings.ModemConfig.Bw250Cr47Sf1024,R.string.modem_config_medium, 60), + MED_SLOW(ChannelProtos.ChannelSettings.ModemConfig.Bw250Cr46Sf2048,R.string.modem_config_slow_medium, 60), LONG(ChannelProtos.ChannelSettings.ModemConfig.Bw31_25Cr48Sf512, R.string.modem_config_long, 240), VERY_LONG(ChannelProtos.ChannelSettings.ModemConfig.Bw125Cr48Sf4096, R.string.modem_config_very_long, 375); diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4a9ebf837..ff8518694 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -65,7 +65,7 @@ None (disable) Short Range / Fast Medium Range / Fast - Long Range / Slow + Long Range / Fast Long Range / Slow UNRECOGNIZED Meshtastic Service Notifications