Resolved conflicts in docker-compose.yml and requirements.txt where both branches added identical content. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
@@ -23,4 +23,4 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
COPY . .
EXPOSE 8080
-CMD ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "8080"]
+CMD ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "8080"]
@@ -1 +1 @@
-3.3.3
+3.3.4
@@ -467,7 +467,9 @@ def home(timeout=15):
idle_reached = check_idle()
if idle_reached:
- state.current_theta = state.current_rho = 0
+ state.current_rho = 0
+ if not state.current_theta:
+ state.current_theta = 0
homing_success = True
logger.info("Homing completed and device is idle")
else:
@@ -17,4 +17,4 @@ aiohttp
RPi.GPIO>=0.7.1 # Required by Adafruit Blinka on Raspberry Pi
rpi-ws281x>=5.0.0 # Low-level NeoPixel/WS281x driver
adafruit-circuitpython-neopixel>=6.3.0
-Adafruit-Blinka>=8.0.0
+Adafruit-Blinka>=8.0.0