Merge branch 'kv4p-203-a' into kv4p-203

Author: SmittyHalibut

android-src/KV4PHT/app/build.gradle

@@ -10,8 +10,8 @@ android {
         applicationId "com.vagell.kv4pht"
         minSdk 26
         targetSdk 34
-        versionCode 34
-        versionName "1.7.0"
+        versionCode 35
+        versionName "1.7.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 

android-src/KV4PHT/app/src/main/java/com/vagell/kv4pht/firmware/FirmwareUtils.java

@@ -18,11 +18,11 @@ public class FirmwareUtils {
     private static int progressPercent = 0;
 
     // Whenever there is new firmware, put the files in res/raw, and update these constants.
-    public static final int PACKAGED_FIRMWARE_VER = 10;
-    private static final int FIRMWARE_FILE_1_ID = R.raw.v10_kv4p_ht_esp32_wroom_32_ino_bootloader;
-    private static final int FIRMWARE_FILE_2_ID = R.raw.v10_kv4p_ht_esp32_wroom_32_ino_partitions;
+    public static final int PACKAGED_FIRMWARE_VER = 11;
+    private static final int FIRMWARE_FILE_1_ID = R.raw.v11_kv4p_ht_esp32_wroom_32_ino_bootloader;
+    private static final int FIRMWARE_FILE_2_ID = R.raw.v11_kv4p_ht_esp32_wroom_32_ino_partitions;
     private static final int FIRMWARE_FILE_3_ID = R.raw.boot_app0; // This one never changes, it's the Arduino ESP32 bootloader
-    private static final int FIRMWARE_FILE_4_ID = R.raw.v10_kv4p_ht_esp32_wroom_32_ino;
+    private static final int FIRMWARE_FILE_4_ID = R.raw.v11_kv4p_ht_esp32_wroom_32_ino;
 
     public FirmwareUtils() {
     }

…s/raw/v10_kv4p_ht_esp32_wroom_32_ino.bin …s/raw/v11_kv4p_ht_esp32_wroom_32_ino.binandroid-src/KV4PHT/app/src/main/res/raw/v10_kv4p_ht_esp32_wroom_32_ino.bin renamed to android-src/KV4PHT/app/src/main/res/raw/v11_kv4p_ht_esp32_wroom_32_ino.bin android-src/KV4PHT/app/src/main/res/raw/v10_kv4p_ht_esp32_wroom_32_ino.bin renamed to android-src/KV4PHT/app/src/main/res/raw/v11_kv4p_ht_esp32_wroom_32_ino.bin

@@ -1,5 +1,6 @@
 {
     "files.associations": {
         "algorithm": "cpp"
-    }
+    },
+    "C_Cpp.clang_format_style": "file:.clang-format"
 }

…v4p_ht_esp32_wroom_32_ino_bootloader.bin …v4p_ht_esp32_wroom_32_ino_bootloader.binandroid-src/KV4PHT/app/src/main/res/raw/v10_kv4p_ht_esp32_wroom_32_ino_bootloader.bin renamed to android-src/KV4PHT/app/src/main/res/raw/v11_kv4p_ht_esp32_wroom_32_ino_bootloader.bin android-src/KV4PHT/app/src/main/res/raw/v10_kv4p_ht_esp32_wroom_32_ino_bootloader.bin renamed to android-src/KV4PHT/app/src/main/res/raw/v11_kv4p_ht_esp32_wroom_32_ino_bootloader.bin

@@ -0,0 +1,52 @@
+---
+BasedOnStyle: LLVM
+AlignConsecutiveAssignments: Consecutive
+AlignEscapedNewlines: DontAlign
+AllowShortBlocksOnASingleLine: Always
+AllowShortCaseLabelsOnASingleLine: true
+AllowShortFunctionsOnASingleLine: Empty
+AllowShortIfStatementsOnASingleLine: AllIfsAndElse
+AllowShortLambdasOnASingleLine: Empty
+AllowShortLoopsOnASingleLine: true
+AlwaysBreakTemplateDeclarations: No
+BreakBeforeBinaryOperators: NonAssignment
+BreakBeforeConceptDeclarations: false
+BreakStringLiterals: false
+ColumnLimit: 0
+CommentPragmas: ""
+ConstructorInitializerIndentWidth: 2
+ContinuationIndentWidth: 2
+DerivePointerAlignment: true
+EmptyLineAfterAccessModifier: Leave
+EmptyLineBeforeAccessModifier: Leave
+FixNamespaceComments: false
+IncludeIsMainRegex: ""
+IndentCaseBlocks: true
+IndentCaseLabels: true
+IndentExternBlock: Indent
+IndentGotoLabels: false
+IndentRequires: true
+MaxEmptyLinesToKeep: 100000
+PenaltyBreakAssignment: 1
+PenaltyBreakBeforeFirstCallParameter: 1
+PenaltyBreakComment: 1
+PenaltyBreakFirstLessLess: 1
+PenaltyBreakOpenParenthesis: 1
+PenaltyBreakString: 1
+PenaltyBreakTemplateDeclaration: 1
+PenaltyExcessCharacter: 1
+PenaltyIndentedWhitespace: 1
+PenaltyReturnTypeOnItsOwnLine: 1
+PointerAlignment: Left
+ReflowComments: false
+ShortNamespaceLines: 0
+SortIncludes: Never
+SortUsingDeclarations: false
+SpaceAfterTemplateKeyword: false
+SpacesBeforeTrailingComments: 2
+SpacesInAngles: Leave
+SpacesInContainerLiterals: false
+SpacesInLineCommentPrefix:
+  Minimum: 0
+Standard: Auto
+TabWidth: 2