cleanup startup messages

Author: qqqlab

src/bar/bar.cpp

@@ -77,7 +77,6 @@ int Bar::setup() {
       break;
     case Cfg::bar_gizmo_enum::mf_BMP580 :
       if(config.i2c_bus) {
-        //gizmo = new BarGizmoBMP580(config.i2c_bus, config.i2c_adr, config.sample_rate);
         gizmo = BarGizmoBMP580::create(&config, this);
       }
       break;
@@ -90,7 +89,7 @@ int Bar::setup() {
 
   //check gizmo
   if(!installed() && config.gizmo != Cfg::bar_gizmo_enum::mf_NONE) {
-    Serial.println("\n" MF_MOD ": ERROR check pin/bus config\n");
+    cfg.printModule(MF_MOD, CfgClass::printModuleMode::CFG_ERROR);
     return -1001;
   }
 

src/bar/bar.h

@@ -28,7 +28,7 @@ SOFTWARE.
 #include "../hal/MF_Schedule.h"
 #include "../cfg/cfg.h"
 #include "../tbx/RuntimeTrace.h"
-#include "../tbx/msg.h"
+#include "../tbx/MsgBroker.h"
 
 struct BarState {
   public:

src/bat/bat.cpp

@@ -59,7 +59,7 @@ int Bat::setup() {
 
   //check gizmo
   if(!installed() && config.gizmo != Cfg::bat_gizmo_enum::mf_NONE) {
-    Serial.println("\n" MF_MOD ": ERROR check pin/bus config\n");
+    cfg.printModule(MF_MOD, CfgClass::printModuleMode::CFG_ERROR);
     return -1001;
   }
 

src/bat/bat.h

@@ -27,7 +27,7 @@ SOFTWARE.
 #include "../hal/MF_I2C.h"
 #include "../cfg/cfg.h"
 #include "../tbx/RuntimeTrace.h"
-#include "../tbx/msg.h"
+#include "../tbx/MsgBroker.h"
 
 struct BatState {
   public:

src/bbx/BinLogWriter.cpp

@@ -248,20 +248,20 @@ namespace BinLogWriter {
 
     //write headers (flush often)
     FMT_sendFMT(); //send FMT for FMT
-    queueSendFMTU(true,0,"",""); //send FMT for FMTU
+    queueSendFMTU(true, 0, "", ""); //send FMT for FMTU
     log_header_msg("ArduPlane"); //this sets the vehicle type -> which drives the translaton of flightmode codes to names (among other things probably)
     //log_header_msg("ArduCopter");  //gives problems with plot.ardupilot.org
     //TODO log_header_msg(MADFLIGHT_VERSION);
     queueFlush();
 
     //write multipliers
-    for(int i=0;i<_num_multipliers;i++) {
+    for(int i = 0; i < _num_multipliers; i++) {
       log_header_mult(log_Multipliers[i].ID, log_Multipliers[i].mult);
       queueFlush();
     }
 
     //write units
-    for(int i=0;i<_num_units;i++) {
+    for(int i = 0; i < _num_units; i++) {
       log_header_unit(log_Units[i].ID, log_Units[i].unit);
       queueFlush();
     }

src/cfg/cfg.cpp

@@ -83,7 +83,7 @@ bool CfgClass::getOptionString(uint16_t param_idx, int32_t param_val, char out_o
 }
 
 //print all parameters for module_name on single line
-void CfgClass::printModule(const char* module_name) {
+void CfgClass::printModule(const char* module_name, printModuleMode mode) {
   String modname = String(module_name);
   modname.toUpperCase();
   Serial.printf("%s: ", modname.c_str());
@@ -97,8 +97,22 @@ void CfgClass::printModule(const char* module_name) {
     printValue(gizmo_i);
     Serial.print(" ");
   }
+
+  if(mode == printModuleMode::GIZMO) {
+    Serial.println();
+    return;
+  }
+
+  if(mode == printModuleMode::GIZMO_NO_CR) {
+    Serial.print("- ");
+    return;
+  }
+
+  if(mode == printModuleMode::CFG_ERROR) {
+    Serial.print("ERROR check pin/bus config: ");
+  }
+
   //print config
-  Serial.print("setup - ");
   for(int i = 0; i < paramCount(); i++) {
     if(strncmp(Cfg::param_list[i].name, modname_.c_str(), modname_.length()) == 0 && i != gizmo_i) { //starts with module_name + '_', omit gizmo
       Serial.print(Cfg::param_list[i].name);
@@ -198,11 +212,11 @@ void CfgClass::cli_diff(const char* filter) {
 
 //sort by pin number (using inefficient sort)
 void CfgClass::printPins() {
-  for(int pinno = 0; pinno<128; pinno++) {
+  Serial.println("\n=== PINOUT ===\n");
+  for(int pinno = 0; pinno < 128; pinno++) {
     int cnt = 0;
     for(int i = 0; i < paramCount(); i++) {
       if(strncmp(Cfg::param_list[i].name, "pin_", 4) == 0 && getValue(i) == pinno) {
-        Serial.print("PIN: ");
         if(cnt==0) {
           printNameAndValue(i);
         }else{

src/cfg/cfg.h

@@ -353,7 +353,8 @@ class CfgClass : public CfgParam {
   //print
   bool getOptionString(uint16_t param_idx, int32_t param_val, char out_option[20]);
   void printPins();
-  void printModule(const char* module_name);
+  enum class printModuleMode {GIZMO, CFG_ERROR, GIZMO_NO_CR};
+  void printModule(const char* module_name, printModuleMode mode = printModuleMode::GIZMO);
   void printNameAndValue(uint16_t i, const char* comment = nullptr);
   void printValue(uint16_t i);
 

src/cli/cli.cpp

@@ -1,10 +1,8 @@
-#include "cli.h"
 #include "../madflight_modules.h"
 #include "msp/msp.h"
 #include "cli_RclCalibrate.h"
 #include "stat.h"
 #include "FreeRTOS_ps.h"
-#include "../tbx/msg.h"
 
 //create global module instance
 Cli cli;
@@ -414,6 +412,7 @@ void Cli::help() {
   "-- TOOLS --\n"
   "help or ?           This info\n"
   "ps                  Task list\n"
+  "res                 Resources\n"
   "i2c                 I2C scan\n"
   "serial <bus_id>     Dump serial data\n"
   "spinmotors          Spin each motor\n"
@@ -529,7 +528,6 @@ void Cli::processCmd() {
   this->executeCmd(cmd, arg1, arg2);
 }
 
-
 void Cli::executeCmd(String cmd, String arg1, String arg2) {
   //process external print commands
   for (int i=0;i<cli_print_extern_count;i++) {
@@ -608,6 +606,8 @@ void Cli::executeCmd(String cmd, String arg1, String arg2) {
     cli_serial(arg1.toInt());
   }else if (cmd == "spinmotors") {
     cli_spinmotors();
+  }else if (cmd == "res") {
+    print_resources();
   }else if (cmd != "") {
     Serial.println("ERROR Unknown command - Type help for help");
   }
@@ -993,10 +993,31 @@ void Cli::cli_print_loop() {
 }
 
 void Cli::ps() {
-  hal_print_resources();
   MsgBroker::top();
   RuntimeTraceGroup::print();
   freertos_ps();
   Serial.println();
   hal_meminfo();
 }
+
+void Cli::print_resources() {
+  // MEMINFO 
+  hal_meminfo();
+
+  // DMA, PIO
+  hal_print_resources();
+
+  //serial, i2c, and spi busses
+  hal_print_businfo();
+
+  //i2c clock speeds
+  for(int i=0;i<2;i++) {
+    MF_I2C* i2c = hal_get_i2c_bus(i);
+    if(i2c) {
+      Serial.printf("I2C: bus:%d clock:%d\n", i, (int)i2c->getClock());
+    }
+  }
+
+  //pinout sorted by gpio number
+  cfg.printPins();
+}

src/cli/cli.h

@@ -48,6 +48,7 @@ class Cli {
   void help();
   void ps();
   void banner();
+  void print_resources();
 
 protected:
   friend void cli_task(void *pvParameters);

src/gps/gps.cpp

@@ -50,7 +50,7 @@ int Gps::setup() {
 
   //check gizmo
   if(!installed() && config.gizmo != Cfg::gps_gizmo_enum::mf_NONE) {
-    Serial.println("\n" MF_MOD ": ERROR check pin/bus config\n");
+    cfg.printModule(MF_MOD, CfgClass::printModuleMode::CFG_ERROR);
     return -1001;
   }