Merge branches 'web-server-v2' and 'master' of https://github.com/3dw…

…esupport/OpenBot into web-server-v2
ob-f · Jun 25, 2024 · ac1538f · ac1538f
2 parents f3f3be2 + caeba05
commit ac1538f
Show file tree

Hide file tree

Showing 239 changed files with 12,129 additions and 261 deletions.
diff --git a/.gitignore b/.gitignore
@@ -16,4 +16,4 @@ wandb/
 
 # build
 /bin
-
+/node_modules/
diff --git a/android/robot/src/main/java/org/openbot/googleServices/README.md b/android/robot/src/main/java/org/openbot/googleServices/README.md
@@ -35,7 +35,7 @@ To integrate Firebase into an Android OpenBot application for Google Sign-In, we
   3. Google Analytics can be disabled if you do not want to use them.
   4. Click on the "Create Project" button.
 <p>
-<img src="../../../../../../../../docs/images/firebase_create_project.jpg" alt="Create project" width="25%"/>
+<img src="../../../../../../../../docs/images/firebase_create_app_project.jpg" alt="Create project" width="25%"/>
 <img src="../../../../../../../../docs/images/firebase_enter_project_name.jpg" alt="Enter project name" width=40%"/>
 <img src="../../../../../../../../docs/images/firebase_disable_analytics.jpg" alt="Disable analytics" width="27.5%"/>
 </p>
@@ -89,12 +89,12 @@ To integrate Firebase into an Android OpenBot application for Google Sign-In, we
   6. Click on the `toggle button` to `enable` Google Sign-In authentication.
 
 <p>
-<img style="width:36%" src="../../../../../../../../docs/images/firebase_product_services.jpg" alt="Firebase product services" width="47.5%"/>
-<img src="../../../../../../../../docs/images/firebase_authentication.jpg" alt="Firebase authentication" width="42%"/>
+<img style="width:36%" src="../../../../../../../../docs/images/firebase_product_services.jpg" alt="Firebase product services" width="50%"/>
+<img src="../../../../../../../../docs/images/firebase_app_authentication.jpg" alt="Firebase authentication" width="39%"/>
 </p>
 <p>
-<img src="../../../../../../../../docs/images/firebase_google_signin.jpg" alt="Google Sign-In" width="60%"/>
-<img src="../../../../../../../../docs/images/firebase_google_signin_enable.jpg" alt="Google Sign-In enable" width="31.5%"/>
+<img src="../../../../../../../../docs/images/firebase_app_google_signin.jpg" alt="Google Sign-In" width="50%"/>
+<img src="../../../../../../../../docs/images/firebase_google_signin_enable.jpg" alt="Google Sign-In enable" width="26.1%"/>
 </p>
 
 

diff --git a/android/robot/src/main/java/org/openbot/modelManagement/ModelManagementFragment.java b/android/robot/src/main/java/org/openbot/modelManagement/ModelManagementFragment.java
@@ -439,4 +439,4 @@ public void onModelDelete(Model mItem) {
                             PermissionUtils.showStoragePermissionModelManagementToast(requireActivity());
                         }
                     });
-}
+}
diff --git a/android/robot/src/main/res/values/strings.xml b/android/robot/src/main/res/values/strings.xml
@@ -95,98 +95,57 @@
     <string name="tracking_lost">Tracking lost.</string>
     <string name="no_initial_ar_core_pose">No initial AR Core pose.</string>
     <string name="ar_core_session_paused">AR Core session paused.</string>
-  <string name="bumpers">Bumpers</string>
-  <string name="n_a">N/A</string>
-  <string name="robot_type">Robot Type:</string>
-  <string name="indicators">Indicators</string>
-  <string name="back">Back</string>
-  <string name="voltage_divider">Voltage Divider</string>
-  <string name="status">Status</string>
-  <string name="front">Front</string>
-  <string name="robot_icon">Robot Icon</string>
-  <string name="wheel_odometry_front">Wheel Odometry Front</string>
-  <string name="wheel_odometry_back">Wheel Odometry Back</string>
-  <string name="backward">Backward</string>
-  <string name="forward">Forward</string>
-  <string name="stop">Stop</string>
-  <string name="motors">Motors</string>
-  <string name="leds">LEDs</string>
-  <string name="lights">Lights</string>
-  <string name="sensors">Sensors</string>
-  <string name="send_commands">Send Commands</string>
-  <string name="wheel_odometry">Wheel Odometry</string>
-  <string name="readings">Readings</string>
-  <string name="lights_slider">lights slider</string>
-  <string name="tips_connect_timeout">connect timeout</string>
-  <string name="tips_connect_fail">connect fail</string>
-  <string name="tips_connection_disconnected">connection has disconnected</string>
-  <string name="tips_write_operation">please enter a hex string</string>
-  <string name="indicator_leds">Indicator LEDs</string>
-  <string name="back_leds">Back LEDs</string>
-  <string name="status_leds">Status LEDs</string>
-  <string name="front_leds">Front LEDs</string>
-  <string name="usb">USB</string>
-  <string-array name="servers">
-    <item>No server</item>
-  </string-array>
-  <string-array name="models">
-    <item>CmdNav</item>
-    <item>GoalNav</item>
-    <item>MobileNet</item>
-    <item>EfficientDet</item>
-    <item>YoloV4</item>
-    <item>YoloV5</item>
-  </string-array>
-  <string-array name="devices">
-    <item>CPU</item>
-    <item>GPU</item>
-    <item>NNAPI</item>
-  </string-array>
-  <string-array name="baud_rates">
-    <item>9600</item>
-    <item>14400</item>
-    <item>19200</item>
-    <item>38400</item>
-    <item>57600</item>
-    <item>115200</item>
-    <item>230400</item>
-    <item>460800</item>
-    <item>921600</item>
-  </string-array>
-  <string-array name="log_settings">
-    <item>all_imgs</item>
-    <item>crop_img</item>
-    <item>preview_img</item>
-    <item>only_sensors</item>
-  </string-array>
-  <string-array name="control_modes">
-    <item>Gamepad</item>
-    <item>Phone</item>
-    <item>Webserver</item>
-  </string-array>
-  <string-array name="drive_modes">
-    <item>Dual</item>
-    <item>Game</item>
-    <item>Joystick</item>
-  </string-array>
-  <string-array name="preview_resolutions">
-    <item>Low</item>
-    <item>Medium</item>
-    <item>High</item>
-  </string-array>
-  <string-array name="stream_server">
-    <item>WebRTC</item>
-    <item>RTSP</item>
-  </string-array>
-  <string-array name="speed_modes">
-    <item>Slow</item>
-    <item>Normal</item>
-    <item>Fast</item>
-  </string-array>
-  <string-array name="connection_type">
-    <item>Bluetooth</item>
-    <item>USB</item>
-  </string-array>
+    <string name="tips_connect_timeout">connect timeout</string>
+    <string name="tips_connect_fail">connect fail</string>
+    <string name="tips_connection_disconnected">connection has disconnected</string>
+    <string name="tips_write_operation">please enter a hex string</string>
+    <string-array name="servers">
+        <item>No server</item>
+    </string-array>
+    <string-array name="models">
+        <item>Autopilot_F</item>
+        <item>MobileNetV1_1_0_Q</item>
+        <item>MobileNetV3_S_Q</item>
+        <item>YoloV4</item>
+    </string-array>
+    <string-array name="devices">
+        <item>CPU</item>
+        <item>GPU</item>
+        <item>NNAPI</item>
+    </string-array>
+    <string-array name="baud_rates">
+        <item>9600</item>
+        <item>14400</item>
+        <item>19200</item>
+        <item>38400</item>
+        <item>57600</item>
+        <item>115200</item>
+        <item>230400</item>
+        <item>460800</item>
+        <item>921600</item>
+    </string-array>
+    <string-array name="log_settings">
+        <item>all_imgs</item>
+        <item>crop_img</item>
+        <item>preview_img</item>
+        <item>only_sensors</item>
+    </string-array>
+    <string-array name="control_modes">
+        <item>Gamepad</item>
+        <item>Phone</item>
+        <!--        <item>WebRTC</item>-->
+    </string-array>
+    <string-array name="drive_modes">
+        <item>Dual</item>
+        <item>Game</item>
+        <item>Joystick</item>
+    </string-array>
+
+    <string-array name="preview_resolutions">
+        <item>Low</item>
+        <item>Medium</item>
+        <item>High</item>
+    </string-array>
 
     <string-array name="save_data">
         <item>Local Storage</item>
@@ -195,6 +154,20 @@
     </string-array>
 
     <!-- TODO: Remove or change this placeholder text -->
+    <string-array name="stream_server">
+        <item>WebRTC</item>
+        <item>RTSP</item>
+    </string-array>
+    <string-array name="connection_type">
+        <item>Bluetooth</item>
+        <item>USB</item>
+    </string-array>
+    <!-- TODO: Remove or change this placeholder text -->
+    <string-array name="speed_modes">
+        <item>Slow</item>
+        <item>Normal</item>
+        <item>Fast</item>
+    </string-array>
     <string name="profile">Profile</string>
     <string name="projects">Projects</string>
     <string name="scanner">Scanner</string>
