Remove devcontainer, update PCA9685 & protobuf RPC configs

sfxfs · Dec 24, 2024 · 254e277 · 254e277
1 parent c9a4484
commit 254e277
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 101 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 .vscode/
+.devcontainer/
 build/
 sdkconfig
 sdkconfig.old
diff --git a/README.md b/README.md
@@ -15,7 +15,7 @@
 
 ## 编译
 
-本项目使用 VSCode 进行开发，请提前安装 `esp-idf` 插件。首次克隆项目后，请使用插件生成 `.vscode` 目录，以确保代码查错功能正常。可以直接通过插件进行项目的编译和烧录。
+本项目要求的 `esp-idf` 最低版本为 `v5.3.2`，推荐使用 VSCode 进行开发，请提前安装 `esp-idf` 插件。首次克隆项目后，请使用插件生成 `.vscode` 目录，以确保代码查错功能正常。可以直接通过插件进行项目的编译和烧录。
 
 ## 开发
 

diff --git a/components/pca9685/Kconfig.projbuild b/components/pca9685/Kconfig.projbuild
@@ -3,7 +3,7 @@ menu "SUB:PCA9685"
 
     config SUB_ENABLE_PCA9685
         bool "Enable PCA9685 peripheral"
-        default n
+        default y
         help
             PCA9685 is a I2C based 16-channel PWM controller.
 
@@ -16,11 +16,11 @@ menu "SUB:PCA9685"
         config SUB_PCA9685_IIC_ADDRESS
             hex "Set PCA9685 IIC address"
             range 0 0x7f # 7bit address
-            default 0x3B
+            default 0x40
 
         config SUB_PCA9685_IIC_FREQUENCY
             int "Set PCA9685 IIC freq"
-            range 100000 400000
+            range 100000 1000000
             default 400000
 
         config SUB_PCA9685_IIC_TIMEOUT

diff --git a/components/pca9685/pca9685_intf.c b/components/pca9685/pca9685_intf.c
@@ -119,7 +119,7 @@ uint8_t pca9685_interface_iic_write(uint8_t addr, uint8_t reg, uint8_t *buf, uin
     if (NULL == temp_buf)
         return 1;
 
-    temp_buf[0] = addr;
+    temp_buf[0] = reg;
     memcpy(&temp_buf[1], buf, len);
 
     esp_err_t ret = i2c_master_transmit(pca9685_i2c_dev_handle, temp_buf, len + 1, CONFIG_SUB_PCA9685_IIC_TIMEOUT);

diff --git a/components/protobuf_rpc/Kconfig.projbuild b/components/protobuf_rpc/Kconfig.projbuild
@@ -2,7 +2,7 @@ menu "SUB:ProtoBuf-RPC"
     menu "Interface"
         config SUB_PROTOBUF_UART_PORT
             int "Which UARTx will be used"
-            default 0
+            default 2
             help
                 The interface that used to communicate with sub-navi.
 
@@ -20,20 +20,20 @@ menu "SUB:ProtoBuf-RPC"
 
         config SUB_PROTOBUF_UART_CUSTOM_PINS
             bool "Use custom pins"
-            default n
+            default y
             help
                 If you want to use custom pins for UARTx, enable this option.
 
         if SUB_PROTOBUF_UART_CUSTOM_PINS
             config SUB_PROTOBUF_UART_TX_PIN
                 int "UARTx TX pin"
-                default 17
+                default 37
                 help
                     The TX pin of UARTx.
 
             config SUB_PROTOBUF_UART_RX_PIN
                 int "UARTx RX pin"
-                default 16
+                default 36
                 help
                     The RX pin of UARTx.
         endif
@@ -42,19 +42,19 @@ menu "SUB:ProtoBuf-RPC"
     menu "Thruster"
         config SUB_PROTOBUF_THRUSTER0_PIN
             int "Thruster0 pin"
-            default 18
+            default 27
             help
                 The pin of thruster channel 0.
 
         config SUB_PROTOBUF_THRUSTER1_PIN
             int "Thruster1 pin"
-            default 19
+            default 26
             help
                 The pin of thruster channel 1.
 
         config SUB_PROTOBUF_THRUSTER2_PIN
             int "Thruster2 pin"
-            default 20
+            default 25
             help
                 The pin of thruster channel 2.
 
@@ -72,19 +72,19 @@ menu "SUB:ProtoBuf-RPC"
 
         config SUB_PROTOBUF_THRUSTER5_PIN
             int "Thruster5 pin"
-            default 23
+            default 19
             help
                 The pin of thruster channel 5.
 
         config SUB_PROTOBUF_THRUSTER6_PIN
             int "Thruster6 pin"
-            default 24
+            default 23
             help
                 The pin of thruster channel 6.
 
         config SUB_PROTOBUF_THRUSTER7_PIN
             int "Thruster7 pin"
-            default 25
+            default 18
             help
                 The pin of thruster channel 7.
     endmenu

diff --git a/components/sub_bus_init/Kconfig.projbuild b/components/sub_bus_init/Kconfig.projbuild
@@ -6,16 +6,16 @@ menu "SUB:Bus Interface"
         menu "I2C0 Config"
             config SUB_ENABLE_I2C0
                 bool "Enable interface"
-                default n
+                default y
 
             if SUB_ENABLE_I2C0
                 config SUB_I2C0_SCL_PIN
                     int "Set SCL pin num"
-                    default 6
+                    default 17
 
                 config SUB_I2C0_SDA_PIN
                     int "Set SDA pin num"
-                    default 7
+                    default 5
             endif
         endmenu