Merge pull request #319 from meshtastic/channels

add LoRa channels (MediumFast, MediumSlow)

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"
             }

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, 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);
 
     companion object {
         fun fromConfig(modemConfig: ChannelProtos.ChannelSettings.ModemConfig?): ChannelOption? {

app/src/main/res/values-pt-rBR/strings.xml

@@ -59,10 +59,10 @@
     <string name="app_too_old">Atualização do aplicativo necessária</string>
     <string name="must_update">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 <a href="https://www.meshtastic.org/software/android-too-old.html">wiki</a>.</string>
     <string name="none">Nenhum (desabilitado)</string>
-    <string name="modem_config_short">Curto alcance (mais rápido)</string>
-    <string name="modem_config_medium">Médio alcance (rápido)</string>
-    <string name="modem_config_long">Longo alcance (lento)</string>
-    <string name="modem_config_very_long">Muito longo alcance (mais lento)</string>
+    <string name="modem_config_short">Curto alcance / rápido</string>
+    <string name="modem_config_medium">Médio alcance / rápido</string>
+    <string name="modem_config_long">Longo alcance / lento</string>
+    <string name="modem_config_very_long">Longo alcance / lento</string>
     <string name="modem_config_unrecognized">DESCONHECIDO</string>
     <string name="meshtastic_service_notifications">Notificações do Serviço Meshtastic</string>
     <string name="location_disabled_warning"> Você deve ativar o modo de alta precisão nas Configurações de Local do Android</string>
@@ -114,4 +114,6 @@
     <string name="provide_location_to_mesh">Fornecer localização para mesh</string>
     <string name="camera_required">Permissão da câmera</string>
     <string name="why_camera_required">Precisamos acessar a câmera para escanear códigos QR. Nenhuma foto ou video são armazenados.</string>
+    <string name="modem_config_slow_short">Curto alcance / lento</string>
+    <string name="modem_config_slow_medium">Médio alcance / lento</string>
 </resources>

app/src/main/res/values-pt/strings.xml

@@ -58,10 +58,10 @@
     <string name="app_too_old">A aplicação é muito antiga</string>
     <string name="must_update">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.</string>
     <string name="none">Nenhum (desabilitado)</string>
-    <string name="modem_config_short">Curto alcance (mas rápido)</string>
-    <string name="modem_config_medium">Médio alcance (mas rápido)</string>
-    <string name="modem_config_long">Longo alcance (mas lento)</string>
-    <string name="modem_config_very_long">Muito longo alcance (mas lento)</string>
+    <string name="modem_config_short">Curto alcance / rápido</string>
+    <string name="modem_config_medium">Médio alcance / rápido</string>
+    <string name="modem_config_long">Longo alcance / lento</string>
+    <string name="modem_config_very_long">Longo alcance / lento</string>
     <string name="modem_config_unrecognized">DESCONHECIDO</string>
     <string name="meshtastic_service_notifications">Notificações do Serviço Meshtastic</string>
     <string name="location_disabled_warning">Deve ativar os serviços de localização nas configurações do Android</string>
@@ -114,4 +114,6 @@
     <string name="provide_location_to_mesh">Fornecer localização para mesh</string>
     <string name="why_camera_required">Precisamos acessar a câmera para escanear códigos QR. Nenhuma foto ou video são armazenados.</string>
     <string name="camera_required">Permissão da câmera</string>
+    <string name="modem_config_slow_short">Curto alcance / lento</string>
+    <string name="modem_config_slow_medium">Médio alcance / lento</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -63,10 +63,10 @@
     <string name="app_too_old">Application update required</string>
     <string name="must_update">You must update this application on the app store (or Github). It is too old to talk to this radio firmware.  Please read our <a href="https://www.meshtastic.org/software/android-too-old.html">wiki</a> on this topic.</string>
     <string name="none">None (disable)</string>
-    <string name="modem_config_short">Short range (but fast)</string>
-    <string name="modem_config_medium">Medium range (but fast)</string>
-    <string name="modem_config_long">Long range (but slower)</string>
-    <string name="modem_config_very_long">Very long range (but slow)</string>
+    <string name="modem_config_short">Short Range / Fast</string>
+    <string name="modem_config_medium">Medium Range / Fast</string>
+    <string name="modem_config_long">Long Range / Fast</string>
+    <string name="modem_config_very_long">Long Range / Slow</string>
     <string name="modem_config_unrecognized">UNRECOGNIZED</string>
     <string name="meshtastic_service_notifications">Meshtastic Service Notifications</string>
     <string name="location_disabled_warning">You must turn on (high accuracy) location services in Android Settings</string>
@@ -118,4 +118,6 @@
     <string name="provide_location_to_mesh">Provide location to mesh</string>
     <string name="camera_required">Camera permission</string>
     <string name="why_camera_required">We must be granted access to the camera to read QR codes. No pictures or videos will be saved.</string>
+    <string name="modem_config_slow_short">Short Range / Slow</string>
+    <string name="modem_config_slow_medium">Medium Range / Slow</string>
 </resources>