From 81172b43ec1e79806f8c2257c268a33c862fd09d Mon Sep 17 00:00:00 2001
From: Breno <breno.vitorino@hotmail.com>
Date: Fri, 25 Apr 2025 17:23:46 -0300
Subject: [PATCH 1/4] SDK30 working brench config

---
 Android_App/.idea/.name                       |   2 +-
 Android_App/.idea/codeStyles/Project.xml      | 123 ----
 .../.idea/codeStyles/codeStyleConfig.xml      |   5 -
 .../.idea/deploymentTargetSelector.xml        |  18 -
 Android_App/.idea/gradle.xml                  |   1 -
 Android_App/.idea/misc.xml                    |   1 +
 Android_App/.idea/vcs.xml                     |   6 -
 Android_App/README.md                         |   1 -
 Android_App/app/build.gradle.kts              |  38 +-
 .../ExampleInstrumentedTest.kt                |   4 +-
 Android_App/app/src/main/AndroidManifest.xml  |  16 +-
 .../main/java/com/example/.idea/.gitignore    |   3 -
 .../example/.idea/caches/deviceStreaming.xml  | 607 ------------------
 .../src/main/java/com/example/.idea/misc.xml  |   6 -
 .../main/java/com/example/.idea/modules.xml   |   8 -
 .../java/com/example/mqtt/ConexaoActivity.kt  |  44 ++
 .../InputParametersActivity.kt                |  32 +-
 .../{prog1_teste => mqtt}/MainActivity.kt     |   4 +-
 .../main/java/com/example/mqtt/MqttConfig.kt  |   7 +
 .../main/java/com/example/mqtt/MqttHelper.kt  | 103 +++
 .../java/com/example/mqtt/ResultActivity.kt   | 158 +++++
 .../example/prog1_teste/ConexaoActivity.kt    |  31 -
 .../com/example/prog1_teste/MqttConfig.kt     |  12 -
 .../com/example/prog1_teste/ResultActivity.kt |  64 --
 .../com/example/prog1_teste/mqttHelper.kt     |  75 ---
 .../src/main/res/layout/activity_conexao.xml  |  10 +-
 .../res/layout/activity_input_parameters.xml  |   8 +-
 .../app/src/main/res/layout/activity_main.xml |   8 +-
 .../res/layout/activity_main_back_main.xml    |  50 --
 .../src/main/res/layout/activity_result.xml   |  23 +-
 .../app/src/main/res/layout/publish.xml       |  37 ++
 .../ic_launcher.xml                           |   0
 .../ic_launcher_round.xml                     |   0
 .../app/src/main/res/values-night/themes.xml  |   2 +-
 Android_App/app/src/main/res/values/ids.xml   |   6 +
 .../app/src/main/res/values/strings.xml       |  16 +-
 .../app/src/main/res/values/themes.xml        |   4 +-
 .../{prog1_teste => mqtt}/ExampleUnitTest.kt  |   2 +-
 Android_App/gradle.properties                 |   3 +-
 Android_App/gradle/libs.versions.toml         |  14 +-
 .../gradle/wrapper/gradle-wrapper.properties  |   2 +-
 Android_App/settings.gradle.kts               |   3 +-
 42 files changed, 458 insertions(+), 1099 deletions(-)
 delete mode 100644 Android_App/.idea/codeStyles/Project.xml
 delete mode 100644 Android_App/.idea/codeStyles/codeStyleConfig.xml
 delete mode 100644 Android_App/.idea/deploymentTargetSelector.xml
 delete mode 100644 Android_App/.idea/vcs.xml
 delete mode 100644 Android_App/README.md
 rename Android_App/app/src/androidTest/java/com/example/{prog1_teste => mqtt}/ExampleInstrumentedTest.kt (84%)
 delete mode 100644 Android_App/app/src/main/java/com/example/.idea/.gitignore
 delete mode 100644 Android_App/app/src/main/java/com/example/.idea/caches/deviceStreaming.xml
 delete mode 100644 Android_App/app/src/main/java/com/example/.idea/misc.xml
 delete mode 100644 Android_App/app/src/main/java/com/example/.idea/modules.xml
 create mode 100644 Android_App/app/src/main/java/com/example/mqtt/ConexaoActivity.kt
 rename Android_App/app/src/main/java/com/example/{prog1_teste => mqtt}/InputParametersActivity.kt (58%)
 rename Android_App/app/src/main/java/com/example/{prog1_teste => mqtt}/MainActivity.kt (96%)
 create mode 100644 Android_App/app/src/main/java/com/example/mqtt/MqttConfig.kt
 create mode 100644 Android_App/app/src/main/java/com/example/mqtt/MqttHelper.kt
 create mode 100644 Android_App/app/src/main/java/com/example/mqtt/ResultActivity.kt
 delete mode 100644 Android_App/app/src/main/java/com/example/prog1_teste/ConexaoActivity.kt
 delete mode 100644 Android_App/app/src/main/java/com/example/prog1_teste/MqttConfig.kt
 delete mode 100644 Android_App/app/src/main/java/com/example/prog1_teste/ResultActivity.kt
 delete mode 100644 Android_App/app/src/main/java/com/example/prog1_teste/mqttHelper.kt
 delete mode 100644 Android_App/app/src/main/res/layout/activity_main_back_main.xml
 create mode 100644 Android_App/app/src/main/res/layout/publish.xml
 rename Android_App/app/src/main/res/{mipmap-anydpi-v26 => mipmap-anydpi}/ic_launcher.xml (100%)
 rename Android_App/app/src/main/res/{mipmap-anydpi-v26 => mipmap-anydpi}/ic_launcher_round.xml (100%)
 create mode 100644 Android_App/app/src/main/res/values/ids.xml
 rename Android_App/app/src/test/java/com/example/{prog1_teste => mqtt}/ExampleUnitTest.kt (90%)

diff --git a/Android_App/.idea/.name b/Android_App/.idea/.name
index 0ed34b1..7871cf3 100644
--- a/Android_App/.idea/.name
+++ b/Android_App/.idea/.name
@@ -1 +1 @@
-Prog1_teste
\ No newline at end of file
+MQTT
\ No newline at end of file
diff --git a/Android_App/.idea/codeStyles/Project.xml b/Android_App/.idea/codeStyles/Project.xml
deleted file mode 100644
index 7643783..0000000
--- a/Android_App/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -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>
\ No newline at end of file
diff --git a/Android_App/.idea/codeStyles/codeStyleConfig.xml b/Android_App/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100644
index 79ee123..0000000
--- a/Android_App/.idea/codeStyles/codeStyleConfig.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/Android_App/.idea/deploymentTargetSelector.xml b/Android_App/.idea/deploymentTargetSelector.xml
deleted file mode 100644
index be400e7..0000000
--- a/Android_App/.idea/deploymentTargetSelector.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="deploymentTargetSelector">
-    <selectionStates>
-      <SelectionState runConfigName="app">
-        <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2025-04-23T01:46:47.333347100Z">
-          <Target type="DEFAULT_BOOT">
-            <handle>
-              <DeviceId pluginId="LocalEmulator" identifier="path=C:\Users\joao3\.android\avd\Pixel_XL_API_36.avd" />
-            </handle>
-          </Target>
-        </DropdownSelection>
-        <DialogSelection />
-      </SelectionState>
-    </selectionStates>
-  </component>
-</project>
\ No newline at end of file
diff --git a/Android_App/.idea/gradle.xml b/Android_App/.idea/gradle.xml
index 639c779..97f0a8e 100644
--- a/Android_App/.idea/gradle.xml
+++ b/Android_App/.idea/gradle.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
diff --git a/Android_App/.idea/misc.xml b/Android_App/.idea/misc.xml
index b2c751a..74dd639 100644
--- a/Android_App/.idea/misc.xml
+++ b/Android_App/.idea/misc.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">
diff --git a/Android_App/.idea/vcs.xml b/Android_App/.idea/vcs.xml
deleted file mode 100644
index 94a25f7..0000000
--- a/Android_App/.idea/vcs.xml
+++ /dev/null
@@ -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>
\ No newline at end of file
diff --git a/Android_App/README.md b/Android_App/README.md
deleted file mode 100644
index bdfcc3a..0000000
--- a/Android_App/README.md
+++ /dev/null
@@ -1 +0,0 @@
-the functions present in MqttHelper.kt should be used to connect, publsih and disconnect on the ESP32
diff --git a/Android_App/app/build.gradle.kts b/Android_App/app/build.gradle.kts
index 1f41fb1..d64d17f 100644
--- a/Android_App/app/build.gradle.kts
+++ b/Android_App/app/build.gradle.kts
@@ -3,21 +3,14 @@ plugins {
     alias(libs.plugins.kotlin.android)
 }
 
