Code cleanup

[kiibohd-controller.git] / Debug / cli / cli.h

diff --git a/Debug/cli/cli.h b/Debug/cli/cli.h
index ab96fb227242a5faa029dbf4738d1aace2bc8369..97efd8aa6f80032cd6cccda47f79bcfe5c699064 100644 (file)
--- a/Debug/cli/cli.h
+++ b/Debug/cli/cli.h
@@ -19,8 +19,7 @@
  * THE SOFTWARE.
  */
 
-#ifndef cli_h__
-#define cli_h__
+#pragma once
 
 // ----- Includes -----
 
@@ -55,7 +54,7 @@
        const PROGMEM char name##CLIDict_DescEntry[] = description;
 
 // ARM is easy :P
-#elif defined(_mk20dx128_) || defined(_mk20dx128vlf5_) || defined(_mk20dx256_) // ARM
+#elif defined(_mk20dx128_) || defined(_mk20dx128vlf5_) || defined(_mk20dx256_) || defined(_mk20dx256vlh7_) // ARM
 #define CLIDict_Def(name,description) \
        const char name##Name[] = description; \
        const CLIDictItem name[]
@@ -67,8 +66,8 @@
        const char name##CLIDict_DescEntry[] = description;
 #endif
 
-#define RING_PREV(i) wrap(i-1,0,CLIMaxHistorySize-1)
-#define RING_NEXT(i) wrap(i+1,0,CLIMaxHistorySize-1)
+#define RING_PREV(i) CLI_wrap(i - 1, 0, CLIMaxHistorySize - 1)
+#define RING_NEXT(i) CLI_wrap(i + 1, 0, CLIMaxHistorySize - 1)
 
 
 // ----- Structs -----
@@ -111,11 +110,11 @@ void CLI_process();
 void CLI_registerDictionary( const CLIDictItem *cmdDict, const char* dictName );
 void CLI_argumentIsolation( char* string, char** first, char** second );
 
-int wrap( int x, int low, int high );
+int CLI_wrap( int x, int low, int high );
 void CLI_commandLookup();
 void CLI_tabCompletion();
-void cli_saveHistory( char *buff );
-void cli_retreiveHistory( int index );
+void CLI_saveHistory( char *buff );
+void CLI_retreiveHistory( int index );
 
 // CLI Command Functions
 void cliFunc_arch    ( char* args );
@@ -130,6 +129,3 @@ void cliFunc_reset   ( char* args );
 void cliFunc_restart ( char* args );
 void cliFunc_version ( char* args );
 
-
-#endif
-