used batt in charging calc

5 years ago · 1383cd69ee
parent 19aa4f4d7b
commit 1383cd69ee
1 changed files with 2 additions and 2 deletions
--- a/afsk/main.c
+++ b/afsk/main.c
@ -1084,9 +1084,9 @@ if (firstTime != ON)
 //  float charging = current[map[PLUS_X]] + current[map[MINUS_X]] + current[map[PLUS_Y]] + current[map[MINUS_Y]] + current[map[PLUS_Z]] + current[map[MINUS_Z]];
  float charging = eclipse * (fabs(amps_max[0] * 0.707) + fabs(amps_max[1] * 0.707) + rnd_float(-4.0, 4.0)); 
 	  printf("Charging: %f \n", charging);
-  current[map[BAT]] = ((current[map[BUS]] * voltage[map[BUS]]) / (voltage[map[BAT]] * 1.0)) - charging;
+  current[map[BAT]] = ((current[map[BUS]] * voltage[map[BUS]]) / (batt * 1.0)) - charging;
 	  
-  printf("charging: %f bat curr: %f bus curr: %f bat volt: %f bus volt: %f \n",charging, current[map[BAT]], current[map[BUS]], voltage[map[BAT]], voltage[map[BUS]]);
+  printf("charging: %f bat curr: %f bus curr: %f bat volt: %f bus volt: %f \n",charging, current[map[BAT]], current[map[BUS]], batt, voltage[map[BUS]]);
 	  
  batt -= (batt > 3.5) ? current[map[BAT]]/30000: current[map[BAT]]/3000;
  if (batt < 3.0)