X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Output%2FpjrcUSB%2Foutput_com.h;h=abb8124526e27be3c1d77b986ab167956f789781;hb=3c9a97d51a2f3b94168e46ff1524ceec63703eff;hp=1daaf027ae75ee2c5af4d5c647019dab08b61d27;hpb=2be0d1393bbcb52bde9462a0b17a9e548316a8a2;p=kiibohd-controller.git

diff --git a/Output/pjrcUSB/output_com.h b/Output/pjrcUSB/output_com.h
index 1daaf02..abb8124 100644
--- 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-2016 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 -----
 
@@ -51,9 +50,10 @@ typedef enum USBKeyChangeState {
 	USBKeyChangeState_MainKeys      = 0x02,
 	USBKeyChangeState_SecondaryKeys = 0x04,
 	USBKeyChangeState_TertiaryKeys  = 0x08,
-	USBKeyChangeState_System        = 0x10,
-	USBKeyChangeState_Consumer      = 0x20,
-	USBKeyChangeState_All           = 0x3F,
+	USBKeyChangeState_QuartiaryKeys = 0x10,
+	USBKeyChangeState_System        = 0x20,
+	USBKeyChangeState_Consumer      = 0x40,
+	USBKeyChangeState_All           = 0x7F,
 } USBKeyChangeState;
 
 
@@ -72,24 +72,20 @@ extern          uint16_t USBKeys_ConsCtrl; // 1KRO container for Consumer Contro
 
 extern volatile uint8_t  USBKeys_Protocol; // 0 - Boot Mode, 1 - NKRO Mode
 
+extern volatile uint16_t USBMouse_Buttons; // Bitmask for mouse buttons
+
 // Misc variables (XXX Some are only properly utilized using AVR)
 extern          uint8_t  USBKeys_Idle_Config;
 extern          uint8_t  USBKeys_Idle_Count;
 
 extern USBKeyChangeState USBKeys_Changed;
+extern          uint8_t  USBMouse_Changed;
 
+extern volatile uint8_t  Output_Available; // 0 - Output module not fully functional, 1 - Output module working
 
+extern          uint8_t  Output_DebugMode; // 0 - Debug disabled, 1 - Debug enabled
 
-// ----- Capabilities -----
-
-// Output 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 );
-
-// Configuration capabilities
-void Output_kbdProtocolBoot_capability( uint8_t state, uint8_t stateType, uint8_t *args );
-void Output_kbdProtocolNKRO_capability( uint8_t state, uint8_t stateType, uint8_t *args );
+extern          uint16_t Output_ExtCurrent_Available; // mA - Set by outside module if not using USB (i.e. Interconnect)
 
 
 
@@ -106,9 +102,13 @@ void Output_softReset();
 // Relies on USB serial module
 unsigned int Output_availablechar();
 
+// Returns the total mA available (total, if used in a chain, each device will have to use a slice of it)
+unsigned int Output_current_available();
+
+void Output_update_external_current( unsigned int current );
+void Output_update_usb_current( unsigned int current );
+
 int Output_getchar();
 int Output_putchar( char c );
 int Output_putstr( char* str );
 
-#endif
-