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

Dont forget ESP32 has 12 bits ADC

Browse Source
This commit is contained in:
Harald Barth 2022-10-05 23:43:09 +02:00
parent 452ffc5725
commit c36234df73
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
GITHUB_SHA.h
View File

@ -1 +1 @@
#define GITHUB_SHA "PORTX-HAL-202210052105Z" #define GITHUB_SHA "PORTX-HAL-202210052142Z"

6
MotorDriver.cpp
View File

@ -26,10 +26,12 @@
#include "DCCWaveform.h" #include "DCCWaveform.h"
#include "DCCTimer.h" #include "DCCTimer.h"
#include "DIAG.h" #include "DIAG.h"
#define ADC_INPUT_MAX_VALUE 1023 // 10 bit ADC
#if defined(ARDUINO_ARCH_ESP32) #if defined(ARDUINO_ARCH_ESP32)
#include "ESP32-fixes.h" #include "ESP32-fixes.h"
#define ADC_INPUT_MAX_VALUE 4095 // 12 bit ADC (should be moved to ADCee as well)
#else
#define ADC_INPUT_MAX_VALUE 1023 // 10 bit ADC
#endif #endif
bool MotorDriver::commonFaultPin=false; bool MotorDriver::commonFaultPin=false;
@ -290,9 +292,11 @@ void MotorDriver::setDCSignal(byte speedcode) {
} }
unsigned int MotorDriver::raw2mA( int raw) { unsigned int MotorDriver::raw2mA( int raw) {
//DIAG(F("%d = %d * %d / %d"), (int32_t)raw * senseFactorInternal / senseScale, raw, senseFactorInternal, senseScale);
return (int32_t)raw * senseFactorInternal / senseScale; return (int32_t)raw * senseFactorInternal / senseScale;
} }
unsigned int MotorDriver::mA2raw( unsigned int mA) { unsigned int MotorDriver::mA2raw( unsigned int mA) {
//DIAG(F("%d = %d * %d / %d"), (int32_t)mA * senseScale / senseFactorInternal, mA, senseScale, senseFactorInternal);
return (int32_t)mA * senseScale / senseFactorInternal; return (int32_t)mA * senseScale / senseFactorInternal;
} }