Skip to content
This repository was archived by the owner on Jul 18, 2025. It is now read-only.

Commit 96bec92

Browse files
authored
Merge pull request #12 from ThundeRatz/develop
Update master to release v2.0
2 parents f9fc66d + e0418fb commit 96bec92

75 files changed

Lines changed: 2061 additions & 1031 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.all-contributorsrc

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
{
2+
"projectName": "vss_simulation",
3+
"projectOwner": "thunderatz",
4+
"repoType": "github",
5+
"repoHost": "https://github.com",
6+
"files": [
7+
"README.md"
8+
],
9+
"imageSize": 100,
10+
"commit": true,
11+
"commitConvention": "gitmoji",
12+
"contributors": [
13+
{
14+
"login": "FelipeGdM",
15+
"name": "Felipe Gomes de Melo",
16+
"avatar_url": "https://avatars3.githubusercontent.com/u/1054087?v=4",
17+
"profile": "https://github.com/FelipeGdM",
18+
"contributions": [
19+
"doc",
20+
"review",
21+
"code",
22+
"translation"
23+
]
24+
},
25+
{
26+
"login": "LucasHaug",
27+
"name": "Lucas Haug",
28+
"avatar_url": "https://avatars3.githubusercontent.com/u/39196309?v=4",
29+
"profile": "https://github.com/LucasHaug",
30+
"contributions": [
31+
"review"
32+
]
33+
},
34+
{
35+
"login": "Tocoquinho",
36+
"name": "tocoquinho",
37+
"avatar_url": "https://avatars2.githubusercontent.com/u/37677881?v=4",
38+
"profile": "https://github.com/Tocoquinho",
39+
"contributions": [
40+
"ideas",
41+
"doc"
42+
]
43+
},
44+
{
45+
"login": "Berbardo",
46+
"name": "Bernardo Coutinho",
47+
"avatar_url": "https://avatars0.githubusercontent.com/u/48636340?v=4",
48+
"profile": "https://github.com/Berbardo",
49+
"contributions": [
50+
"review",
51+
"code",
52+
"doc"
53+
]
54+
},
55+
{
56+
"login": "lucastrschneider",
57+
"name": "Lucas Schneider",
58+
"avatar_url": "https://avatars0.githubusercontent.com/u/50970346?v=4",
59+
"profile": "https://github.com/lucastrschneider",
60+
"contributions": [
61+
"review",
62+
"code",
63+
"translation",
64+
"doc"
65+
]
66+
},
67+
{
68+
"login": "JuliaMdA",
69+
"name": "Júlia Mello",
70+
"avatar_url": "https://avatars1.githubusercontent.com/u/65100162?v=4",
71+
"profile": "https://github.com/JuliaMdA",
72+
"contributions": [
73+
"design",
74+
"data"
75+
]
76+
},
77+
{
78+
"login": "ThallesCarneiro",
79+
"name": "ThallesCarneiro",
80+
"avatar_url": "https://avatars1.githubusercontent.com/u/71659373?v=4",
81+
"profile": "https://github.com/ThallesCarneiro",
82+
"contributions": [
83+
"design",
84+
"data"
85+
]
86+
},
87+
{
88+
"login": "TetsuoTakahashi",
89+
"name": "TetsuoTakahashi",
90+
"avatar_url": "https://avatars2.githubusercontent.com/u/38441802?v=4",
91+
"profile": "https://github.com/TetsuoTakahashi",
92+
"contributions": [
93+
"ideas"
94+
]
95+
}
96+
],
97+
"contributorsPerLine": 7
98+
}

.gitignore

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# .gitignore taken from https://github.com/ThundeRatz/ThunderTrekking
1+
# .gitignore taken from https://github.com/ThundeRatz/ThunderTrekking-Public
22

33
*.o
44
*~
@@ -38,3 +38,9 @@ missing
3838

