DataFlash: allow replay to work again

libraries/DataFlash/DataFlash.h

@@ -67,6 +67,7 @@ public:
 
     // initialisation
     void Init(const struct LogStructure *structure, uint8_t num_types);
+    void set_num_types(uint8_t num_types) { _num_types = num_types; }
 
     bool CardInserted(void);
 
@@ -227,6 +228,9 @@ public:
     float quiet_nanf() const { return nanf("0x4152"); } // "AR"
     double quiet_nan() const { return nan("0x4152445550490a"); } // "ARDUPI"
 
+    // returns true if msg_type is associated with a message
+    bool msg_type_in_use(uint8_t msg_type) const;
+
 protected:
 
     const struct LogStructure *_structures;
@@ -274,9 +278,6 @@ private:
     struct log_write_fmt *msg_fmt_for_name(const char *name, const char *labels, const char *units, const char *mults, const char *fmt);
     const struct log_write_fmt *log_write_fmt_for_msg_type(uint8_t msg_type) const;
 
-    // returns true if msg_type is associated with a message
-    bool msg_type_in_use(uint8_t msg_type) const;
-
     const struct LogStructure *structure_for_msg_type(uint8_t msg_type);
 
     // return a msg_type which is not currently in use (or -1 if none available)

libraries/DataFlash/DataFlash_Backend.cpp

@@ -97,6 +97,9 @@ void DataFlash_Backend::push_log_blocks() {
 // for other messages to go out to the log
 bool DataFlash_Backend::WriteBlockCheckStartupMessages()
 {
+#if APM_BUILD_TYPE(APM_BUILD_Replay)
+    return true;
+#endif
     if (_startup_messagewriter->fmt_done()) {
         return true;
     }