-
Notifications
You must be signed in to change notification settings - Fork 267
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
guisoares9
wants to merge
152
commits into
CopterExpress:master
Choose a base branch
from
Grupo-SEMEAR-USP:swarm_in_blocks
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from 1 commit
Commits
Show all changes
152 commits
Select commit
Hold shift + click to select a range
1ac1045
Create SwormAtena
guisoares9 961bdc3
Renamed file SwarmAtena
guisoares9 950d4e2
Merge branch 'CopterExpress:master' into master
Playergeek181 2ff9917
Swarm in Blocks project application of Atena team.
guisoares9 cc2750f
Merge branch 'master' of https://github.com/Grupo-SEMEAR-USP/clover
guisoares9 958f39f
Update Swarm_in_Blocks.md
guisoares9 74de58e
Merge pull request #1 from Grupo-SEMEAR-USP/Swarm_in_Blocks
guisoares9 f2b40b5
Fixing MAVLINK to MAVLink
guisoares9 545797d
Trailling spaces fixed
guisoares9 8aef11c
Markdown lint solved
guisoares9 f3ce4e0
Merge branch 'CopterExpress:master' into master
Playergeek181 bb5c628
Merge branch 'CopterExpress:master' into master
guisoares9 489807c
Merge branch 'CopterExpress:master' into Swarm_in_Blocks
guisoares9 aeae9ec
file renamed
guisoares9 4fe0d0b
file renamed
guisoares9 9a5f725
Merge branch 'CopterExpress:master' into master
guisoares9 a52c5ea
Started to update the project readme.
guisoares9 17038ec
Merge branch 'CopterExpress:master' into master
guisoares9 242981c
Merge branch 'CopterExpress:master' into Swarm_in_Blocks
Playergeek181 5d4379b
Update files to be possible to generate new files using then
Playergeek181 8ff5275
Update to be possible to use leds in multiple drones
Playergeek181 c5d836d
roswww_static updated to swarm_in_blocks front-end.
guisoares9 1a999da
favicon add on the localhost:2001 page
Felipe-Tommaselli 7f6de12
arrumando o problema do path com o rospkg
Felipe-Tommaselli c69b7f2
melhorando o design do localhost
Felipe-Tommaselli 33e81f8
roswww_static fixed
guisoares9 c4a978b
arrumando o localhost
Felipe-Tommaselli 64e3c69
restaurando clover_blocks para o original
Felipe-Tommaselli 19d900d
atualizando o localhost:2001
Felipe-Tommaselli 12c0cae
Led names fixed
guisoares9 d88a8d6
minor changes
Felipe-Tommaselli 0104eeb
Merge branch 'master' of https://github.com/Grupo-SEMEAR-USP/clover
Felipe-Tommaselli fd7636b
Adding initial pose to simple_offboard
guisoares9 d509a79
Pull request done
guisoares9 7bde23e
Led plugin fixed to work without camera plugin
guisoares9 8f46f0f
leds
guisoares9 d34b634
nothing
guisoares9 4070296
Lights world
guisoares9 e99af63
Merge branch 'CopterExpress:master' into master
guisoares9 5454035
Flashlights on clover disabled
guisoares9 d0b39b0
Merge branch 'master' of github.com:Grupo-SEMEAR-USP/clover
guisoares9 1310ff6
sim_leds fixed
guisoares9 f306db9
localhost assets updated
guisoares9 9445b71
minor changes
Felipe-Tommaselli 7870e73
minor changes
Felipe-Tommaselli 8f1a1ea
editing the files from "eazy to swarm" heading
Felipe-Tommaselli 5fc7510
Final article started
guisoares9 32adfe5
changing size of led_ring
Playergeek181 44d62b6
Merge branch 'master' of https://github.com/Grupo-SEMEAR-USP/clover
Playergeek181 985096e
Starting the article
Rafael-Saud 2bba895
Adding topics in the article
Rafael-Saud bef8b4f
Updates in the article
Rafael-Saud e15071e
nothing
guisoares9 bbeccc5
Merge branch 'master' of github.com:Grupo-SEMEAR-USP/clover
guisoares9 bdd556b
Swarm tools done
Rafael-Saud 3a659a8
Conclusion
Rafael-Saud 7a04967
Minor changes
Rafael-Saud e866b31
Update swarm_in_blocks.md
Felipe-Tommaselli 6212b10
Update swarm_in_blocks.md
Felipe-Tommaselli 9f1fedb
gifs
guisoares9 06ff103
Merge branch 'master' of github.com:Grupo-SEMEAR-USP/clover
guisoares9 3b6c636
gifs added
guisoares9 2134de4
Update swarm_in_blocks.md
Rafael-Saud b907433
Update swarm_in_blocks.md
Rafael-Saud e9f527c
Update swarm_in_blocks.md
Rafael-Saud c55e1c1
gifs added
guisoares9 b942c26
Merge branch 'master' of github.com:Grupo-SEMEAR-USP/clover
guisoares9 1122d2b
Update swarm_in_blocks.md
Rafael-Saud 2501c21
gifs added
guisoares9 1669113
Merge branch 'master' of github.com:Grupo-SEMEAR-USP/clover
guisoares9 8c9b234
gifs added
guisoares9 2b58502
Update swarm_in_blocks.md
Rafael-Saud 91141cb
Merge branch 'master' of github.com:Grupo-SEMEAR-USP/clover
guisoares9 993dd58
Update swarm_in_blocks.md
Rafael-Saud 197ac20
gifs added
guisoares9 031b607
video added
guisoares9 b6e07ff
video added
guisoares9 3fe4003
video added
guisoares9 4859334
video added
guisoares9 e3015ab
Update swarm_in_blocks.md
Rafael-Saud 62249ca
Update swarm_in_blocks.md
Rafael-Saud d01fe43
video added
guisoares9 a7d0e15
Merge branch 'master' of github.com:Grupo-SEMEAR-USP/clover
guisoares9 7f3f186
Update swarm_in_blocks.md
Rafael-Saud e02df58
Add files via upload
Rafael-Saud ac98ed4
Update swarm_in_blocks.md
Rafael-Saud 85b78fe
Tentativa
faresedu 28ba9e2
Update swarm_in_blocks.md
faresedu a4d79e7
Update swarm_in_blocks.md
faresedu 143aeb6
Update swarm_in_blocks.md
faresedu 60c2fbc
Update swarm_in_blocks.md
faresedu c23e908
Update swarm_in_blocks.md
faresedu 8464791
Update swarm_in_blocks.md
faresedu 3e775c6
Update swarm_in_blocks.md
faresedu d4e6ab5
Update swarm_in_blocks.md
faresedu f4a2510
Update swarm_in_blocks.md
faresedu 05980bb
Merge branch 'CopterExpress:master' into master
guisoares9 e18044f
Minor changes
guisoares9 72c36df
Merge branch 'master' of github.com:Grupo-SEMEAR-USP/clover
guisoares9 a9bbc6d
Minor change
guisoares9 0765092
swarm_in_blocks branch updated
guisoares9 f565131
final article added from master to swarm_in_blocks branch
guisoares9 1d30e0f
Merge branch 'CopterExpress:master' into master
guisoares9 a78f650
Merge branch 'CopterExpress:master' into swarm_in_blocks
guisoares9 2994005
final article added but without assets
guisoares9 8897049
Assets added
guisoares9 e4c20ca
Added information about the Clover Platform and Swarm in Blocks repos…
guisoares9 943294c
Minor changes
guisoares9 38687cb
Minor changes
guisoares9 022f88f
Merge branch 'master' of github.com:Grupo-SEMEAR-USP/clover
guisoares9 7b1ef87
Minor changes
Rafael-Saud ea4e900
Minor changes
Rafael-Saud ec63ead
Update swarm_in_blocks.md
guisoares9 f5b4bd1
Add video preview image to the repo
okalachev 75f54b0
Some editing
okalachev 242e695
Reduce image size
okalachev e2c7f64
Merge branch 'master' into Grupo-SEMEAR-USP-edits
okalachev cb3d491
List article
okalachev 5a017d2
Remove unused image
okalachev e6f9b03
Replace huge animations with external links to save space
okalachev dd2f6b9
pull
joseCarlosAndrade 0b87070
merging - reviewing changes
joseCarlosAndrade de1f6eb
..
joseCarlosAndrade 0700458
Merge branch 'Swarm_in_Blocks' into swarm_in_blocks
joseCarlosAndrade a5d4d6e
Update leds.py
guisoares9 e04bbfd
Update blockly_compressed.js
guisoares9 7171430
Update index.html
guisoares9 f38feba
Update index.html
guisoares9 0c39248
Update main.js
joseCarlosAndrade ff75133
Update main.css
guisoares9 a7b645f
Update main.css
guisoares9 ce783e9
Update main.js
joseCarlosAndrade 5b30c17
Update clover4.xacro
guisoares9 b4841e1
Update led_strip.xacro
joseCarlosAndrade 179b0e1
Update clover.world
guisoares9 513e305
Update clover_aruco.world
guisoares9 0c4d642
Update simulator.launch
guisoares9 c030cb8
Delete clover_light.world
guisoares9 02a52c7
Merged
guisoares9 0efea38
Merged with swarm_in_blocks
guisoares9 675ea2e
Readme fixed
guisoares9 8c95725
Updated copterhack2022.md
guisoares9 3552677
Updated copterhack2022.md
guisoares9 3612f7f
Update swarm_in_blocks.md
guisoares9 555de33
Readme files fixed.
guisoares9 6c40b0d
Merge branch 'swarm_in_blocks' of github.com:Grupo-SEMEAR-USP/clover …
guisoares9 a413198
Resolving example.launch
joseCarlosAndrade 37429f0
Merge branch 'CopterExpress:master' into swarm_in_blocks
guisoares9 cf3f3ed
Namespaces on swarm are used. When it uses <robotNamespace></robotNam…
guisoares9 37c4c3b
Minor fixes
guisoares9 794e41c
Minor fixes
guisoares9 bb6807e
Minor fixes
guisoares9 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Update swarm_in_blocks.md
- Loading branch information
commit a4d79e79ca0e16ce6306ac84d300659e00495ef2
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The article is already present, please, merge
master
into your branch.