Renaming *_msg to *_print

- Fixing long-standing print api inconsistency
- Also fixes api calls

Author: haata

Debug/cli/cli.c

@@ -689,7 +689,7 @@ void cliFunc_periodic( char* args )
 	}
 
 	// Show number of clock cycles between periods
-	info_msg("Period Clock Cycles: ");
+	info_print("Period Clock Cycles: ");
 	printInt32( Periodic_cycles() );
 }
 
@@ -704,7 +704,7 @@ void cliFunc_rand( char* args )
 		return;
 	}
 
-	info_msg("Rand: ");
+	info_print("Rand: ");
 	printHex32( rand_value32() );
 }
 
@@ -714,7 +714,7 @@ void cliFunc_reload( char* args )
 	{
 		print( NL );
 		warn_printNL("flashModeEnabled not set, cancelling firmware reload...");
-		info_msg("Set flashModeEnabled to 1 in your kll configuration.");
+		info_print("Set flashModeEnabled to 1 in your kll configuration.");
 		return;
 	}
 
@@ -741,7 +741,7 @@ void cliFunc_tick( char* args )
 	Time now = Time_now();
 
 	// Display <systick>:<cycleticks since systick>
-	info_msg("ns per cycletick: ");
+	info_print("ns per cycletick: ");
 	print( Time_ticksPer_ns_str );
 	print( NL );
 	info_printNL("<systick ms>:<cycleticks since systick>");

Debug/print/print.h

@@ -64,23 +64,23 @@
 
 // Info Messages
 #define info_dPrint(...)  dPrintMsg        ("1;32",   "INFO",    __VA_ARGS__) // Info Msg
-#define info_print(str)   printMsgNL       ("1;32",   "INFO",    str)         // Info Msg
-#define info_msg(str)     printMsg         ("1;32",   "INFO",    str)         // Info Msg
+#define info_print(str)   printMsg         ("1;32",   "INFO",    str)         // Info Msg
+#define info_printNL(str) printMsgNL       ("1;32",   "INFO",    str)         // Info Msg
 
 // Warning Messages
 #define warn_dPrint(...)  dPrintMsg        ("1;33",   "WARNING", __VA_ARGS__) // Warning Msg
-#define warn_print(str)   printMsgNL       ("1;33",   "WARNING", str)         // Warning Msg
-#define warn_msg(str)     printMsg         ("1;33",   "WARNING", str)         // Warning Msg
+#define warn_print(str)   printMsg         ("1;33",   "WARNING", str)         // Warning Msg
+#define warn_printNL(str) printMsgNL       ("1;33",   "WARNING", str)         // Warning Msg
 
 // Error Messages
 #define erro_dPrint(...)  dPrintMsg        ("1;5;31", "ERROR",   __VA_ARGS__) // Error Msg
-#define erro_print(str)   printMsgNL       ("1;5;31", "ERROR",   str)         // Error Msg
-#define erro_msg(str)     printMsg         ("1;5;31", "ERROR",   str)         // Error Msg
+#define erro_print(str)   printMsg         ("1;5;31", "ERROR",   str)         // Error Msg
+#define erro_printNL(str) printMsgNL       ("1;5;31", "ERROR",   str)         // Error Msg
 
 // Debug Messages
 #define dbug_dPrint(...)  dPrintMsg        ("1;35",   "DEBUG",   __VA_ARGS__) // Debug Msg
-#define dbug_print(str)   printMsgNL       ("1;35",   "DEBUG",   str)         // Debug Msg
-#define dbug_msg(str)     printMsg         ("1;35",   "DEBUG",   str)         // Debug Msg
+#define dbug_print(str)   printMsg         ("1;35",   "DEBUG",   str)         // Debug Msg
+#define dbug_printNL(str) printMsgNL       ("1;35",   "DEBUG",   str)         // Debug Msg
 
 
 // Static String Printing

Macro/PartialMap/macro.c

@@ -518,7 +518,7 @@ uint8_t Macro_pressReleaseAdd( void *trigger_ptr )
 		case ScheduleType_O:
 			break;
 		default:
-			erro_msg("Invalid key state - ");
+			erro_print("Invalid key state - ");
 			error = 1;
 			break;
 		}
@@ -543,15 +543,15 @@ uint8_t Macro_pressReleaseAdd( void *trigger_ptr )
 
 	// Invalid TriggerGuide type for Interconnect
 	default:
-		erro_msg("Invalid type - ");
+		erro_print("Invalid type - ");
 		error = 1;
 		break;
 	}
 
 	// Check if ScanCode is out of range
 	if ( trigger->index > MaxScanCode_KLL )
 	{
-		warn_msg("ScanCode is out of range/not defined - ");
+		warn_print("ScanCode is out of range/not defined - ");
 		error = 1;
 	}
 
