From f8f3be36eeea550abe9d213894690855fcac7c96 Mon Sep 17 00:00:00 2001 From: Gandalf Date: Thu, 11 Jun 2026 22:41:02 +0100 Subject: [PATCH] feat: initialize Android project structure with Gradle and basic UI/data architecture --- .gitignore | 15 + .idea/.name | 1 + .idea/codeStyles/Project.xml | 123 ++ .idea/codeStyles/codeStyleConfig.xml | 5 + .idea/compiler.xml | 6 + .idea/deploymentTargetSelector.xml | 11 + .idea/gradle.xml | 7 +- .idea/misc.xml | 2 +- 24-INT10.ads | 1261 +++++++++++++++++ README.md | 120 +- app/.gitignore | 1 + app/build.gradle.kts | 84 ++ .../ui/main/MainScreenTest.kt | 26 + app/src/main/AndroidManifest.xml | 35 + .../esp32aldldashboard/MainActivity.kt | 22 + .../example/esp32aldldashboard/Navigation.kt | 27 + .../esp32aldldashboard/NavigationKeys.kt | 6 + .../bluetooth/BluetoothService.kt | 330 +++++ .../esp32aldldashboard/data/DataRepository.kt | 12 + .../esp32aldldashboard/parser/ALDLParser.kt | 269 ++++ .../example/esp32aldldashboard/theme/Color.kt | 11 + .../example/esp32aldldashboard/theme/Theme.kt | 50 + .../example/esp32aldldashboard/theme/Type.kt | 36 + .../esp32aldldashboard/ui/main/MainScreen.kt | 712 ++++++++++ .../ui/main/MainScreenViewModel.kt | 42 + .../res/drawable/ic_launcher_background.xml | 170 +++ .../res/drawable/ic_launcher_foreground.xml | 24 + .../res/mipmap-anydpi-v26/ic_launcher.xml | 6 + .../mipmap-anydpi-v26/ic_launcher_round.xml | 6 + app/src/main/res/mipmap-hdpi/ic_launcher.webp | Bin 0 -> 1404 bytes .../res/mipmap-hdpi/ic_launcher_round.webp | Bin 0 -> 2898 bytes app/src/main/res/mipmap-mdpi/ic_launcher.webp | Bin 0 -> 982 bytes .../res/mipmap-mdpi/ic_launcher_round.webp | Bin 0 -> 1772 bytes .../main/res/mipmap-xhdpi/ic_launcher.webp | Bin 0 -> 1900 bytes .../res/mipmap-xhdpi/ic_launcher_round.webp | Bin 0 -> 3918 bytes .../main/res/mipmap-xxhdpi/ic_launcher.webp | Bin 0 -> 2884 bytes .../res/mipmap-xxhdpi/ic_launcher_round.webp | Bin 0 -> 5914 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.webp | Bin 0 -> 3844 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.webp | Bin 0 -> 7778 bytes app/src/main/res/values/strings.xml | 3 + app/src/main/res/values/themes.xml | 5 + app/src/main/res/xml/backup_rules.xml | 13 + .../main/res/xml/data_extraction_rules.xml | 19 + .../esp32aldldashboard/ALDLParserTest.kt | 73 + .../ui/main/MainScreenViewModelTest.kt | 44 + build.gradle.kts | 6 + gradle.properties | 29 + gradle/gradle-daemon-jvm.properties | 13 + gradle/libs.versions.toml | 43 + gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 54329 bytes gradle/wrapper/gradle-wrapper.properties | 7 + gradlew | 172 +++ gradlew.bat | 84 ++ settings.gradle.kts | 33 + 54 files changed, 3961 insertions(+), 3 deletions(-) create mode 100644 .gitignore create mode 100644 .idea/.name create mode 100644 .idea/codeStyles/Project.xml create mode 100644 .idea/codeStyles/codeStyleConfig.xml create mode 100644 .idea/compiler.xml create mode 100644 .idea/deploymentTargetSelector.xml create mode 100644 24-INT10.ads create mode 100644 app/.gitignore create mode 100644 app/build.gradle.kts create mode 100644 app/src/androidTest/java/com/example/esp32aldldashboard/ui/main/MainScreenTest.kt create mode 100644 app/src/main/AndroidManifest.xml create mode 100644 app/src/main/java/com/example/esp32aldldashboard/MainActivity.kt create mode 100644 app/src/main/java/com/example/esp32aldldashboard/Navigation.kt create mode 100644 app/src/main/java/com/example/esp32aldldashboard/NavigationKeys.kt create mode 100644 app/src/main/java/com/example/esp32aldldashboard/bluetooth/BluetoothService.kt create mode 100644 app/src/main/java/com/example/esp32aldldashboard/data/DataRepository.kt create mode 100644 app/src/main/java/com/example/esp32aldldashboard/parser/ALDLParser.kt create mode 100644 app/src/main/java/com/example/esp32aldldashboard/theme/Color.kt create mode 100644 app/src/main/java/com/example/esp32aldldashboard/theme/Theme.kt create mode 100644 app/src/main/java/com/example/esp32aldldashboard/theme/Type.kt create mode 100644 app/src/main/java/com/example/esp32aldldashboard/ui/main/MainScreen.kt create mode 100644 app/src/main/java/com/example/esp32aldldashboard/ui/main/MainScreenViewModel.kt create mode 100644 app/src/main/res/drawable/ic_launcher_background.xml create mode 100644 app/src/main/res/drawable/ic_launcher_foreground.xml create mode 100644 app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml create mode 100644 app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/values/strings.xml create mode 100644 app/src/main/res/values/themes.xml create mode 100644 app/src/main/res/xml/backup_rules.xml create mode 100644 app/src/main/res/xml/data_extraction_rules.xml create mode 100644 app/src/test/java/com/example/esp32aldldashboard/ALDLParserTest.kt create mode 100644 app/src/test/java/com/example/esp32aldldashboard/ui/main/MainScreenViewModelTest.kt create mode 100644 build.gradle.kts create mode 100644 gradle.properties create mode 100644 gradle/gradle-daemon-jvm.properties create mode 100644 gradle/libs.versions.toml create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle.kts diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..aa724b7 --- /dev/null +++ b/.gitignore @@ -0,0 +1,15 @@ +*.iml +.gradle +/local.properties +/.idea/caches +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +/.idea/navEditor.xml +/.idea/assetWizardSettings.xml +.DS_Store +/build +/captures +.externalNativeBuild +.cxx +local.properties diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..47b3928 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +ESP32 ALDL Dashboard \ No newline at end of file diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..7643783 --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,123 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 0000000..79ee123 --- /dev/null +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..b589d56 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml new file mode 100644 index 0000000..ca16a99 --- /dev/null +++ b/.idea/deploymentTargetSelector.xml @@ -0,0 +1,11 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index b838237..cdbc250 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -5,7 +5,12 @@ diff --git a/.idea/misc.xml b/.idea/misc.xml index 3aec57f..3b0be22 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,7 +1,7 @@ - + diff --git a/24-INT10.ads b/24-INT10.ads new file mode 100644 index 0000000..3adef74 --- /dev/null +++ b/24-INT10.ads @@ -0,0 +1,1261 @@ +//-------------------------------------------------------------------------------------- +// Created by TunerPro. Hand editing is *not* recommended or supported. +//-------------------------------------------------------------------------------------- + + +//-------------------------------------------------------------------------------------- +//--------------------------------- HEADER ------------------------------------ +//-------------------------------------------------------------------------------------- + +{ + fDefFrmtVers =1.21; + strDefVersion =Version 1.0; + strDefTitle =A29 $24; + strAuthor =Robert Saar; + strEngine =2.8MPFIHO L44; + strYear =1985-1988; + strVINCode =9; + strCodeMask =$24 $24A; + strComments =use 10K resistor. questions comments should be directed to robertisaar@yahoo.com; + iBaud =160; + dwFlags =0x00000000; + dwCSID =0x0000BCE4; + btNumDumpRequests =1; + + strCommandName =Data Transfer; + rgbtCommand =; + iTotalBytesInCommand =0; + bChecksumCommand =0; + iNumBytesInPayload =25; + iNumBytesBeforePayload =-1; + bMaster =1; + bMonitor =1; + iChainTo =-1; +} + +//-------------------------------------------------------------------------------------- +//---------------------------------- DASH ------------------------------------- +//-------------------------------------------------------------------------------------- + +{ + dwItemType =6; + strItemComments =; + bSeparator =0; + bVisible =1; + dwUniqueID =0; + + btNumGauges =6; + strIDsDisplayed =0,0,0,0,0,0,; + btNumMonitors =4; + strMonsDisplayed =0,0,0,0,; +} + +//-------------------------------------------------------------------------------------- +//--------------------------------- VALUES ------------------------------------ +//-------------------------------------------------------------------------------------- + +{ + dwItemType =1; + strItemComments =; + bSeparator =1; + bVisible =1; + dwUniqueID =54; + + btByteNumber =0; + btMessageNumber =0; + dwItemSizeBits =8; + dwOperation =0; + dFactor =1.000000; + dOffset =0.000000; + strItemTitle ======Important=====; + strUnitLabel =Units; + dwAlarmHigh =255; + bAlarmHighENable =0; + dwAlarmLow =0; + bAlarmLowEnable =0; + iRangeHigh =255; + iRangeLow =0; + iLookupTableIndex =-1; +} + +{ + dwItemType =1; + strItemComments =; + bSeparator =0; + bVisible =1; + dwUniqueID =4; + + btByteNumber =6; + btMessageNumber =1; + dwItemSizeBits =8; + dwOperation =3; + dFactor =1.000000; + dOffset =0.000000; + strItemTitle =Vehicle Speed; + strUnitLabel =MPH; + dwAlarmHigh =255; + bAlarmHighENable =0; + dwAlarmLow =0; + bAlarmLowEnable =0; + iRangeHigh =255; + iRangeLow =0; + iLookupTableIndex =-1; +} + +{ + dwItemType =1; + strItemComments =; + bSeparator =0; + bVisible =1; + dwUniqueID =7; + + btByteNumber =8; + btMessageNumber =1; + dwItemSizeBits =8; + dwOperation =0; + dFactor =25.000000; + dOffset =0.000000; + strItemTitle =Engine Speed; + strUnitLabel =RPM; + dwAlarmHigh =255; + bAlarmHighENable =0; + dwAlarmLow =0; + bAlarmLowEnable =0; + iRangeHigh =255; + iRangeLow =0; + iLookupTableIndex =-1; +} + +{ + dwItemType =1; + strItemComments =; + bSeparator =0; + bVisible =1; + dwUniqueID =8; + + btByteNumber =9; + btMessageNumber =1; + dwItemSizeBits =8; + dwOperation =0; + dFactor =0.019608; + dOffset =0.000000; + strItemTitle =TPS; + strUnitLabel =Volts; + dwAlarmHigh =255; + bAlarmHighENable =0; + dwAlarmLow =0; + bAlarmLowEnable =0; + iRangeHigh =255; + iRangeLow =0; + iLookupTableIndex =-1; +} + +{ + dwItemType =1; + strItemComments =; + bSeparator =1; + bVisible =1; + dwUniqueID =55; + + btByteNumber =0; + btMessageNumber =0; + dwItemSizeBits =8; + dwOperation =0; + dFactor =1.000000; + dOffset =0.000000; + strItemTitle ======Temps=====; + strUnitLabel =Units; + dwAlarmHigh =255; + bAlarmHighENable =0; + dwAlarmLow =0; + bAlarmLowEnable =0; + iRangeHigh =255; + iRangeLow =0; + iLookupTableIndex =-1; +} + +{ + dwItemType =1; + strItemComments =; + bSeparator =0; + bVisible =1; + dwUniqueID =2; + + btByteNumber =5; + btMessageNumber =1; + dwItemSizeBits =8; + dwOperation =0; + dFactor =0.750000; + dOffset =-40.000000; + strItemTitle =Coolant Temp; + strUnitLabel =C; + dwAlarmHigh =255; + bAlarmHighENable =0; + dwAlarmLow =0; + bAlarmLowEnable =0; + iRangeHigh =255; + iRangeLow =0; + iLookupTableIndex =-1; +} + +{ + dwItemType =1; + strItemComments =; + bSeparator =0; + bVisible =1; + dwUniqueID =3; + + btByteNumber =5; + btMessageNumber =1; + dwItemSizeBits =8; + dwOperation =0; + dFactor =1.350000; + dOffset =-40.000000; + strItemTitle =Coolant Temp; + strUnitLabel =F; + dwAlarmHigh =255; + bAlarmHighENable =0; + dwAlarmLow =0; + bAlarmLowEnable =0; + iRangeHigh =255; + iRangeLow =0; + iLookupTableIndex =-1; +} + +{ + dwItemType =1; + strItemComments =; + bSeparator =0; + bVisible =1; + dwUniqueID =49; + + btByteNumber =23; + btMessageNumber =1; + dwItemSizeBits =8; + dwOperation =6; + dFactor =1.000000; + dOffset =0.000000; + strItemTitle =MAT; + strUnitLabel =C; + dwAlarmHigh =255; + bAlarmHighENable =0; + dwAlarmLow =0; + bAlarmLowEnable =0; + iRangeHigh =255; + iRangeLow =0; + iLookupTableIndex =52; +} + +{ + dwItemType =1; + strItemComments =; + bSeparator =0; + bVisible =1; + dwUniqueID =50; + + btByteNumber =23; + btMessageNumber =1; + dwItemSizeBits =8; + dwOperation =6; + dFactor =1.000000; + dOffset =0.000000; + strItemTitle =MAT; + strUnitLabel =F; + dwAlarmHigh =255; + bAlarmHighENable =0; + dwAlarmLow =0; + bAlarmLowEnable =0; + iRangeHigh =255; + iRangeLow =0; + iLookupTableIndex =53; +} + +{ + dwItemType =1; + strItemComments =; + bSeparator =1; + bVisible =1; + dwUniqueID =56; + + btByteNumber =0; + btMessageNumber =0; + dwItemSizeBits =8; + dwOperation =0; + dFactor =1.000000; + dOffset =0.000000; + strItemTitle ======Air/Fuel=====; + strUnitLabel =Units; + dwAlarmHigh =255; + bAlarmHighENable =0; + dwAlarmLow =0; + bAlarmLowEnable =0; + iRangeHigh =255; + iRangeLow =0; + iLookupTableIndex =-1; +} + +{ + dwItemType =1; + strItemComments =; + bSeparator =0; + bVisible =1; + dwUniqueID =5; + + btByteNumber =7; + btMessageNumber =1; + dwItemSizeBits =8; + dwOperation =0; + dFactor =0.019608; + dOffset =0.000000; + strItemTitle =MAP; + strUnitLabel =Volts; + dwAlarmHigh =255; + bAlarmHighENable =0; + dwAlarmLow =0; + bAlarmLowEnable =0; + iRangeHigh =255; + iRangeLow =0; + iLookupTableIndex =-1; +} + +{ + dwItemType =1; + strItemComments =; + bSeparator =0; + bVisible =1; + dwUniqueID =6; + + btByteNumber =7; + btMessageNumber =1; + dwItemSizeBits =8; + dwOperation =0; + dFactor =0.369000; + dOffset =10.354000; + strItemTitle =MAP; + strUnitLabel =kPa; + dwAlarmHigh =255; + bAlarmHighENable =0; + dwAlarmLow =0; + bAlarmLowEnable =0; + iRangeHigh =255; + iRangeLow =0; + iLookupTableIndex =-1; +} + +{ + dwItemType =1; + strItemComments =; + bSeparator =0; + bVisible =1; + dwUniqueID =45; + + btByteNumber =19; + btMessageNumber =1; + dwItemSizeBits =8; + dwOperation =3; + dFactor =1.000000; + dOffset =0.000000; + strItemTitle =BLM; + strUnitLabel =; + dwAlarmHigh =255; + bAlarmHighENable =0; + dwAlarmLow =0; + bAlarmLowEnable =0; + iRangeHigh =255; + iRangeLow =0; + iLookupTableIndex =-1; +} + +{ + dwItemType =1; + strItemComments =; + bSeparator =0; + bVisible =1; + dwUniqueID =9; + + btByteNumber =10; + btMessageNumber =1; + dwItemSizeBits =8; + dwOperation =3; + dFactor =1.000000; + dOffset =0.000000; + strItemTitle =INT; + strUnitLabel =; + dwAlarmHigh =255; + bAlarmHighENable =0; + dwAlarmLow =0; + bAlarmLowEnable =0; + iRangeHigh =255; + iRangeLow =0; + iLookupTableIndex =-1; +} + +{ + dwItemType =1; + strItemComments =; + bSeparator =0; + bVisible =1; + dwUniqueID =10; + + btByteNumber =11; + btMessageNumber =1; + dwItemSizeBits =8; + dwOperation =0; + dFactor =4.440000; + dOffset =0.000000; + strItemTitle =O2 Sensor; + strUnitLabel =mV; + dwAlarmHigh =255; + bAlarmHighENable =0; + dwAlarmLow =0; + bAlarmLowEnable =0; + iRangeHigh =255; + iRangeLow =0; + iLookupTableIndex =-1; +} + +{ + dwItemType =1; + strItemComments =; + bSeparator =0; + bVisible =1; + dwUniqueID =46; + + btByteNumber =20; + btMessageNumber =1; + dwItemSizeBits =8; + dwOperation =3; + dFactor =1.000000; + dOffset =0.000000; + strItemTitle =Rich/Lean Transitions; + strUnitLabel =Crosses; + dwAlarmHigh =255; + bAlarmHighENable =0; + dwAlarmLow =0; + bAlarmLowEnable =0; + iRangeHigh =255; + iRangeLow =0; + iLookupTableIndex =-1; +} + +{ + dwItemType =1; + strItemComments =; + bSeparator =0; + bVisible =1; + dwUniqueID =51; + + btByteNumber =24; + btMessageNumber =1; + dwItemSizeBits =16; + dwOperation =0; + dFactor =0.015259; + dOffset =0.000000; + strItemTitle =BPW; + strUnitLabel =mS; + dwAlarmHigh =255; + bAlarmHighENable =0; + dwAlarmLow =0; + bAlarmLowEnable =0; + iRangeHigh =65536; + iRangeLow =0; + iLookupTableIndex =-1; +} + +{ + dwItemType =1; + strItemComments =; + bSeparator =1; + bVisible =1; + dwUniqueID =57; + + btByteNumber =0; + btMessageNumber =0; + dwItemSizeBits =8; + dwOperation =0; + dFactor =1.000000; + dOffset =0.000000; + strItemTitle ======Misc=====; + strUnitLabel =Units; + dwAlarmHigh =255; + bAlarmHighENable =0; + dwAlarmLow =0; + bAlarmLowEnable =0; + iRangeHigh =255; + iRangeLow =0; + iLookupTableIndex =-1; +} + +{ + dwItemType =1; + strItemComments =; + bSeparator =0; + bVisible =1; + dwUniqueID =48; + + btByteNumber =22; + btMessageNumber =1; + dwItemSizeBits =8; + dwOperation =0; + dFactor =0.392157; + dOffset =0.000000; + strItemTitle =EGR Duty Cycle; + strUnitLabel =%; + dwAlarmHigh =255; + bAlarmHighENable =0; + dwAlarmLow =0; + bAlarmLowEnable =0; + iRangeHigh =255; + iRangeLow =0; + iLookupTableIndex =-1; +} + +{ + dwItemType =1; + strItemComments =; + bSeparator =0; + bVisible =1; + dwUniqueID =47; + + btByteNumber =21; + btMessageNumber =1; + dwItemSizeBits =8; + dwOperation =0; + dFactor =0.351563; + dOffset =0.000000; + strItemTitle =Spark Advance; + strUnitLabel =*; + dwAlarmHigh =255; + bAlarmHighENable =0; + dwAlarmLow =0; + bAlarmLowEnable =0; + iRangeHigh =255; + iRangeLow =0; + iLookupTableIndex =-1; +} + +{ + dwItemType =1; + strItemComments =; + bSeparator =0; + bVisible =1; + dwUniqueID =44; + + btByteNumber =18; + btMessageNumber =1; + dwItemSizeBits =8; + dwOperation =0; + dFactor =0.100000; + dOffset =0.000000; + strItemTitle =Battery Voltage; + strUnitLabel =Volts; + dwAlarmHigh =255; + bAlarmHighENable =0; + dwAlarmLow =0; + bAlarmLowEnable =0; + iRangeHigh =255; + iRangeLow =0; + iLookupTableIndex =-1; +} + +{ + dwItemType =1; + strItemComments =; + bSeparator =0; + bVisible =1; + dwUniqueID =1; + + btByteNumber =4; + btMessageNumber =1; + dwItemSizeBits =8; + dwOperation =3; + dFactor =1.000000; + dOffset =0.000000; + strItemTitle =IAC Position; + strUnitLabel =Steps; + dwAlarmHigh =255; + bAlarmHighENable =0; + dwAlarmLow =0; + bAlarmLowEnable =0; + iRangeHigh =255; + iRangeLow =0; + iLookupTableIndex =-1; +} + +//-------------------------------------------------------------------------------------- +//---------------------------------- BITS ------------------------------------- +//-------------------------------------------------------------------------------------- + +{ + dwItemType =2; + strItemComments =; + bSeparator =1; + bVisible =1; + dwUniqueID =11; + + btByteNumber =0; + btMessageNumber =0; + btBitNumber =0; + strItemTitle ======Codes=====; + bAlarmSetEnable =0; + bAlarmNotSetEnable =0; + strBitSetTitle =1; + strBitClearTitle =0; +} + +{ + dwItemType =2; + strItemComments =; + bSeparator =0; + bVisible =1; + dwUniqueID =19; + + btByteNumber =12; + btMessageNumber =1; + btBitNumber =7; + strItemTitle =12 Crank Sensor/System Check; + bAlarmSetEnable =1; + bAlarmNotSetEnable =0; + strBitSetTitle =ERROR; + strBitClearTitle =; +} + +{ + dwItemType =2; + strItemComments =; + bSeparator =0; + bVisible =1; + dwUniqueID =18; + + btByteNumber =12; + btMessageNumber =1; + btBitNumber =6; + strItemTitle =13 O2 Sensor; + bAlarmSetEnable =1; + bAlarmNotSetEnable =0; + strBitSetTitle =ERROR; + strBitClearTitle =; +} + +{ + dwItemType =2; + strItemComments =; + bSeparator =0; + bVisible =1; + dwUniqueID =17; + + btByteNumber =12; + btMessageNumber =1; + btBitNumber =5; + strItemTitle =14 Coolant High; + bAlarmSetEnable =1; + bAlarmNotSetEnable =0; + strBitSetTitle =ERROR; + strBitClearTitle =; +} + +{ + dwItemType =2; + strItemComments =; + bSeparator =0; + bVisible =1; + dwUniqueID =16; + + btByteNumber =12; + btMessageNumber =1; + btBitNumber =4; + strItemTitle =15 Coolant Low; + bAlarmSetEnable =1; + bAlarmNotSetEnable =0; + strBitSetTitle =ERROR; + strBitClearTitle =; +} + +{ + dwItemType =2; + strItemComments =; + bSeparator =0; + bVisible =1; + dwUniqueID =15; + + btByteNumber =12; + btMessageNumber =1; + btBitNumber =3; + strItemTitle =21 TPS High; + bAlarmSetEnable =1; + bAlarmNotSetEnable =0; + strBitSetTitle =ERROR; + strBitClearTitle =; +} + +{ + dwItemType =2; + strItemComments =; + bSeparator =0; + bVisible =1; + dwUniqueID =14; + + btByteNumber =12; + btMessageNumber =1; + btBitNumber =2; + strItemTitle =22 TPS Low; + bAlarmSetEnable =1; + bAlarmNotSetEnable =0; + strBitSetTitle =ERROR; + strBitClearTitle =; +} + +{ + dwItemType =2; + strItemComments =; + bSeparator =0; + bVisible =1; + dwUniqueID =13; + + btByteNumber =12; + btMessageNumber =1; + btBitNumber =1; + strItemTitle =23 MAT Low; + bAlarmSetEnable =1; + bAlarmNotSetEnable =0; + strBitSetTitle =ERROR; + strBitClearTitle =; +} + +{ + dwItemType =2; + strItemComments =; + bSeparator =0; + bVisible =1; + dwUniqueID =12; + + btByteNumber =12; + btMessageNumber =1; + btBitNumber =0; + strItemTitle =24 VSS; + bAlarmSetEnable =1; + bAlarmNotSetEnable =0; + strBitSetTitle =ERROR; + strBitClearTitle =; +} + +{ + dwItemType =2; + strItemComments =; + bSeparator =0; + bVisible =1; + dwUniqueID =25; + + btByteNumber =13; + btMessageNumber =1; + btBitNumber =7; + strItemTitle =25 MAT High; + bAlarmSetEnable =1; + bAlarmNotSetEnable =0; + strBitSetTitle =ERROR; + strBitClearTitle =; +} + +{ + dwItemType =2; + strItemComments =; + bSeparator =0; + bVisible =1; + dwUniqueID =24; + + btByteNumber =13; + btMessageNumber =1; + btBitNumber =5; + strItemTitle =32 EGR; + bAlarmSetEnable =1; + bAlarmNotSetEnable =0; + strBitSetTitle =ERROR; + strBitClearTitle =; +} + +{ + dwItemType =2; + strItemComments =; + bSeparator =0; + bVisible =1; + dwUniqueID =23; + + btByteNumber =13; + btMessageNumber =1; + btBitNumber =4; + strItemTitle =33 MAP High; + bAlarmSetEnable =1; + bAlarmNotSetEnable =0; + strBitSetTitle =ERROR; + strBitClearTitle =; +} + +{ + dwItemType =2; + strItemComments =; + bSeparator =0; + bVisible =1; + dwUniqueID =22; + + btByteNumber =13; + btMessageNumber =1; + btBitNumber =3; + strItemTitle =34 MAP Low; + bAlarmSetEnable =1; + bAlarmNotSetEnable =0; + strBitSetTitle =ERROR; + strBitClearTitle =; +} + +{ + dwItemType =2; + strItemComments =; + bSeparator =0; + bVisible =1; + dwUniqueID =21; + + btByteNumber =13; + btMessageNumber =1; + btBitNumber =2; + strItemTitle =35 IAC; + bAlarmSetEnable =1; + bAlarmNotSetEnable =0; + strBitSetTitle =ERROR; + strBitClearTitle =; +} + +{ + dwItemType =2; + strItemComments =; + bSeparator =0; + bVisible =1; + dwUniqueID =20; + + btByteNumber =13; + btMessageNumber =1; + btBitNumber =0; + strItemTitle =42 EST; + bAlarmSetEnable =1; + bAlarmNotSetEnable =0; + strBitSetTitle =ERROR; + strBitClearTitle =; +} + +{ + dwItemType =2; + strItemComments =; + bSeparator =0; + bVisible =1; + dwUniqueID =32; + + btByteNumber =14; + btMessageNumber =1; + btBitNumber =7; + strItemTitle =43 Knock Sensor; + bAlarmSetEnable =1; + bAlarmNotSetEnable =0; + strBitSetTitle =ERROR; + strBitClearTitle =; +} + +{ + dwItemType =2; + strItemComments =; + bSeparator =0; + bVisible =1; + dwUniqueID =31; + + btByteNumber =14; + btMessageNumber =1; + btBitNumber =6; + strItemTitle =44 O2 Lean; + bAlarmSetEnable =1; + bAlarmNotSetEnable =0; + strBitSetTitle =ERROR; + strBitClearTitle =; +} + +{ + dwItemType =2; + strItemComments =; + bSeparator =0; + bVisible =1; + dwUniqueID =30; + + btByteNumber =14; + btMessageNumber =1; + btBitNumber =5; + strItemTitle =45 O2 Rich; + bAlarmSetEnable =1; + bAlarmNotSetEnable =0; + strBitSetTitle =ERROR; + strBitClearTitle =; +} + +{ + dwItemType =2; + strItemComments =; + bSeparator =0; + bVisible =1; + dwUniqueID =29; + + btByteNumber =14; + btMessageNumber =1; + btBitNumber =4; + strItemTitle =51 PROM; + bAlarmSetEnable =1; + bAlarmNotSetEnable =0; + strBitSetTitle =ERROR; + strBitClearTitle =; +} + +{ + dwItemType =2; + strItemComments =; + bSeparator =0; + bVisible =1; + dwUniqueID =28; + + btByteNumber =14; + btMessageNumber =1; + btBitNumber =3; + strItemTitle =52 CAL-PACK; + bAlarmSetEnable =1; + bAlarmNotSetEnable =0; + strBitSetTitle =ERROR; + strBitClearTitle =; +} + +{ + dwItemType =2; + strItemComments =; + bSeparator =0; + bVisible =1; + dwUniqueID =27; + + btByteNumber =14; + btMessageNumber =1; + btBitNumber =2; + strItemTitle =53 Battery Voltage High; + bAlarmSetEnable =1; + bAlarmNotSetEnable =0; + strBitSetTitle =ERROR; + strBitClearTitle =; +} + +{ + dwItemType =2; + strItemComments =; + bSeparator =0; + bVisible =1; + dwUniqueID =26; + + btByteNumber =14; + btMessageNumber =1; + btBitNumber =0; + strItemTitle =55 ADU; + bAlarmSetEnable =1; + bAlarmNotSetEnable =0; + strBitSetTitle =ERROR; + strBitClearTitle =; +} + +{ + dwItemType =2; + strItemComments =; + bSeparator =1; + bVisible =1; + dwUniqueID =33; + + btByteNumber =0; + btMessageNumber =0; + btBitNumber =0; + strItemTitle ======Misc=====; + bAlarmSetEnable =0; + bAlarmNotSetEnable =0; + strBitSetTitle =1; + strBitClearTitle =0; +} + +{ + dwItemType =2; + strItemComments =; + bSeparator =0; + bVisible =1; + dwUniqueID =34; + + btByteNumber =15; + btMessageNumber =1; + btBitNumber =1; + strItemTitle =BLM Enable; + bAlarmSetEnable =0; + bAlarmNotSetEnable =0; + strBitSetTitle =YES; + strBitClearTitle =; +} + +{ + dwItemType =2; + strItemComments =; + bSeparator =0; + bVisible =1; + dwUniqueID =35; + + btByteNumber =15; + btMessageNumber =1; + btBitNumber =3; + strItemTitle =Quasi Pulse; + bAlarmSetEnable =0; + bAlarmNotSetEnable =0; + strBitSetTitle =YES; + strBitClearTitle =; +} + +{ + dwItemType =2; + strItemComments =; + bSeparator =0; + bVisible =1; + dwUniqueID =36; + + btByteNumber =15; + btMessageNumber =1; + btBitNumber =4; + strItemTitle =Async Pulse; + bAlarmSetEnable =0; + bAlarmNotSetEnable =0; + strBitSetTitle =YES; + strBitClearTitle =; +} + +{ + dwItemType =2; + strItemComments =; + bSeparator =0; + bVisible =1; + dwUniqueID =37; + + btByteNumber =15; + btMessageNumber =1; + btBitNumber =6; + strItemTitle =Rich/Lean; + bAlarmSetEnable =0; + bAlarmNotSetEnable =0; + strBitSetTitle =RICH; + strBitClearTitle =LEAN; +} + +{ + dwItemType =2; + strItemComments =; + bSeparator =0; + bVisible =1; + dwUniqueID =38; + + btByteNumber =15; + btMessageNumber =1; + btBitNumber =7; + strItemTitle =Loop Status; + bAlarmSetEnable =0; + bAlarmNotSetEnable =1; + strBitSetTitle =CLOSED; + strBitClearTitle =OPEN; +} + +{ + dwItemType =2; + strItemComments =; + bSeparator =0; + bVisible =1; + dwUniqueID =39; + + btByteNumber =16; + btMessageNumber =1; + btBitNumber =5; + strItemTitle =A/C; + bAlarmSetEnable =0; + bAlarmNotSetEnable =0; + strBitSetTitle =; + strBitClearTitle =ENABLED; +} + +{ + dwItemType =2; + strItemComments =; + bSeparator =0; + bVisible =1; + dwUniqueID =40; + + btByteNumber =16; + btMessageNumber =1; + btBitNumber =7; + strItemTitle =P/N Switch; + bAlarmSetEnable =0; + bAlarmNotSetEnable =0; + strBitSetTitle =PARK/NEUTRAL; + strBitClearTitle =; +} + +{ + dwItemType =2; + strItemComments =; + bSeparator =0; + bVisible =1; + dwUniqueID =41; + + btByteNumber =17; + btMessageNumber =1; + btBitNumber =0; + strItemTitle =A/C Clutch; + bAlarmSetEnable =0; + bAlarmNotSetEnable =0; + strBitSetTitle =ENABLED; + strBitClearTitle =; +} + +{ + dwItemType =2; + strItemComments =; + bSeparator =0; + bVisible =1; + dwUniqueID =42; + + btByteNumber =17; + btMessageNumber =1; + btBitNumber =2; + strItemTitle =TCC; + bAlarmSetEnable =0; + bAlarmNotSetEnable =0; + strBitSetTitle =LOCKED; + strBitClearTitle =; +} + +{ + dwItemType =2; + strItemComments =; + bSeparator =0; + bVisible =1; + dwUniqueID =43; + + btByteNumber =17; + btMessageNumber =1; + btBitNumber =5; + strItemTitle =Power Steering Cramp; + bAlarmSetEnable =0; + bAlarmNotSetEnable =0; + strBitSetTitle =ACTIVE; + strBitClearTitle =; +} + +//-------------------------------------------------------------------------------------- +//---------------------------- LOOKUP TABLES ---------------------------------- +//-------------------------------------------------------------------------------------- + +{ + dwItemType =5; + strItemComments =; + bSeparator =0; + bVisible =1; + dwUniqueID =52; + + btDataType =2; + wTableSize =256; + wIndexSize =4; + strTableName =MAT C; + dwReserved =0; + dwReserved =0; + pbtData =0, 200.00 + 12, 150.00 + 13, 145.00 + 14, 140.00 + 16, 135.00 + 18, 130.00 + 21, 125.00 + 23, 120.00 + 26, 115.00 + 30, 110.00 + 34, 105.00 + 39, 100.00 + 44, 95.00 + 50, 90.00 + 56, 85.00 + 64, 80.00 + 72, 75.00 + 81, 70.00 + 92, 65.00 + 102, 60.00 + 114, 55.00 + 126, 50.00 + 139, 45.00 + 152, 40.00 + 165, 35.00 + 177, 30.00 + 189, 25.00 + 199, 20.00 + 209, 15.00 + 218, 10.00 + 225, 5.00 + 231, 0.00 + 237, -5.00 + 241, -10.00 + 245, -15.00 + 247, -20.00 + 250, -25.00 + 251, -30.00 + 255, -40.00; +} + +{ + dwItemType =5; + strItemComments =; + bSeparator =0; + bVisible =1; + dwUniqueID =53; + + btDataType =2; + wTableSize =256; + wIndexSize =4; + strTableName =MAT F; + dwReserved =0; + dwReserved =0; + pbtData =0, 392.00 + 12, 302.00 + 13, 293.00 + 14, 284.00 + 16, 275.00 + 18, 266.00 + 21, 257.00 + 23, 248.00 + 26, 239.00 + 30, 230.00 + 34, 221.00 + 39, 212.00 + 44, 203.00 + 50, 194.00 + 56, 185.00 + 64, 176.00 + 72, 167.00 + 81, 158.00 + 92, 149.00 + 102, 140.00 + 114, 131.00 + 126, 122.00 + 139, 113.00 + 152, 104.00 + 165, 95.00 + 177, 86.00 + 189, 77.00 + 199, 68.00 + 209, 59.00 + 218, 50.00 + 225, 41.00 + 231, 32.00 + 237, 23.00 + 241, 14.00 + 245, 5.00 + 247, -4.00 + 250, -13.00 + 251, -22.00 + 255, -40.00; +} + diff --git a/README.md b/README.md index 0519ecb..6e2034c 100644 --- a/README.md +++ b/README.md @@ -1 +1,119 @@ - \ No newline at end of file +# ESP32 ALDL Dashboard + +An Android application built using Jetpack Compose to display real-time engine telemetry from a **1986 Pontiac Fiero 2.8L V6 (1227170 ECM)**. The app connects to a Bluetooth serial device named **ESP32-ALDL** and decodes a raw binary stream of 27-byte frames containing ECM data packets under the `$24` mask specifications. + +--- + +## Technical Specifications + +### Data Stream Frame Structure +The ESP32 reads the raw 160-baud unidirectional ALDL stream from the ECM and encapsulates it in a 27-byte packet transmitted over Bluetooth SPP. + +| Byte Index | Length | Value / Field | Description | +| :--- | :--- | :--- | :--- | +| **0 - 1** | 2 bytes | `AA 55` | Frame Sync Header (added by ESP32) | +| **2 - 26** | 25 bytes | Raw Data Payload | 1227170 ECM data stream (0-indexed indices 0 to 24) | + +--- + +## Parameter Offsets & Decoding Formulas + +The telemetry parameters are parsed from the `$24` / `$24A` ECM mask definitions (`24-INT10.ads`). In TunerPro's `.ads` file, the byte numbers are 1-indexed (e.g. `btByteNumber = 4` maps to raw payload byte index `3`). + +### 1. Primary Sensors & Measurements + +| Parameter | Payload Index | Raw Size | Formula / Conversion | Units | +| :--- | :--- | :--- | :--- | :--- | +| **IAC Position** | Index 3 (Byte 4) | 8-bit | $Value = Raw$ | Steps | +| **Coolant Temp** | Index 4 (Byte 5) | 8-bit | $C = (Raw \times 0.75) - 40$
$F = (Raw \times 1.35) - 40$ | °C / °F | +| **Vehicle Speed** | Index 5 (Byte 6) | 8-bit | $Value = Raw$ (Operation 3) | MPH | +| **MAP** | Index 6 (Byte 7) | 8-bit | $Volts = Raw \times 0.019608$
$kPa = (Raw \times 0.369) + 10.354$ | Volts / kPa | +| **Engine Speed** | Index 7 (Byte 8) | 8-bit | $RPM = Raw \times 25$ | RPM | +| **TPS** | Index 8 (Byte 9) | 8-bit | $Volts = Raw \times 0.019608$ | Volts | +| **Integrator (INT)** | Index 9 (Byte 10) | 8-bit | $Value = Raw$ | — | +| **O2 Sensor** | Index 10 (Byte 11) | 8-bit | $mV = Raw \times 4.44$ | mV | +| **Battery Voltage** | Index 17 (Byte 18) | 8-bit | $Volts = Raw \times 0.1$ | Volts | +| **BLM** | Index 18 (Byte 19) | 8-bit | $Value = Raw$ | — | +| **Rich/Lean Crosses** | Index 19 (Byte 20) | 8-bit | $Value = Raw$ | Crosses | +| **Spark Advance** | Index 20 (Byte 21) | 8-bit | $Degrees = Raw \times 0.351563$ | Degrees | +| **EGR Duty Cycle** | Index 21 (Byte 22) | 8-bit | $Percent = Raw \times 0.392157$ | % | +| **Manifold Air Temp (MAT)** | Index 22 (Byte 23) | 8-bit | **Linear Table Interpolation** (see below) | °C / °F | +| **Base Pulse Width (BPW)** | Index 23-24 (Byte 24-25) | 16-bit | $Raw = (HighByte \ll 8) \vert LowByte$
$ms = Raw \times 0.015259$ | Milliseconds (ms) | + +--- + +### 2. MAT Linear Interpolation Tables +The Manifold Air Temperature (MAT) is read from Index 22. It is mapped to degrees C or F using interpolation curves specified in tables 52 and 53: + +* **Celsius (`MAT C` - Table 52):** + * `0` -> `200.0`, `12` -> `150.0`, `13` -> `145.0`, `14` -> `140.0`, `16` -> `135.0`, `18` -> `130.0`, `21` -> `125.0`, `23` -> `120.0`, `26` -> `115.0`, `30` -> `110.0`, `34` -> `105.0`, `39` -> `100.0`, `44` -> `95.0`, `50` -> `90.0`, `56` -> `85.0`, `64` -> `80.0`, `72` -> `75.0`, `81` -> `70.0`, `92` -> `65.0`, `102` -> `60.0`, `114` -> `55.0`, `126` -> `50.0`, `139` -> `45.0`, `152` -> `40.0`, `165` -> `35.0`, `177` -> `30.0`, `189` -> `25.0`, `199` -> `20.0`, `209` -> `15.0`, `218` -> `10.0`, `225` -> `5.0`, `231` -> `0.0`, `237` -> `-5.0`, `241` -> `-10.0`, `245` -> `-15.0`, `247` -> `-20.0`, `250` -> `-25.0`, `251` -> `-30.0`, `255` -> `-40.0` +* **Fahrenheit (`MAT F` - Table 53):** + * `0` -> `392.0`, `12` -> `302.0`, `13` -> `293.0`, `14` -> `284.0`, `16` -> `275.0`, `18` -> `266.0`, `21` -> `257.0`, `23` -> `248.0`, `26` -> `239.0`, `30` -> `230.0`, `34` -> `221.0`, `39` -> `212.0`, `44` -> `203.0`, `50` -> `194.0`, `56` -> `185.0`, `64` -> `176.0`, `72` -> `167.0`, `81` -> `158.0`, `92` -> `149.0`, `102` -> `140.0`, `114` -> `131.0`, `126` -> `122.0`, `139` -> `113.0`, `152` -> `104.0`, `165` -> `95.0`, `177` -> `86.0`, `189` -> `77.0`, `199` -> `68.0`, `209` -> `59.0`, `218` -> `50.0`, `225` -> `41.0`, `231` -> `32.0`, `237` -> `23.0`, `241` -> `14.0`, `245` -> `5.0`, `247` -> `-4.0`, `250` -> `-13.0`, `251` -> `-22.0`, `255` -> `-40.0` + +--- + +### 3. Stored Fault Trouble Codes + +Malfunction Indicator Codes are mapped as bit flags across three specific status bytes: + +#### Codes Byte 1 (Payload Index 11 / Byte 12) +* **Bit 7:** Code 12 - Crank Sensor / System Check +* **Bit 6:** Code 13 - O2 Sensor +* **Bit 5:** Code 14 - Coolant High Temp +* **Bit 4:** Code 15 - Coolant Low Temp +* **Bit 3:** Code 21 - TPS Voltage High +* **Bit 2:** Code 22 - TPS Voltage Low +* **Bit 1:** Code 23 - MAT Voltage Low +* **Bit 0:** Code 24 - Vehicle Speed Sensor (VSS) + +#### Codes Byte 2 (Payload Index 12 / Byte 13) +* **Bit 7:** Code 25 - MAT Voltage High +* **Bit 5:** Code 32 - EGR System +* **Bit 4:** Code 33 - MAP Sensor High +* **Bit 3:** Code 34 - MAP Sensor Low +* **Bit 2:** Code 35 - IAC Position +* **Bit 0:** Code 42 - Electronic Spark Timing (EST) + +#### Codes Byte 3 (Payload Index 13 / Byte 14) +* **Bit 7:** Code 43 - Electronic Spark Control (Knock Sensor) +* **Bit 6:** Code 44 - O2 Sensor Lean Exhaust +* **Bit 5:** Code 45 - O2 Sensor Rich Exhaust +* **Bit 4:** Code 51 - PROM Error +* **Bit 3:** Code 52 - Cal-Pack Error +* **Bit 2:** Code 53 - System Battery Over-Voltage +* **Bit 0:** Code 55 - ADU Error + +--- + +### 4. Engine Status & Bit Flags + +#### Misc Byte 1 (Payload Index 14 / Byte 15) +* **Bit 1:** BLM Enabled (1 = Yes) +* **Bit 3:** Quasi Pulse Mode (1 = Yes) +* **Bit 4:** Async Pulse Mode (1 = Yes) +* **Bit 6:** Rich/Lean Status (1 = Rich, 0 = Lean) +* **Bit 7:** Loop Status (1 = Closed, 0 = Open) + +#### Misc Byte 2 (Payload Index 15 / Byte 16) +* **Bit 5:** A/C Status (0 = Enabled, 1 = Disabled/Idle) +* **Bit 7:** Park/Neutral Switch (1 = Park/Neutral, 0 = In Gear) + +#### Misc Byte 3 (Payload Index 16 / Byte 17) +* **Bit 0:** A/C Clutch Command (1 = Enabled) +* **Bit 2:** Torque Converter Clutch (TCC) (1 = Locked) +* **Bit 5:** Power Steering Cramp Switch (1 = Active) + +--- + +## App Features & Architecture + +1. **Bluetooth Thread Management:** + * Queries for paired devices and connects directly to `"ESP32-ALDL"` over standard SPP RFCOMM sockets. + * Robust frame synchronization: buffers incoming streams and aligns on the double-byte header `0xAA 0x55`. +2. **State Management:** + * State flows from the Bluetooth thread through Kotlin `StateFlow` to Compose UI. +3. **Modern Dash Dashboard UI:** + * Dynamic animations for RPM and TPS sweeps. + * Metrics displayed in responsive tiles with custom indicator colors (e.g. engine loop states, fuel trims, battery health). + * Live trouble code alert panel. + * Diagnostic pane displaying real-time raw hex buffers for physical signal verification. \ No newline at end of file diff --git a/app/.gitignore b/app/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/app/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/app/build.gradle.kts b/app/build.gradle.kts new file mode 100644 index 0000000..0cf9aef --- /dev/null +++ b/app/build.gradle.kts @@ -0,0 +1,84 @@ +plugins { + alias(libs.plugins.android.application) + alias(libs.plugins.compose.compiler) + alias(libs.plugins.kotlin.serialization) +} + +android { + namespace = "com.example.esp32aldldashboard" + compileSdk = 36 + defaultConfig { + applicationId = "com.example.esp32aldldashboard" + minSdk = 24 + targetSdk = 36 + versionCode = 1 + versionName = "1.0" + } + + buildTypes { + release { + isMinifyEnabled = false + proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro") + } + } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } + buildFeatures { + compose = true + aidl = false + buildConfig = false + shaders = false + } + + packaging { + resources { + excludes += "/META-INF/{AL2.0,LGPL2.1}" + } + } +} + +kotlin { + jvmToolchain(17) +} + +dependencies { + val composeBom = platform(libs.androidx.compose.bom) + implementation(composeBom) + androidTestImplementation(composeBom) + + // Core Android dependencies + implementation(libs.androidx.core.ktx) + implementation(libs.androidx.lifecycle.runtime.ktx) + implementation(libs.androidx.activity.compose) + + // Arch Components + implementation(libs.androidx.lifecycle.runtime.compose) + implementation(libs.androidx.lifecycle.viewmodel.compose) + + // Compose + implementation(libs.androidx.compose.ui) + implementation(libs.androidx.compose.ui.tooling.preview) + implementation(libs.androidx.compose.material3) + // Tooling + debugImplementation(libs.androidx.compose.ui.tooling) + // Instrumented tests + androidTestImplementation(libs.androidx.compose.ui.test.junit4) + debugImplementation(libs.androidx.compose.ui.test.manifest) + + // Local tests: jUnit, coroutines, Android runner + testImplementation(libs.junit) + testImplementation(libs.kotlinx.coroutines.test) + + // Instrumented tests: jUnit rules and runners + androidTestImplementation(libs.androidx.test.core) + androidTestImplementation(libs.androidx.test.ext.junit) + androidTestImplementation(libs.androidx.test.runner) + androidTestImplementation(libs.androidx.test.espresso.core) + + // Navigation + implementation(libs.androidx.navigation3.ui) + implementation(libs.androidx.navigation3.runtime) + implementation(libs.androidx.lifecycle.viewmodel.navigation3) +} diff --git a/app/src/androidTest/java/com/example/esp32aldldashboard/ui/main/MainScreenTest.kt b/app/src/androidTest/java/com/example/esp32aldldashboard/ui/main/MainScreenTest.kt new file mode 100644 index 0000000..de4066a --- /dev/null +++ b/app/src/androidTest/java/com/example/esp32aldldashboard/ui/main/MainScreenTest.kt @@ -0,0 +1,26 @@ +package com.example.esp32aldldashboard.ui.main + +import androidx.activity.ComponentActivity +import androidx.compose.ui.test.junit4.createAndroidComposeRule +import androidx.compose.ui.test.onNodeWithText +import org.junit.Before +import org.junit.Rule +import org.junit.Test + +/** UI tests for [com.example.esp32aldldashboard.ui.main.MainScreen]. */ +class MainScreenTest { + + @get:Rule val composeTestRule = createAndroidComposeRule() + + @Before + fun setup() { + composeTestRule.setContent { MainScreen(FAKE_DATA) } + } + + @Test + fun firstItem_exists() { + FAKE_DATA.forEach { composeTestRule.onNodeWithText("Hello $it!").assertExists() } + } +} + +private val FAKE_DATA = listOf("Sample1", "Sample2", "Sample3") diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..86887e4 --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/java/com/example/esp32aldldashboard/MainActivity.kt b/app/src/main/java/com/example/esp32aldldashboard/MainActivity.kt new file mode 100644 index 0000000..683206d --- /dev/null +++ b/app/src/main/java/com/example/esp32aldldashboard/MainActivity.kt @@ -0,0 +1,22 @@ +package com.example.esp32aldldashboard + +import android.os.Bundle +import androidx.activity.ComponentActivity +import androidx.activity.compose.setContent +import androidx.activity.enableEdgeToEdge +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Surface +import androidx.compose.ui.Modifier +import com.example.esp32aldldashboard.theme.ESP32ALDLDashboardTheme + +class MainActivity : ComponentActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + + enableEdgeToEdge() + setContent { + ESP32ALDLDashboardTheme { Surface(modifier = Modifier.fillMaxSize(), color = MaterialTheme.colorScheme.background) { MainNavigation() } } + } + } +} diff --git a/app/src/main/java/com/example/esp32aldldashboard/Navigation.kt b/app/src/main/java/com/example/esp32aldldashboard/Navigation.kt new file mode 100644 index 0000000..757ef4b --- /dev/null +++ b/app/src/main/java/com/example/esp32aldldashboard/Navigation.kt @@ -0,0 +1,27 @@ +package com.example.esp32aldldashboard + +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.safeDrawingPadding +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.dp +import androidx.navigation3.runtime.entryProvider +import androidx.navigation3.runtime.rememberNavBackStack +import androidx.navigation3.ui.NavDisplay +import com.example.esp32aldldashboard.ui.main.MainScreen + +@Composable +fun MainNavigation() { + val backStack = rememberNavBackStack(Main) + + NavDisplay( + backStack = backStack, + onBack = { backStack.removeLastOrNull() }, + entryProvider = + entryProvider { + entry
{ + MainScreen(onItemClick = { navKey -> backStack.add(navKey) }, modifier = Modifier.safeDrawingPadding().padding(16.dp)) + } + }, + ) +} diff --git a/app/src/main/java/com/example/esp32aldldashboard/NavigationKeys.kt b/app/src/main/java/com/example/esp32aldldashboard/NavigationKeys.kt new file mode 100644 index 0000000..9ab7bd6 --- /dev/null +++ b/app/src/main/java/com/example/esp32aldldashboard/NavigationKeys.kt @@ -0,0 +1,6 @@ +package com.example.esp32aldldashboard + +import androidx.navigation3.runtime.NavKey +import kotlinx.serialization.Serializable + +@Serializable data object Main : NavKey diff --git a/app/src/main/java/com/example/esp32aldldashboard/bluetooth/BluetoothService.kt b/app/src/main/java/com/example/esp32aldldashboard/bluetooth/BluetoothService.kt new file mode 100644 index 0000000..b47cd23 --- /dev/null +++ b/app/src/main/java/com/example/esp32aldldashboard/bluetooth/BluetoothService.kt @@ -0,0 +1,330 @@ +package com.example.esp32aldldashboard.bluetooth + +import android.annotation.SuppressLint +import android.bluetooth.BluetoothAdapter +import android.bluetooth.BluetoothDevice +import android.bluetooth.BluetoothManager +import android.bluetooth.BluetoothSocket +import android.content.Context +import android.util.Log +import com.example.esp32aldldashboard.parser.ALDLFrame +import com.example.esp32aldldashboard.parser.ALDLParser +import kotlinx.coroutines.* +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import java.io.IOException +import java.io.InputStream +import java.util.UUID + +enum class ConnectionState { + DISCONNECTED, + CONNECTING, + CONNECTED, + ERROR +} + +class BluetoothService(private val context: Context) { + + private val TAG = "ALDLBluetoothService" + private val SPP_UUID = UUID.fromString("00001101-0000-1000-8000-00805F9B34FB") + + private val _connectionState = MutableStateFlow(ConnectionState.DISCONNECTED) + val connectionState: StateFlow = _connectionState + + private val _latestFrame = MutableStateFlow(null) + val latestFrame: StateFlow = _latestFrame + + private val _rawHexLog = MutableStateFlow>(emptyList()) + val rawHexLog: StateFlow> = _rawHexLog + + private val _errorMessage = MutableStateFlow("") + val errorMessage: StateFlow = _errorMessage + + private var connectionJob: Job? = null + private var socket: BluetoothSocket? = null + private var isConnected = false + private var isSimulating = false + + private val bluetoothAdapter: BluetoothAdapter? by lazy { + val manager = context.getSystemService(Context.BLUETOOTH_SERVICE) as BluetoothManager + manager.adapter + } + + private fun addRawHexLog(hex: String) { + val currentList = _rawHexLog.value.toMutableList() + if (currentList.size >= 100) { + currentList.removeAt(0) + } + currentList.add(hex) + _rawHexLog.value = currentList + } + + fun startSimulation() { + if (_connectionState.value == ConnectionState.CONNECTED) { + disconnect() + } + isSimulating = true + _connectionState.value = ConnectionState.CONNECTED + _errorMessage.value = "" + + connectionJob = CoroutineScope(Dispatchers.Default).launch { + var simStep = 0 + val basePayload = byteArrayOf( + 0x20.toByte(), 0x00.toByte(), 0x2A.toByte(), 0x5F.toByte(), 0x59.toByte(), + 0x00.toByte(), 0xF4.toByte(), 0x00.toByte(), 0x1E.toByte(), 0x80.toByte(), + 0x65.toByte(), 0x08.toByte(), 0x00.toByte(), 0x00.toByte(), 0x00.toByte(), + 0x25.toByte(), 0x18.toByte(), 0x7D.toByte(), 0x80.toByte(), 0x00.toByte(), + 0x00.toByte(), 0x00.toByte(), 0xC9.toByte(), 0x02.toByte(), 0x62.toByte() + ) + + while (isActive && isSimulating) { + // Generate dynamic simulation data to show moving values on UI + val payload = basePayload.clone() + simStep++ + + // Simulate Engine Speed (Index 7), Coolant Temp (Index 4), Speed (Index 5), TPS (Index 8) + val rpmRaw: Int + val coolantRaw: Int + val speedRaw: Int + val tpsRaw: Int + val bpwHighRaw: Int + val bpwLowRaw: Int + val mapRaw: Int + val o2MvRaw: Int + val codesByte1: Int + val miscByte1: Int + + when (simStep % 4) { + 0 -> { // Key On Engine Off (Prompt data) + rpmRaw = 0 + coolantRaw = 89 // ~80F / 26C + speedRaw = 0 + tpsRaw = 30 // ~0.58V + mapRaw = 244 // ~100 kPa (Atmospheric) + o2MvRaw = 101 // ~448 mV + bpwHighRaw = 0x02 + bpwLowRaw = 0x62 // 610 dec = 9.3ms + codesByte1 = 0x08 // Code 21 Active (TPS High) + miscByte1 = 0x00 // Open loop + } + 1 -> { // Cranking + rpmRaw = 8 // 200 RPM + coolantRaw = 90 + speedRaw = 0 + tpsRaw = 35 // ~0.68V + mapRaw = 220 // ~91 kPa + o2MvRaw = 110 // ~488 mV + bpwHighRaw = 0x04 + bpwLowRaw = 0x10 // 1040 dec = 15.8ms + codesByte1 = 0x00 + miscByte1 = 0x00 + } + 2 -> { // Idle (Warmup) + rpmRaw = 30 // 750 RPM + coolantRaw = 140 // ~149F / 65C + speedRaw = 0 + tpsRaw = 28 // ~0.54V + mapRaw = 80 // ~39 kPa (Vacuum) + o2MvRaw = (120 + 80 * Math.sin(simStep.toDouble())).toInt() // oscillating O2 + bpwHighRaw = 0x00 + bpwLowRaw = 0xD0 // 208 dec = 3.1ms + codesByte1 = 0x00 + miscByte1 = 0x82 // Closed Loop, BLM Enable + } + else -> { // Cruising + rpmRaw = 88 // 2200 RPM + coolantRaw = 180 // ~203F / 95C + speedRaw = 45 // 45 MPH + tpsRaw = 62 // ~1.2V + mapRaw = 140 // ~62 kPa + o2MvRaw = (120 + 100 * Math.sin(simStep.toDouble())).toInt() + bpwHighRaw = 0x01 + bpwLowRaw = 0x20 // 288 dec = 4.4ms + codesByte1 = 0x00 + miscByte1 = 0xC2 // Closed Loop, BLM Enable, Rich + } + } + + payload[4] = coolantRaw.toByte() + payload[5] = speedRaw.toByte() + payload[6] = mapRaw.toByte() + payload[7] = rpmRaw.toByte() + payload[8] = tpsRaw.toByte() + payload[10] = o2MvRaw.toByte() + payload[11] = codesByte1.toByte() + payload[14] = miscByte1.toByte() + payload[23] = bpwHighRaw.toByte() + payload[24] = bpwLowRaw.toByte() + + val parsed = ALDLParser.parseFrame(payload) + if (parsed != null) { + _latestFrame.value = parsed + val hexString = payload.joinToString(" ") { String.format("%02X", it) } + addRawHexLog("AA 55 $hexString (SIMULATED)") + } + + delay(1000) + } + } + } + + @SuppressLint("MissingPermission") + fun connect() { + if (isSimulating) { + isSimulating = false + connectionJob?.cancel() + } + + if (_connectionState.value == ConnectionState.CONNECTED || _connectionState.value == ConnectionState.CONNECTING) { + return + } + + val adapter = bluetoothAdapter + if (adapter == null) { + _connectionState.value = ConnectionState.ERROR + _errorMessage.value = "Bluetooth is not supported on this device" + return + } + + if (!adapter.isEnabled) { + _connectionState.value = ConnectionState.ERROR + _errorMessage.value = "Bluetooth is turned off" + return + } + + _connectionState.value = ConnectionState.CONNECTING + _errorMessage.value = "" + + connectionJob = CoroutineScope(Dispatchers.IO).launch { + try { + val pairedDevices = adapter.bondedDevices + val targetDevice: BluetoothDevice? = pairedDevices.find { it.name == "ESP32-ALDL" } + + if (targetDevice == null) { + withContext(Dispatchers.Main) { + _connectionState.value = ConnectionState.ERROR + _errorMessage.value = "Device named 'ESP32-ALDL' is not paired. Please pair in system settings first." + } + return@launch + } + + socket = targetDevice.createRfcommSocketToServiceRecord(SPP_UUID) + adapter.cancelDiscovery() // cancel discovery to speed up connection + + socket?.connect() + isConnected = true + + withContext(Dispatchers.Main) { + _connectionState.value = ConnectionState.CONNECTED + } + + readDataStream(socket!!.inputStream) + + } catch (e: Exception) { + Log.e(TAG, "Connection failed: ${e.message}", e) + withContext(Dispatchers.Main) { + _connectionState.value = ConnectionState.ERROR + _errorMessage.value = e.message ?: "Failed to connect" + } + disconnect() + } + } + } + + private suspend fun readDataStream(inputStream: InputStream) { + val readBuffer = ByteArray(128) + val syncBuffer = ArrayList() + + while (currentCoroutineContext().isActive && isConnected) { + try { + val bytesRead = withContext(Dispatchers.IO) { + inputStream.read(readBuffer) + } + if (bytesRead <= 0) { + break // Stream closed + } + + for (j in 0 until bytesRead) { + syncBuffer.add(readBuffer[j]) + } + + // Check for frame matches in buffer + while (syncBuffer.size >= 27) { + var foundHeader = false + for (idx in 0 until syncBuffer.size - 1) { + if ((syncBuffer[idx].toInt() and 0xFF) == 0xAA && (syncBuffer[idx + 1].toInt() and 0xFF) == 0x55) { + // Discard garbage preceding header + if (idx > 0) { + for (d in 0 until idx) { + syncBuffer.removeAt(0) + } + } + foundHeader = true + break + } + } + + if (foundHeader) { + if (syncBuffer.size >= 27) { + val payload = ByteArray(25) + for (p in 0 until 25) { + payload[p] = syncBuffer[p + 2] + } + + // Consume the 27 bytes from buffer + for (r in 0 until 27) { + syncBuffer.removeAt(0) + } + + val parsed = ALDLParser.parseFrame(payload) + if (parsed != null) { + withContext(Dispatchers.Main) { + _latestFrame.value = parsed + val hexString = payload.joinToString(" ") { String.format("%02X", it) } + addRawHexLog("AA 55 $hexString") + } + } + } else { + // Header found, but waiting for full 27-byte frame + break + } + } else { + // Header sequence not found, purge all but last byte if it is part of a potential header + val lastByte = syncBuffer.last() + syncBuffer.clear() + if ((lastByte.toInt() and 0xFF) == 0xAA) { + syncBuffer.add(lastByte) + } + break + } + } + + } catch (e: IOException) { + Log.e(TAG, "Read stream error: ${e.message}") + break + } + } + + withContext(Dispatchers.Main) { + _connectionState.value = ConnectionState.ERROR + _errorMessage.value = "Connection lost" + } + disconnect() + } + + fun disconnect() { + isConnected = false + isSimulating = false + connectionJob?.cancel() + connectionJob = null + + try { + socket?.close() + } catch (e: IOException) { + Log.e(TAG, "Error closing socket: ${e.message}") + } + socket = null + + _connectionState.value = ConnectionState.DISCONNECTED + } +} diff --git a/app/src/main/java/com/example/esp32aldldashboard/data/DataRepository.kt b/app/src/main/java/com/example/esp32aldldashboard/data/DataRepository.kt new file mode 100644 index 0000000..96df2d5 --- /dev/null +++ b/app/src/main/java/com/example/esp32aldldashboard/data/DataRepository.kt @@ -0,0 +1,12 @@ +package com.example.esp32aldldashboard.data + +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.flow + +interface DataRepository { + val data: Flow> +} + +class DefaultDataRepository : DataRepository { + override val data: Flow> = flow { emit(listOf("Android")) } +} diff --git a/app/src/main/java/com/example/esp32aldldashboard/parser/ALDLParser.kt b/app/src/main/java/com/example/esp32aldldashboard/parser/ALDLParser.kt new file mode 100644 index 0000000..5cbe560 --- /dev/null +++ b/app/src/main/java/com/example/esp32aldldashboard/parser/ALDLParser.kt @@ -0,0 +1,269 @@ +package com.example.esp32aldldashboard.parser + +data class ALDLFrame( + val rawBytes: ByteArray, + val iacPosition: Int, + val coolantTempC: Float, + val coolantTempF: Float, + val vehicleSpeedMPH: Int, + val mapVolts: Float, + val mapKpa: Float, + val engineSpeedRpm: Int, + val tpsVolts: Float, + val integrator: Int, + val o2SensorMv: Float, + val batteryVolts: Float, + val blm: Int, + val richLeanCrosses: Int, + val sparkAdvance: Float, + val egrDutyCycle: Float, + val matC: Float, + val matF: Float, + val bpwMs: Float, + val blmEnable: Boolean, + val quasiPulse: Boolean, + val asyncPulse: Boolean, + val isRich: Boolean, + val isClosedLoop: Boolean, + val isAcEnabled: Boolean, + val isParkNeutral: Boolean, + val isAcClutchEnabled: Boolean, + val isTccLocked: Boolean, + val isPowerSteeringCrampActive: Boolean, + val activeFaultCodes: List, + val timestamp: Long = System.currentTimeMillis() +) { + override fun equals(other: Any?): Boolean { + if (this === other) return true + if (javaClass != other?.javaClass) return false + other as ALDLFrame + return rawBytes.contentEquals(other.rawBytes) + } + + override fun hashCode(): Int { + return rawBytes.contentHashCode() + } +} + +object ALDLParser { + // MAT C interpolation table: key is raw value, value is Temp in C + private val matTableC = listOf( + 0 to 200.0f, + 12 to 150.0f, + 13 to 145.0f, + 14 to 140.0f, + 16 to 135.0f, + 18 to 130.0f, + 21 to 125.0f, + 23 to 120.0f, + 26 to 115.0f, + 30 to 110.0f, + 34 to 105.0f, + 39 to 100.0f, + 44 to 95.0f, + 50 to 90.0f, + 56 to 85.0f, + 64 to 80.0f, + 72 to 75.0f, + 81 to 70.0f, + 92 to 65.0f, + 102 to 60.0f, + 114 to 55.0f, + 126 to 50.0f, + 139 to 45.0f, + 152 to 40.0f, + 165 to 35.0f, + 177 to 30.0f, + 189 to 25.0f, + 199 to 20.0f, + 209 to 15.0f, + 218 to 10.0f, + 225 to 5.0f, + 231 to 0.0f, + 237 to -5.0f, + 241 to -10.0f, + 245 to -15.0f, + 247 to -20.0f, + 250 to -25.0f, + 251 to -30.0f, + 255 to -40.0f + ) + + // MAT F interpolation table: key is raw value, value is Temp in F + private val matTableF = listOf( + 0 to 392.0f, + 12 to 302.0f, + 13 to 293.0f, + 14 to 284.0f, + 16 to 275.0f, + 18 to 266.0f, + 21 to 257.0f, + 23 to 248.0f, + 26 to 239.0f, + 30 to 230.0f, + 34 to 221.0f, + 39 to 212.0f, + 44 to 203.0f, + 50 to 194.0f, + 56 to 185.0f, + 64 to 176.0f, + 72 to 167.0f, + 81 to 158.0f, + 92 to 149.0f, + 102 to 140.0f, + 114 to 131.0f, + 126 to 122.0f, + 139 to 113.0f, + 152 to 104.0f, + 165 to 95.0f, + 177 to 86.0f, + 189 to 77.0f, + 199 to 68.0f, + 209 to 59.0f, + 218 to 50.0f, + 225 to 41.0f, + 231 to 32.0f, + 237 to 23.0f, + 241 to 14.0f, + 245 to 5.0f, + 247 to -4.0f, + 250 to -13.0f, + 251 to -22.0f, + 255 to -40.0f + ) + + private fun interpolate(raw: Int, table: List>): Float { + if (raw <= table.first().first) return table.first().second + if (raw >= table.last().first) return table.last().second + for (i in 0 until table.size - 1) { + val current = table[i] + val next = table[i + 1] + if (raw >= current.first && raw <= next.first) { + val span = next.first - current.first + if (span == 0) return current.second + val t = (raw - current.first).toFloat() / span + return current.second + t * (next.second - current.second) + } + } + return 0.0f + } + + /** + * Parses a 25-byte raw data payload. + */ + fun parseFrame(data: ByteArray): ALDLFrame? { + if (data.size != 25) return null + + val u = IntArray(25) { data[it].toInt() and 0xFF } + + // Mappings based on 1-indexed btByteNumber in 24-INT10.ads (index = byteNumber - 1) + val iacPosition = u[3] // Byte 4 + val coolantTempC = u[4] * 0.75f - 40.0f // Byte 5 + val coolantTempF = u[4] * 1.35f - 40.0f // Byte 5 + val vehicleSpeedMPH = u[5] // Byte 6 + val mapVolts = u[6] * 0.019608f // Byte 7 + val mapKpa = u[6] * 0.369f + 10.354f // Byte 7 + val engineSpeedRpm = u[7] * 25 // Byte 8 + val tpsVolts = u[8] * 0.019608f // Byte 9 + val integrator = u[9] // Byte 10 + val o2SensorMv = u[10] * 4.44f // Byte 11 + + val codesByte1 = u[11] // Byte 12 + val codesByte2 = u[12] // Byte 13 + val codesByte3 = u[13] // Byte 14 + val miscByte1 = u[14] // Byte 15 + val miscByte2 = u[15] // Byte 16 + val miscByte3 = u[16] // Byte 17 + + val batteryVolts = u[17] * 0.1f // Byte 18 + val blm = u[18] // Byte 19 + val richLeanCrosses = u[19] // Byte 20 + val sparkAdvance = u[20] * 0.351563f // Byte 21 + val egrDutyCycle = u[21] * 0.392157f // Byte 22 + + // MAT (Air Temp) Interpolation + val matC = interpolate(u[22], matTableC) // Byte 23 + val matF = interpolate(u[22], matTableF) // Byte 23 + + // BPW (Base Pulse Width) 16-bit + val rawBpw = (u[23] shl 8) or u[24] // Byte 24 (High), Byte 25 (Low) + val bpwMs = rawBpw * 0.015259f + + // Status Flags Decoding + // Misc Byte 1 (Byte 15) + val blmEnable = (miscByte1 and 0x02) != 0 // bit 1 + val quasiPulse = (miscByte1 and 0x08) != 0 // bit 3 + val asyncPulse = (miscByte1 and 0x10) != 0 // bit 4 + val isRich = (miscByte1 and 0x40) != 0 // bit 6 (1=RICH, 0=LEAN) + val isClosedLoop = (miscByte1 and 0x80) != 0 // bit 7 (1=CLOSED, 0=OPEN) + + // Misc Byte 2 (Byte 16) + val isAcEnabled = (miscByte2 and 0x20) == 0 // bit 5 (0=ENABLED, 1=DISABLED/IDLE) + val isParkNeutral = (miscByte2 and 0x80) != 0 // bit 7 (1=PARK/NEUTRAL, 0=IN GEAR) + + // Misc Byte 3 (Byte 17) + val isAcClutchEnabled = (miscByte3 and 0x01) != 0 // bit 0 (1=ENABLED) + val isTccLocked = (miscByte3 and 0x04) != 0 // bit 2 (1=LOCKED) + val isPowerSteeringCrampActive = (miscByte3 and 0x20) != 0 // bit 5 (1=ACTIVE) + + // Active Fault Codes list based on code bits + val activeCodes = mutableListOf() + // Byte 12 + if ((codesByte1 and 0x80) != 0) activeCodes.add(12) // bit 7 + if ((codesByte1 and 0x40) != 0) activeCodes.add(13) // bit 6 + if ((codesByte1 and 0x20) != 0) activeCodes.add(14) // bit 5 + if ((codesByte1 and 0x10) != 0) activeCodes.add(15) // bit 4 + if ((codesByte1 and 0x08) != 0) activeCodes.add(21) // bit 3 + if ((codesByte1 and 0x04) != 0) activeCodes.add(22) // bit 2 + if ((codesByte1 and 0x02) != 0) activeCodes.add(23) // bit 1 + if ((codesByte1 and 0x01) != 0) activeCodes.add(24) // bit 0 + // Byte 13 + if ((codesByte2 and 0x80) != 0) activeCodes.add(25) // bit 7 + if ((codesByte2 and 0x20) != 0) activeCodes.add(32) // bit 5 + if ((codesByte2 and 0x10) != 0) activeCodes.add(33) // bit 4 + if ((codesByte2 and 0x08) != 0) activeCodes.add(34) // bit 3 + if ((codesByte2 and 0x04) != 0) activeCodes.add(35) // bit 2 + if ((codesByte2 and 0x01) != 0) activeCodes.add(42) // bit 0 + // Byte 14 + if ((codesByte3 and 0x80) != 0) activeCodes.add(43) // bit 7 + if ((codesByte3 and 0x40) != 0) activeCodes.add(44) // bit 6 + if ((codesByte3 and 0x20) != 0) activeCodes.add(45) // bit 5 + if ((codesByte3 and 0x10) != 0) activeCodes.add(51) // bit 4 + if ((codesByte3 and 0x08) != 0) activeCodes.add(52) // bit 3 + if ((codesByte3 and 0x04) != 0) activeCodes.add(53) // bit 2 + if ((codesByte3 and 0x01) != 0) activeCodes.add(55) // bit 0 + + return ALDLFrame( + rawBytes = data, + iacPosition = iacPosition, + coolantTempC = coolantTempC, + coolantTempF = coolantTempF, + vehicleSpeedMPH = vehicleSpeedMPH, + mapVolts = mapVolts, + mapKpa = mapKpa, + engineSpeedRpm = engineSpeedRpm, + tpsVolts = tpsVolts, + integrator = integrator, + o2SensorMv = o2SensorMv, + batteryVolts = batteryVolts, + blm = blm, + richLeanCrosses = richLeanCrosses, + sparkAdvance = sparkAdvance, + egrDutyCycle = egrDutyCycle, + matC = matC, + matF = matF, + bpwMs = bpwMs, + blmEnable = blmEnable, + quasiPulse = quasiPulse, + asyncPulse = asyncPulse, + isRich = isRich, + isClosedLoop = isClosedLoop, + isAcEnabled = isAcEnabled, + isParkNeutral = isParkNeutral, + isAcClutchEnabled = isAcClutchEnabled, + isTccLocked = isTccLocked, + isPowerSteeringCrampActive = isPowerSteeringCrampActive, + activeFaultCodes = activeCodes + ) + } +} diff --git a/app/src/main/java/com/example/esp32aldldashboard/theme/Color.kt b/app/src/main/java/com/example/esp32aldldashboard/theme/Color.kt new file mode 100644 index 0000000..825610b --- /dev/null +++ b/app/src/main/java/com/example/esp32aldldashboard/theme/Color.kt @@ -0,0 +1,11 @@ +package com.example.esp32aldldashboard.theme + +import androidx.compose.ui.graphics.Color + +val Purple80 = Color(0xFFD0BCFF) +val PurpleGrey80 = Color(0xFFCCC2DC) +val Pink80 = Color(0xFFEFB8C8) + +val Purple40 = Color(0xFF6650a4) +val PurpleGrey40 = Color(0xFF625b71) +val Pink40 = Color(0xFF7D5260) diff --git a/app/src/main/java/com/example/esp32aldldashboard/theme/Theme.kt b/app/src/main/java/com/example/esp32aldldashboard/theme/Theme.kt new file mode 100644 index 0000000..7de22ff --- /dev/null +++ b/app/src/main/java/com/example/esp32aldldashboard/theme/Theme.kt @@ -0,0 +1,50 @@ +package com.example.esp32aldldashboard.theme + +import android.os.Build +import androidx.compose.foundation.isSystemInDarkTheme +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.darkColorScheme +import androidx.compose.material3.dynamicDarkColorScheme +import androidx.compose.material3.dynamicLightColorScheme +import androidx.compose.material3.lightColorScheme +import androidx.compose.runtime.Composable +import androidx.compose.ui.platform.LocalContext + +private val DarkColorScheme = darkColorScheme(primary = Purple80, secondary = PurpleGrey80, tertiary = Pink80) + +private val LightColorScheme = + lightColorScheme( + primary = Purple40, + secondary = PurpleGrey40, + tertiary = Pink40, + + /* Other default colors to override + background = Color(0xFFFFFBFE), + surface = Color(0xFFFFFBFE), + onPrimary = Color.White, + onSecondary = Color.White, + onTertiary = Color.White, + onBackground = Color(0xFF1C1B1F), + onSurface = Color(0xFF1C1B1F), + */ + ) + +@Composable +fun ESP32ALDLDashboardTheme( + darkTheme: Boolean = isSystemInDarkTheme(), + // Dynamic color is available on Android 12+ + dynamicColor: Boolean = true, + content: @Composable () -> Unit, +) { + val colorScheme = + when { + dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> { + val context = LocalContext.current + if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context) + } + darkTheme -> DarkColorScheme + else -> LightColorScheme + } + + MaterialTheme(colorScheme = colorScheme, typography = Typography, content = content) +} diff --git a/app/src/main/java/com/example/esp32aldldashboard/theme/Type.kt b/app/src/main/java/com/example/esp32aldldashboard/theme/Type.kt new file mode 100644 index 0000000..0aca8b7 --- /dev/null +++ b/app/src/main/java/com/example/esp32aldldashboard/theme/Type.kt @@ -0,0 +1,36 @@ +package com.example.esp32aldldashboard.theme + +import androidx.compose.material3.Typography +import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.sp + +// Set of Material typography styles to start with +val Typography = + Typography( + bodyLarge = + TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Normal, + fontSize = 16.sp, + lineHeight = 24.sp, + letterSpacing = 0.5.sp, + ) + /* Other default text styles to override + titleLarge = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Normal, + fontSize = 22.sp, + lineHeight = 28.sp, + letterSpacing = 0.sp + ), + labelSmall = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Medium, + fontSize = 11.sp, + lineHeight = 16.sp, + letterSpacing = 0.5.sp + ) + */ + ) diff --git a/app/src/main/java/com/example/esp32aldldashboard/ui/main/MainScreen.kt b/app/src/main/java/com/example/esp32aldldashboard/ui/main/MainScreen.kt new file mode 100644 index 0000000..7e68f17 --- /dev/null +++ b/app/src/main/java/com/example/esp32aldldashboard/ui/main/MainScreen.kt @@ -0,0 +1,712 @@ +package com.example.esp32aldldashboard.ui.main + +import android.Manifest +import android.content.pm.PackageManager +import android.widget.Toast +import androidx.activity.compose.rememberLauncherForActivityResult +import androidx.activity.result.contract.ActivityResultContracts +import androidx.compose.foundation.background +import androidx.compose.foundation.border +import androidx.compose.foundation.layout.* +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.foundation.verticalScroll +import androidx.compose.material3.* +import androidx.compose.runtime.* +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Brush +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import androidx.core.content.ContextCompat +import androidx.lifecycle.compose.collectAsStateWithLifecycle +import androidx.lifecycle.viewmodel.compose.viewModel +import androidx.navigation3.runtime.NavKey +import com.example.esp32aldldashboard.bluetooth.ConnectionState +import com.example.esp32aldldashboard.parser.ALDLFrame + +// Theme Colors +private val DarkBg = Color(0xFF0F0F12) +private val CardBg = Color(0xFF1B1B22) +private val BorderColor = Color(0xFF2E2E38) +private val NeonCyan = Color(0xFF00E5FF) +private val NeonRed = Color(0xFFFF3D00) +private val NeonGreen = Color(0xFF00E676) +private val NeonOrange = Color(0xFFFF9100) +private val TextWhite = Color(0xFFEEEEEE) +private val TextMuted = Color(0xFF9E9EAF) + +@Composable +fun MainScreen( + onItemClick: (NavKey) -> Unit, + modifier: Modifier = Modifier, +) { + val context = LocalContext.current + val viewModel: MainScreenViewModel = viewModel { MainScreenViewModel(context) } + + val connState by viewModel.connectionState.collectAsStateWithLifecycle() + val frame by viewModel.latestFrame.collectAsStateWithLifecycle() + val rawLog by viewModel.rawHexLog.collectAsStateWithLifecycle() + val errorMsg by viewModel.errorMessage.collectAsStateWithLifecycle() + val isCelsius by viewModel.isCelsius.collectAsStateWithLifecycle() + + val permissionsLauncher = rememberLauncherForActivityResult( + contract = ActivityResultContracts.RequestMultiplePermissions() + ) { permissions -> + val allGranted = permissions.values.all { it } + if (allGranted) { + viewModel.connect() + } else { + Toast.makeText(context, "Bluetooth and Location permissions are required to connect", Toast.LENGTH_LONG).show() + } + } + + val onConnectClick = { + val requiredPermissions = if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) { + arrayOf( + Manifest.permission.BLUETOOTH_SCAN, + Manifest.permission.BLUETOOTH_CONNECT + ) + } else { + arrayOf( + Manifest.permission.ACCESS_FINE_LOCATION, + Manifest.permission.ACCESS_COARSE_LOCATION + ) + } + + val allGranted = requiredPermissions.all { perm -> + ContextCompat.checkSelfPermission(context, perm) == PackageManager.PERMISSION_GRANTED + } + + if (allGranted) { + viewModel.connect() + } else { + permissionsLauncher.launch(requiredPermissions) + } + } + + MainScreenContent( + connState = connState, + frame = frame, + rawLog = rawLog, + errorMsg = errorMsg, + isCelsius = isCelsius, + onConnect = onConnectClick, + onDisconnect = { viewModel.disconnect() }, + onSimulate = { viewModel.startSimulation() }, + onToggleUnit = { viewModel.toggleTemperatureUnit() }, + modifier = modifier + ) +} + +@Composable +fun MainScreenContent( + connState: ConnectionState, + frame: ALDLFrame?, + rawLog: List, + errorMsg: String, + isCelsius: Boolean, + onConnect: () -> Unit, + onDisconnect: () -> Unit, + onSimulate: () -> Unit, + onToggleUnit: () -> Unit, + modifier: Modifier = Modifier +) { + Column( + modifier = modifier + .fillMaxSize() + .background(DarkBg) + .verticalScroll(rememberScrollState()) + ) { + // App Title Banner + Text( + text = "PONTIAC FIERO ALDL DASHBOARD", + color = NeonOrange, + fontSize = 18.sp, + fontWeight = FontWeight.ExtraBold, + letterSpacing = 1.5.sp, + textAlign = TextAlign.Center, + modifier = Modifier + .fillMaxWidth() + .padding(vertical = 12.dp) + ) + + // Connection Action Card + ConnectionCard( + connState = connState, + errorMsg = errorMsg, + isCelsius = isCelsius, + onConnect = onConnect, + onDisconnect = onDisconnect, + onSimulate = onSimulate, + onToggleUnit = onToggleUnit + ) + + Spacer(modifier = Modifier.height(12.dp)) + + // Telemetry Panels + if (frame != null) { + // Trouble Codes Card (Flashing if active) + if (frame.activeFaultCodes.isNotEmpty()) { + TroubleCodesCard(activeCodes = frame.activeFaultCodes) + Spacer(modifier = Modifier.height(12.dp)) + } + + // Key Metrics + Row( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 16.dp), + horizontalArrangement = Arrangement.spacedBy(12.dp) + ) { + MetricCard( + title = "ENGINE SPEED", + value = "${frame.engineSpeedRpm}", + unit = "RPM", + progress = frame.engineSpeedRpm / 6000f, + progressColor = NeonCyan, + modifier = Modifier.weight(1f) + ) + MetricCard( + title = "VEHICLE SPEED", + value = "${frame.vehicleSpeedMPH}", + unit = "MPH", + progress = frame.vehicleSpeedMPH / 120f, + progressColor = NeonGreen, + modifier = Modifier.weight(1f) + ) + } + + Spacer(modifier = Modifier.height(12.dp)) + + // Grid of Minor Telemetry Parameters + Column( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 16.dp), + verticalArrangement = Arrangement.spacedBy(12.dp) + ) { + // Coolant and Intake Temp Row + Row(horizontalArrangement = Arrangement.spacedBy(12.dp)) { + val coolantVal = if (isCelsius) frame.coolantTempC else frame.coolantTempF + val coolantUnit = if (isCelsius) "°C" else "°F" + val coolantProgress = (coolantVal + 40) / 290f // normalized range + + val matVal = if (isCelsius) frame.matC else frame.matF + val matProgress = (matVal + 40) / 290f + + GridItemCard( + title = "COOLANT TEMP", + value = String.format("%.1f", coolantVal) + coolantUnit, + progress = coolantProgress, + progressColor = if (coolantVal > 210) NeonRed else NeonGreen, + modifier = Modifier.weight(1f) + ) + GridItemCard( + title = "MAT (AIR TEMP)", + value = String.format("%.1f", matVal) + coolantUnit, + progress = matProgress, + progressColor = NeonCyan, + modifier = Modifier.weight(1f) + ) + } + + // Fuel control row + Row(horizontalArrangement = Arrangement.spacedBy(12.dp)) { + GridItemCard( + title = "BPW (INJECTOR)", + value = String.format("%.3f ms", frame.bpwMs), + progress = frame.bpwMs / 15f, + progressColor = NeonCyan, + modifier = Modifier.weight(1f) + ) + GridItemCard( + title = "O2 SENSOR", + value = "${frame.o2SensorMv.toInt()} mV", + progress = frame.o2SensorMv / 1000f, + progressColor = if (frame.isRich) NeonGreen else NeonOrange, + modifier = Modifier.weight(1f) + ) + } + + // Air flow & Throttle Position + Row(horizontalArrangement = Arrangement.spacedBy(12.dp)) { + GridItemCard( + title = "TPS (THROTTLE)", + value = String.format("%.2f V", frame.tpsVolts), + progress = frame.tpsVolts / 5.0f, + progressColor = NeonGreen, + modifier = Modifier.weight(1f) + ) + GridItemCard( + title = "MAP (VACUUM)", + value = String.format("%.1f kPa", frame.mapKpa), + progress = frame.mapKpa / 105f, + progressColor = NeonCyan, + modifier = Modifier.weight(1f) + ) + } + + // Fuel trims (BLM & INT) & Battery + Row(horizontalArrangement = Arrangement.spacedBy(12.dp)) { + GridItemCard( + title = "BLM / INT", + value = "${frame.blm} / ${frame.integrator}", + progress = frame.blm / 256f, + progressColor = if (frame.blm in 120..136) NeonGreen else NeonOrange, + modifier = Modifier.weight(1f) + ) + GridItemCard( + title = "BATTERY VOLTS", + value = String.format("%.1f V", frame.batteryVolts), + progress = (frame.batteryVolts - 8) / 8f, + progressColor = if (frame.batteryVolts < 12.0f) NeonRed else NeonGreen, + modifier = Modifier.weight(1f) + ) + } + + // IAC, Spark & EGR + Row(horizontalArrangement = Arrangement.spacedBy(12.dp)) { + GridItemCard( + title = "IAC POSITION", + value = "${frame.iacPosition} Steps", + progress = frame.iacPosition / 160f, + progressColor = NeonCyan, + modifier = Modifier.weight(1f) + ) + GridItemCard( + title = "SPARK / EGR", + value = String.format("%.1f° / %.0f%%", frame.sparkAdvance, frame.egrDutyCycle), + progress = frame.egrDutyCycle / 100f, + progressColor = NeonCyan, + modifier = Modifier.weight(1f) + ) + } + } + + Spacer(modifier = Modifier.height(16.dp)) + + // Status Badges Section + StatusFlagsPanel(frame = frame) + + Spacer(modifier = Modifier.height(16.dp)) + } else { + // Empty / Waiting display + Box( + modifier = Modifier + .fillMaxWidth() + .height(260.dp) + .padding(horizontal = 16.dp) + .background(CardBg, shape = RoundedCornerShape(12.dp)) + .border(1.dp, BorderColor, shape = RoundedCornerShape(12.dp)), + contentAlignment = Alignment.Center + ) { + Text( + text = "Waiting for ALDL Stream data...\nSelect Connection or Simulation above.", + color = TextMuted, + fontSize = 14.sp, + textAlign = TextAlign.Center + ) + } + Spacer(modifier = Modifier.height(16.dp)) + } + + // Live Diagnostic Console log + DiagnosticConsole(rawLog = rawLog) + + Spacer(modifier = Modifier.height(24.dp)) + } +} + +@Composable +fun ConnectionCard( + connState: ConnectionState, + errorMsg: String, + isCelsius: Boolean, + onConnect: () -> Unit, + onDisconnect: () -> Unit, + onSimulate: () -> Unit, + onToggleUnit: () -> Unit +) { + Card( + shape = RoundedCornerShape(12.dp), + colors = CardDefaults.cardColors(containerColor = CardBg), + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 16.dp) + .border(1.dp, BorderColor, shape = RoundedCornerShape(12.dp)) + ) { + Column( + modifier = Modifier.padding(16.dp) + ) { + // Status bar + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.SpaceBetween, + verticalAlignment = Alignment.CenterVertically + ) { + Row(verticalAlignment = Alignment.CenterVertically) { + Text( + text = "STATUS: ", + color = TextMuted, + fontWeight = FontWeight.Bold, + fontSize = 13.sp + ) + val (statusText, statusColor) = when (connState) { + ConnectionState.DISCONNECTED -> "DISCONNECTED" to TextMuted + ConnectionState.CONNECTING -> "CONNECTING..." to NeonOrange + ConnectionState.CONNECTED -> "CONNECTED" to NeonGreen + ConnectionState.ERROR -> "ERROR" to NeonRed + } + Text( + text = statusText, + color = statusColor, + fontWeight = FontWeight.Bold, + fontSize = 13.sp + ) + } + + // Temperature Toggle Button + Button( + onClick = onToggleUnit, + colors = ButtonDefaults.buttonColors(containerColor = BorderColor), + contentPadding = PaddingValues(horizontal = 12.dp, vertical = 4.dp), + shape = RoundedCornerShape(6.dp), + modifier = Modifier.height(28.dp) + ) { + Text( + text = if (isCelsius) "USE °F" else "USE °C", + color = TextWhite, + fontSize = 11.sp, + fontWeight = FontWeight.Bold + ) + } + } + + if (errorMsg.isNotEmpty()) { + Spacer(modifier = Modifier.height(8.dp)) + Text( + text = errorMsg, + color = NeonRed, + fontSize = 12.sp, + fontWeight = FontWeight.Medium + ) + } + + Spacer(modifier = Modifier.height(14.dp)) + + // Action Buttons + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(8.dp) + ) { + if (connState != ConnectionState.CONNECTED && connState != ConnectionState.CONNECTING) { + Button( + onClick = onConnect, + colors = ButtonDefaults.buttonColors(containerColor = NeonOrange), + modifier = Modifier.weight(1f), + shape = RoundedCornerShape(8.dp) + ) { + Text("CONNECT BT", fontWeight = FontWeight.Bold) + } + } else { + Button( + onClick = onDisconnect, + colors = ButtonDefaults.buttonColors(containerColor = BorderColor), + modifier = Modifier.weight(1f), + shape = RoundedCornerShape(8.dp) + ) { + Text("DISCONNECT", fontWeight = FontWeight.Bold, color = TextWhite) + } + } + + Button( + onClick = onSimulate, + colors = ButtonDefaults.buttonColors(containerColor = BorderColor), + modifier = Modifier.weight(1f), + shape = RoundedCornerShape(8.dp) + ) { + Text("SIMULATE", fontWeight = FontWeight.Bold, color = NeonCyan) + } + } + } + } +} + +@Composable +fun MetricCard( + title: String, + value: String, + unit: String, + progress: Float, + progressColor: Color, + modifier: Modifier = Modifier +) { + Card( + shape = RoundedCornerShape(12.dp), + colors = CardDefaults.cardColors(containerColor = CardBg), + modifier = modifier + .border(1.dp, BorderColor, shape = RoundedCornerShape(12.dp)) + ) { + Column( + modifier = Modifier.padding(14.dp), + horizontalAlignment = Alignment.CenterHorizontally + ) { + Text( + text = title, + color = TextMuted, + fontSize = 11.sp, + fontWeight = FontWeight.Bold + ) + Spacer(modifier = Modifier.height(4.dp)) + Row( + verticalAlignment = Alignment.Bottom + ) { + Text( + text = value, + color = TextWhite, + fontSize = 28.sp, + fontWeight = FontWeight.Black + ) + Spacer(modifier = Modifier.width(4.dp)) + Text( + text = unit, + color = TextMuted, + fontSize = 12.sp, + fontWeight = FontWeight.Bold, + modifier = Modifier.padding(bottom = 4.dp) + ) + } + Spacer(modifier = Modifier.height(8.dp)) + LinearProgressIndicator( + progress = progress.coerceIn(0f, 1f), + color = progressColor, + trackColor = BorderColor, + modifier = Modifier + .fillMaxWidth() + .height(6.dp) + ) + } + } +} + +@Composable +fun GridItemCard( + title: String, + value: String, + progress: Float, + progressColor: Color, + modifier: Modifier = Modifier +) { + Card( + shape = RoundedCornerShape(10.dp), + colors = CardDefaults.cardColors(containerColor = CardBg), + modifier = modifier + .border(1.dp, BorderColor, shape = RoundedCornerShape(10.dp)) + ) { + Column( + modifier = Modifier.padding(10.dp) + ) { + Text( + text = title, + color = TextMuted, + fontSize = 10.sp, + fontWeight = FontWeight.Bold + ) + Spacer(modifier = Modifier.height(2.dp)) + Text( + text = value, + color = TextWhite, + fontSize = 18.sp, + fontWeight = FontWeight.ExtraBold + ) + Spacer(modifier = Modifier.height(6.dp)) + LinearProgressIndicator( + progress = progress.coerceIn(0f, 1f), + color = progressColor, + trackColor = BorderColor, + modifier = Modifier + .fillMaxWidth() + .height(4.dp) + ) + } + } +} + +@Composable +fun TroubleCodesCard(activeCodes: List) { + Card( + shape = RoundedCornerShape(12.dp), + colors = CardDefaults.cardColors(containerColor = CardBg), + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 16.dp) + .border(1.dp, NeonRed, shape = RoundedCornerShape(12.dp)) + ) { + Column( + modifier = Modifier.padding(16.dp) + ) { + Row( + verticalAlignment = Alignment.CenterVertically + ) { + Text( + text = "⚠️ ACTIVE ECM FAULT CODES", + color = NeonRed, + fontWeight = FontWeight.Black, + fontSize = 14.sp + ) + } + Spacer(modifier = Modifier.height(8.dp)) + Row( + horizontalArrangement = Arrangement.spacedBy(8.dp) + ) { + activeCodes.forEach { code -> + Box( + modifier = Modifier + .background(NeonRed, shape = RoundedCornerShape(4.dp)) + .padding(horizontal = 10.dp, vertical = 4.dp) + ) { + Text( + text = "CODE $code", + color = Color.White, + fontWeight = FontWeight.Bold, + fontSize = 12.sp + ) + } + } + } + Spacer(modifier = Modifier.height(8.dp)) + Text( + text = "Refer to Fiero shop manual for diagnosis.", + color = TextMuted, + fontSize = 11.sp + ) + } + } +} + +@OptIn(ExperimentalLayoutApi::class) +@Composable +fun StatusFlagsPanel(frame: ALDLFrame) { + Card( + shape = RoundedCornerShape(12.dp), + colors = CardDefaults.cardColors(containerColor = CardBg), + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 16.dp) + .border(1.dp, BorderColor, shape = RoundedCornerShape(12.dp)) + ) { + Column( + modifier = Modifier.padding(14.dp) + ) { + Text( + text = "LOOP STATUS & SYSTEM SWITCHES", + color = TextMuted, + fontSize = 12.sp, + fontWeight = FontWeight.Bold + ) + Spacer(modifier = Modifier.height(10.dp)) + + FlowRow( + horizontalArrangement = Arrangement.spacedBy(6.dp), + verticalArrangement = Arrangement.spacedBy(6.dp), + modifier = Modifier.fillMaxWidth() + ) { + StatusBadge(label = "Closed Loop", active = frame.isClosedLoop, activeColor = NeonGreen) + StatusBadge(label = "Rich Mixture", active = frame.isRich, activeColor = NeonGreen) + StatusBadge(label = "BLM Enabled", active = frame.blmEnable, activeColor = NeonGreen) + StatusBadge(label = "TCC Locked", active = frame.isTccLocked, activeColor = NeonGreen) + StatusBadge(label = "AC Clutch", active = frame.isAcClutchEnabled, activeColor = NeonGreen) + StatusBadge(label = "Park/Neutral", active = frame.isParkNeutral, activeColor = NeonCyan) + StatusBadge(label = "A/C Request", active = frame.isAcEnabled, activeColor = NeonCyan) + StatusBadge(label = "PS Cramp", active = frame.isPowerSteeringCrampActive, activeColor = NeonOrange) + StatusBadge(label = "Async Pulse", active = frame.asyncPulse, activeColor = NeonOrange) + StatusBadge(label = "Quasi Pulse", active = frame.quasiPulse, activeColor = NeonOrange) + } + } + } +} + +@Composable +fun StatusBadge(label: String, active: Boolean, activeColor: Color) { + Box( + modifier = Modifier + .background( + color = if (active) activeColor.copy(alpha = 0.15f) else Color.Transparent, + shape = RoundedCornerShape(4.dp) + ) + .border( + width = 1.dp, + color = if (active) activeColor else BorderColor, + shape = RoundedCornerShape(4.dp) + ) + .padding(horizontal = 8.dp, vertical = 4.dp) + ) { + Text( + text = label, + color = if (active) activeColor else TextMuted, + fontSize = 11.sp, + fontWeight = FontWeight.Bold + ) + } +} + +@Composable +fun DiagnosticConsole(rawLog: List) { + Card( + shape = RoundedCornerShape(12.dp), + colors = CardDefaults.cardColors(containerColor = CardBg), + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 16.dp) + .border(1.dp, BorderColor, shape = RoundedCornerShape(12.dp)) + ) { + Column( + modifier = Modifier.padding(14.dp) + ) { + Text( + text = "DIAGNOSTIC TELEMETRY STREAM LOG", + color = TextMuted, + fontSize = 11.sp, + fontWeight = FontWeight.Bold + ) + Spacer(modifier = Modifier.height(8.dp)) + Box( + modifier = Modifier + .fillMaxWidth() + .height(100.dp) + .background(Color.Black, shape = RoundedCornerShape(6.dp)) + .padding(8.dp) + ) { + Column( + modifier = Modifier + .fillMaxSize() + .verticalScroll(rememberScrollState()) + ) { + if (rawLog.isEmpty()) { + Text( + text = "Console Idle. Connect to view hex dump...", + color = TextMuted, + fontFamily = FontFamily.Monospace, + fontSize = 10.sp + ) + } else { + rawLog.forEach { logLine -> + Text( + text = logLine, + color = NeonGreen, + fontFamily = FontFamily.Monospace, + fontSize = 10.sp + ) + } + } + } + } + } + } +} diff --git a/app/src/main/java/com/example/esp32aldldashboard/ui/main/MainScreenViewModel.kt b/app/src/main/java/com/example/esp32aldldashboard/ui/main/MainScreenViewModel.kt new file mode 100644 index 0000000..6ac861c --- /dev/null +++ b/app/src/main/java/com/example/esp32aldldashboard/ui/main/MainScreenViewModel.kt @@ -0,0 +1,42 @@ +package com.example.esp32aldldashboard.ui.main + +import android.content.Context +import androidx.lifecycle.ViewModel +import com.example.esp32aldldashboard.bluetooth.BluetoothService +import com.example.esp32aldldashboard.bluetooth.ConnectionState +import com.example.esp32aldldashboard.parser.ALDLFrame +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow + +class MainScreenViewModel(context: Context) : ViewModel() { + private val bluetoothService = BluetoothService(context.applicationContext) + + val connectionState: StateFlow = bluetoothService.connectionState + val latestFrame: StateFlow = bluetoothService.latestFrame + val rawHexLog: StateFlow> = bluetoothService.rawHexLog + val errorMessage: StateFlow = bluetoothService.errorMessage + + private val _isCelsius = MutableStateFlow(false) // Default to Fahrenheit for standard 80s GM telemetry + val isCelsius: StateFlow = _isCelsius + + fun toggleTemperatureUnit() { + _isCelsius.value = !_isCelsius.value + } + + fun connect() { + bluetoothService.connect() + } + + fun disconnect() { + bluetoothService.disconnect() + } + + fun startSimulation() { + bluetoothService.startSimulation() + } + + override fun onCleared() { + super.onCleared() + bluetoothService.disconnect() + } +} diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..423ed70 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 0000000..1f8b003 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,24 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..6f3b755 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..6f3b755 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..c209e78ecd372343283f4157dcfd918ec5165bb3 GIT binary patch literal 1404 zcmV-?1%vuhNk&F=1pok7MM6+kP&il$0000G0000-002h-06|PpNX!5L00Dqw+t%{r zzW2vH!KF=w&cMnnN@{whkTw+#mAh0SV?YL=)3MimFYCWp#fpdtz~8$hD5VPuQgtcN zXl<@<#Cme5f5yr2h%@8TWh?)bSK`O z^Z@d={gn7J{iyxL_y_%J|L>ep{dUxUP8a{byupH&!UNR*OutO~0{*T4q5R6@ApLF! z5{w?Z150gC7#>(VHFJZ-^6O@PYp{t!jH(_Z*nzTK4 zkc{fLE4Q3|mA2`CWQ3{8;gxGizgM!zccbdQoOLZc8hThi-IhN90RFT|zlxh3Ty&VG z?Fe{#9RrRnxzsu|Lg2ddugg7k%>0JeD+{XZ7>Z~{=|M+sh1MF7~ zz>To~`~LVQe1nNoR-gEzkpe{Ak^7{{ZBk2i_<+`Bq<^GB!RYG+z)h;Y3+<{zlMUYd zrd*W4w&jZ0%kBuDZ1EW&KLpyR7r2=}fF2%0VwHM4pUs}ZI2egi#DRMYZPek*^H9YK zay4Iy3WXFG(F14xYsoDA|KXgGc5%2DhmQ1gFCkrgHBm!lXG8I5h*uf{rn48Z!_@ z4Bk6TJAB2CKYqPjiX&mWoW>OPFGd$wqroa($ne7EUK;#3VYkXaew%Kh^3OrMhtjYN?XEoY`tRPQsAkH-DSL^QqyN0>^ zmC>{#F14jz4GeW{pJoRpLFa_*GI{?T93^rX7SPQgT@LbLqpNA}<@2wH;q493)G=1Y z#-sCiRNX~qf3KgiFzB3I>4Z%AfS(3$`-aMIBU+6?gbgDb!)L~A)je+;fR0jWLL-Fu z4)P{c7{B4Hp91&%??2$v9iRSFnuckHUm}or9seH6 z>%NbT+5*@L5(I9j@06@(!{ZI?U0=pKn8uwIg&L{JV14+8s2hnvbRrU|hZCd}IJu7*;;ECgO%8_*W Kmw_-CKmY()leWbG literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..b2dfe3d1ba5cf3ee31b3ecc1ced89044a1f3b7a9 GIT binary patch literal 2898 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..4f0f1d64e58ba64d180ce43ee13bf9a17835fbca GIT binary patch literal 982 zcmV;{11bDcNk&G_0{{S5MM6+kP&il$0000G0000l001ul06|PpNU8t;00Dqo+t#w^ z^1csucXz7-Qrhzl9HuHB%l>&>1tG2^vb*E&k^T3$FG1eQZ51g$uv4V+kI`0<^1Z@N zk?Jjh$olyC%l>)Xq;7!>{iBj&BjJ`P&$fsCfpve_epJOBkTF?nu-B7D!hO=2ZR}

C%4 zc_9eOXvPbC4kzU8YowIA8cW~Uv|eB&yYwAObSwL2vY~UYI7NXPvf3b+c^?wcs~_t{ ze_m66-0)^{JdOMKPwjpQ@Sna!*?$wTZ~su*tNv7o!gXT!GRgivP}ec?5>l1!7<(rT zds|8x(qGc673zrvYIz;J23FG{9nHMnAuP}NpAED^laz3mAN1sy+NXK)!6v1FxQ;lh zOBLA>$~P3r4b*NcqR;y6pwyhZ3_PiDb|%n1gGjl3ZU}ujInlP{eks-#oA6>rh&g+!f`hv#_%JrgYPu z(U^&XLW^QX7F9Z*SRPpQl{B%x)_AMp^}_v~?j7 zapvHMKxSf*Mtyx8I}-<*UGn3)oHd(nn=)BZ`d$lDBwq_GL($_TPaS{UeevT(AJ`p0 z9%+hQb6z)U9qjbuXjg|dExCLjpS8$VKQ55VsIC%@{N5t{NsW)=hNGI`J=x97_kbz@ E0Of=7!TQj4N+cqN`nQhxvX7dAV-`K|Ub$-q+H-5I?Tx0g9jWxd@A|?POE8`3b8fO$T))xP* z(X?&brZw({`)WU&rdAs1iTa0x6F@PIxJ&&L|dpySV!ID|iUhjCcKz(@mE z!x@~W#3H<)4Ae(4eQJRk`Iz3<1)6^m)0b_4_TRZ+cz#eD3f8V;2r-1fE!F}W zEi0MEkTTx}8i1{`l_6vo0(Vuh0HD$I4SjZ=?^?k82R51bC)2D_{y8mi_?X^=U?2|F{Vr7s!k(AZC$O#ZMyavHhlQ7 zUR~QXuH~#o#>(b$u4?s~HLF*3IcF7023AlwAYudn0FV~|odGH^05AYPEfR)8p`i{n zwg3zPVp{+wOsxKc>)(pMupKF!Y2HoUqQ3|Yu|8lwR=?5zZuhG6J?H`bSNk_wPoM{u zSL{c@pY7+c2kck>`^q1^^gR0QB7Y?KUD{vz-uVX~;V-rW)PDcI)$_UjgVV?S?=oLR zf4}zz{#*R_{LkiJ#0RdQLNC^2Vp%JPEUvG9ra2BVZ92(p9h7Ka@!yf9(lj#}>+|u* z;^_?KWdzkM`6gqPo9;;r6&JEa)}R3X{(CWv?NvgLeOTq$cZXqf7|sPImi-7cS8DCN zGf;DVt3Am`>hH3{4-WzH43Ftx)SofNe^-#|0HdCo<+8Qs!}TZP{HH8~z5n`ExcHuT zDL1m&|DVpIy=xsLO>8k92HcmfSKhflQ0H~9=^-{#!I1g(;+44xw~=* zxvNz35vfsQE)@)Zsp*6_GjYD};Squ83<_?^SbALb{a`j<0Gn%6JY!zhp=Fg}Ga2|8 z52e1WU%^L1}15Ex0fF$e@eCT(()_P zvV?CA%#Sy08_U6VPt4EtmVQraWJX` zh=N|WQ>LgrvF~R&qOfB$!%D3cGv?;Xh_z$z7k&s4N)$WYf*k=|*jCEkO19{h_(%W4 zPuOqbCw`SeAX*R}UUsbVsgtuG?xs(#Ikx9`JZoQFz0n*7ZG@Fv@kZk`gzO$HoA9kN z8U5{-yY zvV{`&WKU2$mZeoBmiJrEdzUZAv1sRxpePdg1)F*X^Y)zp^Y*R;;z~vOv-z&)&G)JQ{m!C9cmziu1^nHA z`#`0c>@PnQ9CJKgC5NjJD8HM3|KC(g5nnCq$n0Gsu_DXk36@ql%npEye|?%RmG)

FJ$wK}0tWNB{uH;AM~i literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..948a3070fe34c611c42c0d3ad3013a0dce358be0 GIT binary patch literal 1900 zcmV-y2b1_xNk&Fw2LJ$9MM6+kP&il$0000G0001A003VA06|PpNH75a00DqwTbm-~ zullQTcXxO9ki!OCRx^i?oR|n!<8G0=kI^!JSjFi-LL*`V;ET0H2IXfU0*i>o6o6Gy zRq6Ap5(_{XLdXcL-MzlN`ugSdZY_`jXhcENAu)N_0?GhF))9R;E`!bo9p?g?SRgw_ zEXHhFG$0{qYOqhdX<(wE4N@es3VIo$%il%6xP9gjiBri+2pI6aY4 zJbgh-Ud|V%3O!IcHKQx1FQH(_*TK;1>FQWbt^$K1zNn^cczkBs=QHCYZ8b&l!UV{K z{L0$KCf_&KR^}&2Fe|L&?1I7~pBENnCtCuH3sjcx6$c zwqkNkru);ie``q+_QI;IYLD9OV0ZxkuyBz|5<$1BH|vtey$> z5oto4=l-R-Aaq`Dk0}o9N0VrkqW_#;!u{!bJLDq%0092{Ghe=F;(kn} z+sQ@1=UlX30+2nWjkL$B^b!H2^QYO@iFc0{(-~yXj2TWz?VG{v`Jg zg}WyYnwGgn>{HFaG7E~pt=)sOO}*yd(UU-D(E&x{xKEl6OcU?pl)K%#U$dn1mDF19 zSw@l8G!GNFB3c3VVK0?uyqN&utT-D5%NM4g-3@Sii9tSXKtwce~uF zS&Jn746EW^wV~8zdQ1XC28~kXu8+Yo9p!<8h&(Q({J*4DBglPdpe4M_mD8AguZFn~ ztiuO~{6Bx?SfO~_ZV(GIboeR9~hAym{{fV|VM=77MxDrbW6`ujX z<3HF(>Zr;#*uCvC*bpoSr~C$h?_%nXps@A)=l_;({Fo#6Y1+Zv`!T5HB+)#^-Ud_; zBwftPN=d8Vx)*O1Mj+0oO=mZ+NVH*ptNDC-&zZ7Hwho6UQ#l-yNvc0Cm+2$$6YUk2D2t#vdZX-u3>-Be1u9gtTBiMB^xwWQ_rgvGpZ6(C@e23c!^K=>ai-Rqu zhqT`ZQof;9Bu!AD(i^PCbYV%yha9zuoKMp`U^z;3!+&d@Hud&_iy!O-$b9ZLcSRh? z)R|826w}TU!J#X6P%@Zh=La$I6zXa#h!B;{qfug}O%z@K{EZECu6zl)7CiNi%xti0 zB{OKfAj83~iJvmpTU|&q1^?^cIMn2RQ?jeSB95l}{DrEPTW{_gmU_pqTc)h@4T>~& zluq3)GM=xa(#^VU5}@FNqpc$?#SbVsX!~RH*5p0p@w z;~v{QMX0^bFT1!cXGM8K9FP+=9~-d~#TK#ZE{4umGT=;dfvWi?rYj;^l_Zxywze`W z^Cr{55U@*BalS}K%Czii_80e0#0#Zkhlij4-~I@}`-JFJ7$5{>LnoJSs??J8kWVl6|8A}RCGAu9^rAsfCE=2}tHwl93t0C?#+jMpvr7O3`2=tr{Hg$=HlnjVG^ewm|Js0J*kfPa6*GhtB>`fN!m#9J(sU!?(OSfzY*zS(FJ<-Vb zfAIg+`U)YaXv#sY(c--|X zEB+TVyZ%Ie4L$gi#Fc++`h6%vzsS$pjz9aLt+ZL(g;n$Dzy5=m=_TV(3H8^C{r0xd zp#a%}ht55dOq?yhwYPrtp-m1xXp;4X;)NhxxUpgP%XTLmO zcjaFva^}dP3$&sfFTIR_jC=2pHh9kpI@2(6V*GQo7Ws)`j)hd+tr@P~gR*2gO@+1? zG<`_tB+LJuF|SZ9tIec;h%}}6WClT`L>HSW?E{Hp1h^+mlbf_$9zA>!ug>NALJsO{ mU%z=YwVD?}XMya)Bp;vlyE5&E_6!fzx9pwrdz474!~g(M6R?N? literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..1b9a6956b3acdc11f40ce2bb3f6efbd845cc243f GIT binary patch literal 3918 zcmV-U53%r4Nk&FS4*&pHMM6+kP&il$0000G0001A003VA06|PpNSy@$00HoY|G(*G z+qV7x14$dSO^Re!iqt-AAIE9iwr$(CZQJL$blA4B`>;C3fBY6Q8_YSjb2%a=fc}4E zrSzssacq<^nmW|Rs93PJni30R<8w<(bK_$LO4L?!_OxLl$}K$MUEllnMK|rg=f3;y z*?;3j|Nh>)p0JQ3A~rf(MibH2r+)3cyV1qF&;8m{w-S*y+0mM){KTK^M5}ksc`qX3 zy>rf^b>~l>SSHds8(I@hz3&PD@LmEs4&prkT=BjsBCXTMhN$_)+kvnl0bLKW5rEsj z*d#KXGDB4P&>etx0X+`R19yC=LS)j!mgs5M0L~+o-T~Jl!p!AJxnGAhV%~rhYUL4hlWhgES3Kb5oA&X z{}?3OBSS-{!v$nCIGj->(-TAG)8LR{htr41^gxsT8yqt2@DEG6Yl`Uma3Nd4;YUoW zTbkYl3CMU5ypMF3EIkYmWL|*BknM`0+Kq6CpvO(y$#j94e+q{vI{Zp8cV_6RK!`&C zob$*5Q|$IZ09dW=L!V zw@#2wviu|<#3lgGE8GEhcx+zBt`} zOwP8j9X%^f7i_bth4PiJ$LYtFJSCN$3xwDN;8mr*B;CJwBP2G0TMq0uNt7S^DO_wE zepk!Wrn#Z#03j{`c*Rf~y3o7?J}w?tEELRUR2cgxB*Y{LzA#pxHgf}q?u5idu>077 zd^=p)`nA}6e`|@`p?u}YU66PP_MA}Zqqe!c{nK&z%Jwq1N4e_q<#4g^xaz=ao;u|6 zwpRcW2Lax=ZGbx=Q*HhlJ`Ns#Y*r0*%!T?P*TTiX;rb)$CGLz=rSUum$)3Qyv{BL2 zO*=OI2|%(Yz~`pNEOnLp>+?T@glq-DujlIp?hdJeZ7ctP4_OKx|5@EOps3rr(pWzg zK4d3&oN-X2qN(d_MkfwB4I)_)!I_6nj2iA9u^pQ{;GckGLxBGrJUM2Wdda!k)Y>lq zmjws>dVQ*vW9lvEMkiN3wE-__6OWD0txS&Qn0n22cyj4Q*8(nG4!G{6OOwNvsrPIL zCl-$W9UwkEUVuLwyD%|inbOF*xMODZ4VMEVAq_zUxZ+K#Gdqf!DW$5f)?7UNOFMz! zrB~tuu=6X2FE(p^iqgxr+?ZK;=yz`e;C$#_@D9Lj-+TDVOrva>(#*PVbaHO>A)mhl z07OJWCqYC60518$!&c`eNBcBW%GnfaQ*$eazV^2_AW?j)h;J1nUjN(I9=0+!RVx~% z3@Tf!P0TE+98jA?WceK-}A1% zW!K)lyKcGqy#M~})315-A#2NXQ`?6NR#Apo=S!oF=JfpX>iR*49ec{7AN$xxpK{D$ z2d%Fz&rdfSqourN$~Y^NFIMV1CZ?J*bMx~H3k&meGtH@q9ra2vZxmA$S(#jaaj-g4 ztJmxG+DLV<*q<|sDXPp$X>E)#S}Vm&sRaO5P&goh2><}FEdZSXDqsL$06sAkh(e+v zAsBhKSRexgwg6tIy~GFJzaTxXD(}|+0eOwFDA%rn`X;MVwDHT9=4=g%OaJ9s%3b9>9EUTnnp0t;2Zpa{*>mk~hZqItE_!dQ zOtC>8`$l|mV43Jbudf0N6&&X;{=z}Zi}d1`2qmJ}i|0*GsulD3>GgQXHN)pkR6sf1 z?5ZU%&xtL}oH;YiAA)d*^Ndw2T$+Mjuzyzz@-SM`9df7LqTxLuIwC~S0092~+=qYv z@*ja;?Wt!T!{U?c*Z0YtGe)XbI&y-?B&G2$`JDM)(dIV9G`Sc#6?sI60de6kv+)Qb zUW~2|WjvJq3TA8`0+sWA3zRhY9a~ow)O~&StBkG2{*{TGiY~S8ep{V&Vo2l<6LWsu z^#p0-v*t2?3&aA1)ozu|%efSR=XnpX$lvTeRdKlvM!@|pM5p2w3u-6 zU>}t2xiYLS+{|%C65AzX+23Mtlq?BS&YdYcYsVjoiE&rT>;Necn6l^K)T^lmE`5u{ zm1i+-a-gc;Z&v-{;8r)z6NYfBUv+=_L}ef}qa9FX01)+Aaf+;xj(mL6|JUzGJR1|fnanb%?BPPIp>SCjP|8qE5qJ{=n5ZGw?81z3(k;pzH%1CtlX50{E7h)$h{qGKfzC`e2o`*IqA#tjA z`Fz&^%$b9F*N`)U-#6>a)Z`55`$Dd0cfcs0$d13^ONrdCu9xcv_=n#WQo8stcz3jP9|2EvdI-RhJM3%Q%oM&!OlShM|0 z?gz?wHZSnm45njLtsz8PVT1S&jAlbKg5kVam$p16=EK@Sj4EP0OtH zmJDmdc^v)x>56Qg_wmYHz6h)>kl_h$>0@J!ypv%APmjZTAQVLy6Fu50RGY&JAVNhx zrF_qG6`x9MkT;1SFWo$)l{M$;3qUDn9JwE}z zRl#E_bDRJFii61kPgBybIgp8dNW!Cc1b*^YYk-#oWLJvtM_v^hQx~9?8LD4VFFxBF z3MlrsSC%f9Oupn*ctPL0U1fwfX?`tRhPD{PSLFPQOmIt$mDy0SgpNVvHS+f#Do>h1Gn?LZU9(KaN>Q_=Y*_T zvtD7%_u^^+{g`0VGzg(VZrpVQ6Ub5M=tI_p7T93R8@3Zulu3|#{iNcu!oiHxZ4Rf*( zfmiN$$ru(*_Zqn=`Gq#OuHRTSwp7uH_SokR&|)RuW5yo=Z|_4?qU-JU+tpt>!B&Is z@N(=SG;bpVc;AO@zbmMM zScqq1)b-ZQIrs={oD}|?6y{$HNB1U0^LsBh8JI&3!GBZxOXI<}&5-$lgkAaYqhOTb z?2vEnZ$-kk;*M_17(upJF3%+iH*s0-r{vttXVB2OUwI1s^+G(Ft(U8gYFXC}#P&E^ z>T@C^tS`Z7{6HT4_nF~n>JlZtk5&qDBl6r|^kzQYe`wq!C)n@$c>WOPA61NDFj<<6 zGW71NMMhwAl!U-yqrq2xrSFqRCI8acw7?}3j;ynxo*-b7Co;g5r%^j=H@9({PXXBf z@r>U>>N;E)81wx`B4f%{PB~MHka_);%kBCb(d|Jy5!MqJ%2p`t&@L)4$T2j&-WHvG zv3(uyA_gwqNu(k?jQTtv3dgPKRZoH8prxe7>pQBW5L&dpumS&5Ld2?(sCpJjvc4L5 zEnh&?91WVm)ZdTj=fjJ$pPDdgAttLXuke+?KdKxu*;kTC(r!tQk6;gxj4h%FdHAt(^M3YvYj(!tOeN)+Hvj6+< zzyJRG?^lZfWuR#t!tUKP&(?%3v&Zd$R2YN>lB(Lq`OInY48%4%yTv2 zYe1{G`3)(PDEio5Y@-I5tUf`c%%OCJMtSW56g3iEg%3`$7XSJJHyA z<|7&N)5Xrlgv~%BO24eFd;Hd;uiK%D`EdK|quUeRZDqbh9l)%j%J#0lfrZumvA<_w zu&=AVvdChf6}eqh(bUz`(`Ue*p01{fBAcTgKyDYLs_I+YyJEk+rM@avU~>fB$n)HS zM7pfJydu`i%gfS<{PF94kZDv$t>06sAkheDzu40NJ$5CMW%n^Lls?8^p^QGWURbKu3ZduZQZ((s2? zzE`}<{;Zt7<$C|9R8A~DJ~@%x>TfP zF>TX8)@v|t)q4GjRt<}5s6hLHwRel7>V@&r-O|Av(yh;Q1A{E>Ir>p+%dHD|=l+lT zpr(Dg&>#Nu=!)6bCLr-ZS%|;h)Ij$+e@r8_{qO19QvDe=&1tmpY*0lcA^Cc-#{9fQ z<~$*<&P$Q<_jy#<$40PMofM7aQ}C=jphI`4kLg}Z7CIN#26D{-4v-_CA-LiE@(%{y!BzsU%gG`Q?sjLUf%qFSl0y)2#ae*+EI>s|i`d^V$Dn)qmzqRq6VJRY|{4ujsIU%#bnqU6MR&-1I_43=|5(6Jr;Jvert) zE?S|Tmn}Tv<-??sxV5@9t}3D=>YZ0JrQe$CO~|EY=Lj9RM&4svQHPQL6%pV5fPFiH zfXDx;l@~et{*{U*#c#Dvzu)|znDO7$#CRx)Z&yp-}SrD{&|(MQtfUz~n35@RLfUy=aqrhCX0M}J_r5QsK~NmRCR|Nm&L z41UdsLjWxSUlL41r^0K&nCCK>fdR-!MYjFg(z9_mF^C|#ZQw?`)f6uVzF^`bRnVY& zo}@M06J&_+>w9@jpaO4snmU;0t-(zYW1qVBHtuD!d?%?AtN7Plp><-1Y8Rqb20ZaP zTCgn*-Sri4Q8Xn>=gNaWQ57%!D35UkA@ksOlPB*Dvw}t02ENAqw|kFhn%ZyyW%+t{ zNdM!uqEM^;2}f+tECHbwLmH*!nZVrb$-az%t50Y2pg(HqhvY-^-lb}>^6l{$jOI6} zo_kBzj%8aX|6H5M0Y<)7pzz_wLkIpRm!;PzY)9+24wk2&TT{w--phDGDCOz{cN_ca zpnm7`$oDy=HX%0i-`769*0M6(e5j-?(?24%)<)&46y0e&6@HCDZAm9W6Ib#Y#BF6- z=30crHGg+RRTe%VBC>T00OV6F+gQDAK38Ne3N9bm|62tPccBJi)5{B z4zc^Db72XiBd}v$CF|yU{Z=M|DZ%-(XarYNclODlb1Kz1_EKLy(NSLCN`eUl(rBCL zT*jx@wNvze0|TSqgE(QArOZU)_?qH(sj#TwzElLs9q)(0u!_P|R%Cy_0JFQxgGV>1 zz4?_uq<8_gM0`c*Hh|;UMz~vrg1gQXp{ufg`hM_qU;U>+zmvc5blCLSq@PrEBSGR# z&8=2Z4uXN`F3p73ueD1l{s{k$WipAvSh5W7ABe?4)t;r@V?y`bNB5FvBuE|0VRTb< zM1Hn^?DSsJY+sX@T5xW=#>T9VEV|?<(=6|ge$X6Sb05!LFdjDcoq*gM(Zq=t;_)Le&jyt(&9jzR73noru`a# zN*<`KwGa^gZU3-)MSLF0aFag#f0<>E(bYTeHmtdbns#|I)-$)mJ`q9ctQ8g0=ET?| zdO}eZ*b_p>ygRTtR^5Ggdam=Zb5wmd{}np+Jn1d_=M`~P=M67jj})fH4ztb5yQqQW z^C|C&^LHAK-u+ooIK)yM)QM?t;|<{P;;{`p=BclzAN#JzL4jCwXkQB1Dy{=^KR`=~ zTrr)y7eiYBzSNs_DvO=4A6#EgGS-zY%Vi)N*Yb`U;6o}KR}dq{r9pT5wqZ@3NOE8- z9-(}D|Nc5732CSYQbL)!gPQ#RbD8BhK3dl{sUuPvei0tkvnJBxDEAYTesU8H$)g(Plra{VH(v3u^CO1~(+ zU0O7#)jaS4{NcwA+LuSm&VBcX2#Im3xg)W}ySNw%->orn1taZ&+d)}8gJTqA!u|5P z{yv?zol_3|(1(%M(EVU=cp?L`{Pi|ixk{U)*guFML3P!OSlz;zGA#T+E@8@cgQ_mv1o7RSU=Zo_82F?&&2r;WE z@wk}JHYEZ9nYUc(Vv~iTCa3u8e4q(yq<29VoNbKk|`mq%I6u)My=gPIDuUb&lzf4`MEA9^g8u z)vp8|$$HE9m_BTV?lOosIGa4jud=jIbw)O2eCMfyw2*S8?hjWw^nqws$O*M$3I1)x zR0PWFb3$ySOcGTe1dz%N0l;RPc`x%05FtT^f^j{YCP}*Q=lvp4$ZXrTZQHhO+w%wJn3c8j%+5C3UAFD&%8dBl_qi9D5g8fry}6Ev z2_Q~)5^N$!IU`BPh1O|=BxQ#*C5*}`lluC515$lxc-vNC)IgW=K|=z7o%cWFpndn= zX}f{`!VK02_kU+Q5a3m37J;c} zTzbxteE{GNf?yLt5X=Bzc-mio^Up0nunMCgp*ZJ;%MJvPM3QK)BryP(_v@ei4UvHr z6+sbCifQaOkL6-;5fL8$W($zZ_;CZp305C;~$hhRquZr-r)jjd1z z31%ZK{-(`P#|Um_Sivn@p$-vz46uqT>QG0B1w9znfS9A8PB2LaHdzA|_)yjXVR*l{ zkcu3@vEf7bxH0nkh`q?8FmoO_Ucui*>_a~P?qQrlZ9@+D7%MTpSnztpylXrt5!-k8_QPB?YL8Kx_On8WD zgT+111d(Op$^$&KLAN5+@?>f7F4~wFi(8TL8+szgVmcMDTp5l&k6~=rA{Dt}!gb^r zSWY<)M7D|Z2P0cEodj6E42PV>&>DFmQpgt)E-|#sSUU@uKed+F680H@<;-x{p|nuH4!_mn85rx>wz;0mPi2ZkL#k6;sznu?cXh!T0S>{w6 zL^gvR05NY64l*<+_L>On$rjx9!US;l;LX6@z}yi#2XHh)F@Oo+l)h%fq$v}DNmF2> zfs^_t0)3N-W<9-N?uedVv{)-J0W5mh#29QM5R5h&KuiRM=0Zvnf#lF=K#WlCgc#9c zS;qvh(P$!_a8JwyhI^ZJV2k+B6Z^64?w|1?5gyo6y{}923CRZfYVe1#?F% z7h2SUiNO3;T#JUOyovSs@@C1GtwipycA=*x5{BpIZ_#GCMuV8XK=x;qCNy{d7?wA~ zC+=vjls;ci&zW=6$H~4^K%v{p}Ab?U%C6Z4p%eC<3ExqU$XR<}LLF67A$Sr20DR_pJ3yeBa~ z^sw{V0FI5;UpwXsScYuhbqGQ`YQ25;6p6W^+tgL&;Ml;>S3CGpSZ>VrTn0m1$y$HU z&65)I!c?oREz};c=nLCliriqQX->4uivHTgd${GqeAlf*!P^B|jkU|*IdNP(&6C>4 zqOW$)Nw9nvjy^&`?E|gotDV{JmJ9Q~vuhy<`^C4XIUDt|j4o6rK^e8_(=YqC zuaR6TRVf@tUFHB079o4MBIh{M~4>WwnGgesQH*3?w(RA%hCZ*7)b!aNV=yOQ%o_Y=Lt0Sl*(9^jfRnC210Om$=y>*o|3z} zAR&vAdrB#mWoaB0fJSw9xw|Am$fzK>rx-~R#7IFSAwdu_EI|SRfB*yl0w8oX09H^q zAjl2?0I)v*odGJ40FVGaF&2qJq9Gv`>V>2r0|c`GX8h>CX8eHcOy>S0@<;M3<_6UM z7yCEpug5NZL!H_0>Hg_HasQGxR`rY&Z{geOy?N92Z z{lER^um|$*?*G63*njwc(R?NT)Bei*3jVzR>FWUDb^gKhtL4A=kE_1p-%Fo2`!8M} z(0AjuCiS;G{?*^1tB-uY%=)SRx&D)pK4u@>f6@KPe3}2j_har$>HqzH;UCR^ssFD0 z7h+VLO4o@_Yt>>AeaZKUxqyvxWCAjKB>qjQ30UA)#w z&=RmdwlT`7a8J8Yae=7*c8XL|{@%wA8uvCqfsNX^?UZsS>wX}QD{K}ad4y~iO*p%4 z_cS{u7Ek%?WV6em2(U9#d8(&JDirb^u~7wK4+xP$iiI6IlD|a&S)6o=kG;59N|>K1 zn(0mUqbG3YIY7dQd+*4~)`!S9m7H6HP6YcKHhBc#b%1L}VIisp%;TckEkcu0>lo@u995$<*Em;XNodjTiCdC%R+TX|_ZR#|1`RR|`^@Teh zl#w@8fI1FTx2Dy+{blUT{`^kY*V-AZUd?ZZqCS4gW(kY5?retkLbF=>p=59Nl|=sf zo1Pc|{{N4>5nt#627ylGF`3n>X%`w%bw-Y~zWM_{Si$dc82|=YhISal{N7OY?O`C4 zD|qb}6nLWJ`hUyL+E>-;ricg9J@ZNYP(x(Sct&OI$Y!QWr*=^VN;G3#i>^1n4e#Je zOVhbFbLpXVu*16enDM+ic;97@R~u&kh__kgP#!R`*rQEnA+_dLkNP~L`0alC|J;c; zeiK=s8;BsLE)KbG3BD&Br@(Ha@SBT&$?xX`=$;eeel=|R_dIr6-Ro?=HEjnsJ_b`1 zK6Yg^-6;^2aW!xeTK)A~3Rm|L^FCHB_I>jIju7ZGo&N_1*QHkxH2!!%@o4iZ?vntS;&zJdPe1dH#04YD93A44o-MpfD zP{rn_aq>U%RDvC2+bp;xPlsOzauIi3*Lf42`jVKKZCRuKdYhi>FDuL2l=v{$BCN#Q6796s%r-AG$Q^t(3c@ zD?w0UhYr11@feiyl9kY_@H8~|xlmO<8PfQmj1!$@WieW@VxR@Psxfe-v9WCi1+f>F4VL?0O~K7T?m4-u|pSkBpUJZZe*16_wAp zSYZ@;k`3;W3UHKUWc8QeI}0jH5Ly=cGWQPw(Kr2fm=-5L(d`lcXofy8tJY3@Tuadz zYWXR{mW7XT!RF#RVCe%}=tM*O6!AD3^(!8un~opNI%Uko7$5t@<8+?; zTxDys(MyyGsUjtSu9$+|_-t!U3fVb1dkK?l`17<+jfl=hrBHnDSV>^R1=TnQeyqbW z>ov#l%!1|S!1>8UUxIdhQq`_klcHVx0{?#>K3#$4GlXncwldt!g17TcvKq-jo_996 z>oA=tH9CqRl6Yw?Uc`am!V?lHJbizOJaVaScf1UP5e7Dbgabq=b!B~T&_F6?ooU>w%x0A zH~&MHJ=q`fCH{U<7MDXE4SD32cDZA)WJeWkllJ`UspWaS#eDe^kg^oU_A14UE9zG-a^g{xaXf$})Wik>gT zl#dkzGr(;h0JZDuFn(+k8wNq?PZ5grQ<+sM?wBGt@JnH6v0#or-5wBQWKU~(S_> zkE!tc*ZJ1Y&*p(xX84POb3cClRMd!^qJ#CAZfIepEj-<`VURS_yCz0(?*Ixcj4 z-!zV1_QZhpm=0<;*(nm+F>T=)o?ep@CK5I%g^VAA+RB25ab?7)A~z~egru=I1S|@v zH7tXV!0wmGS^qj#e+MY;C5eUjEAp$Y?LDkS^QPZ}8WN85?r$u<-Epi;yZ1|J2J`se z$D6DpH~2F=eI0B&=UFAUnJvZAmClJlK)sutJ?M>xpZiWV&0=G4MZP+x+p>EX=HbCz zxls%Mw?*u^;LbHWIWCyq+yi)`GmFn9J112CZda_u@YIP%i;srFg_paU02Ifij*7}l z&CF-(3|>*a|+vbNR`^RP=9G?ymEJ0Z~)d&c*UE$UMepZ zcITr{0WqhxkjUnM15js_gW=e3Uh|y6ZReaXHIz-=p`x5VvB&rH9y>Amv@^WmXFEw) zQXYrk3feir=a{jMQ+wDIkkFnZ$k{sJakHn*?u za%4b!00ev8NVLM1TY=cl?KB&55BY_MU-sg?c>=Dbz_W{(Z~c?HJi*XpYL)C6Bd8WH zt+v-#0&o~@t4qESi*)+eW%@VD0|o^yF)n0hME$UtXF$*Lvh}7sso{`|pn*JDIy5^Fm3s$5*zEE=?u5<=l8FJc3r%+H} zdfoNl2J0^~!-*mOL5o-x32|e0Im*E!yY7F7E5N)W3>+v_LBydlEx?4$RL5f2oYRD# zaR0wv(-p~wO0eLDl3K=%`{5+0Gd$ktO=W)gWlGZJ0`K z$_RNA=ckrfa;H0KA~dR^p�(p-{x$&=IACIfoAR!za)F-^da-t3#0Dycnp zwO~NVXwXCl;jE<}>%@xz|=8fIJAB?>+E{7)|4l${4ngA3G|=r z2Dyv;VVWSgZx9Wj>qUjleGl3Ei9K4>h!(lPS%8VOG>Xu0%6VDz^O=bjJmuP7>DeUv zrbI}MlHB^^d?{zv6d=@_ZD2lg1&G7UjnVN{1}9WkaM3H~btX0GtSzB+tZ^qRgWo4m z!GmimlG$=wgXCnr6j@m<1gAL46#T~5Bnm=2{^@>|t&`9mkEPddj zAvG~@Tv~TAm2i%VW}R-g(Z0)z-Y|szHr@rk>4MAyG*Ma*7Yh#H7(!-5>DZ@8r;_dx z{prSe<>~099F8vsYd2xff7uAS%7{S)f(|@me3t2$iy&NEc7OUEchp@9A|X;;IA>8!oX+y(BKJ$EzV* znR$z;!L$s7uy@{OT~nG#B!NRraT8(X##Ho!0r_o@gg0CA-9H^;-uE&?$2$nHv_00o z%cbuUc-tCx$Uh&EZ4Nf4Zgqv)Y6>usG3>GeQnxx_Z6+PcbX-+ysbt1hQ`K1LDpOE? zrAhIZhSN9yVIAOa22gn577tbc&i3|3V8NWy&!tw##`}9*x}gtI^h1DzZRA>UuaJG) zaZ7j)dq!O}{?#8Y7~7i6fHh4{`pL?>-18|p!S75Y#^DM>-S3)vuZG+Q7l@ek zQP~#cBpWgg#mApc_sPYjpw8odQuRokmTkzcNl`^CcKB7e&;zViV;{Y{o^Y$%7i0m# z62%#1Lq!RC?}lK>%mp}T!3Xv;L*0v*>USLm``N%>w>@fwC+#T&Tx2bN4w(20JB}oU zuSa6v^kXi0xPs?pbaOHnyiqq6By1EZY9OZ^^QA>{q-Hsd&m`pbQ%8121aWG-F5xf zlZ%;B{;C>X19|`^_?dVyCq>n+41w7|!tUS!{9rHlbhX=SZO5CQ^;!Du_E7*`GiR^Q w)2!4MKjfSAeNo!9>IaV6aUZ*?W>} zs4%E?srLW`CJh0GCIK@hTkrW7A15Iu%N&?Q^$0+!{Tv&|t^Y@u%!L zglTg&?Q5q#ijZ;&HBQ?FNPp;k3J5!&{^+SGq?AX~SiOM9jJMRpyP?RCr@z38AQyy&WRMaC;n4una$~nJKSp?q|s8F00c9?Q! zY_ovvjTFm+DeQM^LXJ#v0}6HRt3R1%5PT*}W!k8BEM;Jrj8dIceFo2fhzTqaB3KKk zGlCLI)gU25(#u6ch6GeB1k@eHq7l{EHXv0n6xE#ws#ri}08kkCf8hUt{|Ejb`2YW* zvg}0nSSX1m=76s?sZhRY$K=3dpJ+y*eDULGnL2}4>4nvW^7_<~wIM_5fjvwt4h1|g z)g0Z6ZFq9j<~9~b8((~TN{Z?ZQfw|is&Xp~AC61sj;xItKyCHdI|tCMC_LbXF>~vR z=w6V3^H=W4CbAgR4#xw}ETTwu2guW~=Crl@SMXv85jQ=%y!s^?m4PI0My7MWICO;- z175jm%&PcPWh8QdOU(#8bp4!N7ET-+)N}N2zk2)8ch|4Q&lPFNQgT-thu053`r*h3 z_8dI@G;`zn;lH$zX3RzIk`E8~`J=BBdR}qD%n@vVG1834)!pS1Y?zVkJGtsa(sB~y zNfMYKsOJb%5J(0ivK8d+l2D2y&5X!cg3BG!AJ}910|_${nF}sC1QF^nLIhzXk-Y#x z0)&1iK!O;Og0Ky!;`b~v%b$`S4E&fB)1NB4v@8wr( z&+NX4e^&o)ecb=)dd~C!{(1e6t?&9j{l8%U*k4)?`(L3;Qjw z#w7FS+U(94MaJKS!J9O8^$)36_J8;thW#2$y9i{bB{?M{QS_inZIJ!jwqAbfXYVd$ zQ5fC$6Nc9hFi8m^;oI-%C#BS|c8vy+@{jx6hFcf^_;2VRgkoN(0h!_VSGmgNPRsxI z8$rTo0LaYq-H5i&gtj81=&xU?H-Y2==G@uQV7E`@+2E9XQW@{&j`?EOktk|Ho{HU>ZqDzvgjwBmdex z&uZNd2C1h{{}2k6Ys9$*nFP3;K%u!MhW`uZy7Sn`1M1zs@Es&;z*Z>Gsh@-3Fe6pE zQD2@cqF((NrRevgvLsvM_8;;iNyJ5nyPyy?e!kvKjGj`6diRFBEe49Oa7wwkJFV7Z z$YT&DWloYu-H?3<0BKn9L&JYDT-SK~*6c5pi18P26$JESKRYj{T7Zk6KiRJcbvOO*{P56Q6s8msbeI3>|j>K9}Q9UBeq*inXKemCm`-<5|-$ZyN4u$(3 z&HcvqehFD%5Yrmykg-^d`=BSa8(i=>ZoC77^mWY{evp(km@aHqhUECBz76YiR+VYK zY_avFC~V3$=`6C4JhfHAQ@DZtUOwH`L;oYX6zK0-uI^?hS$ALfq}A7evR;ohJHij} zHSZdW?EKv9U1s4oD*<(0oQ*;MaQ6@cvGL zuHCPgm_NhVsgp^sfr*ia^Db}swo1?O(_Q2)y+S$CBm+g=9wCOUPbz(x)_GbaKa@A7 zuI&!ynLiZRT#V%_y_-D`0Z5lT*auoe{(U5NylTzFSJW()W-#F6*&A`LNO1bV#Y;QJ zSbLBnp|B^dtK|KIWC|No>JjWBWE@n7O)x{&^E(WMeMvp57#qA8m* zeTow*U@_86B#Fm*rxyYu5PRWaWHx8y> z*qmHEp(AMDl0v)ij(AY8fnH=~ZwwjVAbu*m5;xPfidh@ov6d8g zfJsi&!QyK53Es%sC39ts;54V68koALD4b|%tNHW0bIkZAJKa=W&FomJSEDT>W1xIX z1x%Z>AvNIsSPLcn3RTcHXb@KB?cuM)=x6fcIx>&(GxqZ8w3p#jJ(GVgc*`c0HG}dv zIop&Qim!K1NFwic%07KcjWgHBPUkq7f~lj;TPqVGTiT#cUeim>;nY`>h@a*S{qQex zQ`z62WK|Mj)Y{tfF{;T4P;c8$Q|KU?Joh zIkA^z%X7z|r>4aTh@|StTi!-r1D!g=zb#3d#{{&K3CqE$Iz-UH<%37c zRfkO`&uM%#AD3PHv`g5t0e^O%nVL0d{Xlx^EjEC3#skF@`zl-7PF^0oxW)1!C!JxR zWvuAHH?)61FKA1QeT*_sY7;_Id#!GmV4n`MO{~sv}VLSK` zXRw=Y=Clz*00B(5y^K;gCZMAzjT5+c3IC=)l(9VIDdatpxj3y89WwI|bH&$!ZEvp` zPR!T@#!(|KfI-w?!&+7$N3F6>tD{YO4Qg$d_`nNEdfVCha9vaPn0jI0`)`@*72hq! zpU5ND^P*RoEkbD5o#az(-g=Y)L>HH>Oc%}$ zT3Rs_ih0;4+Lv4Y;@Iv(;fUbQ=i-G(#>vghec~*j(I#r|5mqFiJBpzi&hzEcD{u$< zRsm0BVYn=pT;0>R(itW|*D&;O%bOc7et9ACaH#J>z3A1A~6fdP>pmbM%xzm4>|;c_?B+%sl;Qs2{t!60$^u zH1t@9^6>;?!FuusnISi$f5CL&;z?EqJN$FBuWDA#D5`cy_UvCFIVvf{c?4N0teh;d zET$7aVbj08KTQS!x?Nd1Is8q8qFzs}a=!@nJ;7FSfCY^T@D-gpw`w<6e#X3+;O}1h z$%I!M)0bg|EKUA04Qjn@+x{Rj8vt6Wn!R|3A92z}^$KfF5(#CWr4y#~re1CN4i4w0 z#GsypBR{xA3Er7sgAi(|}1-W?s~n$7?K|9WL8kpVfw-;#b9 z+mn;=ep!162U5R>_t}fOt~tE?s#m( zO-S$7>Ay6*hHdZ)7_oU915WYYCIX;hFI-U2EWYX!pllONr@Q--2o~`!isi6vTPLJ4@(|o=%NHYjo0_S&q*UQIROw@*N-By@PaQ&;YxFZ0aR zX&}LeOEz);#m~Hwm^VAY8DK}b$F4bo{jMN?d!lxKPhNklzr^Cd`0f4oJr^z=I|l`* zm8AHm*fPV`0=lF3Pnnp}&J0N1X@}-D94YvmUabFrLGSnTz7Mu^21F#O5tN#CuY9Vh zUZBH=ez%h*wkf0hBtXJh1SN3d+IF{gzT7lp)j}n?03lt;XSQRAh7qd&v;RwTYDuQ# zbI2*r<>?x-G0@hM{;%{VBD7nLKt~D`T~-HAt5;h%i0_=Ifs=yHma5dhJ+QMG?Ux(a z|E?1CMy1!~oA`FP!k~iG=t&5#>bVdz=peT8HMB6Y)#7PpETtNryT^+Rv3vpJaF^zP z{H}0-LyV9Fu21ID%wO9f1IKlFr1p4c{o-?03vyB-tr5duk^&L$;m_|f$vs`^Sl{j2 z95}oY{LlY+=ZS%J+tZoXCd0*sSU7w^gjovXn+g7uyra5{cU49@yHf#Z^Jl-$9cIfo z+AJuxH$VLb=#+uBbVmUjnx zxb1pZ@-O9=AIk4@S)m6fJ2?{HrNYwwnL3a45muuNjr;6$O`bGEM0T4A2_S$t=86*- zcO+0mywg*j#A4mU}enR_!cGmIYQ;qwfchWtFEXL)AK%*;=j znYne+hS4EMy3S)C*mZ1KI>!+)0V@9!N6H$Y}~MJ{rYuf zz^KljIWvFi-?#?V@LPR&c6Nn{!=XM z>}-h$S76;$H{E{Y%@^zlmOl^efBwa%UU+jJD9UVukQ3ti_kH-?H*RC0?M1W%FCvMB zM_+v6fk$6X2sx)-p~B3&Kl{nscK}pNLM*qjtpaf9>AU{-iPKQZR8yCg!TY}Qg*(;) z)gdvCcB%kppZc$VdvsK@)3l1{&DG!d_6OHOS`y=ITLEVu`unSKA2E%JD*DVX{LJ}K z9l>hMRDqxQh0lnpGHpVYneX}eA3Pt|2v%=q;rt)``R|#bDyB)OXY&vI_@|*}h}G?^ z@aZ4_!7cQPX`!fW_?{oT1NTwHs#l5L-0`E|y@48<3Q^HFf8=Idi zpJYD%1MkII!~|7I^WGo)IF=?{>ACnjJ_WUi39C}!Q{QnheVJqeKKqq5^o5CBde(g9 zvw$X6^jz_^E2$wSw4!q5*RG(C2_^XO$HBn_55vbl44OnTTRwRaePP0vo{K)U1#99& z<>rq7V&V(<&@I%MFoN5zrY}sz=(*-L&}1QQ*a%`u25h{cFj===17eB_uGuzG&byQ< zrm8BJZl4r_E$3k|Wo6FW0-6M7>qac5uFQsQcmkLWGfeH74S3Z_rJ!jgN++!@i=HW8 zkyjI(oPH-+-N#Qc^-mpNO`bc6r=2-<%&Wy5K1vfFJB(L_IkpS6fY^NmuL8qsgj>MD zn~BHH9WM~32_3vd=W&B)k7F9q%stJx+b_L_X-4zr^LVUMCmyCTA3sWtkvsmME?Xiy z?xOSfB=_$oY06~J-HcCq&)qcW{j;uP;?Dm}=hkq?zh&n!;m((-G-u_t|6x399Q;>A zgNpxoJNj{u|MFDH7Rhq@FCAl0dE|ddnl!oh9{Lq?@JDoR6L;C941IK`ISfdE$4S zE0AUQ8+2|Ncl_q5QkSp#AODp~(^mfP&%Au@@|TBQwoP`UU+V{6u8|)6ZA{~uKmQ*M zmrMTDU8S~8Eqi{^v0Ug&5Upcm#y7Z1(RbgZAG8jB$eRwCspQ)>5;U)oGZ&E5aeR*K z8Yt`Y0$G))Yd(Y3KH}tA4`-_QmNke5hU_|nq=xtyjwW(_o?itz>B>WM&^63bNdQ)k@-IgDHW*RW$Xo9#RzrTrCn7L2H{9Amq|qNg@#eZY=|P zCoI?2s+L)zsM%WX(NbVEY^`C>lFjIBYmJ6@DKJ0ZT4&F&WHW!dwa%QzOG!?jY_2(S zDcEzZbz*2Q!43|z))9yOP9X1Xt%DXzwY(3tl-TR=Qb_MbZYRrooh;dYYmS!U_as1(=YVB?Q_A|tNu5Ut&_q3jbfDM zoFxT^uEuH`nX3*sB%K?GuHUkweYReBwnHqh3P)~`+s3+Tj!rDA1e)8vuBv5J*IsxC zkd^~b(aGzArj08{>cnzOuy04C+C`}gb|Yz-1avxeWzev3NzcHbz_&4W@QCr$z3~w=8Ua- z`;vfG1~BP8CyLb=F7t1am~ph_#|O%$khSJ9%Vtcn)YmpgQxF?xM^_Vb+5fnpB^W0I`f%X8gb9#X{Q-yJG0{Z56aWeI&zPxnf5pdJA38bM`cYnS#x)% z`n1tFf$i)W-hGm(f9mde^=X@NcV_lFb=P`4&CI&H=IArijGwdCk&X@uQ$5xmj!~^? z#$ROCI)V-~t%L%GS#wo@U27ddR`4`3)WoB{R-4snfNrfee|kI8^bu#yDgYqOwas9# zmcb`3!kRJ`Cr=_tq)8aMt{aGtUZsqwVlj6DgCGre>AEt&x8H_in!x@uwgExIh|-mA zjdaC(29~CTVSaaF7HPbql&*9Uo8P@f)>LqCXclr}peS7_1BQ28u9PO8Eq1@`l3q9o zkfKCaO2?T?ZyA6loW<#9_c^O=m<&h}CA!ineAD@=(gbq`vyT|tiJ6#^B1$P;;qax` z55k&Q?wEh#87niLo*+n4L@65J(Nz~=Ya%7^(miLb(E>A3B@|Jjl;FU&D>o|9#7PJH z?|ago!o;WC^h=|T7PVBg(DAB}72cyUS zb(f>Bwbr!F1eTCO5fpj<{PqhY5>143p?~5ZA5H40);=@M#MYvrB6gqHbU_!GSY??i z%s=>-ciA4*zOOZHds0a(kWewZ4h(k8h(ua7HX)Au&mY~H8KY6(_cb$_&fA@QjIW-*heP3%$d!m5^AdnT}`12qA^c@!g3DOwZ5WwE2?)-yU z!)Vx#Mtxt?FzFTwK!77sy7)sMzUd->w4^bxtpM2j!b1pjgyk zGKwWGeb4)^zjy{9Es&PU1}gwg?|J#L$KJB7ett9@4M%-nGtIQr0>Fl@8-yh`-+1ed zS6r}(MeSvgSoFmH*_WPu@i?}!AB~2?;i&IxrkNg~cQ9Som98tcq)k^|eeER|Zl77t za-TVUc;DNvzVXJ%w52+#weN?+;i#{f#!Oc&z?81*N>^e~ltRS%ZI@lR{rs()HmqG! zx*}ZrI-EZ}ckJMiy>A^oofwDfC~IH)z8{VHKGT@#E5I(Ll&+MnMCl>~AV7+>Gi%mF zkU1QlKASdR0B80!YhP<$Ywi0?W2Ux45oPfxv9QolWzJPD^weBfvo4SONxP35106sAmh(e+vAs0GboFD@PvNs)jNPvarhW}0YliZEg{Gazv z+JDIpoojRVPr<*C|BTq<`6ga{5q^8^!|0cxe=rZ!zxH3%f5ZO0cQ*Z<^$Yt2{|Ek0 zyT|*F+CO@K;(owBKtGg!S^xj-Z~rga2m6nxKl9J=fBSuNKW_dLKWhJKeg^-Xe`^1? z`TyJj)8E!#>_3Y?uKrwqq3LJ#SGU>AzUO|6`nR^u&3FNN_jGOc zw)Nw`wr3yIKhgcee6IaN=ws>M{6677%)hPwx&HzC(f&u~&)6@b2kNRzBDQAP0*H73 zq%McOmRk{B3i47qRe=DA*$&odrbEJZ*pV9XXa&p@wlW~@Yfs>V{yiTtplMhgM*-Bz zsSnlq&pG;z0OUN%$~$3=g1UF+G*>+17eRbBf3=y79J}KR8owon@$1Z7MIrvvWWH)34nK2SD)GsrJ{l z1Cl#oVo3A8qY3e=aF)qzms~FG#2$LzT=gs&aVMOj>(%{y<&O0cG!nCiESl~x=^dF{ zKvj8F1K8Ng171wwM5Fh4KoQw`_c6#y$(5cAm7e}~nJ#A*fx+c9;y#&W!#VukR)ugk zKp3=+;Ut+IYn%m+r4d*<`L2h%aDnX5}^!5R|H;(34AoVWjRx(msBZvk;rCI*|~ zdOijqI@9Z{Vu!~jvHW{lBa$rnl4+!s_5sfK3bCGk-B%iDe&@-}+%fOKU|(9?V1 zHE8&@4z)Kx!RAvAs z!Wic9=o#(bg?kc-G68-m(jZ`^=XGUXb)}t(%&~sjFnV^sEX%hSy6UKC4iOhgV=BHV z2w`4g7Y=s#Vu2B_?#VQ|hP39@eArgfX>-0S+dd&^mx0*wp}>)x;c4RUgxz%;oNe?& z-7-lJ@Y^2^C;=qJsxx5|xF)*pTGhch2B&kxtn;f!7=gznk}I3}Dh}(CoMXgA5-p&kS202!l?!fT3t|HG*rIP~mS* z$Wjo}jq3}z$Qq!9yrtd3fM0N629ZM?LU$nv@Tv9b7I;D|;0H2dsA~g7Z7zp1| zB)XmrkMgF6OQr|R)HHD^TE{Y#j!~SR?b`Xt3Qs`B+x<hxexYeAjMUWdZ-*n9%(1)Wb(n2U<><7&9dwGJmrob)4%H? zlQ%z+L-^$dFhhH|@u$%97Qz?*Ynh2VG@q|?8vY&L74&fs&_b&3$x&Oyjl~LQDRRap zJU4U*R+(2Dd!G+lh8!V{pT_UJn+^1Qg6$` zqkNm(a#hWyc6SP+p5=C4HL8-m`pO`5o~`-LI?_h5CsH?F_%?nDodmz&pWR20WTpJE z?N|wSzLjMUK8E)a2tI}Lf;+;*M|h3Y(U#>)g1>zk9|Hd}oZAa2 zLYBWBoSW!Ts!RwXr^8h+U*@{9{zqS^iH)Op<;r`Uw~nc}<^$V~_i%$GFjaG?X1@E|M`h)nekvFKt`Dh-f>@|0-`Xoq)o` zx;JmzDfOV9qCx|EVpogEe0LK~tGS?5$$L_i6P$P6wIsCQaP_;d{{N=iV@+8LI}o#( zvo*Ejy=IIn{rdIQh1&q-{EuohpVOjJ^Q3lD*YTp37$^RRgn8ihpdu5{Ct%5-KO!VL zcNB6dUajXI9jkm-P|i3~GB-A(X`P1Oqqb$tcku)UJw0w3GeUijb__#QT4j%64z%EeB7S?jlWwx_7&+EEvB|6N=kV}DwnyAlX=?j`) zmU#!$*^@NIu#n_d7;WoJV@*Fbv9|yJO4;n|BNF2xy(54RyB>t~8lUOUW$&2%Nwi1y zx6JxW88>U2$#qhl^6KUbtmg9}D0o5vYDT7kWJthLGkpGnN4T>{St^_EU>4;DmLF9o zr|LqsA8_MoNLQ=}w?8u!ziSZ@PC#Y<#9uJFo-ozVo6D;<8j^1$c|qAE3ZTE5i~zmE z$BU5lw6l=EWsg^y^;8>r9qH{xfL|~PZYK#md$zZ0?o11gV<*WSW~cgy2GYGQir%wf zt4iW8D+;s*;RGrmd(-T<@2&j(Cb9xhV*l-x`TpK`xq|7p?5R%5*s!69?2c!cC*VY* z2DE^9pvOPLU!1e}wA8S8opcTJ3`NB>hY=JQnL~QFXR4K8A$BqJnoEB$wn-%u@E6Mh zCfMF4kusv3N!(aHC}4)Xs^xoOwXd%e^6pi5|DZo=Q25j+6HlJ^7FodH6y1bMROR^q zGu6)fopS`h%Sw<;ZH%TEPf+#81-#_v+@8nlR0jLcIDKQtLleOC)6yLZgC!D9X3GgS zohwU{v$jl=quD#Go^hB{`@Qw*a%`(^jyT~=q^bWgGzRj;|12J55HWdCWV}EB|K=%N z3Nq-qxJJ`>^|1MNN+q}zTB&ooE3j==AgK@^UW<^oSbeALa2peF)Th6{@sj0KyMNHZ zksk1+MXN2tv+22A%cQOGpS9)77(uP9mh+!5T5ERLvF@b}$+WvXM45Z?-kCa)fb~f1 znVbTD$Gx-0Zxc`0D@YgHakge6SL0H`-vN_x?AP0>iGH0_EE&=v83hMJgaKAI0jJXm zVxVz;X<$v6WW7}fxROO7vr#YLP;;lij5VrX{;>7kK6TtOH&6|Ar^xo>00%+u$C4@# z>!jOt6*3><171+WxoZnKDTzJtDRw+T030;yI}~uV@9fCnei^I*j>Bp&mzP2d=FPb_ zCM*l_+$LDR3B*a!A$g#>xsrZvw0lckxmMg>0aQd7tPyN=t{dgXb;Ie+T8{fZH=gdu zM7Rg9c(kg(Jg0?ARRRl=AONFKrvFj)lTY$KfT%6^6s`mk*ABGhsce*LsoD>K{z_M2 ziPpnu+lw22PfF!CoId^6n*G4H(Ix+#+N{C(da7t1BYMGEaE#PdpOLxsVD5riQXHp@OX;`S`8VnpM~)I920w~<3|mo0 zf8~Az`*?2?H&gZ&*K&bRkV@qzvMlRHXys8*Ze2+1c?5o!^+$&MHxB@4Ee5cke52R! zmn7AZtY6ST%ixgU5)%$%QcwHj7Es-Qu^kLAPwy%7pGBw_4Q9#da^W2$}axNHr03)_nw z5?yuNmXrI5HgS46)c5&}B)Tts49oU92>3xBLLy}FMUW=84DQbVq^;7_e7|(Sdz|&J z73N+M`rc2rt*oSWu#7S{*s~nH6HRHJS1SmzeXk|;CA)FI4bat3<%}nkB%;;?=F>B7ms9QSxv#@+69;@>QaR?REYX4&)=itG>rM{<{A79Rmk)`5ON#GL`*KX%}Ihk3w(RtM-WLt z?f&FLF}4N^yE!(pZ&Yj&Bc`~K0@4_}*0Om?wN|}4WJ>WL;G^H2*QpgEkGA~OET-Km zkwz|5{6dnz1U<2Pe9DNL>3g5FEIvp1jzP&2K#z~j%g6!7B;^zF+o95?fV{3mnB8*RMhCDNp>Am-3e@jNfMj?jHV$MWjk!DDKP zkAz$Y?Sr)!GUOX}qTQ5aMh|wq1uq}~joWyKl=b_LboM#wi{CMuz5x6BKlA-qy++cM01D3b7`uD z#l6M4pI;JCypO8JZ6?U&wNxR!{4oB_ zlV!x9+-&Qy6{%MQ{~yoZGkKiTSC`YS_j22~G;xUV855g2&C(zm^V!(wpcm@zn{%!g z4}JGo(sGZ1O~to-}le

UmY2RIYtNPVDpE$%vda+HD#3m z&VuXJ{BK&Qe+rBa7eq}Q(bq|tn(RrJAk|ztj2(i{d>nmQnM?;HF2k&9sA6up5tmjl z7lySlzMbifH17-m-Lwa_F&e7nOH?ESi3#ckR3tsM+jsck3`oG!uMS}|eAwVXv>}qxwq?QY%QJ0}r@^;fhuUA9W z*BVl>TGo&N004@xSiwDUXUvp51sVmqO3m)=B55aPwf@0=e}cN+$-BdKxY`YrT_4)0 z_d10#i44Q*rFr8MC>*)v$EJvz``(pb{e&*6k+b zsMz%($|1+8hn8c2?P(l@;Rb&CsZeYoCI3?2!LqjbwPXW3z4G$Qfj=cT5Yb%vY0(AX oeb?AaKtwrnc|$|zzw9vfvn^aJJ!zd)XFXqqy0000001=f@-~a#s literal 0 HcmV?d00001 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..be88654 --- /dev/null +++ b/app/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + ESP32 ALDL Dashboard + \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml new file mode 100644 index 0000000..bbc3ccb --- /dev/null +++ b/app/src/main/res/values/themes.xml @@ -0,0 +1,5 @@ + + + +