root: add script for reading logs

main: working version 0.2
Merge pull request #68 from vas-dav/pinmap-hdr
2023-07-07 17:03:57 +03:00 · 2023-07-07 17:03:36 +03:00 · 2023-07-07 15:22:14 +03:00 · 2023-06-17 10:28:16 +03:00 · 2023-06-15 11:16:10 +03:00 · 2023-06-14 20:36:26 +03:00
60 changed files with 295 additions and 1123 deletions
--- a/app/.gitignore
+++ b/app/.gitignore
@ -1,15 +0,0 @@
 *.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
--- a/app/.idea/.gitignore
+++ b/app/.idea/.gitignore
@ -1,3 +0,0 @@
 # Default ignored files
 /shelf/
 /workspace.xml
--- a/app/.idea/.name
+++ b/app/.idea/.name
@ -1 +0,0 @@
 Smart Heater
--- a/app/.idea/codeStyles/Project.xml
+++ b/app/.idea/codeStyles/Project.xml
@ -1,123 +0,0 @@
 <component name="ProjectCodeStyleConfiguration">
  <code_scheme name="Project" version="173">
    <JetCodeStyleSettings>
      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
    </JetCodeStyleSettings>
    <codeStyleSettings language="XML">
      <option name="FORCE_REARRANGE_MODE" value="1" />
      <indentOptions>
        <option name="CONTINUATION_INDENT_SIZE" value="4" />
      </indentOptions>
      <arrangement>
        <rules>
          <section>
            <rule>
              <match>
                <AND>
                  <NAME>xmlns:android</NAME>
                  <XML_ATTRIBUTE />
                  <XML_NAMESPACE>^$</XML_NAMESPACE>
                </AND>
              </match>
            </rule>
          </section>
          <section>
            <rule>
              <match>
                <AND>
                  <NAME>xmlns:.*</NAME>
                  <XML_ATTRIBUTE />
                  <XML_NAMESPACE>^$</XML_NAMESPACE>
                </AND>
              </match>
              <order>BY_NAME</order>
            </rule>
          </section>
          <section>
            <rule>
              <match>
                <AND>
                  <NAME>.*:id</NAME>
                  <XML_ATTRIBUTE />
                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                </AND>
              </match>
            </rule>
          </section>
          <section>
            <rule>
              <match>
                <AND>
                  <NAME>.*:name</NAME>
                  <XML_ATTRIBUTE />
                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                </AND>
              </match>
            </rule>
          </section>
          <section>
            <rule>
              <match>
                <AND>
                  <NAME>name</NAME>
                  <XML_ATTRIBUTE />
                  <XML_NAMESPACE>^$</XML_NAMESPACE>
                </AND>
              </match>
            </rule>
          </section>
          <section>
            <rule>
              <match>
                <AND>
                  <NAME>style</NAME>
                  <XML_ATTRIBUTE />
                  <XML_NAMESPACE>^$</XML_NAMESPACE>
                </AND>
              </match>
            </rule>
          </section>
          <section>
            <rule>
              <match>
                <AND>
                  <NAME>.*</NAME>
                  <XML_ATTRIBUTE />
                  <XML_NAMESPACE>^$</XML_NAMESPACE>
                </AND>
              </match>
              <order>BY_NAME</order>
            </rule>
          </section>
          <section>
            <rule>
              <match>
                <AND>
                  <NAME>.*</NAME>
                  <XML_ATTRIBUTE />
                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                </AND>
              </match>
              <order>ANDROID_ATTRIBUTE_ORDER</order>
            </rule>
          </section>
          <section>
            <rule>
              <match>
                <AND>
                  <NAME>.*</NAME>
                  <XML_ATTRIBUTE />
                  <XML_NAMESPACE>.*</XML_NAMESPACE>
                </AND>
              </match>
              <order>BY_NAME</order>
            </rule>
          </section>
        </rules>
      </arrangement>
    </codeStyleSettings>
    <codeStyleSettings language="kotlin">
      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
    </codeStyleSettings>
  </code_scheme>
 </component>
--- a/app/.idea/codeStyles/codeStyleConfig.xml
+++ b/app/.idea/codeStyles/codeStyleConfig.xml
@ -1,5 +0,0 @@
 <component name="ProjectCodeStyleConfiguration">
  <state>
    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
  </state>
 </component>
--- a/app/.idea/compiler.xml
+++ b/app/.idea/compiler.xml
@ -1,6 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
  <component name="CompilerConfiguration">
    <bytecodeTargetLevel target="17" />
  </component>
 </project>
--- a/app/.idea/gradle.xml
+++ b/app/.idea/gradle.xml
@ -1,19 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
  <component name="GradleMigrationSettings" migrationVersion="1" />
  <component name="GradleSettings">
    <option name="linkedExternalProjectsSettings">
      <GradleProjectSettings>
        <option name="testRunner" value="GRADLE" />
        <option name="distributionType" value="DEFAULT_WRAPPED" />
        <option name="externalProjectPath" value="$PROJECT_DIR$" />
        <option name="modules">
          <set>
            <option value="$PROJECT_DIR$" />
            <option value="$PROJECT_DIR$/app" />
          </set>
        </option>
      </GradleProjectSettings>
    </option>
  </component>
 </project>
--- a/app/.idea/kotlinc.xml
+++ b/app/.idea/kotlinc.xml
@ -1,6 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
  <component name="KotlinJpsPluginSettings">
    <option name="version" value="1.7.20" />
  </component>
 </project>
--- a/app/.idea/misc.xml
+++ b/app/.idea/misc.xml
@ -1,9 +0,0 @@
 <project version="4">
  <component name="ExternalStorageConfigurationManager" enabled="true" />
  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
    <output url="file://$PROJECT_DIR$/build/classes" />
  </component>
  <component name="ProjectType">
    <option name="id" value="Android" />
  </component>
 </project>
--- a/app/.idea/vcs.xml
+++ b/app/.idea/vcs.xml
@ -1,6 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
  <component name="VcsDirectoryMappings">
    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
  </component>
 </project>
--- a/app/app/.gitignore
+++ b/app/app/.gitignore
@ -1 +0,0 @@
 /build
