Просмотр исходного кода

重命名ADC_SAMPLE_TIME to ADC_INSERT_SAMPLE_TIME

Signed-off-by: huhui <huhui@sharkgulf.com>
huhui 2 лет назад
Родитель
Сommit
0be2475256
4 измененных файлов с 33 добавлено и 33 удалено
  1. 12 12
      Applications/bsp/at32/adc.c
  2. 1 1
      Applications/bsp/at32/adc.h
  3. 19 19
      Applications/bsp/gd32/adc.c
  4. 1 1
      Applications/bsp/gd32/adc.h

+ 12 - 12
Applications/bsp/at32/adc.c

@@ -139,18 +139,18 @@ static void adc0_init(void){
 
 
 	adc_preempt_channel_length_set(ADC1, 3);
-	adc_preempt_channel_set(ADC1, V_PHASE_I_CHAN, 1, ADC_SAMPLE_TIME);
-	adc_preempt_channel_set(ADC1, V_PHASE_I_CHAN, 2, ADC_SAMPLE_TIME);
-	adc_preempt_channel_set(ADC1, V_PHASE_I_CHAN, 3, ADC_SAMPLE_TIME);
-	//adc_preempt_channel_set(ADC1, V_PHASE_I_CHAN, 4, ADC_SAMPLE_TIME);
+	adc_preempt_channel_set(ADC1, V_PHASE_I_CHAN, 1, ADC_INSERT_SAMPLE_TIME);
+	adc_preempt_channel_set(ADC1, V_PHASE_I_CHAN, 2, ADC_INSERT_SAMPLE_TIME);
+	adc_preempt_channel_set(ADC1, V_PHASE_I_CHAN, 3, ADC_INSERT_SAMPLE_TIME);
+	//adc_preempt_channel_set(ADC1, V_PHASE_I_CHAN, 4, ADC_INSERT_SAMPLE_TIME);
 	/* adc prempt trigger source */
 	adc_preempt_conversion_trigger_set(ADC1, ADC12_PREEMPT_TRIG_TMR1CH4, TRUE);
 
 	adc_preempt_channel_length_set(ADC2, 3);
-	adc_preempt_channel_set(ADC2, W_PHASE_I_CHAN, 1, ADC_SAMPLE_TIME);
-	adc_preempt_channel_set(ADC2, W_PHASE_I_CHAN, 2, ADC_SAMPLE_TIME);
-	adc_preempt_channel_set(ADC2, W_PHASE_I_CHAN, 3, ADC_SAMPLE_TIME);
-	//adc_preempt_channel_set(ADC2, W_PHASE_I_CHAN, 4, ADC_SAMPLE_TIME);
+	adc_preempt_channel_set(ADC2, W_PHASE_I_CHAN, 1, ADC_INSERT_SAMPLE_TIME);
+	adc_preempt_channel_set(ADC2, W_PHASE_I_CHAN, 2, ADC_INSERT_SAMPLE_TIME);
+	adc_preempt_channel_set(ADC2, W_PHASE_I_CHAN, 3, ADC_INSERT_SAMPLE_TIME);
+	//adc_preempt_channel_set(ADC2, W_PHASE_I_CHAN, 4, ADC_INSERT_SAMPLE_TIME);
 	/* adc prempt trigger source */
 	adc_preempt_conversion_trigger_set(ADC2, ADC12_PREEMPT_TRIG_TMR1CH4, TRUE);
 
@@ -212,10 +212,10 @@ static void adc1_init(void){
 	adc_ordinary_conversion_trigger_set(ADC2, ADC12_ORDINARY_TRIG_SOFTWARE, TRUE);
 
 	adc_preempt_channel_length_set(ADC2, 3);
-	adc_preempt_channel_set(ADC2, W_PHASE_I_CHAN, 1, ADC_SAMPLE_TIME);
-	adc_preempt_channel_set(ADC2, W_PHASE_I_CHAN, 2, ADC_SAMPLE_TIME);
-	adc_preempt_channel_set(ADC2, W_PHASE_I_CHAN, 3, ADC_SAMPLE_TIME);
-	//adc_preempt_channel_set(ADC2, W_PHASE_I_CHAN, 4, ADC_SAMPLE_TIME);
+	adc_preempt_channel_set(ADC2, W_PHASE_I_CHAN, 1, ADC_INSERT_SAMPLE_TIME);
+	adc_preempt_channel_set(ADC2, W_PHASE_I_CHAN, 2, ADC_INSERT_SAMPLE_TIME);
+	adc_preempt_channel_set(ADC2, W_PHASE_I_CHAN, 3, ADC_INSERT_SAMPLE_TIME);
+	//adc_preempt_channel_set(ADC2, W_PHASE_I_CHAN, 4, ADC_INSERT_SAMPLE_TIME);
 	/* adc prempt trigger source */
 	adc_preempt_conversion_trigger_set(ADC2, ADC12_PREEMPT_TRIG_TMR1CH4, TRUE);
 

+ 1 - 1
Applications/bsp/at32/adc.h

@@ -17,7 +17,7 @@ inserted ADC 由timer0 ch3触发,
 #define IL_OFFSET   20
 
 #define ADC_REGCHAN_SAMPLE_TIME ADC_SAMPLETIME_239_5
-#define ADC_SAMPLE_TIME ADC_SAMPLETIME_28_5
+#define ADC_INSERT_SAMPLE_TIME ADC_SAMPLETIME_28_5
 #define ADC_TRIGGER_PHASE ADC12_PREEMPT_TRIG_TMR1CH4
 
 #define PHASE_AB 0

+ 19 - 19
Applications/bsp/gd32/adc.c

@@ -175,27 +175,27 @@ static void adc01_init(void) {
 	/* configure ADC inserted channel length */
 	adc_channel_length_config(ADC0, ADC_INSERTED_CHANNEL, INJ_CHAN_NUM);
 #if 1
-	adc_inserted_channel_config(ADC0, 0, V_PHASE_I_CHAN, ADC_SAMPLE_TIME);
+	adc_inserted_channel_config(ADC0, 0, V_PHASE_I_CHAN, ADC_INSERT_SAMPLE_TIME);
 #if (INJ_CHAN_NUM==4)
-	adc_inserted_channel_config(ADC0, 1, W_PHASE_I_CHAN, ADC_SAMPLE_TIME);
-	adc_inserted_channel_config(ADC0, 2, V_PHASE_I_CHAN, ADC_SAMPLE_TIME);
-	adc_inserted_channel_config(ADC0, 3, W_PHASE_I_CHAN, ADC_SAMPLE_TIME);
+	adc_inserted_channel_config(ADC0, 1, W_PHASE_I_CHAN, ADC_INSERT_SAMPLE_TIME);
+	adc_inserted_channel_config(ADC0, 2, V_PHASE_I_CHAN, ADC_INSERT_SAMPLE_TIME);
+	adc_inserted_channel_config(ADC0, 3, W_PHASE_I_CHAN, ADC_INSERT_SAMPLE_TIME);
 #endif
 #else
-	adc_update_insert_sample_time(ADC0, V_PHASE_I_CHAN, ADC_SAMPLE_TIME);
-	adc_update_insert_sample_time(ADC0, W_PHASE_I_CHAN, ADC_SAMPLE_TIME);
+	adc_update_insert_sample_time(ADC0, V_PHASE_I_CHAN, ADC_INSERT_SAMPLE_TIME);
+	adc_update_insert_sample_time(ADC0, W_PHASE_I_CHAN, ADC_INSERT_SAMPLE_TIME);
 #endif
 	adc_channel_length_config(ADC1, ADC_INSERTED_CHANNEL, INJ_CHAN_NUM);
 #if 1
-	adc_inserted_channel_config(ADC1, 0, W_PHASE_I_CHAN, ADC_SAMPLE_TIME);
+	adc_inserted_channel_config(ADC1, 0, W_PHASE_I_CHAN, ADC_INSERT_SAMPLE_TIME);
 #if (INJ_CHAN_NUM==4)
-	adc_inserted_channel_config(ADC1, 1, V_PHASE_I_CHAN, ADC_SAMPLE_TIME);
-	adc_inserted_channel_config(ADC1, 2, W_PHASE_I_CHAN, ADC_SAMPLE_TIME);
-	adc_inserted_channel_config(ADC1, 3, V_PHASE_I_CHAN, ADC_SAMPLE_TIME);
+	adc_inserted_channel_config(ADC1, 1, V_PHASE_I_CHAN, ADC_INSERT_SAMPLE_TIME);
+	adc_inserted_channel_config(ADC1, 2, W_PHASE_I_CHAN, ADC_INSERT_SAMPLE_TIME);
+	adc_inserted_channel_config(ADC1, 3, V_PHASE_I_CHAN, ADC_INSERT_SAMPLE_TIME);
 #endif
 #else
-	adc_update_insert_sample_time(ADC1, V_PHASE_I_CHAN, ADC_SAMPLE_TIME);
-	adc_update_insert_sample_time(ADC1, W_PHASE_I_CHAN, ADC_SAMPLE_TIME);
+	adc_update_insert_sample_time(ADC1, V_PHASE_I_CHAN, ADC_INSERT_SAMPLE_TIME);
+	adc_update_insert_sample_time(ADC1, W_PHASE_I_CHAN, ADC_INSERT_SAMPLE_TIME);
 #endif
 	adc_mode_config(ADC_DUAL_MODE);
 
@@ -246,15 +246,15 @@ static void adc0_init(void){
     /* configure ADC inserted channel length */
     adc_channel_length_config(ADC0, ADC_INSERTED_CHANNEL, 1);
 
-    //adc_inserted_channel_config(ADC0, 0, U_PHASE_I_CHAN, ADC_SAMPLE_TIME);
+    //adc_inserted_channel_config(ADC0, 0, U_PHASE_I_CHAN, ADC_INSERT_SAMPLE_TIME);
 #ifdef U_PHASE_I_CHAN
-	adc_update_insert_sample_time(ADC0, U_PHASE_I_CHAN, ADC_SAMPLE_TIME);
+	adc_update_insert_sample_time(ADC0, U_PHASE_I_CHAN, ADC_INSERT_SAMPLE_TIME);
 #endif
 #ifdef V_PHASE_I_CHAN	
-	adc_update_insert_sample_time(ADC0, V_PHASE_I_CHAN, ADC_SAMPLE_TIME);
+	adc_update_insert_sample_time(ADC0, V_PHASE_I_CHAN, ADC_INSERT_SAMPLE_TIME);
 #endif
 #ifdef W_PHASE_I_CHAN	
-	adc_update_insert_sample_time(ADC0, W_PHASE_I_CHAN, ADC_SAMPLE_TIME);
+	adc_update_insert_sample_time(ADC0, W_PHASE_I_CHAN, ADC_INSERT_SAMPLE_TIME);
 #endif
 
 #ifdef CONFIG_HW_MUTISAMPLE
@@ -323,13 +323,13 @@ static void adc1_init(void){
 
     /* configure ADC inserted channel */
 #ifdef U_PHASE_I_CHAN
-	adc_update_insert_sample_time(ADC1, U_PHASE_I_CHAN, ADC_SAMPLE_TIME);
+	adc_update_insert_sample_time(ADC1, U_PHASE_I_CHAN, ADC_INSERT_SAMPLE_TIME);
 #endif
 #ifdef V_PHASE_I_CHAN	
-	adc_update_insert_sample_time(ADC1, V_PHASE_I_CHAN, ADC_SAMPLE_TIME);
+	adc_update_insert_sample_time(ADC1, V_PHASE_I_CHAN, ADC_INSERT_SAMPLE_TIME);
 #endif
 #ifdef W_PHASE_I_CHAN	
-	adc_update_insert_sample_time(ADC1, W_PHASE_I_CHAN, ADC_SAMPLE_TIME);
+	adc_update_insert_sample_time(ADC1, W_PHASE_I_CHAN, ADC_INSERT_SAMPLE_TIME);
 #endif
 
 #ifdef CONFIG_HW_MUTISAMPLE

+ 1 - 1
Applications/bsp/gd32/adc.h

@@ -16,7 +16,7 @@ inserted ADC 由timer0 ch3触发,
 #define ISQ3_OFFSET 15
 #define IL_OFFSET   20
 
-#define ADC_SAMPLE_TIME ADC_SAMPLETIME_13POINT5
+#define ADC_INSERT_SAMPLE_TIME ADC_SAMPLETIME_13POINT5
 #ifdef CONFIG_SENSORLESS_TOW_SAMPLES
 #define ADC_TRIGGER_PHASE ADC0_1_EXTTRIG_INSERTED_T0_TRGO
 #else