tylen/SHOH-Innovation-Project
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: tylen:wifi-module
Branches Tags
tylen:main tylen:pinmap-hdr tylen:temperature tylen:rotary tylen:android-app-init tylen:wifi-module tylen:prototype
..
compare: tylen:android-app-init
Branches Tags
tylen:main tylen:pinmap-hdr tylen:temperature tylen:rotary tylen:android-app-init tylen:wifi-module tylen:prototype

1 Commits
wifi-modul ... android-ap

Author SHA1 Message Date
Vasily Davydov
a8363fe402 app: [#65] init empty kotlin project 2023-06-12 12:02:09 +03:00
61 changed files with 1124 additions and 1048 deletions
Expand all files Collapse all files

15
app/.gitignore vendored Normal file
View File

@@ -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

3
app/.idea/.gitignore generated vendored Normal file
View File

@@ -0,0 +1,3 @@
# Default ignored files
/shelf/
/workspace.xml

1
app/.idea/.name generated Normal file
View File

@@ -0,0 +1 @@
Smart Heater

123
app/.idea/codeStyles/Project.xml generated Normal file
View File

@@ -0,0 +1,123 @@
<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>

5
app/.idea/codeStyles/codeStyleConfig.xml generated Normal file
View File

@@ -0,0 +1,5 @@
<component name="ProjectCodeStyleConfiguration">
<state>
<option name="USE_PER_PROJECT_SETTINGS" value="true" />
</state>
</component>

6
app/.idea/compiler.xml generated Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<bytecodeTargetLevel target="17" />
</component>
</project>

19
app/.idea/gradle.xml generated Normal file
View File

@@ -0,0 +1,19 @@
<?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>

6
app/.idea/kotlinc.xml generated Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="KotlinJpsPluginSettings">
<option name="version" value="1.7.20" />
</component>
</project>

9
app/.idea/misc.xml generated Normal file
View File

@@ -0,0 +1,9 @@
<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>

6
app/.idea/vcs.xml generated Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$/.." vcs="Git" />
</component>
</project>

1
app/app/.gitignore vendored Normal file
View File

@@ -0,0 +1 @@
/build

67
app/app/build.gradle Normal file
View File

@@ -0,0 +1,67 @@
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'
}

21
app/app/proguard-rules.pro vendored Normal file
View File

@@ -0,0 +1,21 @@
# 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

24
app/app/src/androidTest/java/com/example/smartheater/ExampleInstrumentedTest.kt Normal file
View File

@@ -0,0 +1,24 @@
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)
}
}

28
app/app/src/main/AndroidManifest.xml Normal file
View File

@@ -0,0 +1,28 @@
<?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>

43
app/app/src/main/java/com/example/smartheater/MainActivity.kt Normal file
View File

@@ -0,0 +1,43 @@
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")
}
}

11
app/app/src/main/java/com/example/smartheater/ui/theme/Color.kt Normal file
View File

@@ -0,0 +1,11 @@
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)

70
app/app/src/main/java/com/example/smartheater/ui/theme/Theme.kt Normal file
View File

@@ -0,0 +1,70 @@
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
)
}

34
app/app/src/main/java/com/example/smartheater/ui/theme/Type.kt Normal file
View File

@@ -0,0 +1,34 @@
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
)
*/
)

30
app/app/src/main/res/drawable-v24/ic_launcher_foreground.xml Normal file
View File

@@ -0,0 +1,30 @@
<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>

170
app/app/src/main/res/drawable/ic_launcher_background.xml Normal file
View File

@@ -0,0 +1,170 @@
<?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>

6
app/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml Normal file
View File

@@ -0,0 +1,6 @@
<?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>

6
app/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml Normal file
View File

@@ -0,0 +1,6 @@
<?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>

BIN
app/app/src/main/res/mipmap-hdpi/ic_launcher.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
app/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
app/app/src/main/res/mipmap-mdpi/ic_launcher.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 982 B

BIN
app/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
app/app/src/main/res/mipmap-xhdpi/ic_launcher.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
app/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.8 KiB

BIN
app/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
app/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.8 KiB

BIN
app/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.8 KiB

BIN
app/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.6 KiB

10
app/app/src/main/res/values/colors.xml Normal file
View File

@@ -0,0 +1,10 @@
<?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>

3
app/app/src/main/res/values/strings.xml Normal file
View File

@@ -0,0 +1,3 @@
<resources>
<string name="app_name">Smart Heater</string>
</resources>

5
app/app/src/main/res/values/themes.xml Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="Theme.SmartHeater" parent="android:Theme.Material.Light.NoActionBar" />
</resources>

13
app/app/src/main/res/xml/backup_rules.xml Normal file
View File

@@ -0,0 +1,13 @@
<?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>

19
app/app/src/main/res/xml/data_extraction_rules.xml Normal file
View File

@@ -0,0 +1,19 @@
<?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>

17
app/app/src/test/java/com/example/smartheater/ExampleUnitTest.kt Normal file
View File

@@ -0,0 +1,17 @@
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)
}
}

6
app/build.gradle Normal file
View File

@@ -0,0 +1,6 @@
// 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
}

23
app/gradle.properties Normal file
View File

@@ -0,0 +1,23 @@
# 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

BIN
app/gradle/wrapper/gradle-wrapper.jar vendored Normal file
View File

Binary file not shown.

6
app/gradle/wrapper/gradle-wrapper.properties vendored Normal file
View File

@@ -0,0 +1,6 @@
#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

185
app/gradlew vendored Executable file
View File

@@ -0,0 +1,185 @@
#!/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" "$@"

89
app/gradlew.bat vendored Normal file
View File

@@ -0,0 +1,89 @@
@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

16
app/settings.gradle Normal file
View File

@@ -0,0 +1,16 @@
pluginManagement {
repositories {
google()
mavenCentral()
gradlePluginPortal()
}
}
dependencyResolutionManagement {
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
repositories {
google()
mavenCentral()
}
}
rootProject.name = "Smart Heater"
include ':app'

