Skip to content

Feat carrier #17

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.

Sign up for GitHub

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

Jump to bottom
Open
ADvanbergeijk wants to merge 82 commits into
base: development
Choose a base branch
from
Open

Feat carrier #17

ADvanbergeijk wants to merge 82 commits into from

Conversation

@ADvanbergeijk
Copy link

@ADvanbergeijk ADvanbergeijk commented May 31, 2017

De eerste slice van de Carrier.
Hallsensor kan magneet detecteren.
Motoren kunnen voorruit, achteruit en draaien.
Sonar kan motoren stoppen.

Nerinai and others added 29 commits May 24, 2017 11:21
@Nerinai
initia commit to add module map /CARRIER
fb7e865
@woodage
sonar code. Not documented yet.
78b9cdb
@WilcoLouwerse
fixed some minor tab/spaces
dc05619
@WilcoLouwerse
Added documentation for sonar.py
f1dcb6d
@WilcoLouwerse
Updated documentation sonar.py
d4f22ae
@WilcoLouwerse
Updated documentation sonar.py (2)
dc3d3ee
@woodage
hall sensor class. Not tested yet
efeb11e
@Nerinai
[carrier-01]: motorcontrol en state machine done TODO: needs doxy
434f9f0
@Nerinai
[carrier-0]: removed main.cc
fbf78a2
@woodage
HallSensor working
d9e215e
improved code to work more efficient, and be more modular also commen…
b94b02a 
…ted everything
@Nerinai
[carrier-01]: removed main.cc commit before merge with motor TODO: ma…
b156693 
…ke this thing usable within main.
@Nerinai
Merge branch 'feat-carrier-sonar' into feat-carrier
6cefa97
@WilcoLouwerse
Added documentation for hallsensor.py
485a0b5
@Nerinai
[carrier-01]: integrated sonar into state machine
fa6ff6e
@WilcoLouwerse
Updated documentation for sonar.py
a6731a5
@WilcoLouwerse
Updated documentation of sonar.py to make it work with doxygen
41f66f9
@WilcoLouwerse
Updated documentation for hallsensor.py to work correctly with doxygen
372068d
@Nerinai
[carrier-01]: changed sonar distance
db56abe
@Nerinai
Merge branch 'feat-carrier' of https://github.com/R2D2-2017/R2D2-2017 …
a4ddb8c 
…into feat-carrier
@WilcoLouwerse
Started doxygen documentation for motor.py
a4cca98
@WilcoLouwerse
Updated documentation of motor.py (and a little of sonar.py)
2347971
@Nerinai
[carrier-01]: Added led output to hallsnesor class.
fe8cf0f
@Nerinai
Merge branch 'feat-carrier-hallsensor' into feat-carrier
aecf6e3
@Nerinai
[carrier-01]: added hallsensor to main.py + added led indicators in h…
8e69605 
…allsensor.py
@WilcoLouwerse
Added documentation about the bits send to control the motors in moto…
6caa8bd 
…r.py
@Nerinai
Merge branch 'feat-carrier' of https://github.com/R2D2-2017/R2D2-2017 …
69931d1 
…into feat-carrier
@Nerinai
[carrier]: Added documentation to main.py
d6f9fdd
@Nerinai
[carrier-01]: Made python indentations correct
994b356
@ADvanbergeijk ADvanbergeijk requested a review from cjsmeele May 31, 2017 15:01
Bob Thomas and others added 27 commits June 14, 2017 15:46
Merge remote-tracking branch 'origin/feat-carrier-parser' into feat-c…
2c902a4 
…arrier
Merge remote-tracking branch 'origin/feat-carrier-motortranslation' i…
cd97d4f 
…nto feat-carrier
@Remco-Ruttenberg
Added simple distance formulas
9bb718c
[CARRIER-02] merged parser and controller
10d7886
@Remco-Ruttenberg
Usage of chrono is now less verbose
82d39db
@Remco-Ruttenberg
Merge branch 'feat-carrier' into feat-carrier-controller
66db6bd
@Remco-Ruttenberg
Filenames now follow code style
c61f119
@Remco-Ruttenberg
Updated include files
33e360d
@Jipolie01
Added doxygen to motor-controller and motor
235389e
[CARRIER-02] add status led
d7d5f1c
Merge remote-tracking branch 'origin/feat-carrier' into feat-carrier
a406dff
@Remco-Ruttenberg
Implemented state controller
4f4ed39
[CARRIER-02] implemented statemachine with current setup (bob thomas,…
5adba29 
… remco ruttenberg)
Merge branch 'feat-carrier-controller' into feat-carrier
4aeb0f5
[CARRIER-02] some minor motor fixes
171ec5c
Merge remote-tracking branch 'origin/feat-carrier-translation' into f…
b8822ca 
…eat-carrier
Revert "[CARRIER-02] some minor motor fixes"
40d5530 
This reverts commit 171ec5c.
@Bob-Thomas
Revert "Merge remote-tracking branch 'origin/feat-carrier-translation…
1a46017 
…' into feat-carrier"

This reverts commit b8822ca, reversing
changes made to 171ec5c.
@Bob-Thomas
[CARRIER-02] revert fix
1068f8e
@Bob-Thomas
[CARRIER-02] Doxygen style fixes
d534648
@ManDeJan
[CARRIER] Style fixes
eb3b179
[Carrier] Added doxygen and finalized code, also remembered to includ…
29d891b 
…e the hall sensor this time.
Merge branch 'feat-carrier-translation' into feat-carrier
5283efd
[CARRIER] Implementatie sonar
6af6579
@Remco-Ruttenberg
Updated doxygen documentation for CarrierController
67204ef
@Remco-Ruttenberg
Merge branch 'feat-carrier' of github.com:R2D2-2017/R2D2-2017 into fe…
d2702fb 
…at-carrier
[CARRIER-03] Fixed serial write problem and sonar refactor and bug fix
254d906
Bob-Thomas
Bob-Thomas previously approved these changes Jun 19, 2017
View reviewed changes
@Bob-Thomas
Copy link

Bob-Thomas commented Jun 19, 2017

@sqrtroot @cjsmeele @ManDeJan deze zal toch niet gemerged worden of wat is het plan hier mee ?

@Bob-Thomas Bob-Thomas dismissed their stale review June 20, 2017 10:04

too much changed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@cjsmeele cjsmeele Awaiting requested review from cjsmeele

@ManDeJan ManDeJan Awaiting requested review from ManDeJan

4 more reviewers

@wds444 wds444 wds444 left review comments

@Nerinai Nerinai Nerinai left review comments

@sqrtroot sqrtroot sqrtroot requested changes

@Bob-Thomas Bob-Thomas Bob-Thomas left review comments

Reviewers whose approvals may not affect merge requirements

At least 1 approving review is required to merge this pull request.

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.