merge conflict and readme update
old code was uploaded in the initial upload changed everything with working programm and updated the readme
This commit is contained in:
+20
-17
@@ -9,6 +9,9 @@ import config as cfg
|
||||
# Globale Variablen
|
||||
robotCommunication = None
|
||||
shared_sim = None
|
||||
emote = None
|
||||
display_text = ""
|
||||
|
||||
if cfg.sim:
|
||||
shared_sim = Simulation()
|
||||
else:
|
||||
@@ -17,7 +20,7 @@ else:
|
||||
else:
|
||||
robotCommunication = ESP32Communication()
|
||||
|
||||
vector_dirmov = [0, 0] # Direction Movement
|
||||
vector_dirmov = [0, 0, 0] # Direction Movement [vx, vy, omega]
|
||||
current_rad: dt.RadArray # Current Rad
|
||||
current_pos: dt.PosArray # Current Position
|
||||
|
||||
@@ -43,26 +46,26 @@ control_pause: bool = False
|
||||
# [90, 150, 65],
|
||||
# ]
|
||||
#)
|
||||
init_deg: dt.DegArray = dt.DegArray(
|
||||
[
|
||||
[90, 30, 95],
|
||||
[90, 30, 95],
|
||||
[90, 30, 95],
|
||||
[90, 150, 85],
|
||||
[90, 150, 85],
|
||||
[90, 150, 85],
|
||||
]
|
||||
)
|
||||
#init_deg: dt.DegArray = dt.DegArray(
|
||||
# [
|
||||
# [90, 45, 140],
|
||||
# [90, 45, 140],
|
||||
# [90, 45, 140],
|
||||
# [90, 135, 40],
|
||||
# [90, 135, 40],
|
||||
# [90, 135, 40],
|
||||
# [90, 30, 95],
|
||||
# [90, 30, 95],
|
||||
# [90, 30, 95],
|
||||
# [90, 150, 85],
|
||||
# [90, 150, 85],
|
||||
# [90, 150, 85],
|
||||
# ]
|
||||
#)
|
||||
init_deg: dt.DegArray = dt.DegArray(
|
||||
[
|
||||
[90, 45, 140],
|
||||
[90, 45, 140],
|
||||
[90, 45, 140],
|
||||
[90, 135, 40],
|
||||
[90, 135, 40],
|
||||
[90, 135, 40],
|
||||
]
|
||||
)
|
||||
|
||||
init90_deg: dt.DegArray = dt.DegArray(
|
||||
[
|
||||
|
||||
Reference in New Issue
Block a user