From bf0e1ab8d5b370f31e7f481683d335df3b190929 Mon Sep 17 00:00:00 2001 From: Artem30801 Date: Mon, 28 Jan 2019 14:09:41 +0300 Subject: [PATCH] Addded blender addon --- .gitmodules | 3 +++ Drone/client.py | 1 - Server/server.py | 2 +- blender-csv-animation | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) create mode 160000 blender-csv-animation diff --git a/.gitmodules b/.gitmodules index 2918b78..01eaa73 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "Drone/FlightLib"] path = Drone/FlightLib url = git://github.com/artem30801/CleverFlightLib.git +[submodule "blender-csv-animation"] + path = blender-csv-animation + url = https://github.com/artem30801/blender-csv-animation diff --git a/Drone/client.py b/Drone/client.py index 19823ff..61004da 100644 --- a/Drone/client.py +++ b/Drone/client.py @@ -172,7 +172,6 @@ USE_LEDS = config.getboolean('COPTER', 'use_leds') play_animation.USE_LEDS = USE_LEDS rospy.init_node('Swarm_client', anonymous=True) -print(USE_LEDS) if USE_LEDS: LedLib.init_led() diff --git a/Server/server.py b/Server/server.py index 1764269..9fce4a3 100644 --- a/Server/server.py +++ b/Server/server.py @@ -211,7 +211,7 @@ def send_animations(): #print(ANS) -def send_starttime(dt=30): +def send_starttime(dt=15): timenow = time.time() print('Now:', time.ctime(timenow), "+ dt =", dt) Client.broadcast(Client.form_command("starttime", (str(timenow+dt), ))) diff --git a/blender-csv-animation b/blender-csv-animation new file mode 160000 index 0000000..e494ced --- /dev/null +++ b/blender-csv-animation @@ -0,0 +1 @@ +Subproject commit e494ced31bf045193d9f3ac1c3602fe3ca1db280