From ba8d830754f4bc3e4c2e8983392c225155816533 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Mon, 11 Mar 2013 13:02:08 +1100
Subject: [PATCH] DataFlash: start to fix example build

---
 .../examples/DataFlash_test/DataFlash_test.pde     | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/libraries/DataFlash/examples/DataFlash_test/DataFlash_test.pde b/libraries/DataFlash/examples/DataFlash_test/DataFlash_test.pde
index e486ab8b3b..426005a56e 100644
--- a/libraries/DataFlash/examples/DataFlash_test/DataFlash_test.pde
+++ b/libraries/DataFlash/examples/DataFlash_test/DataFlash_test.pde
@@ -5,14 +5,18 @@
  */
 
 // Libraries
+#include <AP_HAL.h>
+#include <AP_HAL_AVR.h>
+#include <AP_HAL_AVR_SITL.h>
+#include <AP_HAL_Empty.h>
+#include <AP_HAL_PX4.h>
+
 #include <AP_Common.h>
 #include <AP_Param.h>
 #include <AP_Progmem.h>
 #include <AP_Math.h>            // ArduPilot Mega Vector/Matrix math Library
 #include <DataFlash.h>
 
-#include <AP_HAL.h>
-#include <AP_HAL_AVR.h>
 
 
 const AP_HAL::HAL& hal = AP_HAL_BOARD_DRIVER;
@@ -42,11 +46,7 @@ void setup()
     hal.scheduler->delay(20);
     DataFlash.ReadManufacturerID();
     hal.scheduler->delay(10);
-    hal.console->printf("Manufacturer: 0x%x Device: 0x%x PageSize: %u NumPages: %u\n",
-			(unsigned)DataFlash.df_manufacturer,
-			(unsigned)DataFlash.df_device,
-			(unsigned)DataFlash.df_PageSize,
-			(unsigned)DataFlash.df_NumPages);
+    DataFlash.ShowDeviceInfo(hal.console);
 
     if (DataFlash.NeedErase()) {
         hal.console->println("Erasing...");