Fixing default ErgoDox layout and adding FlashMode button

[kiibohd-controller.git] / Output / pjrcUSB / output_com.h

diff --git a/Output/pjrcUSB/output_com.h b/Output/pjrcUSB/output_com.h
index 30f7b54a05c30c88b278105033f61adeca7e4cf3..c82ed989964430986df5273bbc1df39d5858da1a 100644 (file)
--- a/Output/pjrcUSB/output_com.h
+++ b/Output/pjrcUSB/output_com.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2013-2014 by Jacob Alexander
+/* Copyright (C) 2013-2015 by Jacob Alexander
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -19,8 +19,7 @@
  * THE SOFTWARE.
  */
 
-#ifndef __output_com_h
-#define __output_com_h
+#pragma once
 
 // ----- Includes -----
 
@@ -36,7 +35,7 @@
 
 // Max size of key buffer needed for NKRO
 // Boot mode uses only the first 6 bytes
-#define USB_NKRO_BITFIELD_SIZE_KEYS 26
+#define USB_NKRO_BITFIELD_SIZE_KEYS 27
 #define USB_BOOT_MAX_KEYS 6
 
 
@@ -50,8 +49,11 @@ typedef enum USBKeyChangeState {
        USBKeyChangeState_Modifiers     = 0x01,
        USBKeyChangeState_MainKeys      = 0x02,
        USBKeyChangeState_SecondaryKeys = 0x04,
-       USBKeyChangeState_System        = 0x08,
-       USBKeyChangeState_Consumer      = 0x10,
+       USBKeyChangeState_TertiaryKeys  = 0x08,
+       USBKeyChangeState_QuartiaryKeys = 0x10,
+       USBKeyChangeState_System        = 0x20,
+       USBKeyChangeState_Consumer      = 0x40,
+       USBKeyChangeState_All           = 0x7F,
 } USBKeyChangeState;
 
 
@@ -76,13 +78,9 @@ extern          uint8_t  USBKeys_Idle_Count;
 
 extern USBKeyChangeState USBKeys_Changed;
 
+extern volatile uint8_t  Output_Available; // 0 - Output module not fully functional, 1 - Output module working
 
-
-// ----- Capabilities -----
-
-void Output_consCtrlSend_capability( uint8_t state, uint8_t stateType, uint8_t *args );
-void Output_sysCtrlSend_capability( uint8_t state, uint8_t stateType, uint8_t *args );
-void Output_usbCodeSend_capability( uint8_t state, uint8_t stateType, uint8_t *args );
+extern          uint8_t  Output_DebugMode; // 0 - Debug disabled, 1 - Debug enabled
 
 
 
@@ -91,6 +89,8 @@ void Output_usbCodeSend_capability( uint8_t state, uint8_t stateType, uint8_t *a
 void Output_setup();
 void Output_send();
 
+void Output_flushBuffers();
+
 void Output_firmwareReload();
 void Output_softReset();
 
@@ -101,5 +101,3 @@ int Output_getchar();
 int Output_putchar( char c );
 int Output_putstr( char* str );
 
-#endif
-