Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: The-Robotics-Forum/netra
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d567c387ae89fb3418749a2d43f35806522f038d
Choose a base ref
..
head repository: The-Robotics-Forum/netra
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ff88ebf2dfeb70eab6110b60c8a17cf26a967b63
Choose a head ref
3 changes: 1 addition & 2 deletions .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 0 additions & 12 deletions .idea/runConfigurations.xml

This file was deleted.

1 change: 1 addition & 0 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -18,6 +18,7 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}

lintOptions {
abortOnError false
}
Original file line number Diff line number Diff line change
@@ -109,23 +109,23 @@ class Main3Activity : BluetoothActivity() {


if (item.value == "L") {
sendMessage("L")
sendMessage(getString(R.string.left_direction))
Toast.makeText(applicationContext, "Done Left", Toast.LENGTH_SHORT).show()
startActivity(i)
finish()
} else if (item.value == "R") {
sendMessage("R")
sendMessage(getString(R.string.right_direction))
Toast.makeText(applicationContext, "Done Right", Toast.LENGTH_SHORT).show()
startActivity(i)
finish()
}
if (item.value == "F") {
sendMessage("F")
sendMessage(getString(R.string.forward_direction))
Toast.makeText(applicationContext, "Done Forwerd", Toast.LENGTH_SHORT).show()
startActivity(i)
finish()
} else if (item.value == "S") {
sendMessage("S")
sendMessage(getString(R.string.stop_direction))
Toast.makeText(applicationContext, "Done ", Toast.LENGTH_SHORT).show()
startActivity(i)
finish()
Original file line number Diff line number Diff line change
@@ -20,31 +20,31 @@ class ManualControlActivity : BluetoothActivity() {
var t = findViewById<TextView>(R.id.STT)
right.setOnClickListener(View.OnClickListener {
if (global_variables.bT == 1) {
sendMessage("R")
t.text = "R"
sendMessage(getString(R.string.right_direction))
}
t.text = "R"
})
left.setOnClickListener(View.OnClickListener {
if (global_variables.bT == 1) {
sendMessage("L")
sendMessage(getString(R.string.left_direction))
}
t.text = "L"
})
forward.setOnClickListener(View.OnClickListener {
if (global_variables.bT == 1) {
sendMessage("F")
sendMessage(getString(R.string.forward_direction))
}
t.text = "F"
})
backward.setOnClickListener(View.OnClickListener {
if (global_variables.bT == 1) {
sendMessage("B")
sendMessage(getString(R.string.backward_direction))
}
t.text = "B"
})
stop.setOnClickListener(View.OnClickListener {
if (global_variables.bT == 1) {
sendMessage("S")
sendMessage(getString(R.string.stop_direction))
}
t.text = "S"
})
Original file line number Diff line number Diff line change
@@ -35,7 +35,7 @@ class VoiceControlActivity : BluetoothActivity() {
b.setOnClickListener { startActivityForResult(intent, 1) }
s.setOnClickListener {
if (global_variables.bT == 1) {
sendMessage("S")
sendMessage(getString(R.string.stop_direction))
}
}
}
@@ -50,31 +50,31 @@ class VoiceControlActivity : BluetoothActivity() {
for (s in str) {
if (s.contains("forward")) {
if (global_variables.bT == 1) {
sendMessage("F")
sendMessage(getString(R.string.forward_direction))
}
Log.d("TAG", s)
break
} else if (s.contains("backward")) {
if (global_variables.bT == 1) {
sendMessage("B")
sendMessage(getString(R.string.backward_direction))
}
Log.d("TAG", s)
break
} else if (s.contains("left")) {
if (global_variables.bT == 1) {
sendMessage("L")
sendMessage(getString(R.string.left_direction))
}
Log.d("TAG", s)
break
} else if (s.contains("right")) {
if (global_variables.bT == 1) {
sendMessage("R")
sendMessage(getString(R.string.right_direction))
}
Log.d("TAG", s)
break
} else if (s.contains("stop")) {
if (global_variables.bT == 1) {
sendMessage("S")
sendMessage(getString(R.string.stop_direction))
}
Log.d("TAG", s)
break
7 changes: 7 additions & 0 deletions app/src/main/res/values-night/strings.xml
Original file line number Diff line number Diff line change
@@ -71,4 +71,11 @@
<string name="hello_world">Hello World!</string>
<!-- content_main3-->

<!--Direction Strings-->
<string name="stop_direction">S</string>
<string name="forward_direction">F</string>
<string name="backward_direction">B</string>
<string name="left_direction">L</string>
<string name="right_direction">R</string>

</resources>
9 changes: 9 additions & 0 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
@@ -71,4 +71,13 @@
<string name="hello_world">Hello World!</string>
<!-- content_main3-->

<!--Direction Strings-->
<string name="stop_direction">S</string>
<string name="forward_direction">F</string>
<string name="backward_direction">B</string>
<string name="left_direction">L</string>
<string name="right_direction">R</string>



</resources>