44
source/shoh/.cproject
View File

@@ -43,22 +43,20 @@
<option id="com.crt.advproject.cpp.fpu.1211390952" name="Floating point" superClass="com.crt.advproject.cpp.fpu" useByScannerDiscovery="true"/> <option id="com.crt.advproject.cpp.fpu.1211390952" name="Floating point" superClass="com.crt.advproject.cpp.fpu" useByScannerDiscovery="true"/>
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.cpp.compiler.option.include.paths.417443680" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath"> <option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.cpp.compiler.option.include.paths.417443680" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/lpc_board_nxp_lpcxpresso_11u68/inc}&quot;"/> <listOptionValue builtIn="false" value="&quot;${workspace_loc:/lpc_board_nxp_lpcxpresso_11u68/inc}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/src/threads/relay}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/src}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/lpc_chip_11u6x/inc}&quot;"/> <listOptionValue builtIn="false" value="&quot;${workspace_loc:/lpc_chip_11u6x/inc}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/freertos}&quot;"/> <listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/freertos}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/freertos/inc}&quot;"/> <listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/freertos/inc}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads}&quot;"/> <listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/common}&quot;"/> <listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/common}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/master}&quot;"/> <listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/master}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/user_interface}&quot;"/> <listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/user_interface}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/relay}&quot;"/> <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/src/threads/rotary}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/rotary}&quot;"/> <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/src/threads/manager}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/manager}&quot;"/> <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/src/threads/logging}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/logging}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/temperature}&quot;"/> <listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/temperature}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/networking}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/peripherals}&quot;"/> <listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/peripherals}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/peripherals/networking}&quot;"/>
</option> </option>
<option id="com.crt.advproject.cpp.misc.dialect.4036734" name="Language standard" superClass="com.crt.advproject.cpp.misc.dialect" useByScannerDiscovery="true" value="com.crt.advproject.misc.dialect.cpp17" valueType="enumerated"/> <option id="com.crt.advproject.cpp.misc.dialect.4036734" name="Language standard" superClass="com.crt.advproject.cpp.misc.dialect" useByScannerDiscovery="true" value="com.crt.advproject.misc.dialect.cpp17" valueType="enumerated"/>
<inputType id="com.crt.advproject.compiler.cpp.input.2005422649" superClass="com.crt.advproject.compiler.cpp.input"/> <inputType id="com.crt.advproject.compiler.cpp.input.2005422649" superClass="com.crt.advproject.compiler.cpp.input"/>
@@ -86,19 +84,13 @@
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/lpc_chip_11u6x/inc}&quot;"/> <listOptionValue builtIn="false" value="&quot;${workspace_loc:/lpc_chip_11u6x/inc}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/freertos}&quot;"/> <listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/freertos}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/freertos/inc}&quot;"/> <listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/freertos/inc}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads}&quot;"/> <listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/common}&quot;"/> <listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/common}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/master}&quot;"/> <listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/master}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/user_interface}&quot;"/> <listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/user_interface}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/relay}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/rotary}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/manager}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/logging}&quot;"/> <listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/logging}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/temperature}&quot;"/> <listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/temperature}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/networking}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/peripherals}&quot;"/> <listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/peripherals}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/peripherals/networking}&quot;"/>
</option> </option>
<option id="com.crt.advproject.c.misc.dialect.82852045" name="Language standard" superClass="com.crt.advproject.c.misc.dialect" useByScannerDiscovery="true" value="com.crt.advproject.misc.dialect.c17" valueType="enumerated"/> <option id="com.crt.advproject.c.misc.dialect.82852045" name="Language standard" superClass="com.crt.advproject.c.misc.dialect" useByScannerDiscovery="true" value="com.crt.advproject.misc.dialect.c17" valueType="enumerated"/>
<inputType id="com.crt.advproject.compiler.input.765511076" superClass="com.crt.advproject.compiler.input"/> <inputType id="com.crt.advproject.compiler.input.765511076" superClass="com.crt.advproject.compiler.input"/>
@@ -114,19 +106,13 @@
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/lpc_chip_11u6x/inc}&quot;"/> <listOptionValue builtIn="false" value="&quot;${workspace_loc:/lpc_chip_11u6x/inc}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/freertos}&quot;"/> <listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/freertos}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/freertos/inc}&quot;"/> <listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/freertos/inc}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads}&quot;"/> <listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/common}&quot;"/> <listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/common}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/master}&quot;"/> <listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/master}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/user_interface}&quot;"/> <listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/user_interface}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/relay}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/rotary}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/manager}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/logging}&quot;"/> <listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/logging}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/temperature}&quot;"/> <listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/temperature}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/networking}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/peripherals}&quot;"/> <listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/peripherals}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/peripherals/networking}&quot;"/>
</option> </option>
<inputType id="cdt.managedbuild.tool.gnu.assembler.input.1836378919" superClass="cdt.managedbuild.tool.gnu.assembler.input"/> <inputType id="cdt.managedbuild.tool.gnu.assembler.input.1836378919" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
<inputType id="com.crt.advproject.assembler.input.339410672" name="Additional Assembly Source Files" superClass="com.crt.advproject.assembler.input"/> <inputType id="com.crt.advproject.assembler.input.339410672" name="Additional Assembly Source Files" superClass="com.crt.advproject.assembler.input"/>
@@ -226,13 +212,6 @@
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/common}&quot;"/> <listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/common}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/user_interface}&quot;"/> <listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/user_interface}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/temperature}&quot;"/> <listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/temperature}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/peripherals/networking}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/logging}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/manager}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/rotary}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/relay}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/networking}&quot;"/>
</option> </option>
<inputType id="com.crt.advproject.compiler.cpp.input.903614193" superClass="com.crt.advproject.compiler.cpp.input"/> <inputType id="com.crt.advproject.compiler.cpp.input.903614193" superClass="com.crt.advproject.compiler.cpp.input"/>
</tool> </tool>
@@ -264,13 +243,6 @@
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/common}&quot;"/> <listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/common}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/user_interface}&quot;"/> <listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/user_interface}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/temperature}&quot;"/> <listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/temperature}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/peripherals/networking}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/logging}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/manager}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/rotary}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/relay}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/networking}&quot;"/>
</option> </option>
<option id="com.crt.advproject.c.misc.dialect.1008527937" name="Language standard" superClass="com.crt.advproject.c.misc.dialect" useByScannerDiscovery="true" value="com.crt.advproject.misc.dialect.c17" valueType="enumerated"/> <option id="com.crt.advproject.c.misc.dialect.1008527937" name="Language standard" superClass="com.crt.advproject.c.misc.dialect" useByScannerDiscovery="true" value="com.crt.advproject.misc.dialect.c17" valueType="enumerated"/>
<inputType id="com.crt.advproject.compiler.input.246185412" superClass="com.crt.advproject.compiler.input"/> <inputType id="com.crt.advproject.compiler.input.246185412" superClass="com.crt.advproject.compiler.input"/>
@@ -294,12 +266,6 @@
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/user_interface}&quot;"/> <listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/user_interface}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/logging}&quot;"/> <listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/logging}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/temperature}&quot;"/> <listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/temperature}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/peripherals/networking}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/manager}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/rotary}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/relay}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/networking}&quot;"/>
</option> </option>
<inputType id="cdt.managedbuild.tool.gnu.assembler.input.1117166373" superClass="cdt.managedbuild.tool.gnu.assembler.input"/> <inputType id="cdt.managedbuild.tool.gnu.assembler.input.1117166373" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
<inputType id="com.crt.advproject.assembler.input.2071009798" name="Additional Assembly Source Files" superClass="com.crt.advproject.assembler.input"/> <inputType id="com.crt.advproject.assembler.input.2071009798" name="Additional Assembly Source Files" superClass="com.crt.advproject.assembler.input"/>

