Browse Source

Исправил предыдущий фикс

Vladimir N. Shilov 8 years ago
parent
commit
70399c29ce
1 changed files with 5 additions and 5 deletions
  1. 5 5
      src/main.c

+ 5 - 5
src/main.c

@@ -34,9 +34,9 @@
 #define ADC_SMPLS 64
 // Supply voltage in mili volts
 #define ADC_VREF  3335
-// input OA divider resistance in Ohm
-#define ADC_MULT_TOP  3600
-#define ADC_MULT_BOT  680
+// Ñîïðîòèâëåíèå ðåçèñòîðîâ ÎÓ óñèëèòåëÿ ñèãíàëà øóíòà
+#define CURRENT_MULT_TOP  3600
+#define CURRENT_MULT_BOT  680
 // shunt resistance in mili Ohms
 #define ADC_SHUNT 50
 
@@ -195,8 +195,8 @@ void main(void)
           tbuf *= ADC_VREF; // Ìíîæèì íà îïîðíîå íàïðÿæåíèå
           tbuf = (tbuf + 4096) / 8191; // get ADC input voltage in mV
           tbuf *= 1000; // êîìïåíñàöèÿ ñîïðîòèâëåíèÿ øóíòà
-          tbuf *= (ADC_MULT_TOP + ADC_MULT_BOT);
-          tbuf = (tbuf + (ADC_MULT_BOT/2)) / ADC_MULT_BOT; // get voltage from shunt
+          tbuf *= CURRENT_MULT_BOT;
+          tbuf = (tbuf + ((CURRENT_MULT_TOP + CURRENT_MULT_BOT)/2)) / (CURRENT_MULT_TOP + CURRENT_MULT_BOT); // get voltage from shunt
           /* â Current òîê â ìèëèàìïåðàõ */
           Current = (tbuf + (ADC_SHUNT/2)) / ADC_SHUNT;