Commit Graph

122 Commits

Author SHA1 Message Date
Artem30801
028862c55e Fixed #11 2019-03-20 11:46:56 +03:00
Artem30801
6915a0682e Merge remote-tracking branch 'origin/master' 2019-03-20 11:38:10 +03:00
Artem30801
295ddb60f6 Fixed and improved broadcast binding 2019-03-20 11:37:33 +03:00
Arthur Golubtsov
8852859385 Add client_logs to .gitignore 2019-03-19 10:07:39 +00:00
Arthur
323093447c Add script for clever image setup to swarm configuration 2019-03-16 00:27:54 +03:00
Artem30801
edbbfbbba6 Merge remote-tracking branch 'origin/master' 2019-03-14 18:34:42 +03:00
Artem30801
aa7748a319 New FlightLib!(better functions+logging+selfcheck) (everything needs testing)
Configuration files changed
2019-03-14 18:34:17 +03:00
Arthur Golubtsov
57113ce708 Merge pull request #6 from artem30801/pyqt5-gui
Move GUI from Tkinter to QT
2019-03-14 13:42:11 +03:00
Artem30801
12644c554b Merge branch 'pyqt5-gui' of https://github.com/artem30801/CleverSwarm 2019-03-13 12:40:42 +03:00
Artem30801
9e9a42be51 Animation pause fix 2019-03-13 12:40:20 +03:00
Arthur
1153dbcc50 Add Server/convert_ui.sh script to .gitigrone 2019-03-12 18:08:49 +03:00
artem30801@gmail.com
c307685943 Merge branch 'pyqt5-gui' of https://github.com/artem30801/CleverSwarm 2019-03-12 14:13:56 +03:00
artem30801@gmail.com
e433cc3e4f Merge branch 'master' of https://github.com/artem30801/CleverSwarm 2019-03-12 14:13:32 +03:00
artem30801@gmail.com
92bdc7f422 Added bash script to convert .ui to .py
Now widget capable of window resizing
2019-03-12 14:12:12 +03:00
Arthur
44a8fa5c22 Add row appending when client is connected 2019-03-12 13:26:45 +03:00
artem30801@gmail.com
a293d96ec7 Client syntax fix 2019-03-12 12:44:01 +03:00
artem30801@gmail.com
31cfbf6a6b Pause improved 2019-03-12 12:38:52 +03:00
artem30801@gmail.com
ac8ff53804 Restored all UI functionality (buttons + filedialog) 2019-03-12 12:36:17 +03:00
Arthur
1ce533c004 Add pause and resume commands for receive 2019-03-12 12:15:20 +03:00
Arthur
00b7851228 Connect gui buttons to server code 2019-03-12 12:13:59 +03:00
Arthur
db5d6c454c Modify gui to simplify first working version 2019-03-12 12:12:53 +03:00
artem30801@gmail.com
53a9901230 Broadcast thread demonization 2019-03-11 18:14:57 +03:00
artem30801@gmail.com
71ea0231a7 Added proper objects names 2019-03-11 18:12:00 +03:00
artem30801
77cadb8593 Merge pull request #4 from goldarte/master
Add thread daemon to broadcast_thread to close app correctly
2019-03-11 17:58:25 +03:00
Arthur
88694d06d7 Add thread daemon to broadcast_thread to close app correctly 2019-03-11 17:54:51 +03:00
artem30801@gmail.com
cc5bfcdbb2 Translated server code to qt app code 2019-03-11 17:37:06 +03:00
artem30801
d404e0ac7e Merge pull request #3 from goldarte/PyQt5-interface
PyQT5 interface branch
2019-03-11 17:11:05 +03:00
Arthur
eb2f929c46 Change QTableWidget to model-based QTableView 2019-03-11 17:07:54 +03:00
Arthur
16fe48c9c1 Create test program with server with new gui 2019-03-11 12:29:06 +03:00
Arthur
a1a901a75f Create QT gui files for server with new gui 2019-03-11 12:27:46 +03:00
artem30801
725d02bf77 Merge pull request #2 from goldarte/master
Add first point reaching separately from others and some small corrections in configuration files
v0.1
2019-03-09 23:14:59 +03:00
Arthur
dee5974b2b Change Flightlib submodule back to original 2019-03-09 20:56:12 +03:00
Arthur Golubtsov
99bba177f6 Update .gitignore 2019-03-07 19:11:07 +00:00
Arthur Golubtsov
c9c6215cfa Update gitignore with animation.csv file which is different for different drones 2019-03-07 19:04:02 +00:00
Arthur
7a1c6f6179 Merge remote-tracking branch 'upstream/master' 2019-03-07 19:26:00 +03:00
Artem30801
b1d409463b Broadcast fix 2019-03-07 19:15:45 +03:00
Arthur
e0803aa377 Update fork to upstream 2019-03-07 18:36:57 +03:00
Arthur
f19832c3cf Remove unused lines from server_config.ini 2019-03-07 18:30:52 +03:00
Artem30801
aa74947a63 Merge remote-tracking branch 'origin/master' 2019-03-07 15:27:44 +03:00
Artem30801
386dd4b9e8 New commands for server+client, server ip autosearch, little improvements 2019-03-07 15:27:22 +03:00
ARTem
98dd2cc486 Updated FlightLib 2019-03-05 22:09:36 +03:00
Arthur Golubtsov
66c0285115 Temporarily update Flightlib submodule 2019-03-05 16:31:00 +00:00
Artem30801
09314d835a Update_submodules 2019-02-27 18:13:29 +03:00
Artem30801
d802aa8f37 Merge branch 'pr/1' 2019-02-27 18:06:31 +03:00
Arthur
92db6c55e0 Corrected led color order 2019-02-27 17:32:56 +03:00
Arthur
2b33a3879c Corrected led color order 2019-02-27 17:28:56 +03:00
Arthur
328350e2ab Final test version of play_animation.py 2019-02-26 21:01:24 +00:00
Arthur
7f7af0b2f7 Changed test animation file path 2019-02-26 17:28:55 +00:00
Arthur
b85ecf1317 Change test chain in main function 2019-02-26 11:28:55 +03:00
Artem30801
6fab97c648 Fixed animation reading, improved standalone run procedure 2019-02-26 09:13:35 +03:00