-  repositories {
-	        // paho repository
-	        maven {
-	            url "https://repo.eclipse.org/content/repositories/paho-snapshots/"
-	        }
-	}
-
 android {
-    namespace = "com.example.prog1_teste"
-    compileSdk = 35
+    namespace = "com.example.mqtt"
+    compileSdk = 31
 
     defaultConfig {
-        applicationId = "com.example.prog1_teste"
-        minSdk = 24
-        targetSdk = 35
+        applicationId = "com.example.mqtt"
+        minSdk = 30
+        targetSdk = 30
         versionCode = 1
         versionName = "1.0"
 
@@ -43,16 +36,11 @@ android {
 }
 
 dependencies {
-
-    implementation(libs.androidx.core.ktx)
-    implementation(libs.androidx.appcompat)
-    implementation(libs.material)
-    implementation(libs.androidx.activity)
-    implementation(libs.androidx.constraintlayout)
-    testImplementation(libs.junit)
-    androidTestImplementation(libs.androidx.junit)
-    androidTestImplementation(libs.androidx.espresso.core)
-    // paho dependencies
-	implementation 'org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.1.0'
-	implementation 'org.eclipse.paho:org.eclipse.paho.android.service:1.1.1'
-}
+    implementation("org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.5")
+    implementation("org.eclipse.paho:org.eclipse.paho.android.service:1.1.1")
+    implementation("androidx.localbroadcastmanager:localbroadcastmanager:1.1.0")
+    implementation("androidx.core:core-ktx:1.7.0")
+    implementation("androidx.appcompat:appcompat:1.4.1")
+    implementation("com.google.android.material:material:1.5.0")
+    implementation("androidx.work:work-runtime-ktx:2.7.1")  // Para PendingIntent
+}
\ No newline at end of file
diff --git a/Android_App/app/src/androidTest/java/com/example/prog1_teste/ExampleInstrumentedTest.kt b/Android_App/app/src/androidTest/java/com/example/mqtt/ExampleInstrumentedTest.kt
similarity index 84%
rename from Android_App/app/src/androidTest/java/com/example/prog1_teste/ExampleInstrumentedTest.kt
rename to Android_App/app/src/androidTest/java/com/example/mqtt/ExampleInstrumentedTest.kt
index d01bca9..768452b 100644
--- a/Android_App/app/src/androidTest/java/com/example/prog1_teste/ExampleInstrumentedTest.kt
+++ b/Android_App/app/src/androidTest/java/com/example/mqtt/ExampleInstrumentedTest.kt
@@ -1,4 +1,4 @@
-package com.example.prog1_teste
+package com.example.mqtt
 
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
@@ -19,6 +19,6 @@ class ExampleInstrumentedTest {
     fun useAppContext() {
         // Context of the app under test.
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("com.example.prog1_teste", appContext.packageName)
+        assertEquals("com.example.mqtt", appContext.packageName)
     }
 }
\ No newline at end of file
diff --git a/Android_App/app/src/main/AndroidManifest.xml b/Android_App/app/src/main/AndroidManifest.xml
index 7c14e2e..dbfbade 100644
--- a/Android_App/app/src/main/AndroidManifest.xml
+++ b/Android_App/app/src/main/AndroidManifest.xml
@@ -2,9 +2,9 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
 
     <application
         android:allowBackup="true"
@@ -14,24 +14,28 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.Prog1_teste"
+        android:theme="@style/Theme.MQTT"
         tools:targetApi="31">
-        <service android:name="org.eclise.paho.android.service.MqttService" />
 
         <activity android:name=".ConexaoActivity" />
         <activity android:name=".InputParametersActivity" />
         <activity android:name=".ResultActivity" />
+        <activity android:name=".PublishActivity" />
 
 
+        <service
+            android:name="org.eclipse.paho.android.service.MqttService"
+            android:enabled="true"
+            android:exported="false" />
+
         <activity
             android:name=".MainActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
     </application>
 
-</manifest>
+</manifest>
\ No newline at end of file
diff --git a/Android_App/app/src/main/java/com/example/.idea/.gitignore b/Android_App/app/src/main/java/com/example/.idea/.gitignore
deleted file mode 100644
index 26d3352..0000000
--- a/Android_App/app/src/main/java/com/example/.idea/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
diff --git a/Android_App/app/src/main/java/com/example/.idea/caches/deviceStreaming.xml b/Android_App/app/src/main/java/com/example/.idea/caches/deviceStreaming.xml
deleted file mode 100644
index 9e9ba09..0000000
--- a/Android_App/app/src/main/java/com/example/.idea/caches/deviceStreaming.xml
+++ /dev/null
@@ -1,607 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="DeviceStreaming">
-    <option name="deviceSelectionList">
-      <list>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="27" />
-          <option name="brand" value="DOCOMO" />
-          <option name="codename" value="F01L" />
-          <option name="id" value="F01L" />
-          <option name="labId" value="google" />
-          <option name="manufacturer" value="FUJITSU" />
-          <option name="name" value="F-01L" />
-          <option name="screenDensity" value="360" />
-          <option name="screenX" value="720" />
-          <option name="screenY" value="1280" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="OnePlus" />
-          <option name="codename" value="OP5552L1" />
-          <option name="id" value="OP5552L1" />
-          <option name="labId" value="google" />
-          <option name="manufacturer" value="OnePlus" />
-          <option name="name" value="CPH2415" />
-          <option name="screenDensity" value="480" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2412" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="OPPO" />
-          <option name="codename" value="OP573DL1" />
-          <option name="id" value="OP573DL1" />
-          <option name="labId" value="google" />
-          <option name="manufacturer" value="OPPO" />
-          <option name="name" value="CPH2557" />
-          <option name="screenDensity" value="480" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="28" />
-          <option name="brand" value="DOCOMO" />
-          <option name="codename" value="SH-01L" />
-          <option name="id" value="SH-01L" />
-          <option name="labId" value="google" />
-          <option name="manufacturer" value="SHARP" />
-          <option name="name" value="AQUOS sense2 SH-01L" />
-          <option name="screenDensity" value="480" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2160" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="Lenovo" />
-          <option name="codename" value="TB370FU" />
-          <option name="formFactor" value="Tablet" />
-          <option name="id" value="TB370FU" />
-          <option name="labId" value="google" />
-          <option name="manufacturer" value="Lenovo" />
-          <option name="name" value="Tab P12" />
-          <option name="screenDensity" value="340" />
-          <option name="screenX" value="1840" />
-          <option name="screenY" value="2944" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="a15" />
-          <option name="id" value="a15" />
-          <option name="labId" value="google" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="A15" />
-          <option name="screenDensity" value="450" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2340" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="a35x" />
-          <option name="id" value="a35x" />
-          <option name="labId" value="google" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="A35" />
-          <option name="screenDensity" value="450" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2340" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="31" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="a51" />
-          <option name="id" value="a51" />
-          <option name="labId" value="google" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy A51" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="google" />
-          <option name="codename" value="akita" />
-          <option name="id" value="akita" />
-          <option name="labId" value="google" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 8a" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="motorola" />
-          <option name="codename" value="arcfox" />
-          <option name="id" value="arcfox" />
-          <option name="labId" value="google" />
-          <option name="manufacturer" value="Motorola" />
-          <option name="name" value="razr plus 2024" />
-          <option name="screenDensity" value="360" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="1272" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="motorola" />
-          <option name="codename" value="austin" />
-          <option name="id" value="austin" />
-          <option name="labId" value="google" />
-          <option name="manufacturer" value="Motorola" />
-          <option name="name" value="moto g 5G (2022)" />
-          <option name="screenDensity" value="280" />
-          <option name="screenX" value="720" />
-          <option name="screenY" value="1600" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="b0q" />
-          <option name="id" value="b0q" />
-          <option name="labId" value="google" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy S22 Ultra" />
-          <option name="screenDensity" value="600" />
-          <option name="screenX" value="1440" />
-          <option name="screenY" value="3088" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="32" />
-          <option name="brand" value="google" />
-          <option name="codename" value="bluejay" />
-          <option name="id" value="bluejay" />
-          <option name="labId" value="google" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 6a" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="google" />
-          <option name="codename" value="caiman" />
-          <option name="id" value="caiman" />
-          <option name="labId" value="google" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 9 Pro" />
-          <option name="screenDensity" value="360" />
-          <option name="screenX" value="960" />
-          <option name="screenY" value="2142" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="google" />
-          <option name="codename" value="comet" />
-          <option name="default" value="true" />
-          <option name="id" value="comet" />
-          <option name="labId" value="google" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 9 Pro Fold" />
-          <option name="screenDensity" value="390" />
-          <option name="screenX" value="2076" />
-          <option name="screenY" value="2152" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="29" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="crownqlteue" />
-          <option name="id" value="crownqlteue" />
-          <option name="labId" value="google" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy Note9" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="2220" />
-          <option name="screenY" value="1080" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="dm2q" />
-          <option name="id" value="dm2q" />
-          <option name="labId" value="google" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="S23 Plus" />
-          <option name="screenDensity" value="450" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2340" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="dm3q" />
-          <option name="id" value="dm3q" />
-          <option name="labId" value="google" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy S23 Ultra" />
-          <option name="screenDensity" value="600" />
-          <option name="screenX" value="1440" />
-          <option name="screenY" value="3088" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="e1q" />
-          <option name="default" value="true" />
-          <option name="id" value="e1q" />
-          <option name="labId" value="google" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy S24" />
-          <option name="screenDensity" value="480" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2340" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="e3q" />
-          <option name="id" value="e3q" />
-          <option name="labId" value="google" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy S24 Ultra" />
-          <option name="screenDensity" value="450" />
-          <option name="screenX" value="1440" />
-          <option name="screenY" value="3120" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="google" />
-          <option name="codename" value="eos" />
-          <option name="id" value="eos" />
-          <option name="labId" value="google" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Eos" />
-          <option name="screenDensity" value="320" />
-          <option name="screenX" value="384" />
-          <option name="screenY" value="384" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="google" />
-          <option name="codename" value="felix" />
-          <option name="id" value="felix" />
-          <option name="labId" value="google" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel Fold" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="2208" />
-          <option name="screenY" value="1840" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="google" />
-          <option name="codename" value="felix" />
-          <option name="id" value="felix" />
-          <option name="labId" value="google" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel Fold" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="2208" />
-          <option name="screenY" value="1840" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="google" />
-          <option name="codename" value="felix_camera" />
-          <option name="id" value="felix_camera" />
-          <option name="labId" value="google" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel Fold (Camera-enabled)" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="2208" />
-          <option name="screenY" value="1840" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="motorola" />
-          <option name="codename" value="fogona" />
-          <option name="id" value="fogona" />
-          <option name="labId" value="google" />
-          <option name="manufacturer" value="Motorola" />
-          <option name="name" value="moto g play - 2024" />
-          <option name="screenDensity" value="280" />
-          <option name="screenX" value="720" />
-          <option name="screenY" value="1600" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="g0q" />
-          <option name="id" value="g0q" />
-          <option name="labId" value="google" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="SM-S906U1" />
-          <option name="screenDensity" value="450" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2340" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="gta9pwifi" />
-          <option name="id" value="gta9pwifi" />
-          <option name="labId" value="google" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="SM-X210" />
-          <option name="screenDensity" value="240" />
-          <option name="screenX" value="1200" />
-          <option name="screenY" value="1920" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="gts7xllite" />
-          <option name="id" value="gts7xllite" />
-          <option name="labId" value="google" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="SM-T738U" />
-          <option name="screenDensity" value="340" />
-          <option name="screenX" value="1600" />
-          <option name="screenY" value="2560" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="gts8uwifi" />
-          <option name="formFactor" value="Tablet" />
-          <option name="id" value="gts8uwifi" />
-          <option name="labId" value="google" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy Tab S8 Ultra" />
-          <option name="screenDensity" value="320" />
-          <option name="screenX" value="1848" />
-          <option name="screenY" value="2960" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="gts8wifi" />
-          <option name="formFactor" value="Tablet" />
-          <option name="id" value="gts8wifi" />
-          <option name="labId" value="google" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy Tab S8" />
-          <option name="screenDensity" value="274" />
-          <option name="screenX" value="1600" />
-          <option name="screenY" value="2560" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="gts9fe" />
-          <option name="id" value="gts9fe" />
-          <option name="labId" value="google" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy Tab S9 FE 5G" />
-          <option name="screenDensity" value="280" />
-          <option name="screenX" value="1440" />
-          <option name="screenY" value="2304" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="google" />
-          <option name="codename" value="husky" />
-          <option name="id" value="husky" />
-          <option name="labId" value="google" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 8 Pro" />
-          <option name="screenDensity" value="390" />
-          <option name="screenX" value="1008" />
-          <option name="screenY" value="2244" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="30" />
-          <option name="brand" value="motorola" />
-          <option name="codename" value="java" />
-          <option name="id" value="java" />
-          <option name="labId" value="google" />
-          <option name="manufacturer" value="Motorola" />
-          <option name="name" value="G20" />
-          <option name="screenDensity" value="280" />
-          <option name="screenX" value="720" />
-          <option name="screenY" value="1600" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="google" />
-          <option name="codename" value="komodo" />
-          <option name="id" value="komodo" />
-          <option name="labId" value="google" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 9 Pro XL" />
-          <option name="screenDensity" value="360" />
-          <option name="screenX" value="1008" />
-          <option name="screenY" value="2244" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="google" />
-          <option name="codename" value="lynx" />
-          <option name="id" value="lynx" />
-          <option name="labId" value="google" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 7a" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="motorola" />
-          <option name="codename" value="maui" />
-          <option name="id" value="maui" />
-          <option name="labId" value="google" />
-          <option name="manufacturer" value="Motorola" />
-          <option name="name" value="moto g play - 2023" />
-          <option name="screenDensity" value="280" />
-          <option name="screenX" value="720" />
-          <option name="screenY" value="1600" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="o1q" />
-          <option name="id" value="o1q" />
-          <option name="labId" value="google" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy S21" />
-          <option name="screenDensity" value="421" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="31" />
-          <option name="brand" value="google" />
-          <option name="codename" value="oriole" />
-          <option name="id" value="oriole" />
-          <option name="labId" value="google" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 6" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="google" />
-          <option name="codename" value="panther" />
-          <option name="id" value="panther" />
-          <option name="labId" value="google" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 7" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="q5q" />
-          <option name="id" value="q5q" />
-          <option name="labId" value="google" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy Z Fold5" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1812" />
-          <option name="screenY" value="2176" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="q6q" />
-          <option name="id" value="q6q" />
-          <option name="labId" value="google" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy Z Fold6" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1856" />
-          <option name="screenY" value="2160" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="30" />
-          <option name="brand" value="google" />
-          <option name="codename" value="r11" />
-          <option name="formFactor" value="Wear OS" />
-          <option name="id" value="r11" />
-          <option name="labId" value="google" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel Watch" />
-          <option name="screenDensity" value="320" />
-          <option name="screenX" value="384" />
-          <option name="screenY" value="384" />
-          <option name="type" value="WEAR_OS" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="r11q" />
-          <option name="id" value="r11q" />
-          <option name="labId" value="google" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="SM-S711U" />
-          <option name="screenDensity" value="450" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2340" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="30" />
-          <option name="brand" value="google" />
-          <option name="codename" value="redfin" />
-          <option name="id" value="redfin" />
-          <option name="labId" value="google" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 5" />
-          <option name="screenDensity" value="440" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2340" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="google" />
-          <option name="codename" value="shiba" />
-          <option name="id" value="shiba" />
-          <option name="labId" value="google" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 8" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="t2q" />
-          <option name="id" value="t2q" />
-          <option name="labId" value="google" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy S21 Plus" />
-          <option name="screenDensity" value="394" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="google" />
-          <option name="codename" value="tangorpro" />
-          <option name="formFactor" value="Tablet" />
-          <option name="id" value="tangorpro" />
-          <option name="labId" value="google" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel Tablet" />
-          <option name="screenDensity" value="320" />
-          <option name="screenX" value="1600" />
-          <option name="screenY" value="2560" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="google" />
-          <option name="codename" value="tokay" />
-          <option name="default" value="true" />
-          <option name="id" value="tokay" />
-          <option name="labId" value="google" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 9" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2424" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="35" />
-          <option name="brand" value="google" />
-          <option name="codename" value="tokay" />
-          <option name="default" value="true" />
-          <option name="id" value="tokay" />
-          <option name="labId" value="google" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 9" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2424" />
-        </PersistentDeviceSelectionData>
-      </list>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/Android_App/app/src/main/java/com/example/.idea/misc.xml b/Android_App/app/src/main/java/com/example/.idea/misc.xml
deleted file mode 100644
index 1945ce5..0000000
--- a/Android_App/app/src/main/java/com/example/.idea/misc.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/Android_App/app/src/main/java/com/example/.idea/modules.xml b/Android_App/app/src/main/java/com/example/.idea/modules.xml
deleted file mode 100644
index 9f95c09..0000000
--- a/Android_App/app/src/main/java/com/example/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/example.iml" filepath="$PROJECT_DIR$/example.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/Android_App/app/src/main/java/com/example/mqtt/ConexaoActivity.kt b/Android_App/app/src/main/java/com/example/mqtt/ConexaoActivity.kt
new file mode 100644
index 0000000..1165d27
--- /dev/null
+++ b/Android_App/app/src/main/java/com/example/mqtt/ConexaoActivity.kt
@@ -0,0 +1,44 @@
+package com.example.mqtt
+
+
+import android.content.Intent
+import android.os.Bundle
+import android.widget.Button
+import android.widget.EditText
+import android.widget.Toast
+import androidx.appcompat.app.AppCompatActivity
+
+class ConexaoActivity : AppCompatActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_conexao)
+
+        val edtIp = findViewById<EditText>(R.id.edtIp)
+        val edtPorta = findViewById<EditText>(R.id.edtPorta)
+        val btnAvancar = findViewById<Button>(R.id.btnAvancar)
+        val controllerType = intent.getStringExtra("controller_type")
+
+        btnAvancar.setOnClickListener {
+            val ip = edtIp.text.toString()
+            val porta = edtPorta.text.toString()
+
+            if (ip.isNotEmpty() && porta.isNotEmpty()) {
+                // Monta a URI do broker
+                val brokerUri = "tcp://$ip:$porta"
+                val intent = Intent(this, InputParametersActivity::class.java).apply {
+                    putExtra("BROKER_URI",brokerUri )
+                    putExtra("controller_type", controllerType)
+                }
+                startActivity(intent)
+            } else {
+                Toast.makeText(this, "Preencha IP e porta!", Toast.LENGTH_SHORT).show()
+            }
+           // val intent = Intent(this, InputParametersActivity::class.java)
+            //intent.putExtra("broker_ip", ip)
+            //intent.putExtra("mqtt_topic", porta)
+            //intent.putExtra("controller_type", controllerType)
+            //startActivity(intent)
+        }
+    }
+}
\ No newline at end of file
diff --git a/Android_App/app/src/main/java/com/example/prog1_teste/InputParametersActivity.kt b/Android_App/app/src/main/java/com/example/mqtt/InputParametersActivity.kt
similarity index 58%
rename from Android_App/app/src/main/java/com/example/prog1_teste/InputParametersActivity.kt
rename to Android_App/app/src/main/java/com/example/mqtt/InputParametersActivity.kt
index 36fcbda..0393f1b 100644
--- a/Android_App/app/src/main/java/com/example/prog1_teste/InputParametersActivity.kt
+++ b/Android_App/app/src/main/java/com/example/mqtt/InputParametersActivity.kt
@@ -1,4 +1,4 @@
-package com.example.prog1_teste
+package com.example.mqtt
 
 import android.content.Intent
 import android.os.Bundle
