diff --git a/APP_Framework/Applications/control_app/plc_demo/omron/README.md b/APP_Framework/Applications/control_app/plc_demo/omron/README.md index cb90766e2..6f080c669 100755 --- a/APP_Framework/Applications/control_app/plc_demo/omron/README.md +++ b/APP_Framework/Applications/control_app/plc_demo/omron/README.md @@ -6,9 +6,9 @@ * CP1L本体无接口,增加CP1W-CIF41网络板卡,CP1H自带网口,采用网线直连的方式 * FINS协议,PLC IP:192.168.250.31,Port:9600 -* ![CP1H](./CP1H.jpg) -* ![CP1L](./CP1L.jpg) -* ![xidatong](./xidatong.jpg) +* ![CP1H](./image/CP1H.jpg) +* ![CP1L](./image/CP1L.jpg) +* ![xidatong](./image/xidatong.jpg) ## 存储区 diff --git a/APP_Framework/Applications/control_app/plc_demo/omron/CP1H.jpg b/APP_Framework/Applications/control_app/plc_demo/omron/image/CP1H.jpg similarity index 100% rename from APP_Framework/Applications/control_app/plc_demo/omron/CP1H.jpg rename to APP_Framework/Applications/control_app/plc_demo/omron/image/CP1H.jpg diff --git a/APP_Framework/Applications/control_app/plc_demo/omron/CP1L.jpg b/APP_Framework/Applications/control_app/plc_demo/omron/image/CP1L.jpg similarity index 100% rename from APP_Framework/Applications/control_app/plc_demo/omron/CP1L.jpg rename to APP_Framework/Applications/control_app/plc_demo/omron/image/CP1L.jpg diff --git a/APP_Framework/Applications/control_app/plc_demo/omron/xidatong.jpg b/APP_Framework/Applications/control_app/plc_demo/omron/image/xidatong.jpg similarity index 100% rename from APP_Framework/Applications/control_app/plc_demo/omron/xidatong.jpg rename to APP_Framework/Applications/control_app/plc_demo/omron/image/xidatong.jpg diff --git a/APP_Framework/Applications/control_app/plc_demo/omron/test_recipe_CP1H.json b/APP_Framework/Applications/control_app/plc_demo/omron/json/test_recipe_CP1H.json similarity index 100% rename from APP_Framework/Applications/control_app/plc_demo/omron/test_recipe_CP1H.json rename to APP_Framework/Applications/control_app/plc_demo/omron/json/test_recipe_CP1H.json diff --git a/APP_Framework/Applications/control_app/plc_demo/omron/test_recipe_CP1L.json b/APP_Framework/Applications/control_app/plc_demo/omron/json/test_recipe_CP1L.json similarity index 100% rename from APP_Framework/Applications/control_app/plc_demo/omron/test_recipe_CP1L.json rename to APP_Framework/Applications/control_app/plc_demo/omron/json/test_recipe_CP1L.json diff --git a/APP_Framework/Applications/control_app/plc_demo/schneider/m241_recipe.json b/APP_Framework/Applications/control_app/plc_demo/schneider/json/m241_recipe.json similarity index 100% rename from APP_Framework/Applications/control_app/plc_demo/schneider/m241_recipe.json rename to APP_Framework/Applications/control_app/plc_demo/schneider/json/m241_recipe.json diff --git a/APP_Framework/Applications/control_app/plc_demo/siemens/test_recipe_S7_1512.json b/APP_Framework/Applications/control_app/plc_demo/siemens/json/test_recipe_S7_1512.json similarity index 100% rename from APP_Framework/Applications/control_app/plc_demo/siemens/test_recipe_S7_1512.json rename to APP_Framework/Applications/control_app/plc_demo/siemens/json/test_recipe_S7_1512.json diff --git a/APP_Framework/Applications/control_app/plc_demo/xinje/test_recipe_xdh_60t4-e.json b/APP_Framework/Applications/control_app/plc_demo/xinje/json/test_recipe_xdh_60t4-e.json similarity index 100% rename from APP_Framework/Applications/control_app/plc_demo/xinje/test_recipe_xdh_60t4-e.json rename to APP_Framework/Applications/control_app/plc_demo/xinje/json/test_recipe_xdh_60t4-e.json diff --git a/APP_Framework/Applications/control_app/plc_demo/xinje/test_recipe_xsdh-60a32-e.json b/APP_Framework/Applications/control_app/plc_demo/xinje/json/test_recipe_xsdh-60a32-e.json similarity index 100% rename from APP_Framework/Applications/control_app/plc_demo/xinje/test_recipe_xsdh-60a32-e.json rename to APP_Framework/Applications/control_app/plc_demo/xinje/json/test_recipe_xsdh-60a32-e.json diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/include/connect_usart.h b/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/include/connect_usart.h index 8e277da82..d2edcf29c 100644 --- a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/include/connect_usart.h +++ b/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/include/connect_usart.h @@ -49,9 +49,9 @@ struct UsartHwCfg #define FCG_TMR0_CLK FCG_Fcg2PeriphClockCmd #define FCG_DMA_CLK FCG_Fcg0PeriphClockCmd -#define KERNEL_CONSOLE_BUS_NAME SERIAL_BUS_NAME_3 -#define KERNEL_CONSOLE_DRV_NAME SERIAL_DRV_NAME_3 -#define KERNEL_CONSOLE_DEVICE_NAME SERIAL_3_DEVICE_NAME_0 +#define KERNEL_CONSOLE_BUS_NAME SERIAL_BUS_NAME_6 +#define KERNEL_CONSOLE_DRV_NAME SERIAL_DRV_NAME_6 +#define KERNEL_CONSOLE_DEVICE_NAME SERIAL_6_DEVICE_NAME_0 int HwUsartInit(void); diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usart/Kconfig b/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usart/Kconfig index 7f51f8e7b..4427fdf3a 100644 --- a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usart/Kconfig +++ b/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usart/Kconfig @@ -15,7 +15,7 @@ menuconfig BSP_USING_UART3 menuconfig BSP_USING_UART6 bool "Enable USART6" - default n + default y if BSP_USING_UART6 config SERIAL_BUS_NAME_6 string "serial bus 6 name"