printf format fix for memDump.

Author: dani007200964

.vscode/settings.json

@@ -10,6 +10,7 @@
         "initializer_list": "cpp",
         "xstring": "cpp",
         "xlocale": "cpp",
-        "ios": "cpp"
+        "ios": "cpp",
+        "xmemory": "cpp"
     }
 }

src/Commander-API.hpp

@@ -157,7 +157,7 @@ SOFTWARE.
 /// @param element One element in the system variables table.
 /// @param name The name of the int variable.
 /// @note Do not use & operator before the name. Just use the name, the macro will handle the rest.
-#define systemVariableInt_P( element, name ) { element.name_P = __CONST_TXT__( name ); element.floatData = NULL; element.intData = NULL; element.strData = (char*)name; element.name = NULL; }
+#define systemVariableString_P( element, name ) { element.name_P = __CONST_TXT__( name ); element.floatData = NULL; element.intData = NULL; element.strData = (char*)name; element.name = NULL; }
 
 #endif
 

src/Commander-Database.hpp

@@ -142,14 +142,14 @@ class CommanderDatabase{
 
     /// Find array index by element place.
     ///
-    /// This function returns the array index( from 0 to tree size - 1 )
+    /// This function returns the array index( from 1 to tree size )
     /// of an element by its place variable. It can be handy because the
     /// actual place not represents the real index in the binary tree.
     /// @param place Place of the searched element.
     /// @returns The array index of the element if the place is found.
     ///          If the place is invalid or not found, the returned value
     ///          will be 0 to avoid bad addressing.
-    int findIndexByPlace( int place );
+    uint16_t findIndexByPlace( uint16_t place );
 
     /// Get tree size
     ///
@@ -242,13 +242,13 @@ int CommanderDatabase< T >::strcmpElementCharArrayRegular( dataRecord_t* element
 }
 
 template< typename T >
-int CommanderDatabase< T >::findIndexByPlace( int place ){
+uint16_t CommanderDatabase< T >::findIndexByPlace( uint16_t place ){
 
 	// Generic counter variable
 	uint16_t i;
 
 	// Go through all commands
-	for( i = 0; i < dataTreeSize; i++ ){
+	for( i = 1; i <= dataTreeSize; i++ ){
 
 		// Check that if we found the desired command
 		if( dataTree[ i ].place == place ){

src/Commands/Commander-API-Memory-Commands.cpp

@@ -190,7 +190,7 @@ bool commander_memDump_func( char *args, Stream *response, void* parent ){
         return false;
     }
 
-    if( sscanf( &buffer[ 2 ],"%x", &startAddressNumber ) != 1 ){
+    if( sscanf( &buffer[ 2 ],"%" PRIx32, &startAddressNumber ) != 1 ){
         Commander::printArgumentError( response );
         response -> print( __CONST_TXT__( " Start address format is not correct! Example: 0x012ABC" ) );
         return false;
@@ -239,7 +239,7 @@ bool commander_memDump_func( char *args, Stream *response, void* parent ){
             return false;
         }
 
-        if( sscanf( &buffer[ 2 ],"%x", &endAddressNumber ) != 1 ){
+        if( sscanf( &buffer[ 2 ],"%" PRIx32, &endAddressNumber ) != 1 ){
             return false;
         }
 
@@ -299,11 +299,11 @@ bool commander_memDump_func( char *args, Stream *response, void* parent ){
     }
 
     response -> print( __CONST_TXT__( "Start Address: 0x" ) );
-    snprintf( buffer, sizeof( buffer ), "%08x", startAddressNumber );
+    snprintf( buffer, sizeof( buffer ), "%08" PRIx32, startAddressNumber );
     response -> println( buffer );
 
     response -> print( __CONST_TXT__( "End Address: 0x" ) );
-    snprintf( buffer, sizeof( buffer ), "%08x", endAddressNumber );
+    snprintf( buffer, sizeof( buffer ), "%08" PRIx32, endAddressNumber );
     response -> println( buffer );
 
     response -> print( __CONST_TXT__( "Number of elements: " ) );
@@ -321,7 +321,7 @@ bool commander_memDump_func( char *args, Stream *response, void* parent ){
         }
 
         j = 8 * ( bytesInData - i - 1 );
-        snprintf( buffer, sizeof( buffer ), " %02d:%02d |", j + 7, j);
+        snprintf( buffer, sizeof( buffer ), " %02" PRIu32 ":%02" PRIu32 " |", j + 7, j);
         buffer[ sizeof( buffer ) - 1 ] = '\0';
         response -> print( buffer );
 
@@ -333,7 +333,7 @@ bool commander_memDump_func( char *args, Stream *response, void* parent ){
 
         dataPointer = (uint32_t)( startAddressNumber + i * bytesInData );
         response -> print( __CONST_TXT__( "0x" ) );
-        snprintf( buffer, sizeof( buffer ), "%08x", dataPointer );
+        snprintf( buffer, sizeof( buffer ), "%08" PRIx32, dataPointer );
         buffer[ sizeof( buffer ) - 1 ] = '\0';
         response -> print( buffer );
         response -> print( __CONST_TXT__( " |" ) );