@@ -11,6 +11,7 @@ class InputParametersActivity : AppCompatActivity() {
     private lateinit var edtKcr: EditText
     private lateinit var edtTcr: EditText
     private lateinit var btnCalculate: Button
+    private lateinit var mqttHelper: MqttHelper
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -18,19 +19,48 @@ class InputParametersActivity : AppCompatActivity() {
 
         val controllerType = intent.getStringExtra("controller_type")
 
+
         edtKcr = findViewById(R.id.edtKcr)
         edtTcr = findViewById(R.id.edtTcr)
         btnCalculate = findViewById(R.id.btnCalculate)
 
         btnCalculate.setOnClickListener {
+            val brokerUri = intent.getStringExtra("BROKER_URI") ?: ""
             val kcr = edtKcr.text.toString().toDouble()
             val tcr = edtTcr.text.toString().toDouble()
 
+            mqttHelper = MqttHelper(this, brokerUri)
+
             val intent = Intent(this, ResultActivity::class.java)
+            intent.putExtra("BROKER_URI", brokerUri)
             intent.putExtra("controller_type", controllerType)
             intent.putExtra("kcr", kcr)
             intent.putExtra("tcr", tcr)
             startActivity(intent)
+
+            if (controllerType != null) {
+                sendControllerType(controllerType)
+            }
+
+
         }
     }
+    private fun sendControllerType(controllerType: String) {
+        val message = when (controllerType) {
+            "P" -> "P=true"
+            "PID" -> "PID=true"
+            else -> return
+        }
+
+        mqttHelper.connect(
+            onSuccess = {
+                runOnUiThread {
+                    mqttHelper.publish(message)
+                }
+            },
+            onFailure = {
+                }
+
+        )
+    }
 }
