arduino stuffs
better serial lib
| -rw-r--r-- | car_driver/arduino/arduino.ino | 2 | ||||
| -rw-r--r-- | car_driver/godot/bin/GDsercomm.gdnlib | 19 | ||||
| -rw-r--r-- | car_driver/godot/bin/GDsercomm.gdns | 8 | ||||
| -rw-r--r-- | car_driver/godot/bin/gdserial.gdnlib | 16 | ||||
| -rw-r--r-- | car_driver/godot/bin/gdserial.gdns | 9 | ||||
| -rwxr-xr-x | car_driver/godot/bin/libgdserial.so | bin | 0 -> 3175224 bytes | |||
| -rwxr-xr-x | car_driver/godot/bin/linux64/libGDSercomm.so | bin | 85944 -> 0 bytes | |||
| -rwxr-xr-x | car_driver/godot/bin/linux64/libsercomm.so | bin | 27104 -> 0 bytes | |||
| -rw-r--r-- | car_driver/godot/bin/win32/GDSercomm.dll | bin | 46592 -> 0 bytes | |||
| -rw-r--r-- | car_driver/godot/bin/win32/sercomm.dll | bin | 54784 -> 0 bytes | |||
| -rw-r--r-- | car_driver/godot/bin/win64/GDSercomm.dll | bin | 131584 -> 0 bytes | |||
| -rw-r--r-- | car_driver/godot/bin/win64/sercomm.dll | bin | 544768 -> 0 bytes | |||
| -rw-r--r-- | car_driver/godot/serial.gd | 21 |
13 files changed, 33 insertions, 42 deletions
diff --git a/car_driver/arduino/arduino.ino b/car_driver/arduino/arduino.ino index 37844a4..8e231da 100644 --- a/car_driver/arduino/arduino.ino +++ b/car_driver/arduino/arduino.ino @@ -27,7 +27,7 @@ void loop() { } } -#define DEADZONE 10 +#define DEADZONE 1 // @param cmd the thing that tells it what to do, usually a vector(01, 22). void processCommand(const int x, const int y) { if (x > 100 || x < -100 || y > 100 || y < -100) { diff --git a/car_driver/godot/bin/GDsercomm.gdnlib b/car_driver/godot/bin/GDsercomm.gdnlib deleted file mode 100644 index 765f112..0000000 --- a/car_driver/godot/bin/GDsercomm.gdnlib +++ /dev/null @@ -1,19 +0,0 @@ -[general] - -singleton=false -load_once=true -symbol_prefix="godot_" -reloadable=true - -[entry] - -X11.64="res://bin/linux64/libGDSercomm.so" -Windows.64="res://bin/win64/GDSercomm.dll" -Windows.32="res://bin/win32/GDSercomm.dll" -OSX.64="" - -[dependencies] - -X11.64=[ ] -Windows.64=[ "res://bin/win64/sercomm.dll" ] -OSX.64=[ ] diff --git a/car_driver/godot/bin/GDsercomm.gdns b/car_driver/godot/bin/GDsercomm.gdns deleted file mode 100644 index c1af659..0000000 --- a/car_driver/godot/bin/GDsercomm.gdns +++ /dev/null @@ -1,8 +0,0 @@ -[gd_resource type="NativeScript" load_steps=2 format=2] - -[ext_resource path="res://bin/GDsercomm.gdnlib" type="GDNativeLibrary" id=1] - -[resource] -resource_name = "SERCOMM" -class_name = "SERCOMM" -library = ExtResource( 1 ) diff --git a/car_driver/godot/bin/gdserial.gdnlib b/car_driver/godot/bin/gdserial.gdnlib new file mode 100644 index 0000000..530f3a9 --- /dev/null +++ b/car_driver/godot/bin/gdserial.gdnlib @@ -0,0 +1,16 @@ +[general] + +singleton=false +load_once=true +symbol_prefix="godot_" +reloadable=false + +[entry] + +X11.64="res://bin/libgdserial.so" + +[dependencies] + +X11.64=[] +Windows.64=[] +OSX.64=[]
\ No newline at end of file diff --git a/car_driver/godot/bin/gdserial.gdns b/car_driver/godot/bin/gdserial.gdns new file mode 100644 index 0000000..1243df9 --- /dev/null +++ b/car_driver/godot/bin/gdserial.gdns @@ -0,0 +1,9 @@ +[gd_resource type="NativeScript" load_steps=2 format=2] + +[ext_resource path="res://bin/gdserial.gdnlib" type="GDNativeLibrary" id=1] + +[resource] + +resource_name = "gdserial" +class_name = "GDSerial" +library = ExtResource( 1 )
\ No newline at end of file diff --git a/car_driver/godot/bin/libgdserial.so b/car_driver/godot/bin/libgdserial.so Binary files differnew file mode 100755 index 0000000..fb304e0 --- /dev/null +++ b/car_driver/godot/bin/libgdserial.so diff --git a/car_driver/godot/bin/linux64/libGDSercomm.so b/car_driver/godot/bin/linux64/libGDSercomm.so Binary files differdeleted file mode 100755 index ace8c09..0000000 --- a/car_driver/godot/bin/linux64/libGDSercomm.so +++ /dev/null diff --git a/car_driver/godot/bin/linux64/libsercomm.so b/car_driver/godot/bin/linux64/libsercomm.so Binary files differdeleted file mode 100755 index b6182a5..0000000 --- a/car_driver/godot/bin/linux64/libsercomm.so +++ /dev/null diff --git a/car_driver/godot/bin/win32/GDSercomm.dll b/car_driver/godot/bin/win32/GDSercomm.dll Binary files differdeleted file mode 100644 index 1708780..0000000 --- a/car_driver/godot/bin/win32/GDSercomm.dll +++ /dev/null diff --git a/car_driver/godot/bin/win32/sercomm.dll b/car_driver/godot/bin/win32/sercomm.dll Binary files differdeleted file mode 100644 index 9aa6c53..0000000 --- a/car_driver/godot/bin/win32/sercomm.dll +++ /dev/null diff --git a/car_driver/godot/bin/win64/GDSercomm.dll b/car_driver/godot/bin/win64/GDSercomm.dll Binary files differdeleted file mode 100644 index 9f3c247..0000000 --- a/car_driver/godot/bin/win64/GDSercomm.dll +++ /dev/null diff --git a/car_driver/godot/bin/win64/sercomm.dll b/car_driver/godot/bin/win64/sercomm.dll Binary files differdeleted file mode 100644 index 39236bd..0000000 --- a/car_driver/godot/bin/win64/sercomm.dll +++ /dev/null diff --git a/car_driver/godot/serial.gd b/car_driver/godot/serial.gd index 674d4c2..41525ca 100644 --- a/car_driver/godot/serial.gd +++ b/car_driver/godot/serial.gd @@ -1,30 +1,23 @@ extends Node -const Serial = preload("res://bin/GDsercomm.gdns") -onready var serial = Serial.new() +const Serial = preload("res://bin/gdserial.gdns") +var serial : Serial const baud_rate := 9600 const endline := "\n" #@param text the text to send -func write(text: String) -> void: #"please only use ascii" - if serial.write(text) != 0: #asshole used unicode - print("serial broke, reloading(%s)" % text) - create_serial() +func write(text: String) -> void: + serial.write_text(text) func create_serial(): if serial: - serial.close() + serial.close_port() serial = Serial.new() - serial.call_deferred("open", get_ports()[-1], baud_rate, 1000) + serial.open_port("/dev/ttyACM0", baud_rate) func _ready(): - prints("connecting to", get_ports()[-1]) - create_serial() - - -func get_ports() -> Array: - return serial.list_ports() + create_serial()
\ No newline at end of file |