--- a/app/app/build.gradle
+++ b/app/app/build.gradle
@ -1,67 +0,0 @@
 plugins {
    id 'com.android.application'
    id 'org.jetbrains.kotlin.android'
 }
 android {
    namespace 'com.example.smartheater'
    compileSdk 33
    defaultConfig {
        applicationId "com.example.smartheater"
        minSdk 27
        targetSdk 33
        versionCode 1
        versionName "1.0"
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
        vectorDrawables {
            useSupportLibrary true
        }
    }
    buildTypes {
        release {
            minifyEnabled false
            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
        }
    }
    compileOptions {
        sourceCompatibility JavaVersion.VERSION_1_8
        targetCompatibility JavaVersion.VERSION_1_8
    }
    kotlinOptions {
        jvmTarget = '1.8'
    }
    buildFeatures {
        compose true
    }
    composeOptions {
        kotlinCompilerExtensionVersion '1.3.2'
    }
    packagingOptions {
        resources {
            excludes += '/META-INF/{AL2.0,LGPL2.1}'
        }
    }
 }
 dependencies {
    implementation 'androidx.core:core-ktx:1.8.0'
    implementation platform('org.jetbrains.kotlin:kotlin-bom:1.8.0')
    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.1'
    implementation 'androidx.activity:activity-compose:1.5.1'
    implementation platform('androidx.compose:compose-bom:2022.10.00')
    implementation 'androidx.compose.ui:ui'
    implementation 'androidx.compose.ui:ui-graphics'
    implementation 'androidx.compose.ui:ui-tooling-preview'
    implementation 'androidx.compose.material3:material3'
    testImplementation 'junit:junit:4.13.2'
    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
    androidTestImplementation platform('androidx.compose:compose-bom:2022.10.00')
    androidTestImplementation 'androidx.compose.ui:ui-test-junit4'
    debugImplementation 'androidx.compose.ui:ui-tooling'
    debugImplementation 'androidx.compose.ui:ui-test-manifest'
 }
--- a/app/app/proguard-rules.pro
+++ b/app/app/proguard-rules.pro
@ -1,21 +0,0 @@
 # Add project specific ProGuard rules here.
 # You can control the set of applied configuration files using the
 # proguardFiles setting in build.gradle.
 #
 # For more details, see
 #   http://developer.android.com/guide/developing/tools/proguard.html
 # If your project uses WebView with JS, uncomment the following
 # and specify the fully qualified class name to the JavaScript interface
 # class:
 #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
 #   public *;
 #}
 # Uncomment this to preserve the line number information for
 # debugging stack traces.
 #-keepattributes SourceFile,LineNumberTable
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
--- a/app/app/src/androidTest/java/com/example/smartheater/ExampleInstrumentedTest.kt
+++ b/app/app/src/androidTest/java/com/example/smartheater/ExampleInstrumentedTest.kt
@ -1,24 +0,0 @@
 package com.example.smartheater
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.Assert.*
 /**
 * Instrumented test, which will execute on an Android device.
 *
 * See [testing documentation](http://d.android.com/tools/testing).
 */
@RunWith(AndroidJUnit4::class)
 class ExampleInstrumentedTest {
    @Test
    fun useAppContext() {
        // Context of the app under test.
        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
        assertEquals("com.example.smartheater", appContext.packageName)
    }
 }
--- a/app/app/src/main/AndroidManifest.xml
+++ b/app/app/src/main/AndroidManifest.xml
@ -1,28 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:tools="http://schemas.android.com/tools">
    <application
        android:allowBackup="true"
        android:dataExtractionRules="@xml/data_extraction_rules"
        android:fullBackupContent="@xml/backup_rules"
        android:icon="@mipmap/ic_launcher"
        android:label="@string/app_name"
        android:roundIcon="@mipmap/ic_launcher_round"
        android:supportsRtl="true"
        android:theme="@style/Theme.SmartHeater"
        tools:targetApi="31">
        <activity
            android:name=".MainActivity"
            android:exported="true"
            android:label="@string/app_name"
            android:theme="@style/Theme.SmartHeater">
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />
                <category android:name="android.intent.category.LAUNCHER" />
            </intent-filter>
        </activity>
    </application>
 </manifest>
--- a/app/app/src/main/java/com/example/smartheater/MainActivity.kt
+++ b/app/app/src/main/java/com/example/smartheater/MainActivity.kt
@ -1,43 +0,0 @@
 package com.example.smartheater
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
 import com.example.smartheater.ui.theme.SmartHeaterTheme
 class MainActivity : ComponentActivity() {
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
        setContent {
            SmartHeaterTheme {
                // A surface container using the 'background' color from the theme
                Surface(modifier = Modifier.fillMaxSize(), color = MaterialTheme.colorScheme.background) {
                    Greeting("Android")
                }
            }
        }
    }
 }
@Composable
 fun Greeting(name: String, modifier: Modifier = Modifier) {
    Text(
            text = "Hello $name!",
            modifier = modifier
    )
 }
@Preview(showBackground = true)
@Composable
 fun GreetingPreview() {
    SmartHeaterTheme {
        Greeting("Android")
    }
 }
--- a/app/app/src/main/java/com/example/smartheater/ui/theme/Color.kt
+++ b/app/app/src/main/java/com/example/smartheater/ui/theme/Color.kt
@ -1,11 +0,0 @@
 package com.example.smartheater.ui.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)
--- a/app/app/src/main/java/com/example/smartheater/ui/theme/Theme.kt
+++ b/app/app/src/main/java/com/example/smartheater/ui/theme/Theme.kt
@ -1,70 +0,0 @@
 package com.example.smartheater.ui.theme
 import android.app.Activity
 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.runtime.SideEffect
 import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalView
 import androidx.core.view.WindowCompat
 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 SmartHeaterTheme(
        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
    }
    val view = LocalView.current
    if (!view.isInEditMode) {
        SideEffect {
            val window = (view.context as Activity).window
            window.statusBarColor = colorScheme.primary.toArgb()
            WindowCompat.getInsetsController(window, view).isAppearanceLightStatusBars = darkTheme
        }
    }
    MaterialTheme(
            colorScheme = colorScheme,
            typography = Typography,
            content = content
    )
 }
--- a/app/app/src/main/java/com/example/smartheater/ui/theme/Type.kt
+++ b/app/app/src/main/java/com/example/smartheater/ui/theme/Type.kt
@ -1,34 +0,0 @@
 package com.example.smartheater.ui.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
    )
    */
 )
