Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
B
base-intersemestre-jedi
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
BENHAIDA Intissar
base-intersemestre-jedi
Commits
4e68db18
Commit
4e68db18
authored
2 years ago
by
HUIN Nicolas
Browse files
Options
Downloads
Patches
Plain Diff
* Fixed import
parent
29192171
Branches
master
No related tags found
No related merge requests found
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
controller.py
+2
-2
2 additions, 2 deletions
controller.py
droids.py
+4
-4
4 additions, 4 deletions
droids.py
motor.py
+1
-1
1 addition, 1 deletion
motor.py
rover.py
+1
-1
1 addition, 1 deletion
rover.py
sensors.py
+1
-1
1 addition, 1 deletion
sensors.py
with
9 additions
and
9 deletions
controller.py
+
2
−
2
View file @
4e68db18
...
...
@@ -4,8 +4,8 @@ Description: Provides a PID controller for the robot that deals with motor speed
"""
from
enum
import
IntEnum
,
unique
from
.
motor
import
Motor
from
.
sensors
import
HCSR04
,
HCSR04Event
,
ContinuousSensor
from
motor
import
Motor
from
sensors
import
HCSR04
,
HCSR04Event
,
ContinuousSensor
@unique
...
...
This diff is collapsed.
Click to expand it.
droids.py
+
4
−
4
View file @
4e68db18
...
...
@@ -10,10 +10,10 @@ import tty
import
termios
from
enum
import
IntEnum
,
unique
import
RPi.GPIO
as
GPIO
from
.
motor
import
Motor
from
.
sensors
import
HCSR04
,
ContinuousSensor
from
.
controller
import
PIDController
from
.
pins
import
RaspiPin
,
RaspiPinError
from
motor
import
Motor
from
sensors
import
HCSR04
,
ContinuousSensor
from
controller
import
PIDController
from
pins
import
RaspiPin
,
RaspiPinError
class
Droid
:
...
...
This diff is collapsed.
Click to expand it.
motor.py
+
1
−
1
View file @
4e68db18
...
...
@@ -7,7 +7,7 @@ import time
from
enum
import
IntEnum
import
RPi.GPIO
as
GPIO
from
.
pins
import
RaspiPin
from
pins
import
RaspiPin
class
MotorError
(
Exception
):
...
...
This diff is collapsed.
Click to expand it.
rover.py
+
1
−
1
View file @
4e68db18
...
...
@@ -3,7 +3,7 @@ File: rover.py
Description: Entry point for running the robot from the keyboard
"""
from
.
droids
import
RoverDroid
from
droids
import
RoverDroid
rover
=
RoverDroid
()
...
...
This diff is collapsed.
Click to expand it.
sensors.py
+
1
−
1
View file @
4e68db18
...
...
@@ -8,7 +8,7 @@ from enum import IntEnum
from
math
import
inf
import
threading
import
RPi.GPIO
as
GPIO
from
.
pins
import
RaspiPin
,
RaspiPinError
from
pins
import
RaspiPin
,
RaspiPinError
class
HCSR04Event
(
IntEnum
):
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment