Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Swarm in Blocks: code adaptation to swarms #439

Draft
wants to merge 152 commits into
base: master
Choose a base branch
from
Draft
Changes from 1 commit
Commits
Show all changes
152 commits
Select commit Hold shift + click to select a range
1ac1045
Create SwormAtena
guisoares9 Oct 22, 2021
961bdc3
Renamed file SwarmAtena
guisoares9 Oct 23, 2021
950d4e2
Merge branch 'CopterExpress:master' into master
Playergeek181 Oct 25, 2021
2ff9917
Swarm in Blocks project application of Atena team.
guisoares9 Oct 26, 2021
cc2750f
Merge branch 'master' of https://github.com/Grupo-SEMEAR-USP/clover
guisoares9 Oct 26, 2021
958f39f
Update Swarm_in_Blocks.md
guisoares9 Oct 26, 2021
74de58e
Merge pull request #1 from Grupo-SEMEAR-USP/Swarm_in_Blocks
guisoares9 Oct 26, 2021
f2b40b5
Fixing MAVLINK to MAVLink
guisoares9 Oct 26, 2021
545797d
Trailling spaces fixed
guisoares9 Oct 26, 2021
8aef11c
Markdown lint solved
guisoares9 Oct 26, 2021
f3ce4e0
Merge branch 'CopterExpress:master' into master
Playergeek181 Nov 12, 2021
bb5c628
Merge branch 'CopterExpress:master' into master
guisoares9 Dec 21, 2021
489807c
Merge branch 'CopterExpress:master' into Swarm_in_Blocks
guisoares9 Dec 23, 2021
aeae9ec
file renamed
guisoares9 Dec 27, 2021
4fe0d0b
file renamed
guisoares9 Dec 27, 2021
9a5f725
Merge branch 'CopterExpress:master' into master
guisoares9 Jan 25, 2022
a52c5ea
Started to update the project readme.
guisoares9 Jan 27, 2022
17038ec
Merge branch 'CopterExpress:master' into master
guisoares9 Jan 27, 2022
242981c
Merge branch 'CopterExpress:master' into Swarm_in_Blocks
Playergeek181 Feb 3, 2022
5d4379b
Update files to be possible to generate new files using then
Playergeek181 Feb 3, 2022
8ff5275
Update to be possible to use leds in multiple drones
Playergeek181 Feb 3, 2022
c5d836d
roswww_static updated to swarm_in_blocks front-end.
guisoares9 Feb 5, 2022
1a999da
favicon add on the localhost:2001 page
Felipe-Tommaselli Feb 6, 2022
7f6de12
arrumando o problema do path com o rospkg
Felipe-Tommaselli Feb 6, 2022
c69b7f2
melhorando o design do localhost
Felipe-Tommaselli Feb 10, 2022
33e81f8
roswww_static fixed
guisoares9 Feb 11, 2022
c4a978b
arrumando o localhost
Felipe-Tommaselli Feb 11, 2022
64e3c69
restaurando clover_blocks para o original
Felipe-Tommaselli Feb 12, 2022
19d900d
atualizando o localhost:2001
Felipe-Tommaselli Feb 16, 2022
12c0cae
Led names fixed
guisoares9 Feb 21, 2022
d88a8d6
minor changes
Felipe-Tommaselli Feb 22, 2022
0104eeb
Merge branch 'master' of https://github.com/Grupo-SEMEAR-USP/clover
Felipe-Tommaselli Feb 22, 2022
fd7636b
Adding initial pose to simple_offboard
guisoares9 Feb 22, 2022
d509a79
Pull request done
guisoares9 Feb 22, 2022
7bde23e
Led plugin fixed to work without camera plugin
guisoares9 Mar 8, 2022
8f46f0f
leds
guisoares9 Mar 11, 2022
d34b634
nothing
guisoares9 Mar 14, 2022
4070296
Lights world
guisoares9 Mar 16, 2022
e99af63
Merge branch 'CopterExpress:master' into master
guisoares9 Mar 17, 2022
5454035
Flashlights on clover disabled
guisoares9 Mar 17, 2022
d0b39b0
Merge branch 'master' of github.com:Grupo-SEMEAR-USP/clover
guisoares9 Mar 17, 2022
1310ff6
sim_leds fixed
guisoares9 Mar 17, 2022
f306db9
localhost assets updated
guisoares9 Mar 23, 2022
9445b71
minor changes
Felipe-Tommaselli Mar 23, 2022
7870e73
minor changes
Felipe-Tommaselli Mar 30, 2022
8f1a1ea
editing the files from "eazy to swarm" heading
Felipe-Tommaselli Mar 30, 2022
5fc7510
Final article started
guisoares9 Mar 31, 2022
32adfe5
changing size of led_ring
Playergeek181 Mar 31, 2022
44d62b6
Merge branch 'master' of https://github.com/Grupo-SEMEAR-USP/clover
Playergeek181 Mar 31, 2022
985096e
Starting the article
Rafael-Saud Mar 31, 2022
2bba895
Adding topics in the article
Rafael-Saud Mar 31, 2022
bef8b4f
Updates in the article
Rafael-Saud Mar 31, 2022
e15071e
nothing
guisoares9 Mar 31, 2022
bbeccc5
Merge branch 'master' of github.com:Grupo-SEMEAR-USP/clover
guisoares9 Mar 31, 2022
bdd556b
Swarm tools done
Rafael-Saud Mar 31, 2022
3a659a8
Conclusion
Rafael-Saud Mar 31, 2022
7a04967
Minor changes
Rafael-Saud Mar 31, 2022
e866b31
Update swarm_in_blocks.md
Felipe-Tommaselli Mar 31, 2022
6212b10
Update swarm_in_blocks.md
Felipe-Tommaselli Mar 31, 2022
9f1fedb
gifs
guisoares9 Mar 31, 2022
06ff103
Merge branch 'master' of github.com:Grupo-SEMEAR-USP/clover
guisoares9 Mar 31, 2022
3b6c636
gifs added
guisoares9 Mar 31, 2022
2134de4
Update swarm_in_blocks.md
Rafael-Saud Mar 31, 2022
b907433
Update swarm_in_blocks.md
Rafael-Saud Mar 31, 2022
e9f527c
Update swarm_in_blocks.md
Rafael-Saud Mar 31, 2022
c55e1c1
gifs added
guisoares9 Mar 31, 2022
b942c26
Merge branch 'master' of github.com:Grupo-SEMEAR-USP/clover
guisoares9 Mar 31, 2022
1122d2b
Update swarm_in_blocks.md
Rafael-Saud Mar 31, 2022
2501c21
gifs added
guisoares9 Mar 31, 2022
1669113
Merge branch 'master' of github.com:Grupo-SEMEAR-USP/clover
guisoares9 Mar 31, 2022
8c9b234
gifs added
guisoares9 Mar 31, 2022
2b58502
Update swarm_in_blocks.md
Rafael-Saud Mar 31, 2022
91141cb
Merge branch 'master' of github.com:Grupo-SEMEAR-USP/clover
guisoares9 Mar 31, 2022
993dd58
Update swarm_in_blocks.md
Rafael-Saud Mar 31, 2022
197ac20
gifs added
guisoares9 Mar 31, 2022
031b607
video added
guisoares9 Mar 31, 2022
b6e07ff
video added
guisoares9 Mar 31, 2022
3fe4003
video added
guisoares9 Mar 31, 2022
4859334
video added
guisoares9 Mar 31, 2022
e3015ab
Update swarm_in_blocks.md
Rafael-Saud Mar 31, 2022
62249ca
Update swarm_in_blocks.md
Rafael-Saud Mar 31, 2022
d01fe43
video added
guisoares9 Mar 31, 2022
a7d0e15
Merge branch 'master' of github.com:Grupo-SEMEAR-USP/clover
guisoares9 Mar 31, 2022
7f3f186
Update swarm_in_blocks.md
Rafael-Saud Mar 31, 2022
e02df58
Add files via upload
Rafael-Saud Mar 31, 2022
ac98ed4
Update swarm_in_blocks.md
Rafael-Saud Mar 31, 2022
85b78fe
Tentativa
faresedu Mar 31, 2022
28ba9e2
Update swarm_in_blocks.md
faresedu Mar 31, 2022
a4d79e7
Update swarm_in_blocks.md
faresedu Mar 31, 2022
143aeb6
Update swarm_in_blocks.md
faresedu Mar 31, 2022
60c2fbc
Update swarm_in_blocks.md
faresedu Mar 31, 2022
c23e908
Update swarm_in_blocks.md
faresedu Mar 31, 2022
8464791
Update swarm_in_blocks.md
faresedu Mar 31, 2022
3e775c6
Update swarm_in_blocks.md
faresedu Mar 31, 2022
d4e6ab5
Update swarm_in_blocks.md
faresedu Mar 31, 2022
f4a2510
Update swarm_in_blocks.md
faresedu Mar 31, 2022
05980bb
Merge branch 'CopterExpress:master' into master
guisoares9 Apr 6, 2022
e18044f
Minor changes
guisoares9 Apr 13, 2022
72c36df
Merge branch 'master' of github.com:Grupo-SEMEAR-USP/clover
guisoares9 Apr 13, 2022
a9bbc6d
Minor change
guisoares9 Apr 13, 2022
0765092
swarm_in_blocks branch updated
guisoares9 Apr 13, 2022
f565131
final article added from master to swarm_in_blocks branch
guisoares9 Apr 13, 2022
1d30e0f
Merge branch 'CopterExpress:master' into master
guisoares9 Apr 13, 2022
a78f650
Merge branch 'CopterExpress:master' into swarm_in_blocks
guisoares9 Apr 13, 2022
2994005
final article added but without assets
guisoares9 Apr 13, 2022
8897049
Assets added
guisoares9 Apr 13, 2022
e4c20ca
Added information about the Clover Platform and Swarm in Blocks repos…
guisoares9 Apr 13, 2022
943294c
Minor changes
guisoares9 Apr 13, 2022
38687cb
Minor changes
guisoares9 Apr 13, 2022
022f88f
Merge branch 'master' of github.com:Grupo-SEMEAR-USP/clover
guisoares9 Apr 13, 2022
7b1ef87
Minor changes
Rafael-Saud Apr 14, 2022
ea4e900
Minor changes
Rafael-Saud Apr 14, 2022
ec63ead
Update swarm_in_blocks.md
guisoares9 Apr 14, 2022
f5b4bd1
Add video preview image to the repo
okalachev Apr 18, 2022
75f54b0
Some editing
okalachev Apr 18, 2022
242e695
Reduce image size
okalachev Apr 18, 2022
e2c7f64
Merge branch 'master' into Grupo-SEMEAR-USP-edits
okalachev Apr 18, 2022
cb3d491
List article
okalachev Apr 18, 2022
5a017d2
Remove unused image
okalachev Apr 18, 2022
e6f9b03
Replace huge animations with external links to save space
okalachev Apr 18, 2022
dd2f6b9
pull
joseCarlosAndrade Jun 8, 2022
0b87070
merging - reviewing changes
joseCarlosAndrade Jun 18, 2022
de1f6eb
..
joseCarlosAndrade Jun 18, 2022
0700458
Merge branch 'Swarm_in_Blocks' into swarm_in_blocks
joseCarlosAndrade Jun 18, 2022
a5d4d6e
Update leds.py
guisoares9 Jun 24, 2022
e04bbfd
Update blockly_compressed.js
guisoares9 Jun 24, 2022
7171430
Update index.html
guisoares9 Jun 24, 2022
f38feba
Update index.html
guisoares9 Jun 24, 2022
0c39248
Update main.js
joseCarlosAndrade Jun 24, 2022
ff75133
Update main.css
guisoares9 Jun 24, 2022
a7b645f
Update main.css
guisoares9 Jun 24, 2022
ce783e9
Update main.js
joseCarlosAndrade Jun 24, 2022
5b30c17
Update clover4.xacro
guisoares9 Jun 24, 2022
b4841e1
Update led_strip.xacro
joseCarlosAndrade Jun 24, 2022
179b0e1
Update clover.world
guisoares9 Jun 24, 2022
513e305
Update clover_aruco.world
guisoares9 Jun 24, 2022
0c4d642
Update simulator.launch
guisoares9 Jun 24, 2022
c030cb8
Delete clover_light.world
guisoares9 Jun 24, 2022
02a52c7
Merged
guisoares9 Jun 24, 2022
0efea38
Merged with swarm_in_blocks
guisoares9 Jun 24, 2022
675ea2e
Readme fixed
guisoares9 Jun 24, 2022
8c95725
Updated copterhack2022.md
guisoares9 Jun 24, 2022
3552677
Updated copterhack2022.md
guisoares9 Jun 24, 2022
3612f7f
Update swarm_in_blocks.md
guisoares9 Jun 24, 2022
555de33
Readme files fixed.
guisoares9 Jun 24, 2022
6c40b0d
Merge branch 'swarm_in_blocks' of github.com:Grupo-SEMEAR-USP/clover …
guisoares9 Jun 24, 2022
a413198
Resolving example.launch
joseCarlosAndrade Jun 24, 2022
37429f0
Merge branch 'CopterExpress:master' into swarm_in_blocks
guisoares9 Jul 15, 2022
cf3f3ed
Namespaces on swarm are used. When it uses <robotNamespace></robotNam…
guisoares9 Jul 15, 2022
37c4c3b
Minor fixes
guisoares9 Jul 15, 2022
794e41c
Minor fixes
guisoares9 Jul 15, 2022
bb6807e
Minor fixes
guisoares9 Jul 15, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
arrumando o problema do path com o rospkg
Felipe-Tommaselli committed Feb 6, 2022
commit 7f6de127462b10f809d644a042d451618e9a8b09
2 changes: 1 addition & 1 deletion roswww_static/index.txt
Original file line number Diff line number Diff line change
@@ -33,7 +33,7 @@
<a href="clover_blocks" target=_blank; rel=noopener noreferrer>
<button class="w3-button w3-xlarge w3-black w3-hover-blue"
onclick="document.getElementById('id01').style.display='block'"
style="font-weight:900;"> GOoooo
style="font-weight:900;"> GO
</button>
</a>
<div class="p" style="margin-top: 20px; margin-bottom: 20px">
4 changes: 1 addition & 3 deletions roswww_static/main.py
Original file line number Diff line number Diff line change
@@ -39,7 +39,7 @@
rospy.loginfo('found www path for %s package', name)
os.symlink(path + '/www', www + '/' + name)
if name == 'clover' or name == 'clover_blocks' or name == 'swarm_clover_blocks':
names.append(name)
continue
else:
others.append(name)

@@ -133,12 +133,10 @@
dst = rospkg.get_ros_home() + '/www/assets'
os.mkdir(dst)
try:
#if path already exists, remove it before copying with copytree()
if os.path.exists(dst):
shutil.rmtree(dst)
shutil.copytree(src, dst)
except OSError as e:
# If the error was caused because the source wasn't a directory
if e.errno == errno.ENOTDIR:
shutil.copy(source_dir_prompt, destination_dir_prompt)
else: