Merge pull request #126 in OS/onboard-sdk from OSDK-2360 to develop

* commit '172fe8c78b7843943ea063f52f58e88d2f16271b': feat:add necessary print in battery sample
dji-sdk · Apr 23, 2020 · 9185c7f · 9185c7f
2 parents f41b98f + 172fe8c
commit 9185c7f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 1 deletion.
diff --git a/osdk-lib/x86/advanced-sensing-2.0.3/lib/libadvanced-sensing.a b/osdk-lib/x86/advanced-sensing-2.0.3/lib/libadvanced-sensing.a
diff --git a/osdk-lib/x86/osdk-core/inc/dji_vehicle.hpp b/osdk-lib/x86/osdk-core/inc/dji_vehicle.hpp
@@ -108,7 +108,7 @@ class Vehicle
   MFIO*                mfio;
   MobileDevice*        mobileDevice;
   MissionManager*      missionManager;
-#ifdef WAYPT2_CORE
+#if defined(__linux__)
   WaypointV2MissionOperator*   waypointV2Mission;
 #endif
   HardwareSync*        hardSync;

diff --git a/osdk-lib/x86/osdk-core/lib/libdjiosdk-core.a b/osdk-lib/x86/osdk-core/lib/libdjiosdk-core.a
diff --git a/sample/platform/linux/battery/main.cpp b/sample/platform/linux/battery/main.cpp
@@ -56,8 +56,11 @@ int main(int argc, char** argv) {
     while(true)
     {
       vehicle->djiBattery->getBatteryWholeInfo(batteryWholeInfo);
+      DSTATUS("batteryCapacityPercentage is %ld\n",batteryWholeInfo.batteryCapacityPercentage);
       vehicle->djiBattery->getSingleBatteryDynamicInfo(DJIBattery::RequestSmartBatteryIndex::FIRST_SMART_BATTERY, firstBatteryDynamicInfo);
+      DSTATUS("battery index %d batteryCapacityPercent is %ld\n",firstBatteryDynamicInfo.batteryIndex, firstBatteryDynamicInfo.batteryCapacityPercent);
       vehicle->djiBattery->getSingleBatteryDynamicInfo(DJIBattery::RequestSmartBatteryIndex::SECOND_SMART_BATTERY, secondBatteryDynamicInfo);
+      DSTATUS("battery index %d batteryCapacityPercent is %ld\n",secondBatteryDynamicInfo.batteryIndex, secondBatteryDynamicInfo.batteryCapacityPercent);
 
       OsdkLinux_TaskSleepMs(waitTimeMs);
     }