1
source/shoh/freertos/FreeRTOSConfig.h
View File

@@ -94,7 +94,6 @@
#define configGENERATE_RUN_TIME_STATS 1 #define configGENERATE_RUN_TIME_STATS 1
#define configRECORD_STACK_HIGH_ADDRESS 1 #define configRECORD_STACK_HIGH_ADDRESS 1
#define configUSE_TICKLESS_IDLE 1 #define configUSE_TICKLESS_IDLE 1
#define configUSE_TASK_NOTIFICATIONS 1
#define configRUN_TIME_COUNTER_TYPE uint64_t #define configRUN_TIME_COUNTER_TYPE uint64_t

16
source/shoh/src/peripherals/LpcDebugUart.cpp
View File

@@ -116,14 +116,14 @@ void LpcDebugUart::set_on_receive(void(*cb)(void))
int LpcDebugUart::free() int LpcDebugUart::free()
{ {
std::lock_guard<Fmutex> lock(write_debug_mutex); std::lock_guard<Fmutex> lock(write_mutex);
return UART_RB_SIZE - RingBuffer_GetCount(&txring); return UART_RB_SIZE - RingBuffer_GetCount(&txring);
} }
int LpcDebugUart::peek() int LpcDebugUart::peek()
{ {
std::lock_guard<Fmutex> lock(read_debug_mutex); std::lock_guard<Fmutex> lock(read_mutex);
return RingBuffer_GetCount(&rxring); return RingBuffer_GetCount(&rxring);
} }
@@ -135,7 +135,7 @@ int LpcDebugUart::read(char &c)
int LpcDebugUart::read(char *buffer, int len) int LpcDebugUart::read(char *buffer, int len)
{ {
std::lock_guard<Fmutex> lock(read_debug_mutex); std::lock_guard<Fmutex> lock(read_mutex);
if(RingBuffer_GetCount(&rxring) <= 0) { if(RingBuffer_GetCount(&rxring) <= 0) {
notify_rx = xTaskGetCurrentTaskHandle(); notify_rx = xTaskGetCurrentTaskHandle();
@@ -151,7 +151,7 @@ int LpcDebugUart::read(char *buffer, int len)
int LpcDebugUart::read(char *buffer, int len, TickType_t total_timeout, TickType_t ic_timeout) int LpcDebugUart::read(char *buffer, int len, TickType_t total_timeout, TickType_t ic_timeout)
{ {
std::lock_guard<Fmutex> lock(read_debug_mutex); std::lock_guard<Fmutex> lock(read_mutex);
// we can't read more than ring buffer size at a time // we can't read more than ring buffer size at a time
if(len > UART_RB_SIZE) len = UART_RB_SIZE; if(len > UART_RB_SIZE) len = UART_RB_SIZE;
@@ -181,7 +181,7 @@ int LpcDebugUart::write(const char *s)
int LpcDebugUart::write(const char *buffer, int len) int LpcDebugUart::write(const char *buffer, int len)
{ {
std::lock_guard<Fmutex> lock(write_debug_mutex); std::lock_guard<Fmutex> lock(write_mutex);
int pos = 0; int pos = 0;
notify_tx = xTaskGetCurrentTaskHandle(); notify_tx = xTaskGetCurrentTaskHandle();
@@ -214,15 +214,15 @@ bool LpcDebugUart::rxbreak()
void LpcDebugUart::speed(int bps) void LpcDebugUart::speed(int bps)
{ {
std::lock_guard<Fmutex> lockw(write_debug_mutex); std::lock_guard<Fmutex> lockw(write_mutex);
std::lock_guard<Fmutex> lockr(read_debug_mutex); std::lock_guard<Fmutex> lockr(read_mutex);
Chip_UART0_SetBaud(uart, bps); Chip_UART0_SetBaud(uart, bps);
} }
bool LpcDebugUart::txempty() bool LpcDebugUart::txempty()
{ {
std::lock_guard<Fmutex> lock(write_debug_mutex); std::lock_guard<Fmutex> lock(write_mutex);
return (RingBuffer_GetCount(&txring) == 0); return (RingBuffer_GetCount(&txring) == 0);
} }

4
source/shoh/src/peripherals/LpcDebugUart.h
View File

@@ -56,8 +56,8 @@ private:
TaskHandle_t notify_rx; TaskHandle_t notify_rx;
TaskHandle_t notify_tx; TaskHandle_t notify_tx;
void (*on_receive)(void); // callback for received data notifications void (*on_receive)(void); // callback for received data notifications
Fmutex read_debug_mutex; Fmutex read_mutex;
Fmutex write_debug_mutex; Fmutex write_mutex;
}; };
#endif /* LPCUART_H_ */ #endif /* LPCUART_H_ */

4
source/shoh/src/peripherals/LpcUart.cpp
View File

@@ -8,8 +8,6 @@
#include <cstring> #include <cstring>
#include <mutex> #include <mutex>
#include "LpcUart.h" #include "LpcUart.h"
#include "FreeRTOS.h"
#include "task.h"
/* shoh: Important differences /* shoh: Important differences
* We don't have movable pins -> not needed. * We don't have movable pins -> not needed.
@@ -128,8 +126,6 @@ LpcUart::LpcUart(const LpcUartConfig &cfg) {
uart = cfg.pUART; // set the actual value after validity checking uart = cfg.pUART; // set the actual value after validity checking
//Not that straightforward.
//But will work for uart1, kind of...
if(cfg.tx.port >= 0) { if(cfg.tx.port >= 0) {
Chip_IOCON_PinMuxSet(LPC_IOCON, cfg.tx.port, cfg.tx.pin, (IOCON_FUNC4 | IOCON_MODE_INACT | IOCON_DIGMODE_EN)); Chip_IOCON_PinMuxSet(LPC_IOCON, cfg.tx.port, cfg.tx.pin, (IOCON_FUNC4 | IOCON_MODE_INACT | IOCON_DIGMODE_EN));
} }

787
source/shoh/src/peripherals/networking/esp8266_socket.c
View File

@@ -1,787 +0,0 @@
/* ========================================
*
* Copyright YOUR COMPANY, THE YEAR
* All Rights Reserved
* UNPUBLISHED, LICENSED SOFTWARE.
*
* CONFIDENTIAL AND PROPRIETARY INFORMATION
* WHICH IS THE PROPERTY OF your company.
*
* ========================================
*/
#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
#include <string.h>
#include "ring_buffer.h"
#include "esp8266_socket.h"
#include "serial_port.h"
#include "FreeRTOS.h"
#include "task.h"
typedef int EspSocket_t;
static inline uint32_t get_ticks(void) {
return xTaskGetTickCount();
}
#define I_DONT_USE(x) (void) x
#define DEBUGP( ... ) printf( __VA_ARGS__ )
// macro for changing state. Correct operation requires that ctx is a pointer to state machine instance (see state template)
#define TRAN(st) ctx->next_state = st
typedef enum eventTypes { eEnter, eExit, eTick, eReceive, eConnect, eDisconnect, eSend } EventType;
typedef struct event_ {
EventType ev; // event type (= what happened)
// we could add additional data
} event;
static const event evEnter = { eEnter };
static const event evExit = { eExit };
typedef struct smi_ smi;
typedef void (*smf)(smi *, const event *); // prototype of state handler function pointer
#define EVQ_SIZE 32
#define SMI_BUFSIZE 80
#define RC_NOT_AVAILABLE -1
#define RC_OK 0
#define RC_ERROR 1
struct smi_ {
smf state; // current state (function pointer)
smf next_state; // next state (function pointer)
RINGBUFF_T EspEventQ;
event evq_buf[EVQ_SIZE];
int timer;
int count;
int pos;
char buffer[SMI_BUFSIZE];
char ssid[32]; // SSID
char pwd[32]; // password
char sa_data[32]; // ip address
char sa_port[14]; // port number (string)
};
static void stInit(smi *ctx, const event *e);
static void stEchoOff(smi *ctx, const event *e);
static void stStationModeCheck(smi *ctx, const event *e);
static void stStationModeSet(smi *ctx, const event *e);
static void stConnectAP(smi *ctx, const event *e);
static void stReady(smi *ctx, const event *e);
static void stConnectTCP(smi *ctx, const event *e);
static void stConnected(smi *ctx, const event *e);
static void stCloseTCP(smi *ctx, const event *e);
static void stPassthrough(smi *ctx, const event *e);
static void stPassthroughOK(smi *ctx, const event *e);
static void stAT(smi *ctx, const event *e);
static void stCommandMode(smi *ctx, const event *e);
static void EspSocketRun(smi *ctx);
smi EspSocketInstance;
static void port2str(int i, char *str)
{
int m = 100000;
i %= m; // limit integer size to max 5 digits.
while(i / m == 0) m/=10;
while(m > 0) {
*str++ = '0' + i / m;
i %= m;
m /= 10;
}
*str='\0';
}
void smi_init(smi *ctx)
{
serial_init(ctx);
memset(ctx, 0, sizeof(smi));
ctx->state = stInit;
ctx->next_state = stInit;
RingBuffer_Init(&ctx->EspEventQ, ctx->evq_buf, sizeof(event), EVQ_SIZE);
ctx->state(ctx, &evEnter); // enter initial state
}
//Needs a mechanism to return error code after the timeout.
//Timeout is done by the ctx->timer in states.
//Tick event should be dispatched every ms, which seems not to be the case. (It's more rare.)
//Look at the stInit for reference
int esp_socket(const char *ssid, const char *password)
{
smi_init(&EspSocketInstance);
strncpy(EspSocketInstance.ssid, ssid, 32);
strncpy(EspSocketInstance.pwd, password, 32);
while(EspSocketInstance.state != stReady) {
// run esp task and run ticks
EspSocketRun(&EspSocketInstance);
}
return 0;
}
//Needs a mechanism to return error code after the timeout.
int esp_connect(int sockfd, const char *addr, int port)
{
I_DONT_USE(sockfd);
strncpy(EspSocketInstance.sa_data,addr,sizeof(EspSocketInstance.sa_data)-1);
EspSocketInstance.sa_data[sizeof(EspSocketInstance.sa_data)-1] = '\0';
port2str(port, EspSocketInstance.sa_port);
const event e = { eConnect };
RingBuffer_Insert(&EspSocketInstance.EspEventQ,&e);
int rc = 0;
while(EspSocketInstance.state != stConnected) {
// run esp task and run ticks
EspSocketRun(&EspSocketInstance);
}
return rc;
}
int esp_read(int sockfd, void *data, int length)
{
I_DONT_USE(sockfd);
int count = 0;
if(EspSocketInstance.state == stConnected) {
#if 0
DEBUGP("[rd=%d]\r\n", length);
// read data
while(count < length && serial_get_char(&EspSocketInstance, data)) {
//char c = *((unsigned char *)data);
//DEBUGP("[%02X %c]\r\n", c , isprint(c) ? c : '.');
++count;
++data;
}
#else
count = serial_read_buf(&EspSocketInstance, data, length);
#endif
}
return count;
}
int esp_write(int sockfd, const void *data, int length)
{
I_DONT_USE(sockfd);
if(EspSocketInstance.state == stConnected) {
// write data
serial_write_buf(&EspSocketInstance, data, length);
}
return length;
}
int esp_close(int sockfd)
{
return esp_shutdown(sockfd, -1);
}
int esp_shutdown(int sockfd, int how)
{
I_DONT_USE(sockfd);
I_DONT_USE(how);
const event e = { eDisconnect };
RingBuffer_Insert(&EspSocketInstance.EspEventQ,&e);
while(EspSocketInstance.state != stReady) {
// run esp task and run ticks
EspSocketRun(&EspSocketInstance);
}
return 0;
}
int esp_peek(int sockfd)
{
int cnt = 0;
if(EspSocketInstance.state == stConnected) {
cnt = serial_peek(&EspSocketInstance);
}
return cnt;
}
#if 0
/* this is state template */
void stStateTemplate(smi *ctx, const event *e)
{
switch(e->ev) {
case eEnter:
break;
case eExit:
break;
case eTick:
break;
case eReceive:
break;
default:
break;
}
}
#endif
void init_counters(smi *ctx) {
ctx->count = 0;
ctx->pos = 0;
ctx->timer = 0;
}
/* Read and store characters upto specified length.
* Returns true when specified amount of characters have been accumulated. */
void sm_flush(smi *ctx)
{
//DEBUGP("flush: %d\n", (int)xSerialRxWaiting(ctx->ComPort));
while(serial_get_char(ctx, ctx->buffer));
}
/* Read and store characters upto specified length.
* Returns true when specified amount of characters have been accumulated. */
bool sm_read_buffer(smi *ctx, int count)
{
while(ctx->pos < (SMI_BUFSIZE - 1) && ctx->pos < count && serial_get_char(ctx, ctx->buffer + ctx->pos)) {
//putchar(ctx->buffer[ctx->pos]); // debugging
++ctx->pos;
}
return (ctx->pos >= count);
}
/* Read an integer.
* Consumes characters until a non-nondigit is received. The nondigit is also consumed. */
bool sm_read_int(smi *ctx, int *value)
{
bool result = false;
while(ctx->pos < (SMI_BUFSIZE - 1) && serial_get_char(ctx, ctx->buffer + ctx->pos)) {
if(!isdigit((int)ctx->buffer[ctx->pos])) {
ctx->buffer[ctx->pos] = '\0';
*value = atoi(ctx->buffer);
result = true;
break;
}
else {
++ctx->pos;
}
}
return result;
}
/* Read and store data until one of the specified strings is received.
* The matched string is also included in the data .*/
int sm_read_until(smi *ctx, const char **p)
{
int result = RC_NOT_AVAILABLE;
while(result < 0 && ctx->pos < (SMI_BUFSIZE - 1) && serial_get_char(ctx, ctx->buffer + ctx->pos)) {
++ctx->pos;
ctx->buffer[ctx->pos] = '\0';
for(int i = 0; result < 0 && p[i] != NULL; ++i) {
if(strstr(ctx->buffer, p[i]) != NULL) {
result = i;
}
}
}
return result;
}
/* read and store data until result is received */
int sm_read_result(smi *ctx)
{
static const char *result_list[] = { "OK\r\n", "ERROR\r\n", NULL };
return sm_read_until(ctx, result_list);
}
/* read and consume characters until specified string occurs */
bool sm_wait_for(smi *ctx, const char *p)
{
bool result = false;
int len = strlen(p);
while(sm_read_buffer(ctx, len)) {
ctx->buffer[ctx->pos] = '\0';
if(strstr(ctx->buffer, p) != NULL) {
result = true;
break;
}
else {
memmove(ctx->buffer, ctx->buffer + 1, ctx->pos);
--ctx->pos;
}
}
return result;
}
static void stInit(smi *ctx, const event *e)
{
switch(e->ev) {
case eEnter:
DEBUGP("stInit\r\n");
sm_flush(ctx);
init_counters(ctx);
serial_write_str(ctx, "AT\r\n");
break;
case eExit:
break;
case eTick:
++ctx->timer; //increases timer value with every tick
//if(ctx->timer == 2) DEBUGP("[%s]\r\n", ctx->buffer);
//When it hits five - tries to reach the esp, incresing count of attempts.
if(ctx->timer >= 5) {
ctx->timer = 0;
++ctx->count;
if(ctx->count < 2) {
serial_write_str(ctx, "AT\r\n");
}
//If done more attempts than expected - give up.
else {
DEBUGP("Error: Module not responding\r\n");
TRAN(stAT);
}
}
break;
case eReceive:
if(sm_wait_for(ctx, "OK\r\n")) {
TRAN(stEchoOff);
}
break;
default:
break;
}
}
static void stAT(smi *ctx, const event *e)
{
switch(e->ev) {
case eEnter:
DEBUGP("stAT\r\n");
init_counters(ctx);
break;
case eExit:
break;
case eTick:
++ctx->timer;
if(ctx->timer == 5) serial_write_str(ctx, "+++");
if(ctx->timer == 15) TRAN(stInit);
break;
case eReceive:
break;
default:
break;
}
}
static void stEchoOff(smi *ctx, const event *e)
{
switch(e->ev) {
case eEnter:
DEBUGP("stEchoOff\r\n");
sm_flush(ctx);
init_counters(ctx);
serial_write_str(ctx, "ATE0\r\n");
break;
case eExit:
break;
case eTick:
++ctx->timer;
if(ctx->timer >= 10) {
++ctx->count;
if(ctx->count < 3) {
serial_write_str(ctx, "ATE0\r\n");
}
else {
DEBUGP("Error: setting local echo off failed\r\n");
TRAN(stInit);
}
}
break;
case eReceive:
if(sm_wait_for(ctx, "OK\r\n")) {
TRAN(stStationModeCheck);
}
break;
default:
break;
}
}
static void stStationModeCheck(smi *ctx, const event *e)
{
int rc = -1;
switch(e->ev) {
case eEnter:
DEBUGP("stStationModeCheck\r\n");
init_counters(ctx);
serial_write_str(ctx, "AT+CWMODE_CUR?\r\n");
break;
case eExit:
break;
case eTick:
break;
case eReceive:
rc = sm_read_result(ctx);
if(rc == RC_OK) {
//DEBUGP("%d: %s", rc, ctx->buffer);
if(strstr(ctx->buffer, "+CWMODE_CUR:1\r\n") != NULL) {
TRAN(stConnectAP);
}
else {
TRAN(stStationModeSet);
}
}
else if(rc == RC_ERROR) {
}
break;
default:
break;
}
}
static void stStationModeSet(smi *ctx, const event *e)
{
switch(e->ev) {
case eEnter:
DEBUGP("stStationModeSet\r\n");
init_counters(ctx);
serial_write_str(ctx, "AT+CWMODE_CUR=1\r\n");
break;
case eExit:
break;
case eTick:
break;
case eReceive:
if(sm_wait_for(ctx, "OK\r\n")) {
TRAN(stStationModeCheck);
}
break;
default:
break;
}
}
static void connect_ssid(smi *ctx)
{
serial_write_str(ctx, "AT+CWJAP_CUR=\"");
serial_write_str(ctx, ctx->ssid);
serial_write_str(ctx, "\",\"");
serial_write_str(ctx, ctx->pwd);
serial_write_str(ctx, "\"\r\n");
}
static void stConnectAP(smi *ctx, const event *e)
{
int rc;
switch(e->ev) {
case eEnter:
DEBUGP("stConnectAP\r\n");
init_counters(ctx);
break;
case eExit:
break;
case eTick:
// may take upto 7 seconds. do we need a timeout?
++ctx->timer;
if(ctx->timer == 1) {
connect_ssid(ctx);
}
if(ctx->timer >= 70) {
ctx->timer = 0;
}
break;
case eReceive:
rc = sm_read_result(ctx);
if(rc == RC_OK) {
//DEBUGP("%d: %s", rc, ctx->buffer);
TRAN(stReady);
}
else if(rc == RC_ERROR) {
// failed: what to do now?
}
break;
default:
break;
}
}
static void stReady(smi *ctx, const event *e)
{
switch(e->ev) {
case eEnter:
DEBUGP("stReady\r\n");
init_counters(ctx);
break;
case eExit:
break;
case eTick:
break;
case eReceive:
break;
case eConnect:
TRAN(stConnectTCP);
break;
default:
break;
}
}
static void connect_tcp(smi *ctx)
{
serial_write_str(ctx, "AT+CIPSTART=\"TCP\",\"");
serial_write_str(ctx, ctx->sa_data);
serial_write_str(ctx, "\",");
serial_write_str(ctx, ctx->sa_port);
serial_write_str(ctx, "\r\n");
}
static void stConnectTCP(smi *ctx, const event *e)
{
int rc;
switch(e->ev) {
case eEnter:
DEBUGP("stConnectTCP\r\n");
init_counters(ctx);
connect_tcp(ctx);
break;
case eExit:
break;
case eTick:
++ctx->timer;
if(ctx->timer >= 70) {
ctx->timer = 0;
}
break;
case eReceive:
rc = sm_read_result(ctx);
if(rc == RC_OK) {
//DEBUGP("%d: %s", rc, ctx->buffer);
if(strstr(ctx->buffer, "CONNECT\r\n") != NULL) {
TRAN(stPassthrough);
}
else {
// what else can we get with OK??
}
}
else if(rc == RC_ERROR) {
// failed: what to do now?
DEBUGP("Connect failed\r\n");
connect_tcp(ctx);
}
break;
default:
break;
}
}
static void stPassthrough(smi *ctx, const event *e)
{
int rc;
switch(e->ev) {
case eEnter:
DEBUGP("stPassthrough\r\n");
init_counters(ctx);
serial_write_str(ctx, "AT+CIPMODE=1\r\n");
break;
case eExit:
break;
case eTick:
break;
case eReceive:
rc = sm_read_result(ctx);
if(rc == RC_OK) {
TRAN(stPassthroughOK);
}
else if(rc == RC_ERROR) {
// failed: what to do now?
}
break;
default:
break;
}
}
static void stPassthroughOK(smi *ctx, const event *e)
{
switch(e->ev) {
case eEnter:
DEBUGP("stPassthroughOK\r\n");
init_counters(ctx);
serial_write_str(ctx, "AT+CIPSEND\r\n");
break;
case eExit:
break;
case eTick:
break;
case eReceive:
if(sm_wait_for(ctx, ">")) {
TRAN(stConnected);
}
break;
default:
break;
}
}
static void stConnected(smi *ctx, const event *e)
{
switch(e->ev) {
case eEnter:
DEBUGP("stConnected\r\n");
init_counters(ctx);
break;
case eExit:
break;
case eTick:
break;
case eReceive:
break;
case eDisconnect:
TRAN(stCommandMode);
break;
default:
break;
}
}
static void stCommandMode(smi *ctx, const event *e)
{
switch(e->ev) {
case eEnter:
DEBUGP("stCommandMode\r\n");
init_counters(ctx);
break;
case eExit:
break;
case eTick:
++ctx->timer;
if(ctx->timer == 10) serial_write_str(ctx, "+++");
if(ctx->timer == 25) TRAN(stCloseTCP);
break;
case eReceive:
break;
default:
break;
}
}
static void stCloseTCP(smi *ctx, const event *e)
{
int rc = -1;
switch(e->ev) {
case eEnter:
DEBUGP("stCloseTCP\r\n");
init_counters(ctx);
serial_write_str(ctx, "AT+CIPMODE=0\r\n");;
break;
case eReceive:
rc = sm_read_result(ctx);
if(rc == RC_OK) {
if(strstr(ctx->buffer, "CLOSED") != NULL) {
TRAN(stReady);
}
else {
init_counters(ctx);
serial_write_str(ctx, "AT+CIPCLOSE\r\n");;
}
}
else if(rc == RC_ERROR) {
}
break;
case eExit:
break;
case eTick:
++ctx->timer;
if(ctx->timer == 25) TRAN(stCommandMode);
break;
default:
break;
}
}
static void dispatch_event(smi *ctx, const event *e)
{
ctx->state(ctx, e); // dispatch event to current state
if(ctx->state != ctx->next_state) { // check if state was changed
ctx->state(ctx, &evExit); // exit old state (cleanup)
ctx->state = ctx->next_state; // change state
ctx->state(ctx, &evEnter); // enter new state
}
}
/**
* Receive events from queue and dispatch them to state machine
*/
static void EspSocketRun(smi *ctx)
{
event e;
static uint32_t old = 0 ;
uint32_t now = 0 ;
now = get_ticks()/100;
if(now != old) {
const event tick = { eTick };
old = now;
// send ESP tick
RingBuffer_Insert(&ctx->EspEventQ, &tick);
}
if(serial_peek(ctx)) {
const event rcv = { eReceive };
RingBuffer_Insert(&ctx->EspEventQ, &rcv);
}
// read queue
while (RingBuffer_Pop(&ctx->EspEventQ,&e)) {
dispatch_event(ctx, &e); // dispatch event to current state
}
}
/* [] END OF FILE */

21
source/shoh/src/peripherals/networking/esp8266_socket.h
View File

@@ -1,21 +0,0 @@
#ifndef ESP8266_H_
#define ESP8266_H_
#ifdef __cplusplus
extern "C" {
#endif
int esp_socket(const char *ssid, const char *password) ;
int esp_connect(int sockfd, const char *addr, int port);
int esp_read(int sockfd, void *data, int length);
int esp_write(int sockfd, const void *data, int length);
int esp_close(int sockfd);
int esp_shutdown(int sockfd, int how);
int esp_peek(int sockfd);
#ifdef __cplusplus
}
#endif
#endif

56
source/shoh/src/peripherals/networking/serial_port.cpp
View File

@@ -1,56 +0,0 @@
/*
* serial_port.cpp
*
* Created on: 25.8.2021
* Author: keijo
*/
#include "LpcUart.h"
#include "serial_port.h"
#ifdef __cplusplus
extern "C" {
#endif
static LpcUart *EspUart;
void serial_init(void *ctx)
{
if(EspUart == nullptr) {
LpcPinMap none = {-1, -1}; // unused pin has negative values in it
LpcPinMap txpin_esp = { 0, 14 }; // transmit pin
LpcPinMap rxpin_esp = { 0, 13 }; // receive pin
LpcUartConfig cfg = { LPC_USART1, 115200, UARTN_CFG_DATALEN_8 | UARTN_CFG_PARITY_NONE | UARTN_CFG_STOPLEN_1, false, txpin_esp, rxpin_esp, none, none };
EspUart = new LpcUart(cfg);
}
}
void serial_write_buf(void *ctx, const char *buf, int len)
{
EspUart->write(buf, len);
}
void serial_write_str(void *ctx, const char *s)
{
EspUart->write(s);
}
int serial_read_buf(void *ctx, char *buf, int len)
{
return EspUart->read(buf, len, 20 * len);
}
int serial_get_char(void *ctx, char *p)
{
return EspUart->read(p, 1, 20);//EspUart->read(p, 1, 20);
}
int serial_peek(void *ctx)
{
return EspUart->peek();
}
#ifdef __cplusplus
}
#endif

30
source/shoh/src/peripherals/networking/serial_port.h
View File

@@ -1,30 +0,0 @@
/*
* serial_port.h
*
* Created on: 25.8.2021
* Author: keijo
*/
#ifndef SERIAL_PORT_H_
#define SERIAL_PORT_H_
#ifdef __cplusplus
extern "C" {
#endif
void serial_init(void *ctx);
void serial_write_buf(void *ctx, const char *buf, int len);
void serial_write_str(void *ctx, const char *s);
int serial_read_buf(void *ctx, char *buf, int len);
int serial_get_char(void *ctx, char *p);
int serial_peek(void *ctx);
#ifdef __cplusplus
}
#endif
#endif /* SERIAL_PORT_H_ */

4
source/shoh/src/threads/master/Master.cpp
View File

@@ -14,7 +14,6 @@
#include "Logging.h" #include "Logging.h"
#include "UserInterface.h" #include "UserInterface.h"
#include "Temperature.h" #include "Temperature.h"
#include "Network.h"
#include "queue.h" #include "queue.h"
static const char* rotary_direction[] = static const char* rotary_direction[] =
@@ -137,9 +136,6 @@ void thread_master(void* pvParams) {
manager->tm->createTask(thread_temperature, "temperature", manager->tm->createTask(thread_temperature, "temperature",
configMINIMAL_STACK_SIZE * 8,tskIDLE_PRIORITY + 1UL, configMINIMAL_STACK_SIZE * 8,tskIDLE_PRIORITY + 1UL,
static_cast<void*>(manager)); static_cast<void*>(manager));
manager->tm->createTask(thread_network, "network",
configMINIMAL_STACK_SIZE * 8,tskIDLE_PRIORITY + 1UL,
static_cast<void*>(manager));
LOG_INFO("Master created tasks"); LOG_INFO("Master created tasks");
m.taskFunction(); m.taskFunction();
} }

54
source/shoh/src/threads/networking/Network.cpp
View File

@@ -1,54 +0,0 @@
/*
* Network.cpp
*
* Created on: 31 May 2023
*/
#include "Network.h"
#include "esp8266_socket.h"
#include "Log.h"
#define NETWORK_DEMO 0
Network::Network(ThreadCommon::QueueManager* qm) : _qm(qm)
{
this->ssid = "SSID";
this->password = "PASSWORD";
this->ip = "127.0.0.1";
}
Network::~Network() {}
void Network::taskFunction()
{
#if NETWORK_DEMO
int soc = esp_socket(this->ssid.c_str(), this->password.c_str());
LOG_INFO("Connected to network");
int stat = esp_connect(soc, this->ip.c_str(), 5000);
#endif
for (;;)
{
#if NETWORK_DEMO
LOG_DEBUG("ESP socket status: %d", stat);
if(stat == 0)
stat = esp_connect(soc, this->ip.c_str(), 5000);
#else
vTaskDelay(portMAX_DELAY);
#endif
}
}
void thread_network(void* pvParams)
{
ThreadCommon::CommonManagers * manager = static_cast<ThreadCommon::CommonManagers*>(pvParams);
Network n(manager->qm);
n.taskFunction();
}

29
source/shoh/src/threads/networking/Network.h
View File

@@ -1,29 +0,0 @@
/*
* Network.h
*
* Created on: 31 May 2023
*/
#ifndef THREADS_NETWORKING_NETWORK_H_
#define THREADS_NETWORKING_NETWORK_H_
#include <string>
#include "Event.h"
#include "ThreadCommon.h"
class Network {
public:
Network(ThreadCommon::QueueManager* qm);
virtual ~Network();
void taskFunction();
private:
ThreadCommon::QueueManager* _qm;
std::string ssid;
std::string password;
std::string ip;
};
void thread_network(void* pvParams);
#endif /* THREADS_NETWORKING_NETWORK_H_ */

4
source/shoh/src/threads/relay/Relay.h
View File

@@ -48,8 +48,8 @@ public:
void utilizeEventData(); void utilizeEventData();
private: private:
ThreadCommon::QueueManager* _qm; ThreadCommon::QueueManager* _qm;
RelayDevice relays [2] = {{0, 11, 0}, RelayDevice relays [2] = {{0, 24, 0},
{0, 23, 1}}; {0, 26, 1}};
void parseEvent(Event * e); void parseEvent(Event * e);
int8_t setpoint, ext_temp; int8_t setpoint, ext_temp;

6
source/shoh/src/threads/rotary/Rotary.h
View File

@@ -20,9 +20,9 @@ public:
private: private:
Event* message; Event* message;
ThreadCommon::QueueManager* _qm; ThreadCommon::QueueManager* _qm;
DigitalIoPin signal[3] = { { 1, 18, true, true, false, true, PIN_INT0_IRQn}, //SW1 //Right //0 1 DigitalIoPin signal[3] = { { 0, 1, true, true, false, true, PIN_INT0_IRQn}, //SW1
{ 2, 12, true, true, false, true, PIN_INT1_IRQn}, //SW2 //Left //0 16 { 0, 16, true, true, false, true, PIN_INT1_IRQn}, //SW2
{ 2, 11, true, false, false, true, PIN_INT2_IRQn} }; //Press //1 8 { 1, 8, true, false, false, true, PIN_INT2_IRQn} };
}; };
void thread_rotary(void* pvParams); void thread_rotary(void* pvParams);

12
source/shoh/src/threads/user_interface/UserInterface.cpp
View File

@@ -75,12 +75,12 @@ void UserInterface::handleLCD(LiquidCrystal *lcd, const char *str)
void UserInterface::initLCD1() void UserInterface::initLCD1()
{ {
this->lcd1_rs = new DigitalIoPin(1, 24, false);//(1, 18, false); this->lcd1_rs = new DigitalIoPin(1, 9, false);
this->lcd1_en = new DigitalIoPin(1, 26, false);//(1, 24, false); this->lcd1_en = new DigitalIoPin(0, 14, false);
this->lcd1_d4 = new DigitalIoPin(1, 27, false);//(1, 19, false); this->lcd1_d4 = new DigitalIoPin(0, 13, false);
this->lcd1_d5 = new DigitalIoPin(1, 25, false);//(1, 26, false); this->lcd1_d5 = new DigitalIoPin(0, 12, false);
this->lcd1_d6 = new DigitalIoPin(1, 28, false);//(1, 27, false); this->lcd1_d6 = new DigitalIoPin(0, 23, false);
this->lcd1_d7 = new DigitalIoPin(2, 3, false);//(1, 25, false); this->lcd1_d7 = new DigitalIoPin(0, 11, false);
this->lcd1_rs->write(false); this->lcd1_rs->write(false);
this->lcd1_en->write(false); this->lcd1_en->write(false);