From: Rowan Decker <Smasher816@gmail.com>
Date: Mon, 9 Mar 2015 03:17:39 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=2922fce0f72268b823226268ee9f64f165779621;p=kiibohd-controller.git

Merge remote-tracking branch 'upstream/master'
---

2922fce0f72268b823226268ee9f64f165779621
diff --cc Output/pjrcUSB/output_com.c
index 36329ac,eb25b83..140aba6
--- a/Output/pjrcUSB/output_com.c
+++ b/Output/pjrcUSB/output_com.c
@@@ -127,8 -130,13 +130,13 @@@ USBKeyChangeState USBKeys_Changed = USB
  // Indicates whether the Output module is fully functional
  // 0 - Not fully functional, 1 - Fully functional
  // 0 is often used to show that a USB cable is not plugged in (but has power)
 -         uint8_t  Output_Available = 0;
 +	uint8_t  Output_Available = 0;
  
+ // Debug control variable for Output modules
+ // 0 - Debug disabled (default)
+ // 1 - Debug enabled
+          uint8_t  Output_DebugMode = 0;
+ 
  
  
  // ----- Capabilities -----
diff --cc Output/usbMuxUart/output_com.c
index c8c78f5,d33d7e0..ae27e25
--- a/Output/usbMuxUart/output_com.c
+++ b/Output/usbMuxUart/output_com.c
@@@ -133,8 -133,13 +133,13 @@@ USBKeyChangeState USBKeys_Changed = USB
  // Indicates whether the Output module is fully functional
  // 0 - Not fully functional, 1 - Fully functional
  // 0 is often used to show that a USB cable is not plugged in (but has power)
 -         uint8_t  Output_Available = 0;
 +	uint8_t  Output_Available = 0;
  
+ // Debug control variable for Output modules
+ // 0 - Debug disabled (default)
+ // 1 - Debug enabled
+          uint8_t  Output_DebugMode = 0;
+ 
  
  
  // ----- Capabilities -----