\ No newline at end of file
diff --git a/Android_App/app/src/main/java/com/example/prog1_teste/MainActivity.kt b/Android_App/app/src/main/java/com/example/mqtt/MainActivity.kt
similarity index 96%
rename from Android_App/app/src/main/java/com/example/prog1_teste/MainActivity.kt
rename to Android_App/app/src/main/java/com/example/mqtt/MainActivity.kt
index 417526f..ee842f5 100644
--- a/Android_App/app/src/main/java/com/example/prog1_teste/MainActivity.kt
+++ b/Android_App/app/src/main/java/com/example/mqtt/MainActivity.kt
@@ -1,10 +1,10 @@
-package com.example.prog1_teste
+package com.example.mqtt
 
 import android.content.Intent
 import android.os.Bundle
-import androidx.appcompat.app.AppCompatActivity
 import android.widget.Button
 import android.widget.RadioGroup
+import androidx.appcompat.app.AppCompatActivity
 
 class MainActivity : AppCompatActivity() {
 
diff --git a/Android_App/app/src/main/java/com/example/mqtt/MqttConfig.kt b/Android_App/app/src/main/java/com/example/mqtt/MqttConfig.kt
new file mode 100644
index 0000000..0b0c5a2
--- /dev/null
+++ b/Android_App/app/src/main/java/com/example/mqtt/MqttConfig.kt
@@ -0,0 +1,7 @@
+package com.example.mqtt
+
+object MqttConfig {
+    //const val BROKER_URI = "tcp://192.168.100.214:1883"
+    const val TOPIC_PUBLISH = "/lab_pid"
+    const val CLIENT_ID_PREFIX = "android-client-"
+}
\ No newline at end of file
diff --git a/Android_App/app/src/main/java/com/example/mqtt/MqttHelper.kt b/Android_App/app/src/main/java/com/example/mqtt/MqttHelper.kt
new file mode 100644
index 0000000..508076b
--- /dev/null
+++ b/Android_App/app/src/main/java/com/example/mqtt/MqttHelper.kt
@@ -0,0 +1,103 @@
+package com.example.mqtt
+
+import android.content.Context
+import android.util.Log
+import org.eclipse.paho.android.service.MqttAndroidClient
+import org.eclipse.paho.client.mqttv3.*
+
+class MqttHelper(private val context: Context,
+                 private val brokerUri : String) {
+
+    private lateinit var mqttClient: MqttAndroidClient
+
+    fun connect(
+        onSuccess: () -> Unit,
+        onFailure: (Throwable) -> Unit
+    ) {
+        try {
+            mqttClient = MqttAndroidClient(
+                context,
+                brokerUri,
+                "${MqttConfig.CLIENT_ID_PREFIX}${System.currentTimeMillis()}"
+            )
+
+            val options = MqttConnectOptions().apply {
+                isCleanSession = true       // Limpa sessões anteriores
+                setAutomaticReconnect(true) // Reconecta automaticamente
+                connectionTimeout = 30      // Tempo limite de conexão (segundos)
+                keepAliveInterval = 60      // Intervalo de keep-alive (segundos)
+            }
+
+            mqttClient.setCallback(object : MqttCallback {
+                override fun messageArrived(topic: String, message: MqttMessage) {
+                    Log.d("MQTT", "Mensagem recebida: ${String(message.payload)}")
+                }
+
+                override fun connectionLost(cause: Throwable) {
+                    Log.e("MQTT", "Conexão perdida: ${cause.message}")
+                }
+
+                override fun deliveryComplete(token: IMqttDeliveryToken) {
+                    // Mensagem entregue
+                }
+            })
+
+            mqttClient.connect(options, null, object : IMqttActionListener {
+                override fun onSuccess(asyncActionToken: IMqttToken?) {
+                    Log.d("MQTT", "Conectado ao broker!")
+                    onSuccess()
+                }
+
+                override fun onFailure(asyncActionToken: IMqttToken?, exception: Throwable?) {
+                    val error = exception ?: Throwable("Erro desconhecido")
+                    Log.e("MQTT", "Falha na conexão: ${error.message}")
+                    onFailure(error)
+                }
+            })
+
+        } catch (e: Exception) {
+            Log.e("MQTT", "Erro ao configurar cliente: ${e.message}")
+            onFailure(e)
+        }
+    }
+
+    fun publish(message: String) {
+        try {
+            if (::mqttClient.isInitialized && mqttClient.isConnected) {
+                mqttClient.publish(
+                    MqttConfig.TOPIC_PUBLISH,
+                    message.toByteArray(),
+                    1,
+                    false
+                )
+                Log.d("MQTT", "Mensagem enviada: $message")
+            } else {
+                Log.e("MQTT", "Cliente não conectado")
+            }
+        } catch (e: Exception) {
+            Log.e("MQTT", "Erro ao publicar: ${e.message}")
+        }
+    }
+
+    fun subscribe(topic: String, qos: Int = 1) {
+        try {
+            if (::mqttClient.isInitialized && mqttClient.isConnected) {
+                mqttClient.subscribe(topic, qos)
+                Log.d("MQTT", "Assinado ao tópico: $topic")
+            }
+        } catch (e: Exception) {
+            Log.e("MQTT", "Erro ao assinar tópico: ${e.message}")
+        }
+    }
+
+    fun disconnect() {
+        try {
+            if (::mqttClient.isInitialized && mqttClient.isConnected) {
+                mqttClient.disconnect()
+                Log.d("MQTT", "Desconectado")
+            }
+        } catch (e: Exception) {
+            Log.e("MQTT", "Erro ao desconectar: ${e.message}")
+        }
+    }
+}
\ No newline at end of file
diff --git a/Android_App/app/src/main/java/com/example/mqtt/ResultActivity.kt b/Android_App/app/src/main/java/com/example/mqtt/ResultActivity.kt
new file mode 100644
index 0000000..f877bf7
--- /dev/null
+++ b/Android_App/app/src/main/java/com/example/mqtt/ResultActivity.kt
@@ -0,0 +1,158 @@
+package com.example.mqtt
+
+import android.content.Intent
+import android.os.Bundle
+import android.widget.Button
+import android.widget.SeekBar
+import android.widget.Switch
+import android.widget.TextView
+import android.widget.Toast
+import androidx.appcompat.app.AppCompatActivity
+
+class ResultActivity : AppCompatActivity() {
+
+    private lateinit var mqttHelper: MqttHelper
+    private lateinit var txtResult: TextView
+    private lateinit var tvSetpointValue: TextView
+    private lateinit var tvStatus: TextView
+    private lateinit var seekBarTheta: SeekBar
+    private lateinit var switchAntiWindup: Switch
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_result)
+
+        val brokerUri = intent.getStringExtra("BROKER_URI") ?: run {
+            Toast.makeText(this, "Broker não configurado!", Toast.LENGTH_SHORT).show()
+            finish() // Fecha a Activity se não houver URI
+            return
+        }
+        mqttHelper = MqttHelper(this, brokerUri)
+        val controllerType = intent.getStringExtra("controller_type")
+        val kcr = intent.getDoubleExtra("kcr", 0.0)
+        val tcr = intent.getDoubleExtra("tcr", 0.0)
+
+
+        txtResult = findViewById(R.id.txtResult)
+        tvSetpointValue = findViewById(R.id.tv_setpoint_value)
+        tvStatus = findViewById(R.id.tv_status)
+        seekBarTheta = findViewById(R.id.sb_setpoint)
+        switchAntiWindup = findViewById(R.id.sw_anti_windup)
+
+        // Cálculo dos parâmetros PID
+        val (kp, Ti, Td) = calcularParametrosPID(controllerType ?: "", kcr, tcr)
+        txtResult.text = "Kp = $kp\nTi = $Ti\nTd = $Td"
+
+
+        setupSeekBar()
+
+        // Monitorar estado do Anti-Windup
+        switchAntiWindup.setOnCheckedChangeListener { _, isChecked ->
+            if (isChecked) {
+                tvStatus.text = "Anti-Windup: Ligado"
+            } else {
+                tvStatus.text = "Anti-Windup: Desligado"
+            }
+        }
+
+        //val intent = Intent(this, PublishActivity::class.java).apply {
+        //  putExtra("KCR", 10.0)       // Exemplo: valor de Kcr
+        //putExtra("TCR", 5.0)        // Exemplo: valor de Tcr
+        //putExtra("TIPO", "PID")     // "P" ou "PID"
+        //}
+        //startActivity(intent)
+
+        findViewById<Button>(R.id.btnNext).setOnClickListener {
+            val (kp, Ti, Td) = calcularParametrosPID(controllerType ?: "", kcr, tcr)
+            val message = "KP=$kp,KI=$Ti,KD=$Td"
+            mqttHelper.connect(
+                onSuccess = {
+                    runOnUiThread {
+                        mqttHelper.publish(message)
+                        Toast.makeText(this, "PID Enviado: $message", Toast.LENGTH_SHORT).show()
+                    }
+                },
+                onFailure = { erro ->
+                    runOnUiThread {
+                        Toast.makeText(this, "Erro: ${erro.message}", Toast.LENGTH_LONG).show()
+                    }
+                }
+            )
+        }
+
+        val swAntiWindup = findViewById<Switch>(R.id.sw_anti_windup)
+        swAntiWindup.setOnCheckedChangeListener { _, isChecked ->
+            val message = if (isChecked) "ANTI_WINDUP=TRUE" else "ANTI_WINDUP=FALSE"
+
+            // Envia a mensagem via MQTT
+            mqttHelper.connect(
+                onSuccess = {
+                    runOnUiThread {
+                        mqttHelper.publish(message)
+                        Toast.makeText(this, "Anti-Windup: $message", Toast.LENGTH_SHORT).show()
+                    }
+                },
+                onFailure = { erro ->
+                    runOnUiThread {
+                        Toast.makeText(this, "Erro: ${erro.message}", Toast.LENGTH_LONG).show()
+                    }
+                }
+            )
+        }
+
+    }
+
+    private fun setupSeekBar() {
+        seekBarTheta.setOnSeekBarChangeListener(object : SeekBar.OnSeekBarChangeListener {
+            override fun onProgressChanged(seekBar: SeekBar?, progress: Int, fromUser: Boolean) {
+                // Converte o progresso para o intervalo -3,14 a 3,14
+                val mappedValue = mapProgressToRange(progress)
+
+                // Atualiza a UI (ex: TextView)
+                findViewById<TextView>(R.id.tv_setpoint_value).text =
+                    "Valor: ${"%.2f".format(mappedValue)}"  // Formata com 2 casas decimais
+            }
+
+            override fun onStartTrackingTouch(seekBar: SeekBar?) {}
+
+            override fun onStopTrackingTouch(seekBar: SeekBar) {
+                val mappedValue = mapProgressToRange(seekBar.progress)
+                sendValueViaMQTT(mappedValue)
+            }
+        })
+    }
+
+    // Função para mapear 0-628 → -3,14 a 3,14
+    private fun mapProgressToRange(progress: Int): Double {
+        val minDesired = -3.14
+        val maxDesired = 3.14
+        val totalRange = maxDesired - minDesired
+        return minDesired + (progress * totalRange / seekBarTheta.max)
+    }
+
+    private fun sendValueViaMQTT(value: Double) {
+        val topic = "controle/setpoint"
+        val message = "%.2f".format(value)  // Formata com 2 casas decimais
+        mqttHelper.publish(message)
+       // mqttHelper.connect(
+            // onSuccess = { mqttHelper.publish(message) },
+            //   onFailure = { erro ->
+            //     Toast.makeText(this, "Erro: ${erro.message}", Toast.LENGTH_LONG).show()
+            //}
+        //)
+    }
+
+
+    private fun calcularParametrosPID(
+        tipo: String,
+        kcr: Double,
+        tcr: Double
+    ): Triple<Double, Double, Double> {
+        return when (tipo) {
+            "P" -> Triple(0.5 * kcr, 0.0, 0.0)
+            "PID" -> Triple(0.6 * kcr, 1.2 * kcr / tcr, 0.075 * kcr * tcr)
+            else -> Triple(0.0, 0.0, 0.0)
+        }
+    }
+}
+
diff --git a/Android_App/app/src/main/java/com/example/prog1_teste/ConexaoActivity.kt b/Android_App/app/src/main/java/com/example/prog1_teste/ConexaoActivity.kt
deleted file mode 100644
index f6b51da..0000000
--- a/Android_App/app/src/main/java/com/example/prog1_teste/ConexaoActivity.kt
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.example.prog1_teste
-
-import android.content.Intent
-import android.os.Bundle
-import android.widget.Button
-import android.widget.EditText
-import androidx.appcompat.app.AppCompatActivity
-
-class ConexaoActivity : AppCompatActivity() {
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_conexao)
-
-        val edtIp = findViewById<EditText>(R.id.edtIp)
-        val edtTopico = findViewById<EditText>(R.id.edtTopico)
-        val btnAvancar = findViewById<Button>(R.id.btnAvancar)
-        val controllerType = intent.getStringExtra("controller_type")
-
-        btnAvancar.setOnClickListener {
-            val ip = edtIp.text.toString()
-            val topico = edtTopico.text.toString()
-
-            val intent = Intent(this, InputParametersActivity::class.java)
-            intent.putExtra("broker_ip", ip)
-            intent.putExtra("mqtt_topic", topico)
-            intent.putExtra("controller_type", controllerType)
-            startActivity(intent)
-        }
-    }
-}
\ No newline at end of file
diff --git a/Android_App/app/src/main/java/com/example/prog1_teste/MqttConfig.kt b/Android_App/app/src/main/java/com/example/prog1_teste/MqttConfig.kt
deleted file mode 100644
index 3f3449c..0000000
--- a/Android_App/app/src/main/java/com/example/prog1_teste/MqttConfig.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-object MqttConfig {
-    // Broker (servidor MQTT)
-    const val BROKER_URI = "tcp://200.19.144.16:1883" // ou "ssl://..." para TLS
-    const val BROKER_USERNAME = ""
-    const val BROKER_PASSWORD = ""
-
-    // Tópicos
-    const val TOPIC_PUBLISH = "/lab_pid" 
-
-    // Configurações do cliente
-    const val CLIENT_ID_PREFIX = "android-client-"
-}
diff --git a/Android_App/app/src/main/java/com/example/prog1_teste/ResultActivity.kt b/Android_App/app/src/main/java/com/example/prog1_teste/ResultActivity.kt
deleted file mode 100644
index 3017968..0000000
--- a/Android_App/app/src/main/java/com/example/prog1_teste/ResultActivity.kt
+++ /dev/null
@@ -1,64 +0,0 @@
-package com.example.prog1_teste
-
-import android.os.Bundle
-import android.widget.SeekBar
-import android.widget.Switch
-import android.widget.TextView
-import androidx.appcompat.app.AppCompatActivity
-
-class ResultActivity : AppCompatActivity() {
-
-    private lateinit var txtResult: TextView
-    private lateinit var tvSetpointValue: TextView
-    private lateinit var tvStatus: TextView
-    private lateinit var seekBar: SeekBar
-    private lateinit var switchAntiWindup: Switch
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_result)
-
-        val controllerType = intent.getStringExtra("controller_type")
-        val kcr = intent.getDoubleExtra("kcr", 0.0)
-        val tcr = intent.getDoubleExtra("tcr", 0.0)
-
-        txtResult = findViewById(R.id.txtResult)
-        tvSetpointValue = findViewById(R.id.tv_setpoint_value)
-        tvStatus = findViewById(R.id.tv_status)
-        seekBar = findViewById(R.id.sb_setpoint)
-        switchAntiWindup = findViewById(R.id.sw_anti_windup)
-
-        // Cálculo dos parâmetros PID
-        val (kp, Ti, Td) = calcularParametrosPID(controllerType ?: "", kcr, tcr)
-        txtResult.text = "Kp = $kp\nTi = $Ti\nTd = $Td"
-
-        // Configurações da SeekBar (-3.14 a 3.14)
-        seekBar.min = -3.14
-        seekBar.max = 3.14
-        seekBar.setOnSeekBarChangeListener(object : SeekBar.OnSeekBarChangeListener {
-            override fun onProgressChanged(seekBar: SeekBar?, progress: Int, fromUser: Boolean) {
-                tvSetpointValue.text = "Ref. Posição (Potenciômetro): $progress"
-            }
-
-            override fun onStartTrackingTouch(seekBar: SeekBar?) {}
-            override fun onStopTrackingTouch(seekBar: SeekBar?) {}
-        })
-
-        // Monitorar estado do Anti-Windup
-        switchAntiWindup.setOnCheckedChangeListener { _, isChecked ->
-            if (isChecked) {
-                tvStatus.text = "Anti-Windup: Ligado"
-            } else {
-                tvStatus.text = "Anti-Windup: Desligado"
-            }
-        }
-    }
-
-    private fun calcularParametrosPID(tipo: String, kcr: Double, tcr: Double): Triple<Double, Double, Double> {
-        return when (tipo) {
-            "P" -> Triple(0.5 * kcr, 0.0, 0.0)
-            "PID" -> Triple(0.6 * kcr, 1.2 * kcr / tcr, 0.075 * kcr * tcr)
-            else -> Triple(0.0, 0.0, 0.0)
-        }
-    }
-}
diff --git a/Android_App/app/src/main/java/com/example/prog1_teste/mqttHelper.kt b/Android_App/app/src/main/java/com/example/prog1_teste/mqttHelper.kt
deleted file mode 100644
index ea29699..0000000
--- a/Android_App/app/src/main/java/com/example/prog1_teste/mqttHelper.kt
+++ /dev/null
@@ -1,75 +0,0 @@
-import android.content.Context
-import android.util.Log
-import org.eclipse.paho.client.mqttv3.IMqttActionListener
-import org.eclipse.paho.client.mqttv3.IMqttToken
-import org.eclipse.paho.client.mqttv3.MqttAndroidClient
-import org.eclipse.paho.client.mqttv3.MqttConnectOptions
-import org.eclipse.paho.client.mqttv3.MqttException
-import org.eclipse.paho.client.mqttv3.MqttMessage
-
-class mqttHelper(private val context: Context) {
-
-    private lateinit var mqttClient: MqttAndroidClient
-
-    // Conecta ao broker MQTT
-    fun connect(
-        onSuccess: () -> Unit,
-        onFailure: (Throwable) -> Unit
-    ) {
-        try {
-            mqttClient = MqttAndroidClient(
-                context,
-                MqttConfig.BROKER_URI, // Usa a constante do MqttConfig.kt
-                MqttConfig.CLIENT_ID_PREFIX + System.currentTimeMillis()
-            )
-
-            val options = MqttConnectOptions().apply {
-                userName = MqttConfig.BROKER_USERNAME
-                password = MqttConfig.BROKER_PASSWORD.toCharArray()
-                isCleanSession = true
-                automaticReconnect = true
-            }
-
-            mqttClient.connect(options, null, object : IMqttActionListener {
-                override fun onSuccess(asyncActionToken: IMqttToken?) {
-                    Log.d("MQTT", "Conectado com sucesso!")
-                    onSuccess()
-                }
-
-                override fun onFailure(asyncActionToken: IMqttToken?, exception: Throwable?) {
-                    val errorMsg = "Erro na conexão: ${exception?.message ?: "Sem detalhes"}"
-                    Log.e("MQTT", errorMsg)
-                    onFailure(exception ?: Throwable(errorMsg))
-                }
-            })
-
-        } catch (e: MqttException) {
-            Log.e("MQTT", "Exceção ao conectar: ${e.message}")
-            onFailure(e)
-        }
-    }
-
-    // Publica uma mensagem no tópico definido em MqttConfig.kt
-    fun publish(message: String) {
-        try {
-            val mqttMessage = MqttMessage(message.toByteArray()).apply {
-                qos = 1 // Garante entrega (pode ter duplicatas)
-                retained = false
-            }
-            mqttClient.publish(MqttConfig.TOPIC_PUBLISH, mqttMessage) // Usa a constante do MqttConfig.kt
-            Log.d("MQTT", "Mensagem enviada: [${MqttConfig.TOPIC_PUBLISH}] $message")
-        } catch (e: Exception) {
-            Log.e("MQTT", "Erro ao publicar: ${e.message}")
-        }
-    }
-
-    // Desconecta do broker
-    fun disconnect() {
-        try {
-            mqttClient.disconnect()
-            Log.d("MQTT", "Desconectado")
-        } catch (e: Exception) {
-            Log.e("MQTT", "Erro ao desconectar: ${e.message}")
-        }
-    }
-}
diff --git a/Android_App/app/src/main/res/layout/activity_conexao.xml b/Android_App/app/src/main/res/layout/activity_conexao.xml
index 1b74166..de2f985 100644
--- a/Android_App/app/src/main/res/layout/activity_conexao.xml
+++ b/Android_App/app/src/main/res/layout/activity_conexao.xml
@@ -8,7 +8,7 @@
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/conex_o_mqtt"
+        android:text="Conexão MQTT"
         android:textSize="20sp"
         android:layout_marginBottom="16dp" />
 
