dani/CommandStation-EX
1
0
Fork 0
mirror of https://github.com/DCC-EX/CommandStation-EX.git synced 2024-12-24 13:21:23 +01:00
Code Releases Activity

Cleanup of extra commented lines

Browse Source
This commit is contained in:
Mike S 2021-03-29 15:06:06 -04:00
parent 8839eb293c
commit f5cdd88854
1 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
MotorDriver.cpp
View File

@ -20,14 +20,11 @@
#include "MotorDriver.h" #include "MotorDriver.h"
#include "DCCTimer.h" #include "DCCTimer.h"
#include "DIAG.h" #include "DIAG.h"
//#if defined(TEENSYDUINO)
#if defined(ARDUINO_TEENSY40) || defined(ARDUINO_TEENSY41) #if defined(ARDUINO_TEENSY40) || defined(ARDUINO_TEENSY41)
#include <ADC.h> #include <ADC.h>
#include <ADC_util.h> #include <ADC_util.h>
ADC *adc = new ADC(); // adc object ADC *adc = new ADC(); // adc object
//#if defined(ARDUINO_TEENSY35) || defined(ARDUINO_TEENSY36) || defined(ARDUINO_TEENSY32)
//ADC *adc1 = new ADC(); // adc object
//#endif
#endif #endif
#define setHIGH(fastpin) *fastpin.inout |= fastpin.maskHIGH #define setHIGH(fastpin) *fastpin.inout |= fastpin.maskHIGH
@ -72,19 +69,13 @@ MotorDriver::MotorDriver(byte power_pin, byte signal_pin, byte signal_pin2, int8
senseOffset=analogRead(currentPin); // value of sensor at zero current senseOffset=analogRead(currentPin); // value of sensor at zero current
} }
//#if defined(TEENSYDUINO)
#if defined(ARDUINO_TEENSY40) || defined(ARDUINO_TEENSY41) #if defined(ARDUINO_TEENSY40) || defined(ARDUINO_TEENSY41)
if(currentPin != current_pin && currentPin!=UNUSED_PIN){ if(currentPin != current_pin && currentPin!=UNUSED_PIN){
//adc->adc0->setReference(ADC_REFERENCE::REF_3V3); //adc->adc0->setReference(ADC_REFERENCE::REF_3V3);
adc->adc0->startContinuous(currentPin); adc->adc0->startContinuous(currentPin);
} else if(currentPin!=UNUSED_PIN){ } else if(currentPin!=UNUSED_PIN){
//#if defined(ARDUINO_TEENSY35) || defined(ARDUINO_TEENSY36) || defined(ARDUINO_TEENSY32)
// adc1->adc0->setReference(ADC_REFERENCE::REF_3V3);
// adc1->adc0->startContinuous(currentPin);
//#else
//adc->adc1->setReference(ADC_REFERENCE::REF_3V3); //adc->adc1->setReference(ADC_REFERENCE::REF_3V3);
adc->adc1->startContinuous(currentPin); adc->adc1->startContinuous(currentPin);
//#endif
} }
#endif #endif
faultPin=fault_pin; faultPin=fault_pin;
@ -167,16 +158,11 @@ int MotorDriver::getCurrentRaw(bool isMain) {
if (currentPin==UNUSED_PIN) return 0; if (currentPin==UNUSED_PIN) return 0;
int current; int current;
//#if defined(TEENSYDUINO)
#if defined(ARDUINO_TEENSY40) || defined(ARDUINO_TEENSY41) #if defined(ARDUINO_TEENSY40) || defined(ARDUINO_TEENSY41)
if(isMain) { if(isMain) {
current = (uint16_t)adc->adc0->analogReadContinuous(); current = (uint16_t)adc->adc0->analogReadContinuous();
} else { } else {
//#if defined(ARDUINO_TEENSY35) || defined(ARDUINO_TEENSY36) || defined(ARDUINO_TEENSY32)
//current = (uint16_t)adc1->adc0->analogReadContinuous();
//#else
current = (uint16_t)adc->adc1->analogReadContinuous(); current = (uint16_t)adc->adc1->analogReadContinuous();
//#endif
} }
#elif defined(ARDUINO_TEENSY32) || defined(ARDUINO_TEENSY35)|| defined(ARDUINO_TEENSY36) #elif defined(ARDUINO_TEENSY32) || defined(ARDUINO_TEENSY35)|| defined(ARDUINO_TEENSY36)
unsigned char sreg_backup; unsigned char sreg_backup;