Tweaks as a result of RP2350 porting of the framework

Author: gigapod

src/core/flux_base/flxCoreLog.h

@@ -143,7 +143,7 @@ class flxLogging
 
     //-------------------------------------------------------------------------
     // generic log interface - for flash strings
-    int logPrintf(const flxLogLevel_t level, bool newline, const __FlashStringHelper *fmt, ...);
+    int logPrintf(const flxLogLevel_t level, bool newline, const arduino::__FlashStringHelper *fmt, ...);
 
     //-------------------------------------------------------------------------
     // generic log interface

src/core/flux_base/flxCoreTypes.h

@@ -21,6 +21,7 @@
 #include <string>
 #include <type_traits>
 #include <vector>
+#include <stdexcept>
 
 #include "flxCoreLog.h"
 #include "flxUtils.h"

src/core/flux_base/flxSerial.h

@@ -97,12 +97,12 @@ class flxSerial_ : public flxWriter
     flxSerial_() : _headerWritten{false}, _colorEnabled{false} {};
 
     // Color strings for serial consoles
-    static constexpr char *kClrNormal = "\033[0;39m";
-    static constexpr char *kClrGreen = "\033[1;32m";
-    static constexpr char *kClrYellow = "\033[1;33m";
-    static constexpr char *kClrRed = "\033[1;31m";
-    static constexpr char *kClrBlue = "\033[1;34m";
-    static constexpr char *kClrWhite = "\033[1;37m";
+    static constexpr const char *kClrNormal = "\033[0;39m";
+    static constexpr const char *kClrGreen = "\033[1;32m";
+    static constexpr const char *kClrYellow = "\033[1;33m";
+    static constexpr const char *kClrRed = "\033[1;31m";
+    static constexpr const char *kClrBlue = "\033[1;34m";
+    static constexpr const char *kClrWhite = "\033[1;37m";
 
     bool _headerWritten;
 

src/core/flux_base/flxUtils.cpp

@@ -403,7 +403,7 @@ void flx_utils::timestampISO8601(time_t &t_time, char *buffer, size_t length, bo
 void flx_utils::formatByteString(uint64_t nBytes, uint prec, char *szBuffer, size_t len)
 {
 
-    char *sizeNames[] = {"B", "KB", "MB", "GB", "TB"};
+    const char *sizeNames[] = {"B", "KB", "MB", "GB", "TB"};
 
     if (nBytes < 0)
         nBytes = 0;

src/core/flux_logging/flxLogger.cpp

@@ -362,7 +362,7 @@ void flxLogger::logMessage(char *header, char *message)
 void flxLogger::updateTimeParameterName(void)
 {
 
-    char *timeTitle = "Time";
+    const char *timeTitle = "Time";
     switch (_timestampType)
     {
     case TimeStampMillis:

src/device/device_gnss/flxDevGNSS.h

@@ -83,7 +83,7 @@ class flxDevGNSS : public flxDeviceI2CType<flxDevGNSS>, public flxIClock, public
     float read_pdop();
     float read_horiz_acc();
     float read_vert_acc();
-    uint read_tow();
+    uint32_t read_tow();
     std::string read_iso8601();
     std::string read_yyyy_mm_dd();
     std::string read_yyyy_dd_mm();

src/device/device_nau7802/flxDevNAU7802.h

@@ -70,17 +70,17 @@ class flxDevNAU7802 : public flxDeviceI2CType<flxDevNAU7802>, public NAU7802
 
     // methods used to get values for our RW properties
     int32_t get_zero_offset();
-    void set_zero_offset(int);
+    void set_zero_offset(int32_t);
     float get_calibration_factor();
 
     void set_calibration_factor(float);
 
     // methods for the external calibration offset and gain hidden properties
     int32_t get_ext_offset(void);
-    void set_ext_offset(int);
+    void set_ext_offset(int32_t);
 
     uint32_t get_ext_gain(void);
-    void set_ext_gain(uint);
+    void set_ext_gain(uint32_t);
 
     // methods used to set our input parameters
     void calculate_zero_offset();

src/device/device_pasco2v01/flxDevPASCO2V01.h

@@ -66,7 +66,7 @@ class flxDevPASCO2V01 : public flxDeviceI2CType<flxDevPASCO2V01>
     PASCO2Ino *_theSensor;
 
     // methods used to get values for our output parameters
-    uint read_CO2();
+    uint32_t read_CO2();
 
     // methods used to get values for our RW properties
     bool get_auto_calibrate();