3939
# Doxygen generated files
4040
Doxygen/
41+
42+
# Python virtual enviroment
43+
venv/*
44+
45+
# ROS bagfiles
46+
*.bag

.vscode/settings.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
2-
"ros.distro": "melodic",
2+
"ros.distro": "noetic",
33
"doxdocgen.generic.dateFormat": "MM/YYYY",
44
"doxdocgen.file.copyrightTag": [
5-
"@copyright MIT License - Copyright (c) {year} ThundeRatz"
5+
"@copyright MIT License - Copyright (c) 2020 ThundeRatz"
66
],
77
"C_Cpp.default.configurationProvider": "go2sh.cmake-integration",
88
"python.autoComplete.extraPaths": [
9-
"/opt/ros/melodic/lib/python2.7/dist-packages"
9+
"/opt/ros/noetic/lib/python3/dist-packages"
1010
],
1111
"files.associations": {
1212
"*.world": "xml",
@@ -16,5 +16,4 @@
1616
},
1717
"python.linting.pycodestyleEnabled": true,
1818
"python.linting.enabled": true,
19-
"python.linting.pep8Enabled": true,
2019
}

CHANGELOG.md

Lines changed: 54 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,67 @@
11
# Changelog
22

3-
## v2.0.0-alpha
3+
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
4+
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
45

5-
- Quebra de compatibilidade com a v1.0.0
6-
- Tópicos recebem o valor do **torque em Nm**
6+
Para a versão em PT-BR 🇧🇷 desse documento, veja [aqui](./CHANGELOG.pt-br.md)
7+
8+
## [2.0.0] - 2020-10-05 - [Open Camera](https://github.com/ThundeRatz/vss_simulation/releases/tag/v2.0)
9+
10+
### Added
11+
12+
- Software license (MIT)
13+
- Generic vss robot model
14+
- Gazebo camera plugin
15+
- File requirements.txt for python virtual environments
16+
17+
### Changed
18+
19+
- Upgrade to Gazebo 11 and ROS noetic
20+
- Simulation environmet released as free software
21+
22+
### Deprecated
23+
24+
- Remove original model of ThunderVolt team
25+
26+
### Known problems
27+
28+
- Ball physical properties
29+
- The simulation fails to start sometimes
30+
31+
## [2.0.0-alpha] - 2020-05-12
32+
33+
### Added
34+
35+
- Simulation of dry and viscous friction in wheels movement
36+
- Dependency ```effort_controllers```
37+
38+
### Changed
39+
40+
- Topics receive the command of **torque in Nm**
741
- /robotX/vss_robot_left_controller/command
842
- /robotX/vss_robot_right_controller/command
9-
- Padronização da nomenclatura com o VSSVision
10-
- Simulação do atrito seco e viscoso no movimento das rodas
11-
- Adição do ```effort_controllers``` como dependência
43+
- Name standardization with VSSVision
44+
45+
### Known problems
1246

13-
### Problemas conhecidos
47+
- Ball physical properties
48+
- The simulation fails to start sometimes
1449

15-
- Propriedades físicas da bola
16-
- A simulação falha em iniciar ocasionalmente
50+
## [1.0.0] - 2020-05-04 - [Iron Cup 2020](https://github.com/ThundeRatz/vss_simulation/releases/tag/v1.0)
1751

18-
## v1.0.0 - Iron Cup 2020
52+
### Added
1953

20-
- Primeira versão funcional
21-
- Projeto mecânico v1.1 - Thalles e Diego
22-
- Controle dos motores pela **velocidade em rad/s**
54+
- Mechanical project v1.1 - Thalles e Diego
55+
- Motors control with **velocity in rad/s**
2356
- /robot_X/vss_robot_left_controller/command
2457
- /robot_X/vss_robot_right_controller/command
25-
- Ambientes de simulação
26-
- Robô único
27-
- Time de 3
28-
- Partida 3x3
29-
- Adição do ```velocity_controllers``` como dependência
58+
- Simulation environments
59+
- Single robot
60+
- Team of 3
61+
- Match 3x3
62+
- Dependency ```velocity_controllers```
3063

31-
### Problemas conhecidos
64+
### Known problems
3265

33-
- Propriedades físicas da bola
34-
- Comportamento dos motores ideal demais - longe da realidade
66+
- Ball physical properties
67+
- Motors behavior too ideal - far from reality

CHANGELOG.pt-br.md

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
# Changelog
2+
3+
O formato é baseado no [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
4+
e esse projeto segue a convenção [versionamento semântico](https://semver.org/spec/v2.0.0.html).
5+
6+
## [2.0.0] - 2020-10-05 - [Open Camera](https://github.com/ThundeRatz/vss_simulation/releases/tag/v2.0)
7+
8+
### Adicionado
9+
10+
- Licensa de software (MIT)
11+
- Modelo de robô vss genérico
12+
- Plugin de câmero do Gazebo
13+
- Arquivo requirements.txt para ambientes virtuais de python
14+
15+
### Modificado
16+
17+
- Atualização para Gazebo 11 e ROS noetic
18+
- Ambiente de simulação liberado como software livre
19+
20+
### Obsoleto
21+
22+
- Remoção do modelo original do time ThunderVolt
23+
24+
### Problemas conhecidos
25+
26+
- Propriedades físicas da bola
27+
- A simulação falha em iniciar ocasionalmente
28+
29+
## [2.0.0-alpha] - 2020-05-12
30+
31+
### Adicionado
32+
33+
- Simulação de atrito seco e viscoso no movimento das rodas
34+
- Dependência ```effort_controllers```
35+
36+
### Modificado
37+
38+
- Tópicos recebem o valor do **torque em Nm**
39+
- /robotX/vss_robot_left_controller/command
40+
- /robotX/vss_robot_right_controller/command
41+
- Padronização da nomenclatura com o VSSVision
42+
- Simulação do atrito seco e viscoso no movimento das rodas
43+
44+
### Problemas conhecidos
45+
46+
- Propriedades físicas da bola
47+
- A simulação falha em iniciar ocasionalmente
48+
49+
## [1.0.0] - 2020-05-04 - [Iron Cup 2020](https://github.com/ThundeRatz/vss_simulation/releases/tag/v1.0)
50+
51+
### Adicionado
52+
53+
- Projeto mecânico v1.1 - Thalles e Diego
54+
- Controle dos motores pela **velocidade em rad/s**
55+
- /robot_X/vss_robot_left_controller/command
56+
- /robot_X/vss_robot_right_controller/command
57+
- Ambientes de simulação
58+
- Robô único
59+
- Time de 3
60+
- Partida 3x3
61+
- Dependência```velocity_controllers```
62+
63+
### Problemas conhecidos
64+
65+
- Propriedades físicas da bola
66+
- Comportamento dos motores ideal demais - longe da realidade

CODE_OF_CONDUCT.md

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
# Contributor Covenant Code of Conduct
2+
3+
Para a versão em PT-BR 🇧🇷 desse documento, [veja aqui](CODE_OF_CONDUCT.pt-br.md).
4+
5+
## Our Pledge
6+
7+
In the interest of fostering an open and welcoming environment, we as
8+
contributors and maintainers pledge to making participation in our project and
9+
our community a harassment-free experience for everyone, regardless of age, body
10+
size, disability, ethnicity, sex characteristics, gender identity and expression,
11+
level of experience, education, socio-economic status, nationality, personal
12+
appearance, race, religion, or sexual identity and orientation.
13+
14+
## Our Standards
15+
16+
Examples of behavior that contributes to creating a positive environment
17+
include:
18+
19+
* Using welcoming and inclusive language
20+
* Being respectful of differing viewpoints and experiences
21+
* Gracefully accepting constructive criticism
22+
* Focusing on what is best for the community
23+
* Showing empathy towards other community members
24+
25+
Examples of unacceptable behavior by participants include:
26+
27+
* The use of sexualized language or imagery and unwelcome sexual attention or
28+
advances
29+
* Trolling, insulting/derogatory comments, and personal or political attacks
30+
* Public or private harassment
31+
* Publishing others' private information, such as a physical or electronic
32+
address, without explicit permission
33+
* Other conduct which could reasonably be considered inappropriate in a
34+
professional setting
35+
36+
## Our Responsibilities
37+
38+
Project maintainers are responsible for clarifying the standards of acceptable
39+
behavior and are expected to take appropriate and fair corrective action in
40+
response to any instances of unacceptable behavior.
41+
42+
Project maintainers have the right and responsibility to remove, edit, or
43+
reject comments, commits, code, wiki edits, issues, and other contributions
44+
that are not aligned to this Code of Conduct, or to ban temporarily or
45+
permanently any contributor for other behaviors that they deem inappropriate,
46+
threatening, offensive, or harmful.
47+
48+
## Scope
49+
50+
This Code of Conduct applies both within project spaces and in public spaces
51+
when an individual is representing the project or its community. Examples of
52+
representing a project or community include using an official project e-mail
53+
address, posting via an official social media account, or acting as an appointed
54+
representative at an online or offline event. Representation of a project may be
55+
further defined and clarified by project maintainers.
56+
57+
## Enforcement
58+
59+
Instances of abusive, harassing, or otherwise unacceptable behavior may be
60+
reported by contacting the project team at comp@thunderatz.org. All
61+
complaints will be reviewed and investigated and will result in a response that
62+
is deemed necessary and appropriate to the circumstances. The project team is
63+
obligated to maintain confidentiality with regard to the reporter of an incident.
64+
Further details of specific enforcement policies may be posted separately.
65+
66+
Project maintainers who do not follow or enforce the Code of Conduct in good
67+
faith may face temporary or permanent repercussions as determined by other
68+
members of the project's leadership.
69+
70+
## Attribution
71+
72+
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
73+
available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
74+
75+
[homepage]: https://www.contributor-covenant.org
76+
77+
For answers to common questions about this code of conduct, see
78+
https://www.contributor-covenant.org/faq

0 commit comments

Comments
 (0)