@@ -624,7 +624,7 @@ void Macro_keyState( uint16_t scanCode, uint8_t state )
 		// Check if ScanCode is out of range
 		if ( scanCode > MaxScanCode_KLL )
 		{
-			warn_msg("ScanCode is out of range/not defined: ");
+			warn_print("ScanCode is out of range/not defined: ");
 			printInt16( scanCode );
 			print( NL );
 			return;
@@ -749,7 +749,7 @@ void Macro_animationState( uint16_t animationIndex, uint8_t state )
 		// Check if animation index is out of range
 		if ( animationIndex > AnimationNum_KLL )
 		{
-			warn_msg("AnimationIndex is out of range/not defined: ");
+			warn_print("AnimationIndex is out of range/not defined: ");
 			printInt16( animationIndex );
 			print( NL );
 			return;
@@ -807,7 +807,7 @@ void Macro_layerState( uint16_t layerIndex, uint8_t state )
 		// Check if layer is out of range
 		if ( layerIndex > LayerNum_KLL )
 		{
-			warn_msg("LayerIndex is out of range/not defined: ");
+			warn_print("LayerIndex is out of range/not defined: ");
 			printInt16( layerIndex );
 			print( NL );
 			return;
@@ -863,7 +863,7 @@ void Macro_timeState( uint8_t type, uint16_t cur_time, uint8_t state )
 
 	// Ignore if not the correct type
 	default:
-		warn_msg("Invalid time state trigger update: ");
+		warn_print("Invalid time state trigger update: ");
 		printHex( type );
 		print(NL);
 		return;
@@ -873,7 +873,7 @@ void Macro_timeState( uint8_t type, uint16_t cur_time, uint8_t state )
 	// When this function called the trigger is active
 	if ( cur_time > 0xFF )
 	{
-		warn_msg("Only 255 time instances are accepted for a time state trigger: ");
+		warn_print("Only 255 time instances are accepted for a time state trigger: ");
 		printInt16( cur_time );
 		print(NL);
 		return;
@@ -1081,7 +1081,7 @@ void Macro_periodic()
 
 			// Not implemented
 			default:
-				erro_msg("Interconnect Trigger Event Type - Not Implemented ");
+				erro_print("Interconnect Trigger Event Type - Not Implemented ");
 				printHex( macroInterconnectCache[ c ].type );
 				print( NL );
 				break;
@@ -1120,7 +1120,7 @@ void Macro_periodic()
 		// Bug!
 		else
 		{
-			erro_msg("Macro Trigger Event Overflow! Serious Bug! ");
+			erro_print("Macro Trigger Event Overflow! Serious Bug! ");
 			printInt16( macroTriggerEventBufferSize );
 			print( NL );
 			macroTriggerEventBufferSize = 0;
@@ -1221,14 +1221,14 @@ void cliFunc_capDebug( char* args )
 	capDebugMode = capDebugMode ? 0 : 1;
 
 	print( NL );
-	info_msg("Capability Debug Mode: ");
+	info_print("Capability Debug Mode: ");
 	printInt8( capDebugMode );
 }
 
 void cliFunc_capList( char* args )
 {
 	print( NL );
-	info_msg("Capabilities List ");
+	info_print("Capabilities List ");
 	printHex( CapabilitiesNum );
 
 	// Iterate through all of the capabilities and display them
@@ -1293,7 +1293,7 @@ void cliFunc_capSelect( char* args )
 		{
 			// Indicate that the capability was called
 			print( NL );
-			info_msg("K");
+			info_print("K");
 			printInt8( cap );
 			print(" - ");
 			printHex( argSet[0] );
@@ -1311,7 +1311,7 @@ void cliFunc_capSelect( char* args )
 				{
 					print( NL );
 					warn_printNL("flashModeEnabled not set, cancelling firmware reload...");
-					info_msg("Set flashModeEnabled to 1 in your kll configuration.");
+					info_print("Set flashModeEnabled to 1 in your kll configuration.");
 					return;
 				}
 			}
@@ -1413,14 +1413,14 @@ void cliFunc_layerDebug( char *args )
 	layerDebugMode = layerDebugMode ? 0 : 1;
 
 	print( NL );
-	info_msg("Layer Debug Mode: ");
+	info_print("Layer Debug Mode: ");
 	printInt8( layerDebugMode );
 }
 
 void cliFunc_layerList( char* args )
 {
 	print( NL );
-	info_msg("Layer List");
+	info_print("Layer List");
 
 	// Iterate through all of the layers and display them
 	for ( index_uint_t layer = 0; layer < LayerNum; layer++ )
@@ -1483,7 +1483,7 @@ void cliFunc_layerState( char* args )
 
 			// Display operation (to indicate that it worked)
 			print( NL );
-			info_msg("Setting Layer L");
+			info_print("Setting Layer L");
 			printInt8( arg1 );
 			print(" to - ");
 			printHex( arg2 );
@@ -1528,15 +1528,15 @@ void cliFunc_macroDebug( char* args )
 	}
 
 	print( NL );
-	info_msg("Macro Debug Mode: ");
+	info_print("Macro Debug Mode: ");
 	printInt8( macroDebugMode );
 }
 
 void cliFunc_macroList( char* args )
 {
 	// Show pending key events
 	print( NL );
-	info_msg("Pending Key Events: ");
+	info_print("Pending Key Events: ");
 	printInt16( (uint16_t)macroTriggerEventBufferSize );
 	print(" : ");
 	for ( var_uint_t key = 0; key < macroTriggerEventBufferSize; key++ )
@@ -1547,7 +1547,7 @@ void cliFunc_macroList( char* args )
 
 	// Show pending trigger macros
 	print( NL );
-	info_msg("Pending Trigger Macros: ");
+	info_print("Pending Trigger Macros: ");
 	printInt16( (uint16_t)macroTriggerMacroPendingListSize );
 	print(" : ");
 	for ( var_uint_t macro = 0; macro < macroTriggerMacroPendingListSize; macro++ )
@@ -1558,7 +1558,7 @@ void cliFunc_macroList( char* args )
 
 	// Show pending result macros
 	print( NL );
-	info_msg("Pending Result Macros: ");
+	info_print("Pending Result Macros: ");
 	printInt16( (uint16_t)macroResultMacroPendingList.size );
 	print(" : ");
 	for ( var_uint_t macro = 0; macro < macroResultMacroPendingList.size; macro++ )
@@ -1569,17 +1569,17 @@ void cliFunc_macroList( char* args )
 
 	// Show available trigger macro indices
 	print( NL );
-	info_msg("Trigger Macros Range: T0 -> T");
+	info_print("Trigger Macros Range: T0 -> T");
 	printInt16( (uint16_t)TriggerMacroNum - 1 ); // Hopefully large enough :P (can't assume 32-bit)
 
 	// Show available result macro indices
 	print( NL );
-	info_msg("Result  Macros Range: R0 -> R");
+	info_print("Result  Macros Range: R0 -> R");
 	printInt16( (uint16_t)ResultMacroNum - 1 ); // Hopefully large enough :P (can't assume 32-bit)
 
 	// Show Trigger to Result Macro Links
 	print( NL );
-	info_msg("Trigger : Result Macro Pairs");
+	info_print("Trigger : Result Macro Pairs");
 	for ( var_uint_t macro = 0; macro < TriggerMacroNum; macro++ )
 	{
 		print( NL );
@@ -1596,7 +1596,7 @@ void cliFunc_macroProc( char* args )
 	macroPauseMode = macroPauseMode ? 0 : 1;
 
 	print( NL );
-	info_msg("Macro Processing Mode: ");
+	info_print("Macro Processing Mode: ");
 	printInt8( macroPauseMode );
 }
 
@@ -1611,7 +1611,7 @@ void macroDebugShowTrigger( var_uint_t index )
 	TriggerMacroRecord *record = &TriggerMacroRecordList[ index ];
 
 	print( NL );
-	info_msg("Trigger Macro Index: ");
+	info_print("Trigger Macro Index: ");
 	printInt16( (uint16_t)index ); // Hopefully large enough :P (can't assume 32-bit)
 	print( NL );
 
@@ -1685,7 +1685,7 @@ void macroDebugShowResult( var_uint_t index )
 	const ResultMacro *macro = &ResultMacroList[ index ];
 
 	print( NL );
-	info_msg("Result Macro Index: ");
+	info_print("Result Macro Index: ");
 	printInt16( (uint16_t)index ); // Hopefully large enough :P (can't assume 32-bit)
 	print( NL );
 
@@ -1873,7 +1873,7 @@ void cliFunc_voteDebug( char* args )
 	}
 
 	print( NL );
-	info_msg("Vote Debug Mode: ");
+	info_print("Vote Debug Mode: ");
 	printInt8( voteDebugMode );
 }
 

Macro/PartialMap/result.c

@@ -126,7 +126,7 @@ void Result_evalResultMacroCombo(
 			// Capability debug
 			if ( capDebugMode )
 			{
-				dbug_msg("Safe: ");
+				dbug_print("Safe: ");
 				capability( resultElem->trigger, ScheduleType_Debug, TriggerType_Debug, &guide->args );
 				print( NL );
 			}
@@ -436,7 +436,7 @@ void Result_process_delayed()
 		// Capability debug
 		if ( capDebugMode )
 		{
-			dbug_msg("Un-safe: ");
+			dbug_print("Un-safe: ");
 			capability( item->trigger, ScheduleType_Debug, TriggerType_Debug, item->args );
 			print( NL );
 		}