Merge pull request #2 from goldarte/master

Add first point reaching separately from others and some small corrections in configuration files

.gitignore

@@ -105,3 +105,4 @@ venv.bak/
 .vscode/settings.json
 Server/tests.py
 Drone/test_animation/
+Drone/animation.csv

.gitmodules

@@ -1,6 +1,7 @@
 [submodule "Drone/FlightLib"]
 	path = Drone/FlightLib
 	url = https://github.com/artem30801/CleverFlightLib.git
+	#url = https://github.com/goldarte/CleverFlightLib.git
 [submodule "blender-csv-animation"]
 	path = blender-csv-animation
 	url = https://github.com/artem30801/blender-csv-animation

Drone/client.py

@@ -120,6 +120,8 @@ def animation_player(running_event, stop_event):
     frames = play_animation.read_animation_file()
     rate = rospy.Rate(1000 / 125)
     play_animation.takeoff()
+    play_animation.animate_frame(frames[0]) #Reach first point at the same time with others
+    rospy.sleep(5)
     for frame in frames:
         running_event.wait()
         if stop_event.is_set():

Drone/client_config.ini

@@ -1,6 +1,6 @@
 [SERVER]
 port = 25000
-host = 192.168.43.168
+host = 192.168.1.2
 buffer_size = 1024
 
 [FILETRANSFER]
@@ -11,8 +11,8 @@ host = ntp1.stratum2.ru
 port = 123
 
 [COPTER]
-id = default
-takeoff_height = 1.75
+id = copter2
+takeoff_height = 1
 takeoff_timeout = 7
 use_leds = True
 animation_file = animation.csv

Drone/play_animation.py

@@ -5,7 +5,7 @@
 #FlightLib.init('SingleCleverFlight')
 from FlightLib.FlightLib import LedLib
 
-animation_file_path = 'test_animation/test_1.csv'
+animation_file_path = 'animation.csv'
 USE_LEDS = True
 
 

Server/server_config.ini

@@ -6,6 +6,3 @@ buffer_size = 1024
 host = ntp1.stratum2.ru
 port = 123
 #pool.ntp.org
-
-[FILETRANSFER]
-animation = animation.csv