Merge branch 'RT-Thread:master' into master

RT-Thread · Dec 27, 2024 · daf5582 · daf5582
2 parents 20d72ca + 90b57aa
commit daf5582
Show file tree

Hide file tree

Showing 16 changed files with 135 additions and 9 deletions.
diff --git a/iot/Kconfig b/iot/Kconfig
@@ -68,5 +68,5 @@ source "$PKGS_DIR/packages/iot/zephyr_polling/Kconfig"
 source "$PKGS_DIR/packages/iot/matter-adaptation-layer/Kconfig"
 source "$PKGS_DIR/packages/iot/lhc_modbus/Kconfig"
 source "$PKGS_DIR/packages/iot/qmodbus/Kconfig"
-source "$PKGS_DIR/packages/iot/p-net/Kconfig"
+source "$PKGS_DIR/packages/iot/p-net-rtt/Kconfig"
 endmenu
diff --git a/iot/kawaii-mqtt/package.json b/iot/kawaii-mqtt/package.json
@@ -13,7 +13,7 @@
     "name": "jiejie",
     "email": "[email protected]"
   },
-  "license": "GPL-2.0",
+  "license": "Apache-2.0",
   "repository": "https://github.com/jiejieTop/kawaii-mqtt",
   "icon": "https://github.com/jiejieTop/kawaii-mqtt/tree/master/png/kawaii.png",
   "homepage": "https://github.com/jiejieTop/kawaii-mqtt#readme",

diff --git a/iot/p-net/Kconfig → iot/p-net-rtt/Kconfig b/iot/p-net/Kconfig → iot/p-net-rtt/Kconfig
@@ -13,7 +13,7 @@ if PKG_USING_PNET
 
     config PKG_PNET_PATH
         string
-        default "/packages/iot/p-net"
+        default "/packages/iot/p-net-rtt"
 
     menuconfig PKG_PENT_NETIF_NAME
         bool "Default netif name for P-NET"

diff --git a/iot/p-net/package.json → iot/p-net-rtt/package.json b/iot/p-net/package.json → iot/p-net-rtt/package.json
diff --git a/iot/wiznet/Kconfig b/iot/wiznet/Kconfig
@@ -8,6 +8,7 @@ menuconfig PKG_USING_WIZNET
     select RT_USING_LIBC if RT_VER_NUM < 0x40100
     select RT_USING_SAL
     select RT_USING_TIMER_SOFT
+    select RT_USING_LEGACY
 
 if PKG_USING_WIZNET
 

diff --git a/peripherals/sensors/bmi088/Kconfig b/peripherals/sensors/bmi088/Kconfig
@@ -8,6 +8,11 @@ if PKG_USING_BMI088
     config PKG_BMI088_PATH
         string
         default "/packages/peripherals/sensors/bmi088"
+
+    config PKG_BMI088_USING_SENSOR_V1
+        bool "Enable sensor_v1 divce framework"
+        select RT_USING_SENSOR
+        default n
 
     choice
         prompt "Version"

diff --git a/peripherals/sensors/bmi160_bmx160/Kconfig b/peripherals/sensors/bmi160_bmx160/Kconfig
@@ -19,6 +19,11 @@ if PKG_USING_BMI160_BMX160
     config BMX160_USING_MAG
         bool "Enable BMX160 magnetometer"
         default n
+
+    config PKG_BMI160_BMX160_USING_SENSOR_V1
+        bool "Enable sensor_v1 divce framework"
+        select RT_USING_SENSOR
+        default n
 
     choice
         prompt "Version"

diff --git a/peripherals/sensors/bmp180/Kconfig b/peripherals/sensors/bmp180/Kconfig
@@ -14,6 +14,10 @@ if PKG_USING_BMP180
         bool "Enable bmp180 sample"
         default n
 
+    config PKG_BMP180_USING_SENSOR_V1
+        bool "Enable sensor_v1 divce framework"
+        select RT_USING_SENSOR
+        default n
     choice
         prompt "Version"
         default PKG_USING_BMP180_LATEST_VERSION

diff --git a/peripherals/sensors/da270/Kconfig b/peripherals/sensors/da270/Kconfig
@@ -14,6 +14,11 @@ if PKG_USING_DA270
         bool "Enable da270 acce"
         default y
 
+    config PKG_DA270_USING_SENSOR_V1
+        bool "Enable sensor_v1 divce framework"
+        select RT_USING_SENSOR
+        default n
+
     choice
         prompt "Version"
         default PKG_USING_DA270_LATEST_VERSION

