Code cleanup

[kiibohd-controller.git] / Macro / PartialMap / macro.h

diff --git a/Macro/PartialMap/macro.h b/Macro/PartialMap/macro.h
index 11b40bca069d55b5ab2b034e9b02a75035669e0f..a165a458d503897c5b76ce17de9ff39713be5635 100644 (file)
--- a/Macro/PartialMap/macro.h
+++ b/Macro/PartialMap/macro.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2014 by Jacob Alexander
+/* Copyright (C) 2014-2015 by Jacob Alexander
  *
  * This file is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,8 +14,7 @@
  * along with this file.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __macro_h
-#define __macro_h
+#pragma once
 
 // ----- Includes -----
 
@@ -26,17 +25,19 @@
 
 // ----- Capabilities -----
 
-void Macro_layerStateToggle_capability( uint8_t state, uint8_t stateType, uint8_t *args );
+void Macro_layerState_capability( uint8_t state, uint8_t stateType, uint8_t *args );
+void Macro_layerLatch_capability( uint8_t state, uint8_t stateType, uint8_t *args );
+void Macro_layerLock_capability( uint8_t state, uint8_t stateType, uint8_t *args );
+void Macro_layerShift_capability( uint8_t state, uint8_t stateType, uint8_t *args );
 
 
 
 // ----- Functions -----
 
-void Macro_keyState( uint8_t scanCode, uint8_t state );
 void Macro_analogState( uint8_t scanCode, uint8_t state );
+void Macro_keyState( uint8_t scanCode, uint8_t state );
 void Macro_ledState( uint8_t ledCode, uint8_t state );
+void Macro_triggerState( void *triggers, uint8_t num ); // triggers is of type TriggerGuide, void* for circular dependencies
 void Macro_process();
 void Macro_setup();
 
-#endif
-