--- a/app/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
+++ b/app/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
@ -1,30 +0,0 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:aapt="http://schemas.android.com/aapt"
    android:width="108dp"
    android:height="108dp"
    android:viewportWidth="108"
    android:viewportHeight="108">
    <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
        <aapt:attr name="android:fillColor">
            <gradient
                android:endX="85.84757"
                android:endY="92.4963"
                android:startX="42.9492"
                android:startY="49.59793"
                android:type="linear">
                <item
                    android:color="#44000000"
                    android:offset="0.0" />
                <item
                    android:color="#00000000"
                    android:offset="1.0" />
            </gradient>
        </aapt:attr>
    </path>
    <path
        android:fillColor="#FFFFFF"
        android:fillType="nonZero"
        android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
        android:strokeWidth="1"
        android:strokeColor="#00000000" />
 </vector>
--- a/app/app/src/main/res/drawable/ic_launcher_background.xml
+++ b/app/app/src/main/res/drawable/ic_launcher_background.xml
@ -1,170 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="108dp"
    android:height="108dp"
    android:viewportWidth="108"
    android:viewportHeight="108">
    <path
        android:fillColor="#3DDC84"
        android:pathData="M0,0h108v108h-108z" />
    <path
        android:fillColor="#00000000"
        android:pathData="M9,0L9,108"
        android:strokeWidth="0.8"
        android:strokeColor="#33FFFFFF" />
    <path
        android:fillColor="#00000000"
        android:pathData="M19,0L19,108"
        android:strokeWidth="0.8"
        android:strokeColor="#33FFFFFF" />
    <path
        android:fillColor="#00000000"
        android:pathData="M29,0L29,108"
        android:strokeWidth="0.8"
        android:strokeColor="#33FFFFFF" />
    <path
        android:fillColor="#00000000"
        android:pathData="M39,0L39,108"
        android:strokeWidth="0.8"
        android:strokeColor="#33FFFFFF" />
    <path
        android:fillColor="#00000000"
        android:pathData="M49,0L49,108"
        android:strokeWidth="0.8"
        android:strokeColor="#33FFFFFF" />
    <path
        android:fillColor="#00000000"
        android:pathData="M59,0L59,108"
        android:strokeWidth="0.8"
        android:strokeColor="#33FFFFFF" />
    <path
        android:fillColor="#00000000"
        android:pathData="M69,0L69,108"
        android:strokeWidth="0.8"
        android:strokeColor="#33FFFFFF" />
    <path
        android:fillColor="#00000000"
        android:pathData="M79,0L79,108"
        android:strokeWidth="0.8"
        android:strokeColor="#33FFFFFF" />
    <path
        android:fillColor="#00000000"
        android:pathData="M89,0L89,108"
        android:strokeWidth="0.8"
        android:strokeColor="#33FFFFFF" />
    <path
        android:fillColor="#00000000"
        android:pathData="M99,0L99,108"
        android:strokeWidth="0.8"
        android:strokeColor="#33FFFFFF" />
    <path
        android:fillColor="#00000000"
        android:pathData="M0,9L108,9"
        android:strokeWidth="0.8"
        android:strokeColor="#33FFFFFF" />
    <path
        android:fillColor="#00000000"
        android:pathData="M0,19L108,19"
        android:strokeWidth="0.8"
        android:strokeColor="#33FFFFFF" />
    <path
        android:fillColor="#00000000"
        android:pathData="M0,29L108,29"
        android:strokeWidth="0.8"
        android:strokeColor="#33FFFFFF" />
    <path
        android:fillColor="#00000000"
        android:pathData="M0,39L108,39"
        android:strokeWidth="0.8"
        android:strokeColor="#33FFFFFF" />
    <path
        android:fillColor="#00000000"
        android:pathData="M0,49L108,49"
        android:strokeWidth="0.8"
        android:strokeColor="#33FFFFFF" />
    <path
        android:fillColor="#00000000"
        android:pathData="M0,59L108,59"
        android:strokeWidth="0.8"
        android:strokeColor="#33FFFFFF" />
    <path
        android:fillColor="#00000000"
        android:pathData="M0,69L108,69"
        android:strokeWidth="0.8"
        android:strokeColor="#33FFFFFF" />
    <path
        android:fillColor="#00000000"
        android:pathData="M0,79L108,79"
        android:strokeWidth="0.8"
        android:strokeColor="#33FFFFFF" />
    <path
        android:fillColor="#00000000"
        android:pathData="M0,89L108,89"
        android:strokeWidth="0.8"
        android:strokeColor="#33FFFFFF" />
    <path
        android:fillColor="#00000000"
        android:pathData="M0,99L108,99"
        android:strokeWidth="0.8"
        android:strokeColor="#33FFFFFF" />
    <path
        android:fillColor="#00000000"
        android:pathData="M19,29L89,29"
        android:strokeWidth="0.8"
        android:strokeColor="#33FFFFFF" />
    <path
        android:fillColor="#00000000"
        android:pathData="M19,39L89,39"
        android:strokeWidth="0.8"
        android:strokeColor="#33FFFFFF" />
    <path
        android:fillColor="#00000000"
        android:pathData="M19,49L89,49"
        android:strokeWidth="0.8"
        android:strokeColor="#33FFFFFF" />
    <path
        android:fillColor="#00000000"
        android:pathData="M19,59L89,59"
        android:strokeWidth="0.8"
        android:strokeColor="#33FFFFFF" />
    <path
        android:fillColor="#00000000"
        android:pathData="M19,69L89,69"
        android:strokeWidth="0.8"
        android:strokeColor="#33FFFFFF" />
    <path
        android:fillColor="#00000000"
        android:pathData="M19,79L89,79"
        android:strokeWidth="0.8"
        android:strokeColor="#33FFFFFF" />
    <path
        android:fillColor="#00000000"
        android:pathData="M29,19L29,89"
        android:strokeWidth="0.8"
        android:strokeColor="#33FFFFFF" />
    <path
        android:fillColor="#00000000"
        android:pathData="M39,19L39,89"
        android:strokeWidth="0.8"
        android:strokeColor="#33FFFFFF" />
    <path
        android:fillColor="#00000000"
        android:pathData="M49,19L49,89"
        android:strokeWidth="0.8"
        android:strokeColor="#33FFFFFF" />
    <path
        android:fillColor="#00000000"
        android:pathData="M59,19L59,89"
        android:strokeWidth="0.8"
        android:strokeColor="#33FFFFFF" />
    <path
        android:fillColor="#00000000"
        android:pathData="M69,19L69,89"
        android:strokeWidth="0.8"
        android:strokeColor="#33FFFFFF" />
    <path
        android:fillColor="#00000000"
        android:pathData="M79,19L79,89"
        android:strokeWidth="0.8"
        android:strokeColor="#33FFFFFF" />
 </vector>