@@ -206,5 +179,32 @@
     <string name="logout">Logout</string>
     <string name="auto_mode">Auto Mode</string>
     <string name="dynamic_speed">Dynamic Speed</string>
-
+    <string name="bumpers">Bumpers</string>
+    <string name="n_a">N/A</string>
+    <string name="robot_type">Robot Type:</string>
+    <string name="indicators">Indicators</string>
+    <string name="back">Back</string>
+    <string name="voltage_divider">Voltage Divider</string>
+    <string name="status">Status</string>
+    <string name="front">Front</string>
+    <string name="robot_icon">Robot Icon</string>
+    <string name="wheel_odometry_front">Wheel Odometry Front</string>
+    <string name="wheel_odometry_back">Wheel Odometry Back</string>
+    <string name="backward">Backward</string>
+    <string name="forward">Forward</string>
+    <string name="stop">Stop</string>
+    <string name="motors">Motors</string>
+    <string name="leds">LEDs</string>
+    <string name="lights">Lights</string>
+    <string name="sensors">Sensors</string>
+    <string name="send_commands">Send Commands</string>
+    <string name="wheel_odometry">Wheel Odometry</string>
+    <string name="readings">Readings</string>
+    <string name="lights_slider">lights slider</string>
+    <string name="indicator_leds">Indicator LEDs</string>
+    <string name="back_leds">Back LEDs</string>
+    <string name="status_leds">Status LEDs</string>
+    <string name="front_leds">Front LEDs</string>
+    <string name="usb">USB</string>
+    <string name="cancel">Cancel</string>
 </resources>