@@ -17,20 +17,20 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="48dp"
-        android:hint="@string/ip_do_broker_ex_192_168_0_100"
+        android:hint="IP do broker ex: 192.168.0.100"
         android:inputType="textUri" />
 
     <EditText
-        android:id="@+id/edtTopico"
+        android:id="@+id/edtPorta"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="48dp"
-        android:hint="@string/t_pico_mqtt_ex_pid_controle" />
+        android:hint="Porta" />
 
     <Button
         android:id="@+id/btnAvancar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
-        android:text="@string/avan_ar" />
+        android:text="Avançar" />
 </LinearLayout>
\ No newline at end of file
diff --git a/Android_App/app/src/main/res/layout/activity_input_parameters.xml b/Android_App/app/src/main/res/layout/activity_input_parameters.xml
index dbd6b51..8b48dd8 100644
--- a/Android_App/app/src/main/res/layout/activity_input_parameters.xml
+++ b/Android_App/app/src/main/res/layout/activity_input_parameters.xml
@@ -8,7 +8,7 @@
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/insira_os_valores_de_kcr_e_tcr"
+        android:text="Insira os valores de Kcr e Tcr"
         android:textSize="18sp"
         android:layout_marginBottom="16dp" />
 
@@ -16,7 +16,7 @@
         android:id="@+id/edtKcr"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:hint="@string/valor_de_kcr"