diff --git a/peripherals/sensors/dhtxx/Kconfig b/peripherals/sensors/dhtxx/Kconfig
@@ -31,6 +31,16 @@ if PKG_USING_DHTXX
 
     endif
 
+    config PKG_DHTXX_USING_SENSOR_V1
+        bool "Enable sensor_v1 device framework"
+        select RT_USING_SENSOR
+        default n
+        if PKG_DHTXX_USING_SENSOR_V1
+            config PKG_USING_DHTXX_SAMPLE_SENSOR_V1
+                bool "Enable dhtxx sample for sensor_v1 frame"
+                default n
+        endif
+
     config PKG_USING_DHTXX_DEBUG
         bool "Enable debug log output"
         default n

diff --git a/peripherals/sensors/ds18b20/Kconfig b/peripherals/sensors/ds18b20/Kconfig
@@ -11,6 +11,15 @@ if PKG_USING_DS18B20
         string
         default "/packages/peripherals/sensors/ds18b20"
 
+    config PKG_DS18B20_USING_SENSOR_V1
+        bool "Enable sensor_v1 divce framework"
+        select RT_USING_SENSOR
+        default n
+
+    config PKG_DS18B20_USING_SAMPLE_SENSOR_V1
+        bool "Enable ds18b20 sample"
+        default n
+
     choice
         prompt "Version"
         default PKG_USING_DS18B20_LATEST_VERSION
@@ -21,10 +30,6 @@ if PKG_USING_DS18B20
             bool "latest"
     endchoice
 
-    config PKG_USING_DS18B20_SAMPLE
-        bool "Enable ds18b20 sample"
-        default n
-
     config PKG_DS18B20_VER
        string
        default "latest"    if PKG_USING_DS18B20_LATEST_VERSION

diff --git a/system/CherryUSB/Kconfig b/system/CherryUSB/Kconfig
@@ -38,6 +38,8 @@ if PKG_USING_CHERRYUSB
                 bool "dwc2_gd"
             config PKG_CHERRYUSB_DEVICE_DWC2_HC
                 bool "dwc2_hc"
+            config PKG_CHERRYUSB_DEVICE_DWC2_KENDRYTE
+                bool "dwc2_kendryte"
             config PKG_CHERRYUSB_DEVICE_DWC2_CUSTOM
                 bool "dwc2_custom"
             config PKG_CHERRYUSB_DEVICE_MUSB_ES
@@ -48,6 +50,12 @@ if PKG_USING_CHERRYUSB
                 bool "musb_bk"
             config PKG_CHERRYUSB_DEVICE_MUSB_CUSTOM
                 bool "musb_custom"
+            config PKG_CHERRYUSB_DEVICE_KINETIS_MCX
+                bool "kinetis_mcx"
+            config PKG_CHERRYUSB_DEVICE_KINETIS_MM32
+                bool "kinetis_mm32"
+            config PKG_CHERRYUSB_DEVICE_KINETIS_CUSTOM
+                bool "kinetis_custom"
             config PKG_CHERRYUSB_DEVICE_CHIPIDEA_MCX
                 bool "chipidea_mcx"
             config PKG_CHERRYUSB_DEVICE_CHIPIDEA_CUSTOM
@@ -111,7 +119,7 @@ if PKG_USING_CHERRYUSB
 
         choice
             prompt "Select usb device template"
-            default PKG_CHERRYUSB_DEVICE_TEMPLATE
+            default PKG_CHERRYUSB_DEVICE_TEMPLATE_NONE
             config PKG_CHERRYUSB_DEVICE_TEMPLATE_NONE
                 bool "none (Implement it yourself)"
             config PKG_CHERRYUSB_DEVICE_TEMPLATE_CDC_ACM
@@ -178,6 +186,10 @@ if PKG_USING_CHERRYUSB
                 bool "dwc2_st"
             config PKG_CHERRYUSB_HOST_DWC2_ESP
                 bool "dwc2_esp"
+            config PKG_CHERRYUSB_HOST_DWC2_HC
+                bool "dwc2_hc"
+            config PKG_CHERRYUSB_HOST_DWC2_KENDRYTE
+                bool "dwc2_kendryte"
             config PKG_CHERRYUSB_HOST_DWC2_CUSTOM
                 bool "dwc2_custom"
             config PKG_CHERRYUSB_HOST_MUSB_ES
@@ -192,6 +204,12 @@ if PKG_USING_CHERRYUSB
                 bool "pusb2"
             config PKG_CHERRYUSB_HOST_XHCI
                 bool "xhci"