diff --git a/docs/images/firebase_app_authentication.jpg b/docs/images/firebase_app_authentication.jpg
diff --git a/docs/images/firebase_app_google_signin.jpg b/docs/images/firebase_app_google_signin.jpg
diff --git a/docs/images/firebase_create_app_project.jpg b/docs/images/firebase_create_app_project.jpg
diff --git a/docs/images/firebase_database_location.jpg b/docs/images/firebase_database_location.jpg
diff --git a/docs/images/firebase_database_production_build.jpg b/docs/images/firebase_database_production_build.jpg
diff --git a/docs/images/firebase_database_rules.jpg b/docs/images/firebase_database_rules.jpg
diff --git a/docs/images/firebase_env.jpg b/docs/images/firebase_env.jpg
diff --git a/docs/images/firebase_google_api_services.jpg b/docs/images/firebase_google_api_services.jpg
diff --git a/docs/images/firebase_google_cloud_console.jpg b/docs/images/firebase_google_cloud_console.jpg
diff --git a/docs/images/firebase_google_cloud_project.jpg b/docs/images/firebase_google_cloud_project.jpg
diff --git a/docs/images/firebase_google_drive_enable_api.jpg b/docs/images/firebase_google_drive_enable_api.jpg
diff --git a/docs/images/firebase_google_drive_library.jpg b/docs/images/firebase_google_drive_library.jpg
diff --git a/docs/images/firebase_google_drive_result.jpg b/docs/images/firebase_google_drive_result.jpg
diff --git a/docs/images/firebase_google_option.jpg b/docs/images/firebase_google_option.jpg
diff --git a/docs/images/firebase_project_setting.jpg b/docs/images/firebase_project_setting.jpg
diff --git a/docs/images/firebase_project_setting_config.jpg b/docs/images/firebase_project_setting_config.jpg
diff --git a/docs/images/firebase_register_app.jpg b/docs/images/firebase_register_app.jpg
diff --git a/docs/images/firebase_sdk.jpg b/docs/images/firebase_sdk.jpg
diff --git a/docs/images/firebase_signin_method.png b/docs/images/firebase_signin_method.png
diff --git a/docs/images/firebase_success_creation.jpg b/docs/images/firebase_success_creation.jpg
diff --git a/docs/images/firebase_web_icon.jpg b/docs/images/firebase_web_icon.jpg
diff --git a/docs/images/firestore_database_setup.jpg b/docs/images/firestore_database_setup.jpg
diff --git a/docs/images/playground_advance_ai_blocks.jpg b/docs/images/playground_advance_ai_blocks.jpg
diff --git a/docs/images/playground_ai_blocks.jpg b/docs/images/playground_ai_blocks.jpg
diff --git a/docs/images/playground_banner.png b/docs/images/playground_banner.png
diff --git a/docs/images/playground_blockly_control.jpg b/docs/images/playground_blockly_control.jpg
diff --git a/docs/images/playground_blockly_loops.jpg b/docs/images/playground_blockly_loops.jpg
diff --git a/docs/images/playground_code_editor.jpg b/docs/images/playground_code_editor.jpg
diff --git a/docs/images/playground_control_blocks.png b/docs/images/playground_control_blocks.png
diff --git a/docs/images/playground_controller_blocks.jpg b/docs/images/playground_controller_blocks.jpg
diff --git a/docs/images/playground_create_new_project.jpg b/docs/images/playground_create_new_project.jpg
diff --git a/docs/images/playground_drive.jpg b/docs/images/playground_drive.jpg
diff --git a/docs/images/playground_edit_profile_logout_popup.jpg b/docs/images/playground_edit_profile_logout_popup.jpg
diff --git a/docs/images/playground_edit_profile_modal.jpg b/docs/images/playground_edit_profile_modal.jpg
diff --git a/docs/images/playground_google_drive.gif b/docs/images/playground_google_drive.gif
diff --git a/docs/images/playground_google_drive_folder.jpg b/docs/images/playground_google_drive_folder.jpg
diff --git a/docs/images/playground_help.jpg b/docs/images/playground_help.jpg
diff --git a/docs/images/playground_home_carousal1.jpg b/docs/images/playground_home_carousal1.jpg
diff --git a/docs/images/playground_home_carousal2.jpg b/docs/images/playground_home_carousal2.jpg
diff --git a/docs/images/playground_home_carousal3.jpg b/docs/images/playground_home_carousal3.jpg
diff --git a/docs/images/playground_home_dark_theme_screen.jpg b/docs/images/playground_home_dark_theme_screen.jpg
diff --git a/docs/images/playground_home_light_theme_screen.jpg b/docs/images/playground_home_light_theme_screen.jpg
diff --git a/docs/images/playground_light_blocks.jpg b/docs/images/playground_light_blocks.jpg
diff --git a/docs/images/playground_loop_blocks.png b/docs/images/playground_loop_blocks.png
diff --git a/docs/images/playground_mobile_view.png b/docs/images/playground_mobile_view.png
diff --git a/docs/images/playground_movement_blocks.jpg b/docs/images/playground_movement_blocks.jpg
diff --git a/docs/images/playground_my_project.jpg b/docs/images/playground_my_project.jpg
diff --git a/docs/images/playground_my_project_option.jpg b/docs/images/playground_my_project_option.jpg
diff --git a/docs/images/playground_operator_blocks.jpg b/docs/images/playground_operator_blocks.jpg
diff --git a/docs/images/playground_sensors_blocks.jpg b/docs/images/playground_sensors_blocks.jpg
diff --git a/docs/images/playground_sign-in.gif b/docs/images/playground_sign-in.gif
diff --git a/docs/images/playground_sound_blocks.jpg b/docs/images/playground_sound_blocks.jpg
diff --git a/docs/images/playground_variable_blocks.jpg b/docs/images/playground_variable_blocks.jpg
diff --git a/docs/images/playground_workspace.gif b/docs/images/playground_workspace.gif
diff --git a/docs/images/playground_workspace_model_option.jpg b/docs/images/playground_workspace_model_option.jpg
diff --git a/docs/images/playground_workspace_model_popup.jpg b/docs/images/playground_workspace_model_popup.jpg
diff --git a/docs/images/playground_workspace_rename.jpg b/docs/images/playground_workspace_rename.jpg
diff --git a/firmware/README.md b/firmware/README.md
@@ -8,7 +8,7 @@
   <a href="README.es-ES.md">Español</a>
 </p>
 
-We use a microcontroller unit (MCU) to act as a bridge between the robot body and the smartphone.  We provide our [firmware](openbot_nano/openbot_nano.ino) for the Arduino Nano with an ATmega328P microcontroller as well as for the ESP32 development kit.
+We use a microcontroller unit (MCU) to act as a bridge between the robot body and the smartphone.  We provide our [firmware](openbot/openbot.ino) for the Arduino Nano with an ATmega328P microcontroller as well as for the ESP32 development kit.
 
 ## Features
-Original file line number
+Diff line change
@@ Expand Up / @@ -439,4 +439,4 @@ public void onModelDelete(Model mItem) { @@
                                 PermissionUtils.showStoragePermissionModelManagementToast(requireActivity());
                             }
                         });
-    }
+    }