From e33e8d8aabee114372c9620b6734133e200ff8d0 Mon Sep 17 00:00:00 2001
From: sunbeam <fcb1995@163.com>
Date: Sat, 27 Jul 2024 11:14:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DAD=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .vscode/settings.json                      | 3 ++-
 firmware/src/FunctionState/FunctionState.c | 4 +++-
 firmware/src/RTE/RTE.c                     | 1 +
 firmware/src/main.c                        | 8 +++++---
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 5716d4d..50b1e22 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,6 +1,7 @@
 {
     "files.associations": {
         "rte.h": "c",
-        "sysdiagdetect.h": "c"
+        "sysdiagdetect.h": "c",
+        "osekcom.h": "c"
     }
 }
\ No newline at end of file
diff --git a/firmware/src/FunctionState/FunctionState.c b/firmware/src/FunctionState/FunctionState.c
index 104def7..aff1710 100644
--- a/firmware/src/FunctionState/FunctionState.c
+++ b/firmware/src/FunctionState/FunctionState.c
@@ -22,10 +22,12 @@ void FunctionState_Task(void)
         if (adcResetFlag == 0)
         {
             ADC1_Initialize();
+            ADC1_Enable();
+            ADC1_ChannelSelect(ADC_POSINPUT_AIN6, ADC_NEGINPUT_GND);
+            ADC1_ConversionStart();
             return;
         }
         
-        
         LD_AD_Val = adc[1];
         
         switch(Fuction_State)
diff --git a/firmware/src/RTE/RTE.c b/firmware/src/RTE/RTE.c
index 060c55d..62c503c 100644
--- a/firmware/src/RTE/RTE.c
+++ b/firmware/src/RTE/RTE.c
@@ -1433,6 +1433,7 @@ void RTE_Set_All_Test_Value(void)
                 {
                     baseline_error_repeat_counter = 55000;//110S
                     ADC0_Initialize();
+                    ADC0_Enable();
                 }
             }
             break;
diff --git a/firmware/src/main.c b/firmware/src/main.c
index c3892e7..d06ccd6 100644
--- a/firmware/src/main.c
+++ b/firmware/src/main.c
@@ -96,10 +96,12 @@ void ADC1_ConversionCallback (ADC_STATUS status, uintptr_t context)
             case ADC1_CH_AD_LDO_SNS:
                 ADC1_ChannelSelect(ADC_POSINPUT_AIN6,  ADC_NEGINPUT_GND);
                 adc_ch_sel= ADC1_CH_LD_OUT_SNS;
+                ADC1_ConversionStart();
                 break;
             case ADC1_CH_LD_OUT_SNS:
                 ADC1_ChannelSelect(ADC_POSINPUT_AIN7, ADC_NEGINPUT_GND);
                 adc_ch_sel= ADC1_CH_AD_LDO_SNS;
+                ADC1_Disable();
                 break;
             default:
                 break;
@@ -108,7 +110,7 @@ void ADC1_ConversionCallback (ADC_STATUS status, uintptr_t context)
         //if (adc_ch_sel > ADC1_CH_MAX) {
         //    adc_ch_sel = ADC1_CH_AD_LDO_SNS + 1;
         //}
-        ADC1_ConversionStart();
+        
     }
 }
 
@@ -271,9 +273,9 @@ int main ( void )
     {
         /* Maintain state machines of all polled MPLAB Harmony modules. */
         SYS_Tasks ( );
-        ADC1_ChannelSelect(ADC_POSINPUT_AIN6, ADC_NEGINPUT_GND);
+        //ADC1_ChannelSelect(ADC_POSINPUT_AIN6, ADC_NEGINPUT_GND);
     
-        ADC1_ConversionStart();
+        //ADC1_ConversionStart();