Merge remote-tracking branch 'origin/master' into mergestuff (f520aa48) · Commits · Hierck, J.J. (Jelle, Student M-BME,M-EMSYS) / CPS_project_group13 · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

C

CPS_project_group13
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

f520aa48

Commit f520aa48 authored 4 years ago by SiccoColijn

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master' into mergestuff

# Conflicts:
#	mappingbot/driving.py
#	mappingbot/ultrasound.py

parents ed2522df 6c2e799a

No related branches found

No related tags found

Loading

Changes 14

Hide whitespace changes

Inline Side-by-side

Showing

docs/pin_allocation.md 24 additions, 0 deletions

docs/pin_allocation.md
mappingbot/accelerometer/__init__.py 33 additions, 0 deletions

mappingbot/accelerometer/__init__.py
mappingbot/accelerometer/kalman.py 347 additions, 0 deletions

mappingbot/accelerometer/kalman.py
mappingbot/constants.py 32 additions, 0 deletions

mappingbot/constants.py
mappingbot/driving.py 67 additions, 98 deletions

mappingbot/driving.py
mappingbot/encoder.py 3 additions, 5 deletions

mappingbot/encoder.py
mappingbot/explore.py 220 additions, 10 deletions

mappingbot/explore.py
mappingbot/speed_sensor.py 0 additions, 125 deletions

mappingbot/speed_sensor.py
mappingbot/state_machine_VirtualMapping.py 113 additions, 0 deletions

mappingbot/state_machine_VirtualMapping.py
mappingbot/storage.py 68 additions, 0 deletions

mappingbot/storage.py
mappingbot/test.py 9 additions, 50 deletions

mappingbot/test.py
mappingbot/ultrasound.py 98 additions, 159 deletions

mappingbot/ultrasound.py
requirements.txt 4 additions, 0 deletions

requirements.txt
setup.py 12 additions, 0 deletions

setup.py

with 1030 additions and 447 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment