|
@@ -15,13 +15,14 @@
|
|
|
#define ADC_CHNLI ADC1_CHANNEL_4
|
|
|
#define ADC_SCHTI ADC1_SCHMITTTRIG_CHANNEL4
|
|
|
#define ADC_SMPLS 64
|
|
|
-#define ADC_RES 1023UL
|
|
|
-// Supply voltage in mili volts
|
|
|
+#define ADC_RES (1023UL << 3)
|
|
|
+// Supply voltage in mili volts * fixed coeeficient
|
|
|
#define ADC_VREF 3030UL
|
|
|
// Voltage channel
|
|
|
#define VOLTAGE_MULT_TOP 15UL
|
|
|
#define VOLTAGE_MULT_BOT 100UL
|
|
|
#define VOLT_MUL_K 100UL
|
|
|
+#define VOLT_MUL_KD 110UL
|
|
|
#define VOLT_MUL_DIV (VOLTAGE_MULT_TOP * ADC_RES)
|
|
|
#define VOLTAGE_MUL (uint16_t)((VOLT_MUL_K * (VOLTAGE_MULT_BOT * ADC_VREF) + (VOLT_MUL_DIV/2)) / VOLT_MUL_DIV)
|
|
|
// Current channel
|
|
@@ -29,6 +30,7 @@
|
|
|
#define CURRENT_MULT_TOP 15UL
|
|
|
#define CURRENT_MULT_BOT 1UL
|
|
|
#define CUR_MUL_K 100UL
|
|
|
+#define CUR_MUL_KD 136UL
|
|
|
#define CUR_MUL_DIV (CURRENT_MULT_TOP * ADC_RES)
|
|
|
#define CURRENT_MUL (uint16_t)((CUR_MUL_K * (CURRENT_MULT_BOT * ADC_VREF * CURREN_SHUNT) + (CUR_MUL_DIV/2)) / CUR_MUL_DIV)
|
|
|
|