From 52efd668f6091729b61448b8750d50c53e79252f Mon Sep 17 00:00:00 2001 From: puddly <32534428+puddly@users.noreply.github.com> Date: Mon, 5 Aug 2024 16:09:37 -0400 Subject: [PATCH] Upgrade zwave_ncp_serial_api_controller --- src/zwave_ncp_serial_api_controller/.cproject | 18 +++++++++--------- .../extension_board_8029a_efr32xg13_button.h | 7 +------ .../extension_board_8029a_efr32xg13_led.h | 5 +---- .../extension_board_8029a_efr32xg13_slider.h | 4 +--- .../config/serial_api_config.h | 2 +- .../config/sl_board_control_config.h | 2 +- .../config/sl_debug_swo_config.h | 2 +- .../config/sl_device_init_hfxo_config.h | 4 ++-- .../zwave_ncp_serial_api_controller.pintool | 2 +- .../zwave_ncp_serial_api_controller.slcp | 4 ++-- .../zwave_ncp_serial_api_controller.slps | 3 ++- 11 files changed, 22 insertions(+), 31 deletions(-) diff --git a/src/zwave_ncp_serial_api_controller/.cproject b/src/zwave_ncp_serial_api_controller/.cproject index b62976c8..09078e5b 100644 --- a/src/zwave_ncp_serial_api_controller/.cproject +++ b/src/zwave_ncp_serial_api_controller/.cproject @@ -4,7 +4,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -154,13 +154,13 @@ - + - + - + @@ -295,13 +295,13 @@ - + - + - + @@ -367,7 +367,7 @@ - + diff --git a/src/zwave_ncp_serial_api_controller/config/extension_board_8029a_efr32xg13_button.h b/src/zwave_ncp_serial_api_controller/config/extension_board_8029a_efr32xg13_button.h index 0cc9a7a2..8e4dcc1b 100644 --- a/src/zwave_ncp_serial_api_controller/config/extension_board_8029a_efr32xg13_button.h +++ b/src/zwave_ncp_serial_api_controller/config/extension_board_8029a_efr32xg13_button.h @@ -17,9 +17,7 @@ */ // <<< Use Configuration Wizard in Context Menu >>> - // Button Configuration - #define PB1_LABEL "BTN0" // Button1 ON value @@ -36,7 +34,6 @@ // 0 #define PB1_CAN_WAKEUP_EM4 0 - #define PB2_LABEL "BTN1" // Button2 ON value @@ -53,7 +50,6 @@ // 1 #define PB2_CAN_WAKEUP_EM4 1 - #define PB3_LABEL "BTN2" // Button3 ON value @@ -70,7 +66,6 @@ // 1 #define PB3_CAN_WAKEUP_EM4 1 - #define PB4_LABEL "BTN3" // Button4 ON value @@ -135,4 +130,4 @@ // <<< sl:end pin_tool >>> -#endif /* EXTENSION_BOARD_8029A_EFR32XG13_BUTTON_H */ \ No newline at end of file +#endif /* EXTENSION_BOARD_8029A_EFR32XG13_BUTTON_H */ diff --git a/src/zwave_ncp_serial_api_controller/config/extension_board_8029a_efr32xg13_led.h b/src/zwave_ncp_serial_api_controller/config/extension_board_8029a_efr32xg13_led.h index a440c525..e6717eac 100644 --- a/src/zwave_ncp_serial_api_controller/config/extension_board_8029a_efr32xg13_led.h +++ b/src/zwave_ncp_serial_api_controller/config/extension_board_8029a_efr32xg13_led.h @@ -17,9 +17,7 @@ */ // <<< Use Configuration Wizard in Context Menu >>> - // LED Configuration - // LED1 ON value // <0=> Active low // <1=> Active high @@ -98,7 +96,6 @@ // <<< sl:end pin_tool >>> - /*************************************************************************/ /* Configure RGB LEDs */ /*************************************************************************/ @@ -107,4 +104,4 @@ * If paired with radio board ZGM13 then the RGB on that board can be used */ -#endif /* EXTENSION_BOARD_8029A_EFR32XG13_LED_H */ \ No newline at end of file +#endif /* EXTENSION_BOARD_8029A_EFR32XG13_LED_H */ diff --git a/src/zwave_ncp_serial_api_controller/config/extension_board_8029a_efr32xg13_slider.h b/src/zwave_ncp_serial_api_controller/config/extension_board_8029a_efr32xg13_slider.h index 68cc8856..7b13ffee 100644 --- a/src/zwave_ncp_serial_api_controller/config/extension_board_8029a_efr32xg13_slider.h +++ b/src/zwave_ncp_serial_api_controller/config/extension_board_8029a_efr32xg13_slider.h @@ -12,9 +12,7 @@ /*************************************************************************/ // <<< Use Configuration Wizard in Context Menu >>> - // Slider Configuration - #define SLIDER1_LABEL "SW1" // Slider ON value @@ -49,4 +47,4 @@ // <<< sl:end pin_tool >>> -#endif /* EXTENSION_BOARD_8029A_EFR32XG13_SLIDER_H */ \ No newline at end of file +#endif /* EXTENSION_BOARD_8029A_EFR32XG13_SLIDER_H */ diff --git a/src/zwave_ncp_serial_api_controller/config/serial_api_config.h b/src/zwave_ncp_serial_api_controller/config/serial_api_config.h index ad4a51a3..0d025455 100644 --- a/src/zwave_ncp_serial_api_controller/config/serial_api_config.h +++ b/src/zwave_ncp_serial_api_controller/config/serial_api_config.h @@ -45,4 +45,4 @@ // <<< sl:end pin_tool >>> -#endif // SERIAL_API_CONFIG_H \ No newline at end of file +#endif // SERIAL_API_CONFIG_H diff --git a/src/zwave_ncp_serial_api_controller/config/sl_board_control_config.h b/src/zwave_ncp_serial_api_controller/config/sl_board_control_config.h index ad15ebb1..3faa30a6 100644 --- a/src/zwave_ncp_serial_api_controller/config/sl_board_control_config.h +++ b/src/zwave_ncp_serial_api_controller/config/sl_board_control_config.h @@ -81,4 +81,4 @@ // <<< sl:end pin_tool >>> -#endif // SL_BOARD_CONTROL_CONFIG_H \ No newline at end of file +#endif // SL_BOARD_CONTROL_CONFIG_H diff --git a/src/zwave_ncp_serial_api_controller/config/sl_debug_swo_config.h b/src/zwave_ncp_serial_api_controller/config/sl_debug_swo_config.h index 5ed74316..75896a71 100644 --- a/src/zwave_ncp_serial_api_controller/config/sl_debug_swo_config.h +++ b/src/zwave_ncp_serial_api_controller/config/sl_debug_swo_config.h @@ -106,4 +106,4 @@ // [DBG_SL_DEBUG]$ // <<< sl:end pin_tool >>> -#endif // SL_DEBUG_SWO_CONFIG_H \ No newline at end of file +#endif // SL_DEBUG_SWO_CONFIG_H diff --git a/src/zwave_ncp_serial_api_controller/config/sl_device_init_hfxo_config.h b/src/zwave_ncp_serial_api_controller/config/sl_device_init_hfxo_config.h index 102818c0..d8e42433 100644 --- a/src/zwave_ncp_serial_api_controller/config/sl_device_init_hfxo_config.h +++ b/src/zwave_ncp_serial_api_controller/config/sl_device_init_hfxo_config.h @@ -45,8 +45,8 @@ #define SL_DEVICE_INIT_HFXO_FREQ 39000000 // HFXO precision in PPM <0-65535> -// Default: 50 -#define SL_DEVICE_INIT_HFXO_PRECISION 50 +// Default: 500 +#define SL_DEVICE_INIT_HFXO_PRECISION 500 // CTUNE <0-511> // Default: 360 diff --git a/src/zwave_ncp_serial_api_controller/zwave_ncp_serial_api_controller.pintool b/src/zwave_ncp_serial_api_controller/zwave_ncp_serial_api_controller.pintool index f9e7fb9d..11323bb0 100644 --- a/src/zwave_ncp_serial_api_controller/zwave_ncp_serial_api_controller.pintool +++ b/src/zwave_ncp_serial_api_controller/zwave_ncp_serial_api_controller.pintool @@ -1,5 +1,5 @@ - + diff --git a/src/zwave_ncp_serial_api_controller/zwave_ncp_serial_api_controller.slcp b/src/zwave_ncp_serial_api_controller/zwave_ncp_serial_api_controller.slcp index 23567535..048ff7ae 100644 --- a/src/zwave_ncp_serial_api_controller/zwave_ncp_serial_api_controller.slcp +++ b/src/zwave_ncp_serial_api_controller/zwave_ncp_serial_api_controller.slcp @@ -34,7 +34,7 @@ source: - {path: main.c} tag: [prebuilt_demo] include: -- path: '' +- path: . file_list: - {path: app_node_info.h} - {path: cmd_handlers.h} @@ -50,7 +50,7 @@ include: - {path: utils.h} - {path: virtual_slave_node_info.h} - {path: zaf_config_security.h} -sdk: {id: gecko_sdk, version: 4.4.2} +sdk: {id: gecko_sdk, version: 4.4.3} toolchain_settings: [] component: - {id: ZGM130S037HGN} diff --git a/src/zwave_ncp_serial_api_controller/zwave_ncp_serial_api_controller.slps b/src/zwave_ncp_serial_api_controller/zwave_ncp_serial_api_controller.slps index 74bbc115..d6e7aa18 100644 --- a/src/zwave_ncp_serial_api_controller/zwave_ncp_serial_api_controller.slps +++ b/src/zwave_ncp_serial_api_controller/zwave_ncp_serial_api_controller.slps @@ -1,7 +1,7 @@ - + @@ -12,5 +12,6 @@ + \ No newline at end of file