--- a/app/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@ -1,6 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
    <background android:drawable="@drawable/ic_launcher_background" />
    <foreground android:drawable="@drawable/ic_launcher_foreground" />
    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
 </adaptive-icon>
--- a/app/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@ -1,6 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
    <background android:drawable="@drawable/ic_launcher_background" />
    <foreground android:drawable="@drawable/ic_launcher_foreground" />
    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
 </adaptive-icon>
--- a/app/app/src/main/res/mipmap-hdpi/ic_launcher.webp
+++ b/app/app/src/main/res/mipmap-hdpi/ic_launcher.webp
--- a/app/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
+++ b/app/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
--- a/app/app/src/main/res/mipmap-mdpi/ic_launcher.webp
+++ b/app/app/src/main/res/mipmap-mdpi/ic_launcher.webp
--- a/app/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
+++ b/app/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
--- a/app/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
+++ b/app/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
--- a/app/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
+++ b/app/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
--- a/app/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
+++ b/app/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
--- a/app/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
+++ b/app/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
--- a/app/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
+++ b/app/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
--- a/app/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
+++ b/app/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
--- a/app/app/src/main/res/values/colors.xml
+++ b/app/app/src/main/res/values/colors.xml
@ -1,10 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <color name="purple_200">#FFBB86FC</color>
    <color name="purple_500">#FF6200EE</color>
    <color name="purple_700">#FF3700B3</color>
    <color name="teal_200">#FF03DAC5</color>
    <color name="teal_700">#FF018786</color>
    <color name="black">#FF000000</color>
    <color name="white">#FFFFFFFF</color>
 </resources>
--- a/app/app/src/main/res/values/strings.xml
+++ b/app/app/src/main/res/values/strings.xml
@ -1,3 +0,0 @@
 <resources>
    <string name="app_name">Smart Heater</string>
 </resources>
--- a/app/app/src/main/res/values/themes.xml
+++ b/app/app/src/main/res/values/themes.xml
@ -1,5 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <style name="Theme.SmartHeater" parent="android:Theme.Material.Light.NoActionBar" />
 </resources>
--- a/app/app/src/main/res/xml/backup_rules.xml
+++ b/app/app/src/main/res/xml/backup_rules.xml
@ -1,13 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?><!--
   Sample backup rules file; uncomment and customize as necessary.
   See https://developer.android.com/guide/topics/data/autobackup
   for details.
   Note: This file is ignored for devices older that API 31
   See https://developer.android.com/about/versions/12/backup-restore
 -->
 <full-backup-content>
    <!--
   <include domain="sharedpref" path="."/>
   <exclude domain="sharedpref" path="device.xml"/>
 -->
 </full-backup-content>
--- a/app/app/src/main/res/xml/data_extraction_rules.xml
+++ b/app/app/src/main/res/xml/data_extraction_rules.xml
@ -1,19 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?><!--
   Sample data extraction rules file; uncomment and customize as necessary.
   See https://developer.android.com/about/versions/12/backup-restore#xml-changes
   for details.
 -->
 <data-extraction-rules>
    <cloud-backup>
        <!-- TODO: Use <include> and <exclude> to control what is backed up.
        <include .../>
        <exclude .../>
        -->
    </cloud-backup>
    <!--
    <device-transfer>
        <include .../>
        <exclude .../>
    </device-transfer>
    -->
 </data-extraction-rules>
--- a/app/app/src/test/java/com/example/smartheater/ExampleUnitTest.kt
+++ b/app/app/src/test/java/com/example/smartheater/ExampleUnitTest.kt
@ -1,17 +0,0 @@
 package com.example.smartheater
 import org.junit.Test
 import org.junit.Assert.*
 /**
 * Example local unit test, which will execute on the development machine (host).
 *
 * See [testing documentation](http://d.android.com/tools/testing).
 */
 class ExampleUnitTest {
    @Test
    fun addition_isCorrect() {
        assertEquals(4, 2 + 2)
    }
 }
--- a/app/build.gradle
+++ b/app/build.gradle
@ -1,6 +0,0 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
    id 'com.android.application' version '8.0.2' apply false
    id 'com.android.library' version '8.0.2' apply false
    id 'org.jetbrains.kotlin.android' version '1.7.20' apply false
 }
--- a/app/gradle.properties
+++ b/app/gradle.properties
@ -1,23 +0,0 @@
 # Project-wide Gradle settings.
 # IDE (e.g. Android Studio) users:
 # Gradle settings configured through the IDE *will override*
 # any settings specified in this file.
 # For more details on how to configure your build environment visit
 # http://www.gradle.org/docs/current/userguide/build_environment.html
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 # AndroidX package structure to make it clearer which packages are bundled with the
 # Android operating system, and which are packaged with your app's APK
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
 # Enables namespacing of each library's R class so that its R class includes only the
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
 android.nonTransitiveRClass=true
--- a/app/gradle/wrapper/gradle-wrapper.jar
+++ b/app/gradle/wrapper/gradle-wrapper.jar
--- a/app/gradle/wrapper/gradle-wrapper.properties
+++ b/app/gradle/wrapper/gradle-wrapper.properties
@ -1,6 +0,0 @@
 #Mon Jun 12 11:52:21 EEST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
