Merge pull request #734 from ut-issl/feature/power

pcu_initial_study.cppを再修正
ut-issl · Jan 17, 2025 · 0e3e015 · 0e3e015
2 parents 5a910c9 + aa2dd0e
commit 0e3e015
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/src/components/real/power/pcu_initial_study.cpp b/src/components/real/power/pcu_initial_study.cpp
@@ -84,8 +84,6 @@ void PcuInitialStudy::UpdateChargeCurrentAndBusVoltage() {
   const double cc_charge_current_C = battery_->GetCcChargeCurrent_C();
   const double cv_charge_voltage_V = battery_->GetCvChargeVoltage_V();
   const double battery_resistance_Ohm = battery_->GetResistance_Ohm();
-  const double cell_capacity_Ah = battery_->GetCellCapacity_Ah();
-  const double number_of_parallel = battery_->GetNumberOfParallel();
 
   const double bat_voltage = battery_->GetVoltage_V();
   double power_generation = 0.0;
@@ -95,12 +93,11 @@ void PcuInitialStudy::UpdateChargeCurrentAndBusVoltage() {
   const double current_temp =
       (-bat_voltage + std::sqrt(bat_voltage * bat_voltage + 4.0 * battery_resistance_Ohm * (power_generation - power_consumption_W_))) /
       (2.0 * battery_resistance_Ohm);
-  const double cc_charge_current_A = cc_charge_current_C * cell_capacity_Ah * number_of_parallel;
-  if (current_temp >= cc_charge_current_A) {
-    if (bat_voltage + cc_charge_current_A * battery_resistance_Ohm < cv_charge_voltage_V) {
+  if (current_temp >= cc_charge_current_C) {
+    if (bat_voltage + cc_charge_current_C * battery_resistance_Ohm < cv_charge_voltage_V) {
       // CC Charge
-      battery_->SetChargeCurrent(cc_charge_current_A);
-      bus_voltage_V_ = bat_voltage + battery_resistance_Ohm * cc_charge_current_A;
+      battery_->SetChargeCurrent(cc_charge_current_C);
+      bus_voltage_V_ = bat_voltage + battery_resistance_Ohm * cc_charge_current_C;
     } else {
       // CV Charge
       battery_->SetChargeCurrent((cv_charge_voltage_V - bat_voltage) / battery_resistance_Ohm);