Forráskód Böngészése

adc code with GPIO frequencies

namrota ghosh 6 hónapja
szülő
commit
298f05f0d7
1 módosított fájl, 46 hozzáadás és 16 törlés
  1. 46 16
      src/adc_peripheral/adc_singleConversion.c

+ 46 - 16
src/adc_peripheral/adc_singleConversion.c

@@ -1,7 +1,9 @@
+#include "ti/driverlib/dl_timera.h"
 #include "ti_msp_dl_config.h"
 #include "src/battery_data/battery.h"
 #include <stdio.h>
 #include "src/config.h"
+#include "src/adc_peripheral/adc_singleConversion.h"
 
 /* ADC variables:
  * bare_voltage gets the ADC value from the memory register
@@ -11,6 +13,41 @@
 volatile bool gCheckADC;
 volatile uint16_t gAdcResult;
 static int16_t pwm_value= 0;
+static LedState current_led_state = LED_STATE_NORMAL;
+
+
+void ADC_Controller_INST_IRQHandler(void)
+{
+    switch (DL_ADC12_getPendingInterrupt(ADC_Controller_INST)) {
+        case DL_ADC12_IIDX_MEM0_RESULT_LOADED:
+            gCheckADC = true;
+            break;
+        default:
+            break;
+    }
+}
+
+//converting ms to tick timer
+uint32_t getTicksForMs(uint32_t ms) {
+    return ms * TICKS_PER_MS;
+}
+
+void updateLedBlinkingPeriod(LedState state) {
+    current_led_state = state;
+    printf("Current LED State:%d\n", current_led_state);
+    switch(state) {
+        case LED_STATE_NORMAL:
+            DL_TimerA_setLoadValue(TIMER_LED_INST, getTicksForMs(LED_PERIOD_NORMAL_MS));
+            break;
+        case LED_STATE_SOV_WARNING:
+            DL_TimerA_setLoadValue(TIMER_LED_INST, getTicksForMs(LED_PERIOD_SOV_MS));
+            break;
+        case LED_STATE_HOV_ERROR:
+            DL_TimerA_setLoadValue(TIMER_LED_INST, getTicksForMs(LED_PERIOD_HOV_MS));
+            break;
+    }
+}
+
 
 void processPWMController(){
     
@@ -47,40 +84,33 @@ void processPWMController(){
 
     
     //If the controller exceeds HOV_THRESHOLD then
-    if(adc_voltage >= SOV_THRESHOLD_MV && adc_voltage <= HOV_THRESHOLD_MV){
+    if(adc_voltage >= SOV_THRESHOLD_MV + CONTROLLER_HYSTERESIS && adc_voltage <= HOV_THRESHOLD_MV){
         printf("Controller entered SOV state\n");
-        DL_GPIO_togglePins(GPIO_ControllerBoard_PORT, GPIO_ControllerBoard_LED_Error_PIN);
+        updateLedBlinkingPeriod(LED_STATE_SOV_WARNING);
         if(pwm_value< (PWM_MAX_VALUE - PWM_INCREMENT_VALUE)){
             pwm_value+= PWM_INCREMENT_VALUE; 
-            printf("[Power Burning PWM] SOV/HOV state: Increased power burn PWM to %d\n", pwm_value);
+            printf("[Power Burning PWM] SOV state: Increased power burn PWM to %d\n", pwm_value);
             DL_TimerG_setCaptureCompareValue(PWM_0_INST, pwm_value, DL_TIMER_CC_0_INDEX); 
+            
         }
     }else if(adc_voltage >= HOV_THRESHOLD_MV){
+        printf("Controller entered HOV state\n");
+        updateLedBlinkingPeriod(LED_STATE_HOV_ERROR);
         //Clear all the relays of charging and discharging in the target board:
         DL_GPIO_clearPins(GPIO_Battery_Charging_PIN_PB7_PORT, GPIO_Battery_Charging_PIN_PB7_PIN);
         DL_GPIO_clearPins(GPIO_Battery_Discharging_PIN_PB6_PORT, GPIO_Battery_Discharging_PIN_PB6_PIN);
         //Set PWM
         DL_TimerG_setCaptureCompareValue(PWM_0_INST, PWM_MAX_VALUE, DL_TIMER_CC_0_INDEX); 
         printf("[Power Burning PWM] initial state: %d\n", pwm_value);      
-    }else{
+    }else if(adc_voltage <= SOV_THRESHOLD_MV - CONTROLLER_HYSTERESIS){
+        updateLedBlinkingPeriod(LED_STATE_NORMAL);
         if(pwm_value>= (INITIAL_PWM_VALUE + PWM_DECREMENT_VALUE)){
             pwm_value-= PWM_DECREMENT_VALUE;
             printf("[Power Burning PWM] OK state: Decreased power burn PWM to %d\n", pwm_value);
             DL_TimerG_setCaptureCompareValue(PWM_0_INST, pwm_value, DL_TIMER_CC_0_INDEX);
+            
         }
     }
     gCheckADC = false;
     DL_ADC12_enableConversions(ADC_Controller_INST);
-}
-
-
-void ADC_Controller_INST_IRQHandler(void)
-{
-    switch (DL_ADC12_getPendingInterrupt(ADC_Controller_INST)) {
-        case DL_ADC12_IIDX_MEM0_RESULT_LOADED:
-            gCheckADC = true;
-            break;
-        default:
-            break;
-    }
 }