+        android:hint="Valor de Kcr"
         android:inputType="numberDecimal"
         android:layout_marginBottom="8dp"
         android:autofillHints="username"/>
@@ -25,7 +25,7 @@
         android:id="@+id/edtTcr"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:hint="@string/valor_de_tcr"
+        android:hint="Valor de Tcr"
         android:inputType="numberDecimal"
         android:layout_marginBottom="16dp"
         android:autofillHints="username"/>
@@ -34,5 +34,5 @@
         android:id="@+id/btnCalculate"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="@string/calcular" />
+        android:text="Calcular" />
 </LinearLayout>
\ No newline at end of file
diff --git a/Android_App/app/src/main/res/layout/activity_main.xml b/Android_App/app/src/main/res/layout/activity_main.xml
index b0b78be..498f24e 100644
--- a/Android_App/app/src/main/res/layout/activity_main.xml
+++ b/Android_App/app/src/main/res/layout/activity_main.xml
@@ -8,7 +8,7 @@
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/selecione_o_tipo_de_controlador_pid"
+        android:text="Selecione o tipo de controlador PID"
         android:textSize="18sp"
         android:layout_marginBottom="16dp" />
 
@@ -21,20 +21,20 @@
             android:id="@+id/radioP"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/p" />
+            android:text="P" />
 
 
         <RadioButton
             android:id="@+id/radioPID"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/pid" />
