Skip to content
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

merge dev to main #2

Merged
merged 18 commits into from
Dec 7, 2023
Merged

merge dev to main #2

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
5aae48b
formatting
MADS0LADEN Nov 17, 2023
0c569c5
formatting
MADS0LADEN Nov 17, 2023
fb37d1d
potentiometer.py added
minityhyi Nov 20, 2023
1e4c74c
updated potentiometer.py
minityhyi Nov 20, 2023
770b86c
delay pis, fatter intet
MADS0LADEN Nov 21, 2023
413449e
mulighed for at ændre frekvens fra controller
MADS0LADEN Nov 23, 2023
75b1091
changed controls
minityhyi Nov 23, 2023
abc4331
added a button
minityhyi Nov 23, 2023
31f9671
tested on esp
MADS0LADEN Nov 23, 2023
f6048ac
Merge branch 'dev' of https://github.com/MADS0LADEN/tema2-gruppe1 int…
MADS0LADEN Nov 23, 2023
11e8486
added schematics
minityhyi Nov 26, 2023
4ff27c3
changes to joystick.py
minityhyi Nov 29, 2023
4b05c03
add rc controller
MADS0LADEN Dec 5, 2023
f58c09f
tilpasset 3d print
MADS0LADEN Dec 7, 2023
a5cff57
added button
minityhyi Dec 7, 2023
cc6ca0b
Merge branch 'dev' of https://github.com/MADS0LADEN/tema2-gruppe1 int…
minityhyi Dec 7, 2023
42b92c7
?
minityhyi Dec 7, 2023
a286ada
Merge branch 'main' into dev
MADS0LADEN Dec 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Merge branch 'main' into dev
  • Loading branch information
@MADS0LADEN
MADS0LADEN authored Dec 7, 2023
commit a286ada8a5e4a0c69156acdee21014e48517b840
6 changes: 0 additions & 6 deletions rover/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,6 @@
if size == 1:
if data[0] == "0":
driver.stop()
elif data[0] != "0":
try:
int(data[0])
except ValueError as e:
print(e)
driver.setFreq(data[0])
if size == 2:
cmd, speed = data
if platform == "ESP":
Expand Down
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.