diff --git a/freemodbus/modbus/include/mbport.h b/freemodbus/modbus/include/mbport.h index 4b072d5..affc5d4 100644 --- a/freemodbus/modbus/include/mbport.h +++ b/freemodbus/modbus/include/mbport.h @@ -50,12 +50,10 @@ PR_BEGIN_EXTERN_C #define MB_PORT_SERIAL_ISR_FLAG ESP_INTR_FLAG_LOWMED #endif -#if MB_PORT_TIMER_ISR_IN_IRAM +#if CONFIG_FMB_TIMER_USE_ISR_DISPATCH_METHOD && MB_TIMER_SUPPORTS_ISR_DISPATCH_METHOD #define MB_PORT_ISR_ATTR IRAM_ATTR -#define MB_PORT_TIMER_ISR_FLAG ESP_INTR_FLAG_IRAM #else #define MB_PORT_ISR_ATTR -#define MB_PORT_TIMER_ISR_FLAG ESP_INTR_FLAG_LOWMED #endif /* ----------------------- Type definitions ---------------------------------*/ diff --git a/test/serial/mb_serial_master/sdkconfig.ci.ascii b/test/serial/mb_serial_master/sdkconfig.ci.ascii index 51816c2..dd0f7a8 100644 --- a/test/serial/mb_serial_master/sdkconfig.ci.ascii +++ b/test/serial/mb_serial_master/sdkconfig.ci.ascii @@ -1,7 +1,5 @@ CONFIG_MB_COMM_MODE_ASCII=y CONFIG_MB_UART_BAUD_RATE=115200 -CONFIG_FMB_TIMER_PORT_ENABLED=n -CONFIG_FMB_TIMER_ISR_IN_IRAM=y CONFIG_FMB_MASTER_DELAY_MS_CONVERT=200 CONFIG_FMB_MASTER_TIMEOUT_MS_RESPOND=400 CONFIG_FMB_TIMER_USE_ISR_DISPATCH_METHOD=y diff --git a/test/serial/mb_serial_master/sdkconfig.ci.rtu b/test/serial/mb_serial_master/sdkconfig.ci.rtu index 4c61db3..12537e7 100644 --- a/test/serial/mb_serial_master/sdkconfig.ci.rtu +++ b/test/serial/mb_serial_master/sdkconfig.ci.rtu @@ -1,8 +1,6 @@ CONFIG_MB_COMM_MODE_ASCII=n CONFIG_MB_COMM_MODE_RTU=y CONFIG_MB_UART_BAUD_RATE=115200 -CONFIG_FMB_TIMER_PORT_ENABLED=n -CONFIG_FMB_TIMER_ISR_IN_IRAM=y CONFIG_FMB_MASTER_DELAY_MS_CONVERT=200 CONFIG_FMB_MASTER_TIMEOUT_MS_RESPOND=400 CONFIG_FMB_TIMER_USE_ISR_DISPATCH_METHOD=y diff --git a/test/serial/mb_serial_master/sdkconfig.defaults b/test/serial/mb_serial_master/sdkconfig.defaults index 3c9c6de..d9535e2 100644 --- a/test/serial/mb_serial_master/sdkconfig.defaults +++ b/test/serial/mb_serial_master/sdkconfig.defaults @@ -3,8 +3,6 @@ # CONFIG_MB_COMM_MODE_ASCII=y CONFIG_MB_UART_BAUD_RATE=115200 -CONFIG_FMB_TIMER_PORT_ENABLED=n -CONFIG_FMB_TIMER_ISR_IN_IRAM=y CONFIG_FMB_MASTER_DELAY_MS_CONVERT=200 CONFIG_FMB_MASTER_TIMEOUT_MS_RESPOND=400 CONFIG_FMB_TIMER_USE_ISR_DISPATCH_METHOD=y diff --git a/test/serial/mb_serial_slave/sdkconfig.ci.ascii b/test/serial/mb_serial_slave/sdkconfig.ci.ascii index 791d39f..ae32fc9 100644 --- a/test/serial/mb_serial_slave/sdkconfig.ci.ascii +++ b/test/serial/mb_serial_slave/sdkconfig.ci.ascii @@ -1,6 +1,4 @@ CONFIG_MB_COMM_MODE_ASCII=y CONFIG_MB_SLAVE_ADDR=1 CONFIG_MB_UART_BAUD_RATE=115200 -CONFIG_FMB_TIMER_PORT_ENABLED=y -CONFIG_FMB_TIMER_ISR_IN_IRAM=y CONFIG_FMB_TIMER_USE_ISR_DISPATCH_METHOD=y diff --git a/test/serial/mb_serial_slave/sdkconfig.ci.rtu b/test/serial/mb_serial_slave/sdkconfig.ci.rtu index 2a9d271..5fc59d4 100644 --- a/test/serial/mb_serial_slave/sdkconfig.ci.rtu +++ b/test/serial/mb_serial_slave/sdkconfig.ci.rtu @@ -2,6 +2,4 @@ CONFIG_MB_COMM_MODE_ASCII=n CONFIG_MB_COMM_MODE_RTU=y CONFIG_MB_SLAVE_ADDR=1 CONFIG_MB_UART_BAUD_RATE=115200 -CONFIG_FMB_TIMER_PORT_ENABLED=y -CONFIG_FMB_TIMER_ISR_IN_IRAM=y CONFIG_FMB_TIMER_USE_ISR_DISPATCH_METHOD=y diff --git a/test/serial/mb_serial_slave/sdkconfig.defaults b/test/serial/mb_serial_slave/sdkconfig.defaults index 14806eb..4660423 100644 --- a/test/serial/mb_serial_slave/sdkconfig.defaults +++ b/test/serial/mb_serial_slave/sdkconfig.defaults @@ -4,6 +4,4 @@ CONFIG_MB_COMM_MODE_ASCII=y CONFIG_MB_SLAVE_ADDR=1 CONFIG_MB_UART_BAUD_RATE=115200 -CONFIG_FMB_TIMER_PORT_ENABLED=n -CONFIG_FMB_TIMER_ISR_IN_IRAM=y CONFIG_FMB_TIMER_USE_ISR_DISPATCH_METHOD=y diff --git a/test/tcp/mb_tcp_master/sdkconfig.ci.ethernet b/test/tcp/mb_tcp_master/sdkconfig.ci.ethernet index b2a8033..6d513a8 100644 --- a/test/tcp/mb_tcp_master/sdkconfig.ci.ethernet +++ b/test/tcp/mb_tcp_master/sdkconfig.ci.ethernet @@ -10,7 +10,6 @@ CONFIG_FMB_COMM_MODE_RTU_EN=n CONFIG_FMB_COMM_MODE_ASCII_EN=n CONFIG_FMB_MASTER_TIMEOUT_MS_RESPOND=3000 CONFIG_FMB_MASTER_DELAY_MS_CONVERT=300 -CONFIG_FMB_TIMER_PORT_ENABLED=y CONFIG_FMB_TCP_UID_ENABLED=n CONFIG_FMB_TIMER_USE_ISR_DISPATCH_METHOD=y CONFIG_MB_MDNS_IP_RESOLVER=n diff --git a/test/tcp/mb_tcp_master/sdkconfig.ci.wifi b/test/tcp/mb_tcp_master/sdkconfig.ci.wifi index 31f08b6..b864e2a 100644 --- a/test/tcp/mb_tcp_master/sdkconfig.ci.wifi +++ b/test/tcp/mb_tcp_master/sdkconfig.ci.wifi @@ -7,13 +7,13 @@ CONFIG_FMB_COMM_MODE_RTU_EN=n CONFIG_FMB_COMM_MODE_ASCII_EN=n CONFIG_FMB_MASTER_TIMEOUT_MS_RESPOND=3000 CONFIG_FMB_MASTER_DELAY_MS_CONVERT=300 -CONFIG_FMB_TIMER_PORT_ENABLED=y CONFIG_LOG_DEFAULT_LEVEL_DEBUG=y CONFIG_FMB_TCP_UID_ENABLED=n CONFIG_MB_MDNS_IP_RESOLVER=n CONFIG_MB_SLAVE_IP_FROM_STDIN=y CONFIG_EXAMPLE_CONNECT_IPV6=n CONFIG_FMB_TIMER_USE_ISR_DISPATCH_METHOD=y +CONFIG_EXAMPLE_CONNECT_ETHERNET=n CONFIG_EXAMPLE_CONNECT_WIFI=y CONFIG_EXAMPLE_WIFI_SSID="${CI_WIFI_SSID}" CONFIG_EXAMPLE_WIFI_PASSWORD="${CI_WIFI_PASSW}" diff --git a/test/tcp/mb_tcp_master/sdkconfig.defaults b/test/tcp/mb_tcp_master/sdkconfig.defaults index d80d67d..0aec994 100644 --- a/test/tcp/mb_tcp_master/sdkconfig.defaults +++ b/test/tcp/mb_tcp_master/sdkconfig.defaults @@ -10,11 +10,12 @@ CONFIG_FMB_COMM_MODE_RTU_EN=n CONFIG_FMB_COMM_MODE_ASCII_EN=n CONFIG_FMB_MASTER_TIMEOUT_MS_RESPOND=2000 CONFIG_FMB_MASTER_DELAY_MS_CONVERT=300 -CONFIG_FMB_TIMER_ISR_IN_IRAM=y CONFIG_FMB_TIMER_USE_ISR_DISPATCH_METHOD=y CONFIG_MB_MDNS_IP_RESOLVER=n CONFIG_FMB_TCP_UID_ENABLED=n CONFIG_MB_SLAVE_IP_FROM_STDIN=y CONFIG_EXAMPLE_CONNECT_IPV6=n +CONFIG_EXAMPLE_CONNECT_ETHERNET=n +CONFIG_EXAMPLE_CONNECT_WIFI=y CONFIG_EXAMPLE_WIFI_SSID="${CI_WIFI_SSID}" CONFIG_EXAMPLE_WIFI_PASSWORD="${CI_WIFI_PASSW}" \ No newline at end of file diff --git a/test/tcp/mb_tcp_slave/sdkconfig.ci.wifi b/test/tcp/mb_tcp_slave/sdkconfig.ci.wifi index a9308fc..4de00e6 100644 --- a/test/tcp/mb_tcp_slave/sdkconfig.ci.wifi +++ b/test/tcp/mb_tcp_slave/sdkconfig.ci.wifi @@ -7,7 +7,6 @@ CONFIG_FMB_COMM_MODE_RTU_EN=n CONFIG_FMB_COMM_MODE_ASCII_EN=n CONFIG_FMB_MASTER_TIMEOUT_MS_RESPOND=3000 CONFIG_FMB_MASTER_DELAY_MS_CONVERT=300 -CONFIG_FMB_TIMER_PORT_ENABLED=y CONFIG_LOG_DEFAULT_LEVEL_DEBUG=y CONFIG_FMB_TCP_UID_ENABLED=n CONFIG_MB_MDNS_IP_RESOLVER=n @@ -15,6 +14,7 @@ CONFIG_MB_SLAVE_IP_FROM_STDIN=y CONFIG_MB_SLAVE_ADDR=1 CONFIG_EXAMPLE_CONNECT_IPV6=n CONFIG_FMB_TIMER_USE_ISR_DISPATCH_METHOD=y +CONFIG_EXAMPLE_CONNECT_ETHERNET=n CONFIG_EXAMPLE_CONNECT_WIFI=y CONFIG_EXAMPLE_WIFI_SSID="${CI_WIFI_SSID}" CONFIG_EXAMPLE_WIFI_PASSWORD="${CI_WIFI_PASSW}" diff --git a/test/tcp/mb_tcp_slave/sdkconfig.defaults b/test/tcp/mb_tcp_slave/sdkconfig.defaults index e0d3cdd..7de26d6 100644 --- a/test/tcp/mb_tcp_slave/sdkconfig.defaults +++ b/test/tcp/mb_tcp_slave/sdkconfig.defaults @@ -10,7 +10,7 @@ CONFIG_FMB_COMM_MODE_RTU_EN=n CONFIG_FMB_COMM_MODE_ASCII_EN=n CONFIG_FMB_MASTER_TIMEOUT_MS_RESPOND=2000 CONFIG_FMB_MASTER_DELAY_MS_CONVERT=300 -CONFIG_FMB_TIMER_ISR_IN_IRAM=y +CONFIG_MB_SLAVE_IP_FROM_STDIN=y CONFIG_FMB_TIMER_USE_ISR_DISPATCH_METHOD=y CONFIG_MB_MDNS_IP_RESOLVER=n CONFIG_FMB_TCP_UID_ENABLED=n @@ -22,5 +22,3 @@ CONFIG_EXAMPLE_WIFI_PASSWORD="${CI_WIFI_PASSW}" CONFIG_EXAMPLE_CONNECT_ETHERNET=n CONFIG_EXAMPLE_CONNECT_WIFI=y - -