+            android:text="PID" />
     </RadioGroup>
 
     <Button
         android:id="@+id/btnNext"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="@string/pr_ximo"
+        android:text="Avançar"
         android:layout_marginTop="24dp" />
 </LinearLayout>
\ No newline at end of file
diff --git a/Android_App/app/src/main/res/layout/activity_main_back_main.xml b/Android_App/app/src/main/res/layout/activity_main_back_main.xml
deleted file mode 100644
index ffa560b..0000000
--- a/Android_App/app/src/main/res/layout/activity_main_back_main.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <Button
-        android:id="@+id/button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="92dp"
-        android:text="Breno"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.498"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <Button
-        android:id="@+id/button2"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="92dp"
-        android:text="Diler"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.498"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/button" />
-
-    <Button
-        android:id="@+id/button3"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="João Vicgtor"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.498"
-        app:layout_constraintStart_toStartOf="parent"
-        tools:layout_editor_absoluteY="377dp" />
-
-    <Button
-        android:id="@+id/button4"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="112dp"
-        android:text="Guilherme"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.495"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/button3" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/Android_App/app/src/main/res/layout/activity_result.xml b/Android_App/app/src/main/res/layout/activity_result.xml
index 018c7a5..acc5e49 100644
--- a/Android_App/app/src/main/res/layout/activity_result.xml
+++ b/Android_App/app/src/main/res/layout/activity_result.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
@@ -11,7 +12,7 @@
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/resultados_do_pid"
+        android:text="Resultados do PID"
         android:textSize="18sp"
         android:layout_marginBottom="16dp" />
 
@@ -38,15 +39,13 @@
         android:layout_marginBottom="4dp"
         android:text="Ref. Posição (Potenciômetro)" />
 
-
     <SeekBar
         android:id="@+id/sb_setpoint"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="16dp"
-        android:max="100"
-        android:progress="0" />
-
+        android:max="628"
+        android:progress="314"
+        android:layout_marginBottom="16dp" />
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -62,10 +61,8 @@
         android:layout_height="wrap_content"
         android:orientation="horizontal"
         android:layout_marginBottom="8dp">
-
     </LinearLayout>
 
-
     <TextView
         android:id="@+id/tv_status"
         android:layout_width="match_parent"
@@ -80,7 +77,13 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="Anti-Windup"
-        android:checked="false" />
-
+        android:checked="false"
+        tools:ignore="UseSwitchCompatOrMaterialXml" />
 
+    <Button
+        android:id="@+id/btnNext"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="24dp"
+        android:text="Publicar" />
 </LinearLayout>
diff --git a/Android_App/app/src/main/res/layout/publish.xml b/Android_App/app/src/main/res/layout/publish.xml
new file mode 100644
index 0000000..f52b6f1
--- /dev/null
+++ b/Android_App/app/src/main/res/layout/publish.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:padding="16dp"
+    tools:context=".MainActivity">
+
+    <!-- Campo de texto para entrada -->
+    <EditText
+        android:id="@+id/et_message"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:hint="Sua Mensagem esta sendo publicada"
+        android:inputType="text"/>
+
+    <!-- Botão para enviar -->
+    <Button
+        android:id="@+id/btn_send"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:text="Enviar via MQTT"/>
+
+    <!-- Status da conexão -->
+    <TextView
+        android:id="@+id/tv_status"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="24dp"
+        android:text="Status: Desconectado"
+        android:textAlignment="center"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/Android_App/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/Android_App/app/src/main/res/mipmap-anydpi/ic_launcher.xml
similarity index 100%
rename from Android_App/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
rename to Android_App/app/src/main/res/mipmap-anydpi/ic_launcher.xml
diff --git a/Android_App/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/Android_App/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml
similarity index 100%
rename from Android_App/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
rename to Android_App/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml
diff --git a/Android_App/app/src/main/res/values-night/themes.xml b/Android_App/app/src/main/res/values-night/themes.xml
index 5f1d8de..38c40c2 100644
--- a/Android_App/app/src/main/res/values-night/themes.xml
+++ b/Android_App/app/src/main/res/values-night/themes.xml
@@ -1,6 +1,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Base.Theme.Prog1_teste" parent="Theme.Material3.DayNight.NoActionBar">
+    <style name="Base.Theme.MQTT" parent="Theme.Material3.DayNight.NoActionBar">
         <!-- Customize your dark theme here. -->
         <!-- <item name="colorPrimary">@color/my_dark_primary</item> -->
     </style>
diff --git a/Android_App/app/src/main/res/values/ids.xml b/Android_App/app/src/main/res/values/ids.xml
new file mode 100644
index 0000000..858d42f
--- /dev/null
+++ b/Android_App/app/src/main/res/values/ids.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <item name="et_message" type="id" />
+    <item name="btn_send" type="id" />
+    <item name="tv_status" type="id" />
+</resources>
\ No newline at end of file
diff --git a/Android_App/app/src/main/res/values/strings.xml b/Android_App/app/src/main/res/values/strings.xml
index 200294c..56aa796 100644
--- a/Android_App/app/src/main/res/values/strings.xml
+++ b/Android_App/app/src/main/res/values/strings.xml
@@ -1,17 +1,3 @@
 <resources>
-    <string name="app_name">Prog1_teste</string>
-    <string name="selecione_o_tipo_de_controlador_pid">Selecione o tipo de Controlador PID</string>
-    <string name="p">P</string>
-    <string name="pi">PI</string>
-    <string name="pid">PID</string>
-    <string name="pr_ximo">Próximo</string>
-    <string name="insira_os_valores_de_kcr_e_tcr">Insira os valores de Kcr e Tcr</string>
-    <string name="valor_de_kcr">Valor de Kcr</string>
-    <string name="valor_de_tcr">Valor de Tcr</string>
-    <string name="calcular">Calcular</string>
-    <string name="resultados_do_pid">Resultados do PID</string>
-    <string name="avan_ar">Avançar</string>
-    <string name="conex_o_mqtt">Conexão MQTT</string>
-    <string name="ip_do_broker_ex_192_168_0_100">IP do Broker (ex: 192.168.0.100)</string>
-    <string name="t_pico_mqtt_ex_pid_controle">Tópico MQTT (ex: pid/controle)</string>
+    <string name="app_name">MQTT</string>
 </resources>
\ No newline at end of file
diff --git a/Android_App/app/src/main/res/values/themes.xml b/Android_App/app/src/main/res/values/themes.xml
index 1ccefa4..3dc6843 100644
--- a/Android_App/app/src/main/res/values/themes.xml
+++ b/Android_App/app/src/main/res/values/themes.xml
@@ -1,9 +1,9 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Base.Theme.Prog1_teste" parent="Theme.Material3.DayNight.NoActionBar">
+    <style name="Base.Theme.MQTT" parent="Theme.Material3.DayNight.NoActionBar">
         <!-- Customize your light theme here. -->
         <!-- <item name="colorPrimary">@color/my_light_primary</item> -->
     </style>
 
-    <style name="Theme.Prog1_teste" parent="Base.Theme.Prog1_teste" />
+    <style name="Theme.MQTT" parent="Base.Theme.MQTT" />
 </resources>
\ No newline at end of file
diff --git a/Android_App/app/src/test/java/com/example/prog1_teste/ExampleUnitTest.kt b/Android_App/app/src/test/java/com/example/mqtt/ExampleUnitTest.kt
similarity index 90%
rename from Android_App/app/src/test/java/com/example/prog1_teste/ExampleUnitTest.kt
rename to Android_App/app/src/test/java/com/example/mqtt/ExampleUnitTest.kt
index ba099c0..b2b508f 100644
--- a/Android_App/app/src/test/java/com/example/prog1_teste/ExampleUnitTest.kt
+++ b/Android_App/app/src/test/java/com/example/mqtt/ExampleUnitTest.kt
@@ -1,4 +1,4 @@
-package com.example.prog1_teste
+package com.example.mqtt
 
 import org.junit.Test
 
diff --git a/Android_App/gradle.properties b/Android_App/gradle.properties
index 20e2a01..2f6baf7 100644
--- a/Android_App/gradle.properties
+++ b/Android_App/gradle.properties
@@ -20,4 +20,5 @@ 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
\ No newline at end of file
+android.nonTransitiveRClass=true
+android.enableJetifier=true
\ No newline at end of file
diff --git a/Android_App/gradle/libs.versions.toml b/Android_App/gradle/libs.versions.toml
index e4c8309..28b8652 100644
--- a/Android_App/gradle/libs.versions.toml
+++ b/Android_App/gradle/libs.versions.toml
@@ -1,14 +1,14 @@
 [versions]
 agp = "8.9.1"
 kotlin = "2.0.21"
-coreKtx = "1.10.1"
+coreKtx = "1.16.0"
 junit = "4.13.2"