+            config PKG_CHERRYUSB_HOST_KINETIS_MCX
+                bool "kinetis_mcx"
+            config PKG_CHERRYUSB_HOST_KINETIS_MM32
+                bool "kinetis_mm32"
+            config PKG_CHERRYUSB_HOST_KINETIS_CUSTOM
+                bool "kinetis_custom"
         endchoice
 
         config PKG_CHERRYUSB_HOST_CDC_ACM
@@ -325,12 +343,14 @@ if PKG_USING_CHERRYUSB
 
     choice
         prompt "Version"
-        default PKG_USING_CHERRYUSB_V010400
+        default PKG_USING_CHERRYUSB_V010402
         help
             Select the package version
 
         config PKG_USING_CHERRYUSB_LATEST_VERSION
             bool "latest"
+        config PKG_USING_CHERRYUSB_V010402
+            bool "v1.4.2"
         config PKG_USING_CHERRYUSB_V010400
             bool "v1.4.0"
         config PKG_USING_CHERRYUSB_V010301
@@ -346,6 +366,7 @@ if PKG_USING_CHERRYUSB
     config PKG_CHERRYUSB_VER
        string
        default "latest"    if PKG_USING_CHERRYUSB_LATEST_VERSION
+       default "v1.4.2"   if PKG_USING_CHERRYUSB_V010402
        default "v1.4.0"   if PKG_USING_CHERRYUSB_V010400
        default "v1.3.1"   if PKG_USING_CHERRYUSB_V010301
        default "v1.3.0"   if PKG_USING_CHERRYUSB_V010300

diff --git a/system/CherryUSB/package.json b/system/CherryUSB/package.json
@@ -25,6 +25,11 @@
       "filename": "Null for git package",
       "VER_SHA": "master"
     },
+    {
+      "version": "v1.4.2",
+      "URL": "https://github.com/cherry-embedded/CherryUSB/archive/refs/tags/v1.4.2.zip",
+      "filename": "CherryUSB-1.4.2.zip"
+    },
     {
       "version": "v1.4.0",
       "URL": "https://github.com/cherry-embedded/CherryUSB/archive/refs/tags/v1.4.0.zip",

diff --git a/system/Kconfig b/system/Kconfig
@@ -53,6 +53,7 @@ source "$PKGS_DIR/packages/system/UartFramework/Kconfig"
 source "$PKGS_DIR/packages/system/sfdb/Kconfig"
 source "$PKGS_DIR/packages/system/rtp/Kconfig"
 source "$PKGS_DIR/packages/system/reb/Kconfig"
+source "$PKGS_DIR/packages/system/rmp/Kconfig"
 source "$PKGS_DIR/packages/system/r-rhealstone/Kconfig"
 source "$PKGS_DIR/packages/system/heartbeat/Kconfig"
 endmenu
diff --git a/system/rmp/Kconfig b/system/rmp/Kconfig
@@ -0,0 +1,36 @@
+
+# Kconfig file for package rmp
+menuconfig PKG_USING_RMP
+    bool "rmp: Efficient and secure memory pool"
+    default n
+
+if PKG_USING_RMP
+
+    config PKG_RMP_PATH
+        string
+        default "/packages/system/rmp"
+
+    config RMP_USING_DYNAMIC
+        bool "rmp using dynamic interface"
+        default n
+
+    config RMP_USING_RTOS
+        bool "rmp enable rtos"
+        default y
+
+    choice
+        prompt "Version"
+        default PKG_USING_RMP_LATEST_VERSION
+        help
+            Select the package version
+
+        config PKG_USING_RMP_LATEST_VERSION
+            bool "latest"
+    endchoice
+
+    config PKG_RMP_VER
+       string
+       default "latest"    if PKG_USING_RMP_LATEST_VERSION
+
+endif
+
diff --git a/system/rmp/package.json b/system/rmp/package.json
@@ -0,0 +1,28 @@
+{
+  "name": "rmp",
+  "description": "rmp: Efficient and secure memory pool",
+  "description_zh": "rmp: 高效且安全的内存池",
+  "enable": "PKG_USING_RMP",
+  "keywords": [
+    "rmp"
+  ],
+  "category": "system",
+  "author": {
+    "name": "RiceChen",
+    "email": "[email protected]",
+    "github": "RiceChen0"
+  },
+  "license": "Apache-2.0",
+  "repository": "https://github.com/RiceChen0/rmp",
+  "icon": "unknown",
+  "homepage": "https://github.com/RiceChen0/rmp#readme",
+  "readme": "rmp Efficient and secure memory pool",
+  "site": [
+    {
+      "version": "latest",
+      "URL": "https://github.com/RiceChen0/rmp.git",
+      "filename": "Null for git package",
+      "VER_SHA": "main"
+    }
+  ]
+}