From 2c5c7e8a6299edfd3e2f809eddd1ee0bc40eeb4b Mon Sep 17 00:00:00 2001 From: Roy_01 Date: Wed, 30 Jul 2025 17:45:25 +0800 Subject: [PATCH] feat: rename file name and format code --- app/inc/elite_board.h | 8 +- app/inc/{cpg.h => elite_cpg_v1_1.h} | 0 app/inc/{cpg11_io.h => elite_cpg_v1_1_io.h} | 0 app/inc/{elite_dev.h => elite_dev_v1_0.h} | 5 +- app/inc/{edc.h => elite_edc_v2_0.h} | 0 app/inc/{edc20_io.h => elite_edc_v2_0_io.h} | 84 ++++++++++--------- app/inc/{elite_mmm.h => elite_mmm_v1_0.h} | 0 app/inc/{pel.h => elite_pel_v2_0.h} | 0 app/inc/{pel20_io.h => elite_pel_v2_0_io.h} | 0 app/inc/{pel_v3_0.h => elite_pel_v3_0.h} | 4 +- .../{pel_v3_0_io.h => elite_pel_v3_0_io.h} | 0 app/src/elite.c | 12 +-- app/src/{cpg.c => elite_cpg_v1_1.c} | 2 +- app/src/{cpg11_io.c => elite_cpg_v1_1_io.c} | 8 +- app/src/{elite_dev.c => elite_dev_v1_0.c} | 2 +- app/src/{edc20.c => elite_edc_v2_0.c} | 2 +- ..._mode.c => elite_edc_v2_0_cycle_iv_mode.c} | 2 +- app/src/{edc20_io.c => elite_edc_v2_0_io.c} | 0 app/src/{elite_mmm.c => elite_mmm_v1_0.c} | 2 +- app/src/{pel.c => elite_pel_v2_0.c} | 2 +- app/src/{pel20_io.c => elite_pel_v2_0_io.c} | 2 +- app/src/{pel_v3_0.c => elite_pel_v3_0.c} | 16 ++-- .../{pel_v3_0_io.c => elite_pel_v3_0_io.c} | 0 23 files changed, 76 insertions(+), 75 deletions(-) rename app/inc/{cpg.h => elite_cpg_v1_1.h} (100%) rename app/inc/{cpg11_io.h => elite_cpg_v1_1_io.h} (100%) rename app/inc/{elite_dev.h => elite_dev_v1_0.h} (76%) rename app/inc/{edc.h => elite_edc_v2_0.h} (100%) rename app/inc/{edc20_io.h => elite_edc_v2_0_io.h} (50%) rename app/inc/{elite_mmm.h => elite_mmm_v1_0.h} (100%) rename app/inc/{pel.h => elite_pel_v2_0.h} (100%) rename app/inc/{pel20_io.h => elite_pel_v2_0_io.h} (100%) rename app/inc/{pel_v3_0.h => elite_pel_v3_0.h} (95%) rename app/inc/{pel_v3_0_io.h => elite_pel_v3_0_io.h} (100%) rename app/src/{cpg.c => elite_cpg_v1_1.c} (99%) rename app/src/{cpg11_io.c => elite_cpg_v1_1_io.c} (99%) rename app/src/{elite_dev.c => elite_dev_v1_0.c} (99%) rename app/src/{edc20.c => elite_edc_v2_0.c} (99%) rename app/src/{edc20_cycle_iv_mode.c => elite_edc_v2_0_cycle_iv_mode.c} (99%) rename app/src/{edc20_io.c => elite_edc_v2_0_io.c} (100%) rename app/src/{elite_mmm.c => elite_mmm_v1_0.c} (99%) rename app/src/{pel.c => elite_pel_v2_0.c} (99%) rename app/src/{pel20_io.c => elite_pel_v2_0_io.c} (99%) rename app/src/{pel_v3_0.c => elite_pel_v3_0.c} (97%) rename app/src/{pel_v3_0_io.c => elite_pel_v3_0_io.c} (100%) diff --git a/app/inc/elite_board.h b/app/inc/elite_board.h index fb8253f..5cf3a99 100644 --- a/app/inc/elite_board.h +++ b/app/inc/elite_board.h @@ -18,13 +18,13 @@ extern "C" #if (DEF_ELITE_MODEL == DEF_ELITE_DEV) #elif (DEF_ELITE_MODEL == DEF_ELITE_EDC_V2_0) -#include "edc20_io.h" +#include "elite_edc_v2_0_io.h" #elif (DEF_ELITE_MODEL == DEF_ELITE_PEL_V2_0) -#include "pel20_io.h" +#include "elite_pel_v2_0_io.h" #elif (DEF_ELITE_MODEL == DEF_ELITE_PEL_V3_0) -#include "pel_v3_0_io.h" +#include "elite_pel_v3_0_io.h" #elif (DEF_ELITE_MODEL == DEF_ELITE_CPG_V1_1) -#include "cpg11_io.h" +#include "elite_cpg_v1_1_io.h" #elif (DEF_ELITE_MODEL == DEF_ELITE_MMM_V1_0) #else #error "Not implemented xxx_io.h" diff --git a/app/inc/cpg.h b/app/inc/elite_cpg_v1_1.h similarity index 100% rename from app/inc/cpg.h rename to app/inc/elite_cpg_v1_1.h diff --git a/app/inc/cpg11_io.h b/app/inc/elite_cpg_v1_1_io.h similarity index 100% rename from app/inc/cpg11_io.h rename to app/inc/elite_cpg_v1_1_io.h diff --git a/app/inc/elite_dev.h b/app/inc/elite_dev_v1_0.h similarity index 76% rename from app/inc/elite_dev.h rename to app/inc/elite_dev_v1_0.h index de46fe4..db2a167 100644 --- a/app/inc/elite_dev.h +++ b/app/inc/elite_dev_v1_0.h @@ -2,13 +2,14 @@ #define __ELITE_DEV_H__ #ifdef __cplusplus -extern "C" { +extern "C" +{ #endif #include "app_config.h" #include "elite.h" -const elite_instance_t *dev_init(void); + const elite_instance_t *dev_init(void); #ifdef __cplusplus } diff --git a/app/inc/edc.h b/app/inc/elite_edc_v2_0.h similarity index 100% rename from app/inc/edc.h rename to app/inc/elite_edc_v2_0.h diff --git a/app/inc/edc20_io.h b/app/inc/elite_edc_v2_0_io.h similarity index 50% rename from app/inc/edc20_io.h rename to app/inc/elite_edc_v2_0_io.h index 525f196..5f0419b 100644 --- a/app/inc/edc20_io.h +++ b/app/inc/elite_edc_v2_0_io.h @@ -2,12 +2,14 @@ #define __EDC20_IO_H__ #ifdef __cplusplus -extern "C" { +extern "C" +{ #endif -#include #include "nrf_drv_spi.h" #include "nrf_gpio.h" +#include + #define ADCA2_PIN NRF_GPIO_PIN_MAP(0, 25) #define ADCA1_PIN NRF_GPIO_PIN_MAP(0, 19) @@ -45,51 +47,51 @@ extern "C" { #define SPIM_MOSI_PIN NRF_GPIO_PIN_MAP(0, 7) #define SPIM_MISO_PIN NRF_GPIO_PIN_MAP(1, 9) -typedef struct -{ - float mV_start; - float mV_stop; - float mV_step; - uint32_t uS_step; - uint32_t cycles; - bool hi_z_en; -} elite_dac_config_t; + typedef struct + { + float mV_start; + float mV_stop; + float mV_step; + uint32_t uS_step; + uint32_t cycles; + bool hi_z_en; + } elite_dac_config_t; -void gpio_init(void); -void circuit_selection_vin_0(void); -void circuit_selection_vin_1(void); -void circuit_selection_vin_2(void); -void circuit_selection_Iin_0(void); -void circuit_selection_Iin_1(void); -void circuit_selection_Iin_2(void); -void circuit_selection_Iin_3(void); -void circuit_selection_Iin_4(void); -void circuit_selection_dac_coarse_tune_c(void); -void circuit_selection_dac_fine_tune_f0(void); -void circuit_selection_dac_fine_tune_f1(void); -void circuit_selection_dac_fine_tune_f2(void); -void circuit_selection_cv3_config(void); -void circuit_selection_cc_config(void); -void circuit_selection_dac_circuit_open(void); + void gpio_init(void); + void circuit_selection_vin_0(void); + void circuit_selection_vin_1(void); + void circuit_selection_vin_2(void); + void circuit_selection_Iin_0(void); + void circuit_selection_Iin_1(void); + void circuit_selection_Iin_2(void); + void circuit_selection_Iin_3(void); + void circuit_selection_Iin_4(void); + void circuit_selection_dac_coarse_tune_c(void); + void circuit_selection_dac_fine_tune_f0(void); + void circuit_selection_dac_fine_tune_f1(void); + void circuit_selection_dac_fine_tune_f2(void); + void circuit_selection_cv3_config(void); + void circuit_selection_cc_config(void); + void circuit_selection_dac_circuit_open(void); -void twi_init(void); -void twi0_write_reg(uint8_t slave_addr, uint8_t reg_addr, uint8_t *data, uint8_t data_len); -void twi0_read_reg(uint8_t slave_addr, uint8_t reg_addr, uint8_t *p_rx_buf, uint8_t rx_buffer_length); + void twi_init(void); + void twi0_write_reg(uint8_t slave_addr, uint8_t reg_addr, uint8_t *data, uint8_t data_len); + void twi0_read_reg(uint8_t slave_addr, uint8_t reg_addr, uint8_t *p_rx_buf, uint8_t rx_buffer_length); -void spi_init(void); -void spi1_write(uint8_t *p_tx_buffer, uint16_t tx_buffer_length); -void spim_xfer(uint32_t cs_pin, nrf_spim_mode_t mode, uint8_t *p_tx_buffer, uint16_t tx_buffer_length, uint8_t *p_rx_buf, uint16_t rx_buffer_length); -void spi2_set_mode(nrf_drv_spi_mode_t mode); + void spi_init(void); + void spi1_write(uint8_t *p_tx_buffer, uint16_t tx_buffer_length); + void spim_xfer(uint32_t cs_pin, nrf_spim_mode_t mode, uint8_t *p_tx_buffer, uint16_t tx_buffer_length, uint8_t *p_rx_buf, uint16_t rx_buffer_length); + void spi2_set_mode(nrf_drv_spi_mode_t mode); -void edc20_io_init(void); -void edc20_io_power_off(void); -void edc20_io_power_on(void); + void edc20_io_init(void); + void edc20_io_power_off(void); + void edc20_io_power_on(void); -void edc20_dac_tim_start(uint32_t period, void (*callback)(void *p_arg), void *p_arg); -void edc20_dac_tim_stop(void); + void edc20_dac_tim_start(uint32_t period, void (*callback)(void *p_arg), void *p_arg); + void edc20_dac_tim_stop(void); -void edc20_adc_tim_start(elite_dac_config_t *p_config); -void edc20_adc_tim_stop(void); + void edc20_adc_tim_start(elite_dac_config_t *p_config); + void edc20_adc_tim_stop(void); #ifdef __cplusplus } diff --git a/app/inc/elite_mmm.h b/app/inc/elite_mmm_v1_0.h similarity index 100% rename from app/inc/elite_mmm.h rename to app/inc/elite_mmm_v1_0.h diff --git a/app/inc/pel.h b/app/inc/elite_pel_v2_0.h similarity index 100% rename from app/inc/pel.h rename to app/inc/elite_pel_v2_0.h diff --git a/app/inc/pel20_io.h b/app/inc/elite_pel_v2_0_io.h similarity index 100% rename from app/inc/pel20_io.h rename to app/inc/elite_pel_v2_0_io.h diff --git a/app/inc/pel_v3_0.h b/app/inc/elite_pel_v3_0.h similarity index 95% rename from app/inc/pel_v3_0.h rename to app/inc/elite_pel_v3_0.h index 7625dcb..1ba8ebc 100644 --- a/app/inc/pel_v3_0.h +++ b/app/inc/elite_pel_v3_0.h @@ -13,8 +13,8 @@ extern "C" #define VERSION_DATE_YEAR 25 #define VERSION_DATE_MONTH 7 #define VERSION_DATE_DAY 30 -#define VERSION_DATE_HOUR 16 -#define VERSION_DATE_MINUTE 52 +#define VERSION_DATE_HOUR 17 +#define VERSION_DATE_MINUTE 45 #define PEL_0P5R_MASK (0x01 << 0) #define PEL_1P0R_MASK (0x01 << 1) diff --git a/app/inc/pel_v3_0_io.h b/app/inc/elite_pel_v3_0_io.h similarity index 100% rename from app/inc/pel_v3_0_io.h rename to app/inc/elite_pel_v3_0_io.h diff --git a/app/src/elite.c b/app/src/elite.c index 88de61b..fb9cbc0 100644 --- a/app/src/elite.c +++ b/app/src/elite.c @@ -3,17 +3,17 @@ #include "elite.h" #if (DEF_ELITE_MODEL == DEF_ELITE_DEV) -#include "elite_dev.h" +#include "elite_dev_v1_0.h" #elif (DEF_ELITE_MODEL == DEF_ELITE_EDC_V2_0) -#include "edc.h" +#include "elite_edc_v2_0.h" #elif (DEF_ELITE_MODEL == DEF_ELITE_PEL_V2_0) -#include "pel.h" +#include "elite_pel_v2_0.h" #elif (DEF_ELITE_MODEL == DEF_ELITE_PEL_V3_0) -#include "pel_v3_0.h" +#include "elite_pel_v3_0.h" #elif (DEF_ELITE_MODEL == DEF_ELITE_CPG_V1_1) -#include "cpg.h" +#include "elite_cpg_v1_1.h" #elif (DEF_ELITE_MODEL == DEF_ELITE_MMM_V1_0) -#include "elite_mmm.h" +#include "elite_mmm_v1_0.h" #else #error "Unknown DEF_ELITE_MODEL" #endif diff --git a/app/src/cpg.c b/app/src/elite_cpg_v1_1.c similarity index 99% rename from app/src/cpg.c rename to app/src/elite_cpg_v1_1.c index 0605c8f..57cef3b 100644 --- a/app/src/cpg.c +++ b/app/src/elite_cpg_v1_1.c @@ -1,6 +1,6 @@ #include "app_config.h" -#include "cpg.h" +#include "elite_cpg_v1_1.h" #if (DEF_ELITE_MODEL == DEF_ELITE_CPG_V1_1) diff --git a/app/src/cpg11_io.c b/app/src/elite_cpg_v1_1_io.c similarity index 99% rename from app/src/cpg11_io.c rename to app/src/elite_cpg_v1_1_io.c index 9cf6cc0..feab3f5 100644 --- a/app/src/cpg11_io.c +++ b/app/src/elite_cpg_v1_1_io.c @@ -31,20 +31,20 @@ typedef struct } pulse_gen_hw_t; pulse_gen_hw_t pulse_gen_hw[] = { - {.gpiote_idx = { 0, 1, 2, 3 }, + { .gpiote_idx = { 0, 1, 2, 3 }, .TMR_A = NRF_TIMER1, .TMR_B = NRF_TIMER3, .TMR_A_IRQn = TIMER1_IRQn, .TMR_B_IRQn = TIMER3_IRQn, .p_pulse_gen = NULL, - .private = { NULL, 0, 0 }}, - {.gpiote_idx = { 4, 5, 6, 7 }, + .private = { NULL, 0, 0 } }, + { .gpiote_idx = { 4, 5, 6, 7 }, .TMR_A = NRF_TIMER2, .TMR_B = NRF_TIMER4, .TMR_A_IRQn = TIMER2_IRQn, .TMR_B_IRQn = TIMER4_IRQn, .p_pulse_gen = NULL, - .private = { NULL, 0, 0 }}, + .private = { NULL, 0, 0 } }, }; __STATIC_INLINE void config_tmrB(uint32_t hw_idx, pulse_gen_t *p_pulse_gen) diff --git a/app/src/elite_dev.c b/app/src/elite_dev_v1_0.c similarity index 99% rename from app/src/elite_dev.c rename to app/src/elite_dev_v1_0.c index 5d4987b..e3bcd5e 100644 --- a/app/src/elite_dev.c +++ b/app/src/elite_dev_v1_0.c @@ -1,6 +1,6 @@ #include "app_config.h" -#include "elite_dev.h" +#include "elite_dev_v1_0.h" #if (DEF_ELITE_MODEL == DEF_ELITE_DEV) diff --git a/app/src/edc20.c b/app/src/elite_edc_v2_0.c similarity index 99% rename from app/src/edc20.c rename to app/src/elite_edc_v2_0.c index 14fd3d6..367dbf2 100644 --- a/app/src/edc20.c +++ b/app/src/elite_edc_v2_0.c @@ -1,6 +1,6 @@ #include "app_config.h" -#include "edc.h" +#include "elite_edc_v2_0.h" #if (DEF_ELITE_MODEL == DEF_ELITE_EDC_V2_0) diff --git a/app/src/edc20_cycle_iv_mode.c b/app/src/elite_edc_v2_0_cycle_iv_mode.c similarity index 99% rename from app/src/edc20_cycle_iv_mode.c rename to app/src/elite_edc_v2_0_cycle_iv_mode.c index 9d76986..d9413a7 100644 --- a/app/src/edc20_cycle_iv_mode.c +++ b/app/src/elite_edc_v2_0_cycle_iv_mode.c @@ -1,6 +1,6 @@ #include "app_config.h" -#include "edc.h" +#include "elite_edc_v2_0.h" #if (DEF_ELITE_MODEL == DEF_ELITE_EDC_V2_0) diff --git a/app/src/edc20_io.c b/app/src/elite_edc_v2_0_io.c similarity index 100% rename from app/src/edc20_io.c rename to app/src/elite_edc_v2_0_io.c diff --git a/app/src/elite_mmm.c b/app/src/elite_mmm_v1_0.c similarity index 99% rename from app/src/elite_mmm.c rename to app/src/elite_mmm_v1_0.c index 4054049..c7ab7f1 100644 --- a/app/src/elite_mmm.c +++ b/app/src/elite_mmm_v1_0.c @@ -1,6 +1,6 @@ #include "app_config.h" -#include "elite_mmm.h" +#include "elite_mmm_v1_0.h" #if (DEF_ELITE_MODEL == DEF_ELITE_MMM_V1_0) diff --git a/app/src/pel.c b/app/src/elite_pel_v2_0.c similarity index 99% rename from app/src/pel.c rename to app/src/elite_pel_v2_0.c index 98ed2f8..6485190 100644 --- a/app/src/pel.c +++ b/app/src/elite_pel_v2_0.c @@ -1,6 +1,6 @@ #include "app_config.h" -#include "pel.h" +#include "elite_pel_v2_0.h" #if (DEF_ELITE_MODEL == DEF_ELITE_PEL_V2_0) diff --git a/app/src/pel20_io.c b/app/src/elite_pel_v2_0_io.c similarity index 99% rename from app/src/pel20_io.c rename to app/src/elite_pel_v2_0_io.c index 3476ba0..20ab1d7 100644 --- a/app/src/pel20_io.c +++ b/app/src/elite_pel_v2_0_io.c @@ -23,7 +23,7 @@ pel_hw_t pel_hw = { [OUTPUT_R2_IDX] = OUTPUT_R2_CHANNEL, [OUTPUT_VO_IDX] = OUTPUT_VO_CHANNEL, [OUTPUT_VC_IDX] = OUTPUT_VC_CHANNEL, - [OUTPUT_VE_IDX] = OUTPUT_VE_CHANNEL}, + [OUTPUT_VE_IDX] = OUTPUT_VE_CHANNEL }, .adc.gain = NRF_SAADC_GAIN1_6, .adc.smaple_time = NRF_SAADC_ACQTIME_3US }; diff --git a/app/src/pel_v3_0.c b/app/src/elite_pel_v3_0.c similarity index 97% rename from app/src/pel_v3_0.c rename to app/src/elite_pel_v3_0.c index 83f3ad3..61ad1aa 100644 --- a/app/src/pel_v3_0.c +++ b/app/src/elite_pel_v3_0.c @@ -5,17 +5,15 @@ #include "adc_drv.h" #include "elite.h" #include "elite_board.h" -#include "pel_v3_0.h" -#include "pel_v3_0_io.h" +#include "elite_pel_v3_0.h" +#include "message_buffer.h" +#include "semphr.h" +#include "task.h" +#include "timers.h" -#include "message_buffer.h" //E:\WT\WT_project_code\bmd380_sdk\external\freertos\source\include\message_buffer.h -#include "semphr.h" //E:\WT\WT_project_code\bmd380_sdk\external\freertos\source\include\semphr.h -#include "task.h" //E:\WT\WT_project_code\bmd380_sdk\external\freertos\source\include\task.h -#include "timers.h" //E:\WT\WT_project_code\bmd380_sdk\external\freertos\source\include\timers.h - -#include "nrf_log.h" //E:\WT\WT_project_code\bmd380_sdk\components\libraries\log\nrf_log.h -#include "nrfx_gpiote.h" //E:\WT\WT_project_code\bmd380_sdk\modules\nrfx\drivers\include\nrfx_gpiote.h +#include "nrf_log.h" +#include "nrfx_gpiote.h" #include #include diff --git a/app/src/pel_v3_0_io.c b/app/src/elite_pel_v3_0_io.c similarity index 100% rename from app/src/pel_v3_0_io.c rename to app/src/elite_pel_v3_0_io.c