From e11d726e276435aa161b430d49664bb28efe7de5 Mon Sep 17 00:00:00 2001 From: James Rich <2199651+jamesarich@users.noreply.github.com> Date: Sat, 15 Feb 2025 22:17:57 -0600 Subject: [PATCH] feat: Add RAK2560 hardware model and graphic (#1543) Adds the RAK2560 to the list of supported devices and associates it with the corresponding vector drawable. --- app/src/main/assets/device_hardware.json | 16 ++ .../geeksville/mesh/model/DeviceHardware.kt | 1 + app/src/main/res/drawable/hw_rak2560.xml | 264 ++++++++++++++++++ 3 files changed, 281 insertions(+) create mode 100644 app/src/main/res/drawable/hw_rak2560.xml diff --git a/app/src/main/assets/device_hardware.json b/app/src/main/assets/device_hardware.json index 8f857c67..ef52decd 100644 --- a/app/src/main/assets/device_hardware.json +++ b/app/src/main/assets/device_hardware.json @@ -270,6 +270,22 @@ ], "requiresDfu": true }, + { + "hwModel": 22, + "hwModelSlug": "WISMESH_HUB", + "platformioTarget": "rak2560", + "architecture": "nrf52840", + "activelySupported": true, + "supportLevel": 1, + "displayName": "RAK WisMesh Repeater", + "tags": [ + "RAK" + ], + "images": [ + "rak2560.svg" + ], + "requiresDfu": true + }, { "hwModel": 25, "hwModelSlug": "STATION_G1", diff --git a/app/src/main/java/com/geeksville/mesh/model/DeviceHardware.kt b/app/src/main/java/com/geeksville/mesh/model/DeviceHardware.kt index 43fa03d1..73a412f9 100644 --- a/app/src/main/java/com/geeksville/mesh/model/DeviceHardware.kt +++ b/app/src/main/java/com/geeksville/mesh/model/DeviceHardware.kt @@ -78,6 +78,7 @@ private fun getDrawableFrom(hwModel: Int): Int = when (hwModel) { HardwareModel.RPI_PICO_VALUE -> R.drawable.hw_pico HardwareModel.NRF52_PROMICRO_DIY_VALUE -> R.drawable.hw_promicro HardwareModel.RAK11310_VALUE -> R.drawable.hw_rak11310 + HardwareModel.RAK2560_VALUE -> R.drawable.hw_rak2560 HardwareModel.RAK4631_VALUE -> R.drawable.hw_rak4631_case HardwareModel.RPI_PICO2_VALUE -> R.drawable.hw_rpipicow HardwareModel.SENSECAP_INDICATOR_VALUE -> R.drawable.hw_seeed_sensecap_indicator diff --git a/app/src/main/res/drawable/hw_rak2560.xml b/app/src/main/res/drawable/hw_rak2560.xml new file mode 100644 index 00000000..219e40a0 --- /dev/null +++ b/app/src/main/res/drawable/hw_rak2560.xml @@ -0,0 +1,264 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +