arch

src/core/controller/controller.cpp

@@ -1,7 +1,7 @@
 #include "controller.h"
-#include "actuators.h"
+#include "core/actuators/actuators.h"
 #include "config.h"
-#include "servo.h"
+#include "core/servo/servo.h"
 
 void controllerSetMode(RobotMode m) {
   robot.mode = m;

src/core/controller/controller.h

@@ -1,6 +1,6 @@
 #pragma once
 #include <Arduino.h>
-#include "robot_state.h"
+#include "core/robot_state/robot_state.h"
 
 void controllerSetMode(RobotMode m);
 bool controllerMove(const String& cmd);

src/main.cpp

@@ -1,16 +1,16 @@
 #include <Arduino.h>
 
-#include "lcd_status.h"
-#include "servo.h"
-#include "ultrasonic.h"
-#include "face.h"
-#include "robot_state.h"
+#include "core/deprecate/lcd_status/lcd_status.h"
+#include "core/servo/servo.h"
+#include "core/ultrasonic/ultrasonic.h"
+#include "core/display/face/face.h"
+#include "core/robot_state/robot_state.h"
 
-#include "actuators.h"
-#include "web_server.h"
-#include "ws_server.h"
-#include "controller.h"
-#include "ir_input.h"
+#include "core/actuators/actuators.h"
+#include "server/web_server.h"
+#include "server/ws_server.h"
+#include "core/controller/controller.h"
+// #include "core/deprecate/ir_input/ir_input.h"
 
 void setup() {
   Serial.begin(115200);
@@ -22,7 +22,7 @@ void setup() {
   actuatorsInit();
   webServerInit();
   wsInit();
-  irInit();
+  // irInit();
 
   robot.lastCmdMs = millis();
 }
@@ -31,5 +31,5 @@ void loop() {
   webServerLoop();
   wsLoop();
   controllerUpdate();
-  irPoll();
+  // irPoll();
 }

src/server/web_server.cpp

@@ -3,10 +3,10 @@
 
 #include "config.h"
 #include "web_ui.h"
-#include "controller.h"
-#include "robot_state.h"
-#include "ultrasonic.h"
-#include "lcd_status.h"
+#include "core/controller/controller.h"
+#include "core/robot_state/robot_state.h"
+#include "core/ultrasonic/ultrasonic.h"
+#include "core/deprecate/lcd_status/lcd_status.h"
 
 static WebServer server(80);
 

src/server/ws_server.cpp

@@ -2,9 +2,9 @@
 #include <Arduino.h>
 
 #include "ws_server.h"
-#include "controller.h"
-#include "robot_state.h"
-#include "face.h"
+#include "core/controller/controller.h"
+#include "core/robot_state/robot_state.h"
+#include "core/display/face/face.h"
 
 static WebSocketsServer ws(81); // порт 81