--- a/app/gradlew
+++ b/app/gradlew
@ -1,185 +0,0 @@
 #!/usr/bin/env sh
 #
 # Copyright 2015 the original author or authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #      https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
 ##
 ##############################################################################
 # Attempt to set APP_HOME
 # Resolve links: $0 may be a link
 PRG="$0"
 # Need this for relative symlinks.
 while [ -h "$PRG" ] ; do
    ls=`ls -ld "$PRG"`
    link=`expr "$ls" : '.*-> \(.*\)$'`
    if expr "$link" : '/.*' > /dev/null; then
        PRG="$link"
    else
        PRG=`dirname "$PRG"`"/$link"
    fi
 done
 SAVED="`pwd`"
 cd "`dirname \"$PRG\"`/" >/dev/null
 APP_HOME="`pwd -P`"
 cd "$SAVED" >/dev/null
 APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 warn () {
    echo "$*"
 }
 die () {
    echo
    echo "$*"
    echo
    exit 1
 }
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
 case "`uname`" in
  CYGWIN* )
    cygwin=true
    ;;
  Darwin* )
    darwin=true
    ;;
  MINGW* )
    msys=true
    ;;
  NONSTOP* )
    nonstop=true
    ;;
 esac
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
        # IBM's JDK on AIX uses strange locations for the executables
        JAVACMD="$JAVA_HOME/jre/sh/java"
    else
        JAVACMD="$JAVA_HOME/bin/java"
    fi
    if [ ! -x "$JAVACMD" ] ; then
        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
    fi
 else
    JAVACMD="java"
    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
 fi
 # Increase the maximum file descriptors if we can.
 if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
    MAX_FD_LIMIT=`ulimit -H -n`
    if [ $? -eq 0 ] ; then
        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
            MAX_FD="$MAX_FD_LIMIT"
        fi
        ulimit -n $MAX_FD
        if [ $? -ne 0 ] ; then
            warn "Could not set maximum file descriptor limit: $MAX_FD"
        fi
    else
        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
    fi
 fi
 # For Darwin, add options to specify how the application appears in the dock
 if $darwin; then
    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 # For Cygwin or MSYS, switch paths to Windows format before running java
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
    JAVACMD=`cygpath --unix "$JAVACMD"`
    # We build the pattern for arguments to be converted via cygpath
    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
    SEP=""
    for dir in $ROOTDIRSRAW ; do
        ROOTDIRS="$ROOTDIRS$SEP$dir"
        SEP="|"
    done
    OURCYGPATTERN="(^($ROOTDIRS))"
    # Add a user-defined pattern to the cygpath arguments
    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
    fi
    # Now convert the arguments - kludge to limit ourselves to /bin/sh
    i=0
    for arg in "$@" ; do
        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
        else
            eval `echo args$i`="\"$arg\""
        fi
        i=`expr $i + 1`
    done
    case $i in
        0) set -- ;;
        1) set -- "$args0" ;;
        2) set -- "$args0" "$args1" ;;
        3) set -- "$args0" "$args1" "$args2" ;;
        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
    esac
 fi
 # Escape application args
 save () {
    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
    echo " "
 }
 APP_ARGS=`save "$@"`
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 exec "$JAVACMD" "$@"
--- a/app/gradlew.bat
+++ b/app/gradlew.bat
@ -1,89 +0,0 @@
@rem
@rem Copyright 2015 the original author or authors.
@rem
@rem Licensed under the Apache License, Version 2.0 (the "License");
@rem you may not use this file except in compliance with the License.
@rem You may obtain a copy of the License at
@rem
@rem      https://www.apache.org/licenses/LICENSE-2.0
@rem
@rem Unless required by applicable law or agreed to in writing, software
@rem distributed under the License is distributed on an "AS IS" BASIS,
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
@rem  Gradle startup script for Windows
@rem
@rem ##########################################################################
@rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
 for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
@rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if "%ERRORLEVEL%" == "0" goto execute
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 echo.
 echo Please set the JAVA_HOME variable in your environment to match the
 echo location of your Java installation.
 goto fail
 :findJavaFromJavaHome
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 if exist "%JAVA_EXE%" goto execute
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
 echo.
 echo Please set the JAVA_HOME variable in your environment to match the
 echo location of your Java installation.
 goto fail
 :execute
@rem Setup the command line
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
@rem Execute Gradle
 "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 :end
@rem End local scope for the variables with windows NT shell
 if "%ERRORLEVEL%"=="0" goto mainEnd
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
 if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
 exit /b 1
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
 :omega
--- a/app/settings.gradle
+++ b/app/settings.gradle
@ -1,16 +0,0 @@
 pluginManagement {
    repositories {
        google()
        mavenCentral()
        gradlePluginPortal()
    }
 }
 dependencyResolutionManagement {
    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
    repositories {
        google()
        mavenCentral()
    }
 }
 rootProject.name = "Smart Heater"
 include ':app'
--- a/read_logs.py
+++ b/read_logs.py
@ -0,0 +1,28 @@
 import serial
 from datetime import datetime
 # Configure serial port settings
 port = '/dev/cu.usbmodemNRAQBQER2'  # Replace with your specific serial port
 baud_rate = 115200  # Replace with the appropriate baud rate
 timeout = 1  # Specify the timeout for reading from the serial port
 # Open the serial port
 ser = serial.Serial(port, baud_rate, timeout=timeout)
 # Generate the filename based on current date and time
 now = datetime.now()
 date_time = now.strftime("%Y-%m-%d_%H-%M")
 filename = f"{date_time}_SHOH.txt"
 # Open a file to write the logs
 with open(filename, 'w') as file:
    # Read and write the logs from the serial port
    while True:
        line = ser.readline().decode().strip()
        if line:
            file.write(line + '\n')
            print(line)  # Optional: Print the logs to the console as well
 # Close the serial port when done
 ser.close()
--- a/source/shoh/src/peripherals/I2C.cpp
+++ b/source/shoh/src/peripherals/I2C.cpp
@ -57,8 +57,12 @@ I2C::I2C (const I2C_config &cfg) : device (nullptr)
  */
  //Manual: Table 83 & 90
  Chip_SYSCTL_PeriphReset(RESET_I2C0);
-  Chip_IOCON_PinMuxSet(LPC_IOCON, 0, 4, IOCON_FUNC1 | IOCON_DIGMODE_EN | cfg.i2c_mode);
+  Chip_IOCON_PinMuxSet(LPC_IOCON, ThreadCommon::PORT_I2C_SCL, 
-  Chip_IOCON_PinMuxSet(LPC_IOCON, 0, 5, IOCON_FUNC1 | IOCON_DIGMODE_EN | cfg.i2c_mode);
+                      ThreadCommon::PIN_I2C_SCL, IOCON_FUNC1 |
                       IOCON_DIGMODE_EN | cfg.i2c_mode);
  Chip_IOCON_PinMuxSet(LPC_IOCON, ThreadCommon::PORT_I2C_SDA, 
                      ThreadCommon::PIN_I2C_SDA, IOCON_FUNC1 |
                       IOCON_DIGMODE_EN | cfg.i2c_mode);
  //}
  // else {
  // currently we support only I2C number 0
