From 740e86d66401112761385c24e5a0c29c2484aca4 Mon Sep 17 00:00:00 2001 From: andrekir Date: Wed, 26 Oct 2022 16:50:46 -0300 Subject: [PATCH 1/7] update actions to use Node.js 16 --- .github/workflows/android.yml | 4 ++-- .github/workflows/release.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index fa881ea6..364ced3b 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -12,7 +12,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: submodules: 'recursive' @@ -37,7 +37,7 @@ jobs: run: ./gradlew assembleDebug - name: Upload APK - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: app-debug path: app/build/outputs/apk/debug/app-debug.apk diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7b1e6d55..a1320702 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,7 +13,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: submodules: 'recursive' From 7cdb1d0f90771cc825421eff84b6ac29f64099cd Mon Sep 17 00:00:00 2001 From: andrekir Date: Wed, 26 Oct 2022 17:03:51 -0300 Subject: [PATCH 2/7] include negative snr in rangetest --- app/src/main/java/com/geeksville/mesh/model/UIState.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 b9862b3d..17dd7f7f 100644 --- a/app/src/main/java/com/geeksville/mesh/model/UIState.kt +++ b/app/src/main/java/com/geeksville/mesh/model/UIState.kt @@ -465,7 +465,7 @@ class UIViewModel @Inject constructor( // Filter out of our results any packet that doesn't report SNR. This // is primarily ADMIN_APP. - if (proto.rxSnr > 0.0f) { + if (proto.rxSnr != 0.0f) { val rxDateTime = dateFormat.format(packet.received_date) val rxFrom = proto.from.toUInt() val senderName = nodesById[proto.from]?.user?.longName ?: "" From 8ead6aeb45f2641cc446e5e388816680a3f0c4f0 Mon Sep 17 00:00:00 2001 From: andrekir Date: Wed, 26 Oct 2022 17:09:30 -0300 Subject: [PATCH 3/7] updating proto submodule to latest --- app/src/main/proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/proto b/app/src/main/proto index d0559bfa..579a36af 160000 --- a/app/src/main/proto +++ b/app/src/main/proto @@ -1 +1 @@ -Subproject commit d0559bfa3c31023ed2f2aa3807b6a0a1da9a6feb +Subproject commit 579a36afded1edca9b0ba94f278ad1f637d56bf5 From 726e54786ca09c43163b1f8cd3056b7c940540fc Mon Sep 17 00:00:00 2001 From: andrekir Date: Wed, 26 Oct 2022 17:49:32 -0300 Subject: [PATCH 4/7] updating proto submodule to latest --- app/src/main/proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/proto b/app/src/main/proto index 579a36af..e9b44318 160000 --- a/app/src/main/proto +++ b/app/src/main/proto @@ -1 +1 @@ -Subproject commit 579a36afded1edca9b0ba94f278ad1f637d56bf5 +Subproject commit e9b44318f32255cff38d74bd11577712721a1e9c From 9ad6dd137d85316fd1ac152bbc731f317d3a221f Mon Sep 17 00:00:00 2001 From: andrekir Date: Wed, 26 Oct 2022 17:58:38 -0300 Subject: [PATCH 5/7] when we init default, set use_preset to true (meshtastic/Meshtastic-device#1845) --- app/src/main/java/com/geeksville/mesh/model/Channel.kt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 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 6be86b58..987491a5 100644 --- a/app/src/main/java/com/geeksville/mesh/model/Channel.kt +++ b/app/src/main/java/com/geeksville/mesh/model/Channel.kt @@ -29,8 +29,13 @@ data class Channel( // The default channel that devices ship with val default = Channel( channelSettings { psk = ByteString.copyFrom(defaultPSK) }, - // reference: NodeDB::installDefaultConfig - loRaConfig { txEnabled = true; modemPreset = ModemPreset.LONG_FAST; hopLimit = 3 } + // references: NodeDB::installDefaultConfig / Channels::initDefaultChannel + loRaConfig { + usePreset = true + modemPreset = ModemPreset.LONG_FAST + hopLimit = 3 + txEnabled = true + } ) } From 94a9071dc6448d76bf84ce236e7365676cb844ef Mon Sep 17 00:00:00 2001 From: andrekir Date: Wed, 26 Oct 2022 18:41:02 -0300 Subject: [PATCH 6/7] updating proto submodule to latest --- app/src/main/proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/proto b/app/src/main/proto index e9b44318..a79e3aef 160000 --- a/app/src/main/proto +++ b/app/src/main/proto @@ -1 +1 @@ -Subproject commit e9b44318f32255cff38d74bd11577712721a1e9c +Subproject commit a79e3aef8117dad642b1a011ec0438619616740c From 2cc839eafd9acf427bee14ce66fa29b4ac6b93f7 Mon Sep 17 00:00:00 2001 From: andrekir Date: Thu, 27 Oct 2022 09:14:37 -0300 Subject: [PATCH 7/7] 1.3.48 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index cc66f08c..a446cb75 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -43,8 +43,8 @@ android { applicationId "com.geeksville.mesh" minSdkVersion 21 // The oldest emulator image I have tried is 22 (though 21 probably works) targetSdkVersion 30 - versionCode 20345 // format is Mmmss (where M is 1+the numeric major number - versionName "1.3.45" + versionCode 20348 // format is Mmmss (where M is 1+the numeric major number + versionName "1.3.48" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" // per https://developer.android.com/studio/write/vector-asset-studio