-junitVersion = "1.1.5"
-espressoCore = "3.5.1"
-appcompat = "1.6.1"
-material = "1.10.0"
-activity = "1.8.0"
-constraintlayout = "2.1.4"
+junitVersion = "1.2.1"
+espressoCore = "3.6.1"
+appcompat = "1.7.0"
+material = "1.12.0"
+activity = "1.10.1"
+constraintlayout = "2.2.1"
 
 [libraries]
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
diff --git a/Android_App/gradle/wrapper/gradle-wrapper.properties b/Android_App/gradle/wrapper/gradle-wrapper.properties
index 1d64d10..641293e 100644
--- a/Android_App/gradle/wrapper/gradle-wrapper.properties
+++ b/Android_App/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,4 @@
-#Sun Apr 06 22:30:41 BRT 2025
+#Thu Apr 24 18:48:33 BRT 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
diff --git a/Android_App/settings.gradle.kts b/Android_App/settings.gradle.kts
index b45312d..0c5e1f6 100644
--- a/Android_App/settings.gradle.kts
+++ b/Android_App/settings.gradle.kts
@@ -19,5 +19,6 @@ dependencyResolutionManagement {
     }
 }
 
-rootProject.name = "Prog1_teste"
+rootProject.name = "MQTT"
 include(":app")
+ 
\ No newline at end of file

From 66c918500b833b8f87ee213d56161f005c79a689 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Victor=20Assun=C3=A7=C3=A3o=20Pereira?=
 <105755362+Felicxio@users.noreply.github.com>
Date: Sat, 26 Apr 2025 13:56:23 -0300
Subject: [PATCH 2/4] Altera configs ordem diler.kt

---
 .../app/src/main/java/com/example/mqtt/ResultActivity.kt   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Android_App/app/src/main/java/com/example/mqtt/ResultActivity.kt b/Android_App/app/src/main/java/com/example/mqtt/ResultActivity.kt
index f877bf7..376ccd6 100644
--- a/Android_App/app/src/main/java/com/example/mqtt/ResultActivity.kt
+++ b/Android_App/app/src/main/java/com/example/mqtt/ResultActivity.kt
@@ -64,7 +64,8 @@ class ResultActivity : AppCompatActivity() {
 
         findViewById<Button>(R.id.btnNext).setOnClickListener {
             val (kp, Ti, Td) = calcularParametrosPID(controllerType ?: "", kcr, tcr)
-            val message = "KP=$kp,KI=$Ti,KD=$Td"
+            val pidStatus = if (controllerType == "P") "PID=false" else "PID=true"
+            val message = "$pidStatus,KP=$kp,TI=$Ti,TD=$Td
             mqttHelper.connect(
                 onSuccess = {
                     runOnUiThread {
@@ -82,7 +83,7 @@ class ResultActivity : AppCompatActivity() {
 
         val swAntiWindup = findViewById<Switch>(R.id.sw_anti_windup)
         swAntiWindup.setOnCheckedChangeListener { _, isChecked ->
-            val message = if (isChecked) "ANTI_WINDUP=TRUE" else "ANTI_WINDUP=FALSE"
+            val message = if (isChecked) "ANTI_WINDUP=true" else "ANTI_WINDUP=false"
 
             // Envia a mensagem via MQTT
             mqttHelper.connect(
@@ -132,7 +133,7 @@ class ResultActivity : AppCompatActivity() {
 
     private fun sendValueViaMQTT(value: Double) {
         val topic = "controle/setpoint"
-        val message = "%.2f".format(value)  // Formata com 2 casas decimais
+        val message = "ThetaPot=${"%.2f".format(value)}"  // Adiciona o prefixo "ThetaPot="
         mqttHelper.publish(message)
        // mqttHelper.connect(
             // onSuccess = { mqttHelper.publish(message) },

From 4a26feec53c780172011b8fac4dc67ccebf96192 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Victor=20Assun=C3=A7=C3=A3o=20Pereira?=
 <105755362+Felicxio@users.noreply.github.com>
Date: Sat, 26 Apr 2025 14:12:29 -0300
Subject: [PATCH 3/4] " vibes.kt

---
 .../app/src/main/java/com/example/mqtt/ResultActivity.kt        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Android_App/app/src/main/java/com/example/mqtt/ResultActivity.kt b/Android_App/app/src/main/java/com/example/mqtt/ResultActivity.kt
index 376ccd6..a8fc313 100644
--- a/Android_App/app/src/main/java/com/example/mqtt/ResultActivity.kt
+++ b/Android_App/app/src/main/java/com/example/mqtt/ResultActivity.kt
@@ -65,7 +65,7 @@ class ResultActivity : AppCompatActivity() {
         findViewById<Button>(R.id.btnNext).setOnClickListener {
             val (kp, Ti, Td) = calcularParametrosPID(controllerType ?: "", kcr, tcr)
             val pidStatus = if (controllerType == "P") "PID=false" else "PID=true"
-            val message = "$pidStatus,KP=$kp,TI=$Ti,TD=$Td
+            val message = "$pidStatus,KP=$kp,TI=$Ti,TD=$Td"
             mqttHelper.connect(
                 onSuccess = {
                     runOnUiThread {

From d5cc7645333f47e60fb90a61d330a413a2050989 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Victor=20Assun=C3=A7=C3=A3o=20Pereira?=
 <105755362+Felicxio@users.noreply.github.com>
Date: Sun, 27 Apr 2025 21:11:25 -0300
Subject: [PATCH 4/4] BUG PONTO LOCALE.kt

---
 .../java/com/example/mqtt/ResultActivity.kt   | 35 ++++++++-----------
 1 file changed, 15 insertions(+), 20 deletions(-)

diff --git a/Android_App/app/src/main/java/com/example/mqtt/ResultActivity.kt b/Android_App/app/src/main/java/com/example/mqtt/ResultActivity.kt
index a8fc313..557e276 100644
--- a/Android_App/app/src/main/java/com/example/mqtt/ResultActivity.kt
+++ b/Android_App/app/src/main/java/com/example/mqtt/ResultActivity.kt
@@ -8,6 +8,7 @@ import android.widget.Switch
 import android.widget.TextView
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
+import java.util.Locale
 
 class ResultActivity : AppCompatActivity() {
 
@@ -32,7 +33,6 @@ class ResultActivity : AppCompatActivity() {
         val kcr = intent.getDoubleExtra("kcr", 0.0)
         val tcr = intent.getDoubleExtra("tcr", 0.0)
 
-
         txtResult = findViewById(R.id.txtResult)
         tvSetpointValue = findViewById(R.id.tv_setpoint_value)
         tvStatus = findViewById(R.id.tv_status)
@@ -43,7 +43,6 @@ class ResultActivity : AppCompatActivity() {
         val (kp, Ti, Td) = calcularParametrosPID(controllerType ?: "", kcr, tcr)
         txtResult.text = "Kp = $kp\nTi = $Ti\nTd = $Td"
 
-
         setupSeekBar()
 
         // Monitorar estado do Anti-Windup
@@ -55,13 +54,6 @@ class ResultActivity : AppCompatActivity() {
             }
         }
 
-        //val intent = Intent(this, PublishActivity::class.java).apply {
-        //  putExtra("KCR", 10.0)       // Exemplo: valor de Kcr
-        //putExtra("TCR", 5.0)        // Exemplo: valor de Tcr
-        //putExtra("TIPO", "PID")     // "P" ou "PID"
-        //}
-        //startActivity(intent)
-
         findViewById<Button>(R.id.btnNext).setOnClickListener {
             val (kp, Ti, Td) = calcularParametrosPID(controllerType ?: "", kcr, tcr)
             val pidStatus = if (controllerType == "P") "PID=false" else "PID=true"
@@ -100,7 +92,6 @@ class ResultActivity : AppCompatActivity() {
                 }
             )
         }
-
     }
 
     private fun setupSeekBar() {
@@ -133,17 +124,22 @@ class ResultActivity : AppCompatActivity() {
 
     private fun sendValueViaMQTT(value: Double) {
         val topic = "controle/setpoint"
-        val message = "ThetaPot=${"%.2f".format(value)}"  // Adiciona o prefixo "ThetaPot="
-        mqttHelper.publish(message)
-       // mqttHelper.connect(
-            // onSuccess = { mqttHelper.publish(message) },
-            //   onFailure = { erro ->
-            //     Toast.makeText(this, "Erro: ${erro.message}", Toast.LENGTH_LONG).show()
-            //}
-        //)
+        val message = "ThetaPot=${String.format(Locale.US, "%.2f", value)}"  // Usa ponto como separador decimal
+        mqttHelper.connect(
+            onSuccess = {
+                runOnUiThread {
+                    mqttHelper.publish(message)
+                    Toast.makeText(this, "Setpoint Enviado: $message", Toast.LENGTH_SHORT).show()
+                }
+            },
+            onFailure = { erro ->
+                runOnUiThread {
+                    Toast.makeText(this, "Erro: ${erro.message}", Toast.LENGTH_LONG).show()
+                }
+            }
+        )
     }
 
-
     private fun calcularParametrosPID(
         tipo: String,
         kcr: Double,
@@ -156,4 +152,3 @@ class ResultActivity : AppCompatActivity() {
         }
     }
 }
-