?

MADS0LADEN · Dec 7, 2023 · 42b92c7 · 42b92c7
1 parent cc6ca0b
commit 42b92c7
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 18 deletions.
diff --git a/Schematics/roverTemaSchematics2/joystickRover-backups/joystickRover-2023-12-07_111149.zip b/Schematics/roverTemaSchematics2/joystickRover-backups/joystickRover-2023-12-07_111149.zip
diff --git a/Schematics/roverTemaSchematics2/~Potentiometer.kicad_sch.lck b/Schematics/roverTemaSchematics2/~Potentiometer.kicad_sch.lck
diff --git a/Schematics/roverTemaSchematics2/~Rover.kicad_pcb.lck b/Schematics/roverTemaSchematics2/~Rover.kicad_pcb.lck
diff --git a/Schematics/roverTemaSchematics2/~joystickRover.kicad_sch.lck b/Schematics/roverTemaSchematics2/~joystickRover.kicad_sch.lck
diff --git a/joystick/joystickStryrring.py b/joystick/joystickStryrring.py
@@ -1,11 +1,8 @@
 from time import sleep
-
 from machine import ADC, Pin
-
-# xAxis og yAxis modtager input fra joystik armen
+import socket
 xAxis = ADC(Pin(1, Pin.IN), atten=ADC.ATTN_11DB)
 yAxis = ADC(Pin(2, Pin.IN), atten=ADC.ATTN_11DB)
-# button modtager inputtet fra når man trykker på knappen
 button = Pin(3, Pin.IN, Pin.PULL_UP)
 xStatus = ""
 yStatus = ""
@@ -15,10 +12,8 @@
 back = 0
 boost = 0
 result = ""
-
-import socket
-
 debug = True
+basespeed = 65
 
 sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
 enpoint = input("Hvilken endhed vil du snakke med?\nESP / LOCAL?\n")
@@ -29,7 +24,6 @@
 else:
     server_addr = ("127.0.0.1", 7913)
 
-basespeed = 65
 while True:
     # xValue og yValue aflæser her joystikkets placering, og sender et signal tilbage i microvolt
     xValue = xAxis.read_u16()
@@ -43,26 +37,19 @@
     # når knappen bliver trykket på lyser lampen
     if buttonStatus == "pressed":
         pass
-
     # får de forskellige lamper til at lyse alt efter hvilken x- og y-værdi der er på joystikket.
     if xValue <= 600:
         xStatus = "left"
-
     if xValue >= 60000:
         xStatus = "right"
-
     if yValue <= 600:
         yStatus = "up"
-
     if yValue >= 60000:
         yStatus = "down"
-
     if 10000 <= xValue <= 50000:
         xStatus = "neutral"
-
     if 10000 <= yValue <= 50000:
         yStatus = "neutral"
-
     # straight ahead: no turning
     if yStatus == "up" and xStatus == "neutral":
         forward = 65 + boost