Skip to content

Commit 176b5b6

Browse files
OtavioJFOliveiraOtavioJFOliveira
committed
Code cleaning
1 parent 52bf48f commit 176b5b6

11 files changed

Lines changed: 15 additions & 192 deletions

File tree

‎Server/SerialServer.py‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
#!/usr/bin/python
22
import serial
3+
import keyboard
34

45
from pynput.keyboard import Key, Controller as KeyboardController
6+
57
keyb = KeyboardController()
68

79
comport = serial.Serial('/dev/ttyUSB0', 9600)
@@ -56,17 +58,22 @@ def Position_Controller(dataRec):
5658
keyb.release(Key.right)
5759
keyb.release(Key.left)
5860
keyb.release(Key.up)
59-
keyb.release(Key.page_down)
6061
keyb.release(Key.page_up)
62+
keyb.release(Key.page_down)
6163
else:
64+
6265
f = open("/tmp/query.txt", "w")
6366
f.write(data)
6467
f.close()
6568

69+
# data = 0
70+
71+
6672
if __name__ == "__main__":
6773

6874
while True:
69-
valor = comport.readline().decode('UTF-8')
75+
valor = comport.readline().decode() #'UTF-8')
76+
# print(valor)
7077
Position_Controller(valor)
7178

7279
# comport.close()

controller_app/lib/pages/test.dart renamed to controller_app/lib/ExamplePages/teste.dart

File renamed without changes.

‎controller_app/lib/KeyBoard.dart‎

Lines changed: 0 additions & 152 deletions
This file was deleted.

‎controller_app/lib/Ultrasonic.dart‎

Lines changed: 0 additions & 31 deletions
This file was deleted.

controller_app/lib/pages/info.dart renamed to controller_app/lib/pages/About.dart

File renamed without changes.

controller_app/lib/BluetoothPage.dart renamed to controller_app/lib/pages/Connect.dart

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ import 'package:flutter/material.dart';
66
import 'package:flutter/services.dart';
77
import 'package:flutter_bluetooth_serial/flutter_bluetooth_serial.dart';
88

9+
import 'ExamplesList.dart';
10+
911
class BluetoothPage extends StatelessWidget {
1012
@override
1113
Widget build(BuildContext context) {
@@ -419,7 +421,7 @@ class _BluetoothAppState extends State<BluetoothApp> {
419421
// Method to send message,
420422
// for turning the Bluetooth device off
421423
void _sendPlaceString() async {
422-
connection.output.add(utf8.encode("#"+valido + "\r\n"));
424+
connection.output.add(utf8.encode("#"+StringToSend+"\r\n"));
423425
await connection.output.allSent;
424426
//show('Device Turned Off');
425427
setState(() {
@@ -447,7 +449,7 @@ class _BluetoothAppState extends State<BluetoothApp> {
447449

448450
_dataToSend() {
449451
if(controlBottonSend == ''){
450-
return Container( height:50,color: Colors.red,);
452+
return Container( height:50,);
451453
}else
452454
if(controlBottonSend == 'NetInfo'){
453455
return Card(
@@ -464,7 +466,7 @@ class _BluetoothAppState extends State<BluetoothApp> {
464466
"Send Net Information",
465467
style: TextStyle(
466468
fontSize: 20,
467-
color: colors['neutralTextColor'],
469+
color: Colors.red,//colors['neutralTextColor'],
468470
),
469471
),
470472
),

‎controller_app/lib/pages/MyPlaces.dart‎

Whitespace-only changes.

controller_app/lib/pages/NetInfo.dart renamed to controller_app/lib/pages/NetworkInfo.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import 'package:flutter/material.dart';
22
import 'package:controllerapp/main.dart';
33

4-
import '../BluetoothPage.dart';
4+
import 'BluetoothPage.dart';
55

66
class NetInfoPage extends StatefulWidget {
77
static final tag = 'netinfo-page';

controller_app/lib/pages/HomeList.dart renamed to controller_app/lib/widgets/HomeList.dart

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
1-
21
import 'package:flutter/material.dart';
32

43
class HomeList extends StatefulWidget {
54

65
static List<Widget> items = List<Widget>();
7-
86
@override
97
_HomeListState createState() => _HomeListState();
10-
118
}
129

1310
class _HomeListState extends State<HomeList>{

controller_app/lib/pages/list.dart renamed to controller_app/lib/widgets/list.dart

File renamed without changes.

0 commit comments

Comments
 (0)