From 13a389d821f52dc914fb4f7b26845dcdd1224385 Mon Sep 17 00:00:00 2001
From: Richard Unger <runger@aon.at>
Date: Sat, 2 Oct 2021 23:17:31 +0200
Subject: [PATCH] fix merge errors

---
 .../hardware_specific/samd21_mcu.cpp          | 42 -------------------
 1 file changed, 42 deletions(-)

diff --git a/src/current_sense/hardware_specific/samd21_mcu.cpp b/src/current_sense/hardware_specific/samd21_mcu.cpp
index af2c0048..8bb6d38c 100644
--- a/src/current_sense/hardware_specific/samd21_mcu.cpp
+++ b/src/current_sense/hardware_specific/samd21_mcu.cpp
@@ -72,11 +72,7 @@ static void adcStopWithDMA(void);
 static void adcStartWithDMA(void);
 
 /**
-<<<<<<< HEAD
- * @brief  ADC sync wait
-=======
  * @brief  ADC sync wait 
->>>>>>> dev
  * @retval void
  */
 static __inline__ void ADCsync() __attribute__((always_inline, unused));
@@ -86,15 +82,9 @@ static void   ADCsync() {
 
 //  ADC DMA sequential free running (6) with Interrupts /////////////////
 
-<<<<<<< HEAD
-SAMDCurrentSenseADCDMA * SAMDCurrentSenseADCDMA::getHardwareAPIInstance()
-{
-
-=======
 SAMDCurrentSenseADCDMA * SAMDCurrentSenseADCDMA::getHardwareAPIInstance() 
 {
   
->>>>>>> dev
   return &instance;
 }
 
@@ -146,11 +136,7 @@ float SAMDCurrentSenseADCDMA::toVolts(uint16_t counts) {
 }
 
 void SAMDCurrentSenseADCDMA::initPins(){
-<<<<<<< HEAD
-
-=======
   
->>>>>>> dev
   pinMode(pinAREF, INPUT);
   pinMode(pinA, INPUT);
   pinMode(pinB, INPUT);
@@ -159,11 +145,7 @@ void SAMDCurrentSenseADCDMA::initPins(){
   uint32_t ainB = g_APinDescription[pinB].ulADCChannelNumber;
   firstAIN = min(ainA, ainB);
   lastAIN = max(ainA, ainB);
-<<<<<<< HEAD
-  if( _isset(pinC) )
-=======
   if( _isset(pinC) ) 
->>>>>>> dev
   {
     uint32_t ainC = g_APinDescription[pinC].ulADCChannelNumber;
     pinMode(pinC, INPUT);
@@ -178,15 +160,6 @@ void SAMDCurrentSenseADCDMA::initPins(){
 
 void SAMDCurrentSenseADCDMA::initADC(){
 
-<<<<<<< HEAD
-  analogRead(pinA);  // do some pin init  pinPeripheral()
-  analogRead(pinB);  // do some pin init  pinPeripheral()
-  analogRead(pinC);  // do some pin init  pinPeripheral()
-
-  ADC->CTRLA.bit.ENABLE = 0x00; // Disable ADC
-  ADCsync();
-  //ADC->REFCTRL.bit.REFSEL = ADC_REFCTRL_REFSEL_INTVCC0_Val; //  2.2297f V Supply VDDANA
-=======
   analogRead(pinA);  // do some pin init  pinPeripheral() 
   analogRead(pinB);  // do some pin init  pinPeripheral() 
   analogRead(pinC);  // do some pin init  pinPeripheral() 
@@ -194,7 +167,6 @@ void SAMDCurrentSenseADCDMA::initADC(){
   ADC->CTRLA.bit.ENABLE = 0x00; // Disable ADC
   ADCsync();
   //ADC->REFCTRL.bit.REFSEL = ADC_REFCTRL_REFSEL_INTVCC0_Val; //  2.2297 V Supply VDDANA
->>>>>>> dev
   ADC->INPUTCTRL.bit.GAIN = ADC_INPUTCTRL_GAIN_1X_Val; // Gain select as 1X
   // ADC->INPUTCTRL.bit.GAIN = ADC_INPUTCTRL_GAIN_DIV2_Val;  // default
   ADC->REFCTRL.bit.REFSEL = ADC_REFCTRL_REFSEL_AREFA;
@@ -243,11 +215,7 @@ void SAMDCurrentSenseADCDMA::initADC(){
   */
   ADC->INPUTCTRL.bit.MUXPOS = oneBeforeFirstAIN;
   ADCsync();
-<<<<<<< HEAD
-  ADC->INPUTCTRL.bit.INPUTSCAN = lastAIN; // so the adc will scan from oneBeforeFirstAIN to lastAIN (inclusive)
-=======
   ADC->INPUTCTRL.bit.INPUTSCAN = lastAIN; // so the adc will scan from oneBeforeFirstAIN to lastAIN (inclusive) 
->>>>>>> dev
   ADCsync();
   ADC->INPUTCTRL.bit.INPUTOFFSET = 0; //input scan cursor
   ADCsync();
@@ -278,15 +246,9 @@ void SAMDCurrentSenseADCDMA::adcToDMATransfer(void *rxdata,  uint32_t hwords) {
   DMAC->CHCTRLA.reg &= ~DMAC_CHCTRLA_ENABLE;
   DMAC->CHCTRLA.reg = DMAC_CHCTRLA_SWRST;
   DMAC->SWTRIGCTRL.reg &= (uint32_t)(~(1 << channelDMA));
-<<<<<<< HEAD
-
-  DMAC->CHCTRLB.reg = DMAC_CHCTRLB_LVL(0)
-  | DMAC_CHCTRLB_TRIGSRC(ADC_DMAC_ID_RESRDY)
-=======
   
   DMAC->CHCTRLB.reg = DMAC_CHCTRLB_LVL(0) 
   | DMAC_CHCTRLB_TRIGSRC(ADC_DMAC_ID_RESRDY) 
->>>>>>> dev
   | DMAC_CHCTRLB_TRIGACT_BEAT;
   DMAC->CHINTENSET.reg = DMAC_CHINTENSET_MASK ; // enable all 3 interrupts
   descriptor.descaddr = 0;
@@ -327,11 +289,7 @@ void adcStartWithDMA(void){
   ADCsync();
   ADC->SWTRIG.bit.FLUSH = 1;
   ADCsync();
-<<<<<<< HEAD
-  ADC->CTRLA.bit.ENABLE = 0x01;
-=======
   ADC->CTRLA.bit.ENABLE = 0x01; 
->>>>>>> dev
   ADCsync();
 }