--- a/source/shoh/src/peripherals/I2C.h
+++ b/source/shoh/src/peripherals/I2C.h
@ -10,6 +10,7 @@
 #include "chip.h"
 #include "board.h"
 #include "pinportmap.h"
 struct I2C_config {
 	unsigned int device_number;
--- a/source/shoh/src/threads/common/ThreadCommon.h
+++ b/source/shoh/src/threads/common/ThreadCommon.h
@ -13,12 +13,12 @@
 #include <string>
 #include <map>
 #include "queue.h"
 #include "pinportmap.h"
 #include "task.h"
 #include <assert.h>
 namespace ThreadCommon
 {
    enum RotaryAction 
 	{
 		Right,
--- a/source/shoh/src/threads/common/pinportmap.h
+++ b/source/shoh/src/threads/common/pinportmap.h
@ -0,0 +1,49 @@
 /*
 * pinportmap.h
 *
 *  Created on: 17 Jun 2023
 *      Author: dave
 */
 #ifndef THREADS_COMMON_PINPORTMAP_H_
 #define THREADS_COMMON_PINPORTMAP_H_
 namespace ThreadCommon
 {
 	enum PINMAP
 	{
 		PIN_LCD_RS = 24,
 		PIN_LCD_EN = 26,
 		PIN_LCD_D4 = 27,
 		PIN_LCD_D5 = 25,
 		PIN_LCD_D6 = 28,
 		PIN_LCD_D7 = 3,
 		PIN_I2C_SCL = 4,
 		PIN_I2C_SDA = 5,
 		PIN_ROTARY_SIG_A = 18,
 		PIN_ROTARY_SIG_B = 12,
 		PIN_ROTARY_PRESS = 2,
 		PIN_BOARD_SW1 = 1
 	};
 	enum PORTMAP
 	{
 		PORT_LCD_RS = 1,
 		PORT_LCD_EN = 1,
 		PORT_LCD_D4 = 1,
 		PORT_LCD_D5 = 1,
 		PORT_LCD_D6 = 1,
 		PORT_LCD_D7 = 2,
 		PORT_I2C_SCL = 0,
 		PORT_I2C_SDA = 0,
 		PORT_ROTARY_SIG_A = 1,
 		PORT_ROTARY_SIG_B = 2,
 		PORT_ROTARY_PRESS = 0,
 		PORT_BOARD_SW1 = 0
 	};
 }
 #endif /* THREADS_COMMON_PINPORTMAP_H_ */
--- a/source/shoh/src/threads/logging/Log.h
+++ b/source/shoh/src/threads/logging/Log.h
@ -16,7 +16,7 @@ extern QueueHandle_t logging_queue;
 /* ================= Settings ================== */
 #define LOG_COLORED_OUTPUT
 #define HIGH_PRIORITY_DEBUG
-#define LOG_DEBUG_MESSAGES 1
+#define LOG_DEBUG_MESSAGES 0
 /* ================= Settings ================== */
 // internal debug defines
--- a/source/shoh/src/threads/master/Master.cpp
+++ b/source/shoh/src/threads/master/Master.cpp
@ -50,7 +50,7 @@ void Master::HandleEventType(Event* e)
 			//Comes from rotary, goes to manager
 			send = _qm->send<Event>(ThreadCommon::QueueManager::manager_event_master, e, 0);
 			//LOG_WARNING("Timestamp: %zus, Clock: %zu, Chip freq: %zu", LPC_SCT1->COUNT_U / Chip_Clock_GetMainClockRate(), LPC_SCT1->COUNT_U, Chip_Clock_GetMainClockRate());
-			if (send) LOG_DEBUG("Rotary: %s has been forwarded to manager", rotary_direction[rd]);
+			if (send) LOG_INFO("Rotary: %s has been forwarded to manager", rotary_direction[rd]);
 			break;
 		case Event::InternalTemp:
 			// TODO remove (deprecated)
--- a/source/shoh/src/threads/relay/Relay.h
+++ b/source/shoh/src/threads/relay/Relay.h
@ -48,8 +48,8 @@ public:
 	void utilizeEventData();
 private:
 	ThreadCommon::QueueManager* _qm;
-	RelayDevice relays [2] = {{0, 24, 0},
+	RelayDevice relays [2] = {{0, 11, 0},
-							  {0, 26, 1}};
+							  {0, 23, 1}};
 	void parseEvent(Event * e);
 	int8_t setpoint, ext_temp;
--- a/source/shoh/src/threads/rotary/Rotary.cpp
+++ b/source/shoh/src/threads/rotary/Rotary.cpp
@ -12,6 +12,8 @@
 static QueueHandle_t * p_rotary_isr_q;
 static DigitalIoPin * p_sigB;
 extern "C" 
 {
  void
@ -19,11 +21,17 @@ extern "C"
  {
 	Chip_PININT_ClearIntStatus (LPC_PININT, PININTCH (PIN_INT0_IRQn));
 	portBASE_TYPE xHigherPriorityWoken = pdFALSE;
-	uint8_t data = ThreadCommon::RotaryAction::Right;
+	uint8_t data;
 	if (p_sigB->read())
 		data = ThreadCommon::RotaryAction::Left;
 	else
 		data = ThreadCommon::RotaryAction::Right;
 	xQueueSendFromISR (*p_rotary_isr_q, &data,  &xHigherPriorityWoken);
 	portEND_SWITCHING_ISR(xHigherPriorityWoken);
  }
-
+/*
  void
  PIN_INT1_IRQHandler (void)
  {
@ -33,11 +41,11 @@ extern "C"
 	xQueueSendFromISR (*p_rotary_isr_q, &data,  &xHigherPriorityWoken);
 	portEND_SWITCHING_ISR(xHigherPriorityWoken);
  }
-
+*/
  void
-  PIN_INT2_IRQHandler (void)
+  PIN_INT1_IRQHandler (void)
  {
-    Chip_PININT_ClearIntStatus (LPC_PININT, PININTCH (PIN_INT2_IRQn));
+    Chip_PININT_ClearIntStatus (LPC_PININT, PININTCH (PIN_INT1_IRQn));
 	portBASE_TYPE xHigherPriorityWoken = pdFALSE;
 	uint8_t data = ThreadCommon::RotaryAction::Press;
 	xQueueSendFromISR (*p_rotary_isr_q, &data,  &xHigherPriorityWoken);
@ -48,6 +56,7 @@ extern "C"
 Rotary::Rotary(ThreadCommon::QueueManager* qm) : _qm(qm) 
 {
 	LOG_DEBUG("Creating Rotary");
 	p_sigB = &(this->signal[1]);
 }
 Rotary::~Rotary() 
--- a/source/shoh/src/threads/rotary/Rotary.h
+++ b/source/shoh/src/threads/rotary/Rotary.h
@ -20,9 +20,15 @@ public:
 private:
 	Event* message;
 	ThreadCommon::QueueManager* _qm;
-	DigitalIoPin signal[3] = { { 0, 1, true, true, false, true, PIN_INT0_IRQn}, //SW1
+	DigitalIoPin signal[3] = { { ThreadCommon::PORT_ROTARY_SIG_A, 
-                               { 0, 16, true, true, false, true, PIN_INT1_IRQn}, //SW2
+								 ThreadCommon::PIN_ROTARY_SIG_A, 
-                               { 1, 8, true, false, false, true, PIN_INT2_IRQn} };
+								 true, true, false, true, PIN_INT0_IRQn}, 
                               { ThreadCommon::PORT_ROTARY_SIG_B, 
 							     ThreadCommon::PIN_ROTARY_SIG_B,
 								 true, true, false}, 
                               { ThreadCommon::PORT_ROTARY_PRESS, 
 							     ThreadCommon::PIN_ROTARY_PRESS,
 								 true, true, false, true, PIN_INT1_IRQn} };
 };
 void thread_rotary(void* pvParams);
--- a/source/shoh/src/threads/temperature/SensorTempSHT20.cpp
+++ b/source/shoh/src/threads/temperature/SensorTempSHT20.cpp
@ -0,0 +1,128 @@
 /*
 * SensorTempSHT20.cpp
 *
 *  Created on: 16 May 2023
 */
 #include "SensorTempSHT20.h"
 #include "FreeRTOS.h"
 #include "task.h"
 #include "Log.h"
 //D6U9H:
 //D - Digital (i2c)
 //6 - 2016 year of production
 //U9H - Sensirion undecodable crap
 //Address: 0x40
 //Trigger T measurement | hold master    | 1110 0011 - 0xe3 (implemented)
 //Trigger T measurement | no hold master | 1111 0011 - 0xf3
 //Write user register   |                | 1110 0110 - 0xe6
 //Read user register    |                | 1110 0111 - 0xe7
 //Soft reset            |                | 1111 1110 - 0xfe
 SensorTempSHT20::SensorTempSHT20(I2C* pi2c)
 : _pi2c(pi2c), _dev_addr(0x40), _up_flag(false),
 _com_read_hold(0xe3), _com_read_nohold(0xf3),
 _com_write_ur(0xe6), _com_read_ur(0xe7),
 _com_soft_reset(0xfe), _polynominal(0x131)
 {
  //Read sensor during the initialisation to get the "UP" state earlier.
  this->read();
 }
 SensorTempSHT20::~SensorTempSHT20()
 {}
 /**
 * @brief Gets temperature from SHT20 sensor.
 * 
 * @return int8_t temperature value trimmed from -128 to 127.
 */
 int8_t SensorTempSHT20::getTemperature()
 {
  uint16_t raw_temp = this->read();
  bool err_bit = raw_temp & 0x1;
  int temp = 0;
  if (err_bit)
    return -128;
  //Formula: (St / 2 ^ 16) * 175.72 - 46.85
  temp = ((double)raw_temp / 65536) * 175.72 - 46.85;
  if(temp > 127)
    temp = 127;
  if (temp < -128)
    temp = -128;
  return temp;
 }
 /**
 * @brief Makes sure that the sensor is up.
 * 
 * @return true It is.
 * @return false It is not.
 */
 bool SensorTempSHT20::is_up()
 {
  this->read();
  return this->_up_flag;
 }
 //Use hold master - read(com = 0xe3)
 //Reading is done via 3 bytes.
 //WRITE: I2C address + write | read command
 //READ: Data (MSB) | Data (LSB) + Stat. | Checksum
 /**
 * @brief Gets raw temperature measurement data from sensor
 * using hold master mode.
 * 
 * @return uint16_t Raw temperature measurement data.
 */
 uint16_t SensorTempSHT20::read()
 {
  uint8_t  tbuf = this->_com_read_hold;
  uint8_t  rbuf[3] = {0x0, 0x2, 0x0};
  uint8_t crc = 0x0;
  uint16_t  raw_temp = 0;
  this->_up_flag = this->_pi2c->transaction(this->_dev_addr, &tbuf, 1, rbuf, 3);
  //Sensor changes this bit to 0 on temp measurement.
  if (rbuf[1] & 0x2)
    return 0x1;
  raw_temp |= (rbuf[0] << 8);
  raw_temp |= (rbuf[1] & 0xfc);
  crc = rbuf[2];
  if (this->crc_check(rbuf, 2, crc))
    LOG_WARNING("Temperature sensor reported crc mismatch. Raw data: %04x; CRC: %x", raw_temp, crc);
  return raw_temp;
 }
 /**
 * @brief Checks if checksum is correct.
 * 
 * @param data array of raw data to check.
 * @param nbrOfBytes size of an array.
 * @param checksum received checksum to compare calculated crc to.
 * @return true - checksum is incorrect.
 * @return false - checksum is the same as calculated.
 */
 bool SensorTempSHT20::crc_check(uint8_t * data, uint8_t nbrOfBytes, uint8_t checksum)
 {
  uint8_t crc = 0;
  uint8_t bit;
  uint8_t byteCtr;
  //Calculates 8-Bit checksum with given _polynomial
  for (byteCtr = 0; byteCtr < nbrOfBytes; ++byteCtr)
  {
    crc ^= (data[byteCtr]);
    for ( bit = 8; bit > 0; --bit)
      crc = (crc & 0x80) ? ((crc << 1) ^ this->_polynominal) : (crc << 1);
  }
  return crc != checksum;
 }
--- a/source/shoh/src/threads/temperature/SensorTempSHT20.h
+++ b/source/shoh/src/threads/temperature/SensorTempSHT20.h
@ -0,0 +1,34 @@
 /*
 * SensorTempSHT20.h
 *
 *  Created on: 16 May 2023
 */
 #ifndef THREADS_TEMPERATURE_SENSORTEMPTC74_H_
 #define THREADS_TEMPERATURE_SENSORTEMPTC74_H_
 #include "I2C.h"
 #include "chip.h"
 class SensorTempSHT20 {
 public:
  SensorTempSHT20(I2C* pi2c);
  virtual ~SensorTempSHT20();
  int8_t getTemperature();
  bool is_up();
 private:
  uint16_t read();
  bool crc_check(uint8_t * data, uint8_t nbrOfBytes, uint8_t checksum);
  I2C* _pi2c;
  const uint8_t _dev_addr;
  bool _up_flag;
  const uint8_t _com_read_hold;
  const uint8_t _com_read_nohold;
  const uint8_t _com_write_ur; //user register
  const uint8_t _com_read_ur; //user register
  const uint8_t _com_soft_reset;
  const uint16_t _polynominal;
 };
 #endif /* THREADS_TEMPERATURE_SENSORTEMPSHT20_H_ */
--- a/source/shoh/src/threads/temperature/Temperature.cpp
+++ b/source/shoh/src/threads/temperature/Temperature.cpp
@ -5,7 +5,8 @@
 */
 #include "Temperature.h"
-#include "SensorTempTC74.h"
+//#include "SensorTempTC74.h"
 #include "SensorTempSHT20.h"
 #include "Event.h"
 #include "Log.h"
@ -15,10 +16,11 @@ Temperature::~Temperature() {}
 void Temperature::taskFunction()
 {
-	SensorTempTC74 ext_temp_sensor(this->_pi2c, 0x4a);
+	//SensorTempTC74 ext_temp_sensor(this->_pi2c, 0x4a);
 	SensorTempSHT20 ext_temp_sensor(this->_pi2c);
 	Event t (Event::ExternalTemp, -128);
 	int8_t temp_value = -128;
-	_qm->send<Event>(ThreadCommon::QueueManager::master_event_all, &t, 0);
+	while(ext_temp_sensor.is_up() != true);
 	for (;;)
 	{
 		if (ext_temp_sensor.is_up())
@ -27,6 +29,7 @@ void Temperature::taskFunction()
 		if(temp_value == -128) 
 		{
 			LOG_ERROR("Failed to get temperature.");
 			vTaskDelay(10000);	
 			continue;
 		}
@ -40,7 +43,7 @@ void Temperature::taskFunction()
 void thread_temperature(void* pvParams)
 {
 	ThreadCommon::CommonManagers * manager = static_cast<ThreadCommon::CommonManagers*>(pvParams);
-	I2C_config conf{0x4a, 100000};
+	I2C_config conf{0, 100000};
 	I2C i2c(conf);
 	Temperature t(manager->qm, &i2c);
 	t.taskFunction();
--- a/source/shoh/src/threads/user_interface/UserInterface.cpp
+++ b/source/shoh/src/threads/user_interface/UserInterface.cpp
@ -75,19 +75,25 @@ void UserInterface::handleLCD(LiquidCrystal *lcd, const char *str)
 void UserInterface::initLCD1()
 {
-	this->lcd1_rs = new DigitalIoPin(1, 9, false);
+	this->lcd1_rs = new DigitalIoPin(ThreadCommon::PORT_LCD_RS, 
-	this->lcd1_en = new DigitalIoPin(0, 14, false);
+									 ThreadCommon::PIN_LCD_RS, false);//(1, 18, false);
-	this->lcd1_d4 = new DigitalIoPin(0, 13, false);
+	this->lcd1_en = new DigitalIoPin(ThreadCommon::PORT_LCD_EN, 
-	this->lcd1_d5 = new DigitalIoPin(0, 12, false);
+									 ThreadCommon::PIN_LCD_EN, false);//(1, 24, false);
-	this->lcd1_d6 = new DigitalIoPin(0, 23, false);
+	this->lcd1_d4 = new DigitalIoPin(ThreadCommon::PORT_LCD_D4, 
-	this->lcd1_d7 = new DigitalIoPin(0, 11, false);
+									 ThreadCommon::PIN_LCD_D4, false);//(1, 19, false);
 	this->lcd1_d5 = new DigitalIoPin(ThreadCommon::PORT_LCD_D5, 
 									 ThreadCommon::PIN_LCD_D5, false);//(1, 26, false);
 	this->lcd1_d6 = new DigitalIoPin(ThreadCommon::PORT_LCD_D6, 
 									 ThreadCommon::PIN_LCD_D6, false);//(1, 27, false);
 	this->lcd1_d7 = new DigitalIoPin(ThreadCommon::PORT_LCD_D7, 
 									 ThreadCommon::PIN_LCD_D7, false);//(1, 25, false);
 	this->lcd1_rs->write(false);
 	this->lcd1_en->write(false);
 	this->lcd1_d4->write(false);
 	this->lcd1_d5->write(false);
-  	this->lcd1_d6->write(false);
+	this->lcd1_d6->write(false);
-  	this->lcd1_d7->write(false);
+	this->lcd1_d7->write(false);
 	// LCD init.
 	this->lcd1 = new LiquidCrystal(this->lcd1_rs, this->lcd1_en, this->lcd1_d4,
 								   this->lcd1_d5, this->lcd1_d6, this->lcd1_d7);
Author	SHA1	Message	Date
Vasily Davydov	ed461524af	root: add script for reading logs	2023-07-07 17:03:57 +03:00
Vasily Davydov	486b4a40b2	main: working version 0.2	2023-07-07 17:03:36 +03:00
Vasily Davydov	9be6c99e2c	Merge pull request #68 from vas-dav/pinmap-hdr threadcommon: [#67] common pinmap header	2023-07-07 15:22:14 +03:00
Vasily Davydov	8789e8d886	threadcommon: [#67 ] common pinmap header	2023-06-17 10:28:16 +03:00
Vasily Davydov	eaf0338497	Merge pull request #66 from vas-dav/temperature Temperature	2023-06-15 11:16:10 +03:00
RedHawk	7a25e14a8f	temp: [#61 ] Make things a little clearer. * Newline in log isn't nice. * I managed to confuse even myself with this 0x4a. It's actually not used anywhere currently.	2023-06-14 20:36:26 +03:00
RedHawk	88a7bac525	temp: [#61 ] Temperature parsing and documentation.	2023-06-13 23:52:14 +03:00
RedHawk	cb64ae7e0f	temp: [#61 ] CRC check.	2023-06-13 19:52:53 +03:00
RedHawk	4613fce370	temp: [#61 ] Communication with sensor. * Up/Down state. * Raw temperature data. * Can't believe it actually worked.	2023-06-13 19:27:00 +03:00
RedHawk	7cc658bc2e	temp sensor: [#61 ] Added placeholder for the sensor interface.	2023-06-13 16:50:27 +03:00
RedHawk	34618d640d	rotary: [#62 ] Change pin for rotary press. * Connected button to ground. * It seems that initially chosen pin has no interrupts! * That's a way to spend several hours...	2023-06-13 16:50:10 +03:00
RedHawk	38b24f5998	rotary: [#62 ] Changed interrupts behaviour. * Button on the rotary is still inactive. Demands further investigation with logic analizer.	2023-06-11 13:48:24 +03:00
RedHawk	2b785e5b0c	prototype: Change pins to the prototype ones.	2023-06-11 12:17:43 +03:00