refactored

toppers · Nov 13, 2024 · ea0da30 · ea0da30
1 parent 506663e
commit ea0da30
Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/hakoniwa/config/rc-battery/drone_config_0.json b/hakoniwa/config/rc-battery/drone_config_0.json
@@ -72,7 +72,7 @@
         "VoltageLevelYellow": 9.5,
         "CapacityLevelYellow": 2.5, 
         "NominalVoltage": 14.8,
-        "NominalCapacity": 3.0,
+        "NominalCapacity": 5.0,
         "EODVoltage": 3.0
       },
       "rotor": {

diff --git a/hakoniwa/src/assets/drone/physics/battery/battery_dynamics.hpp b/hakoniwa/src/assets/drone/physics/battery/battery_dynamics.hpp
@@ -36,6 +36,17 @@ class BatteryDynamics : public hako::assets::drone::IBatteryDynamics, public ICs
         std::string line;
 
         while (std::getline(file, line)) {
+            // コメント行（#で始まる行）をスキップ
+            if (line.empty() || line[0] == '#') {
+                continue;
+            }
+
+            // 行内の#以降の文字を削除
+            auto comment_pos = line.find('#');
+            if (comment_pos != std::string::npos) {
+                line = line.substr(0, comment_pos);
+            }
+
             std::istringstream ss(line);
             std::string capacityStr, voltageStr;
             if (std::getline(ss, capacityStr, ',') && std::getline(ss, voltageStr, ',')) {
@@ -50,8 +61,10 @@ class BatteryDynamics : public hako::assets::drone::IBatteryDynamics, public ICs
         std::sort(data.begin(), data.end(), [](const DischargeData& a, const DischargeData& b) {
             return a.capacity < b.capacity;
         });
+
         return data;
     }
+
     void run_discharged_capacity()
     {
         double discharge_capacity_sec = 0;
@@ -160,7 +173,6 @@ class BatteryDynamics : public hako::assets::drone::IBatteryDynamics, public ICs
     }
 
 
-    // TODO グラフをCSVで読み込ませる
     void run() override
     {
         run_discharged_capacity();