Adding None capability.

- Required for 0.3b update of the KLL compiler.

diff --git a/Output/pjrcUSB/capabilities.kll b/Output/pjrcUSB/capabilities.kll
index 13180c1cfc90ea2cd223ddbe9f4e00b464d4f880..42adb01401d6ee76f0f7e41ae853f31deadecc13 100644 (file)
--- a/Output/pjrcUSB/capabilities.kll
+++ b/Output/pjrcUSB/capabilities.kll
@@ -1,14 +1,15 @@
 Name = pjrcUSBCapabilities;
-Version = 0.3;
-Author = "HaaTa (Jacob Alexander) 2014";
-KLL = 0.3;
+Version = 0.4;
+Author = "HaaTa (Jacob Alexander) 2014-2015";
+KLL = 0.3b;
 
 # Modified Date
-Date = 2014-10-01;
+Date = 2015-05-02;
 
 
 # Output capabilities
 consCtrlOut => Output_consCtrlSend_capability( consCode : 2 );
+NoneOut     => Output_noneSend_capability();
 sysCtrlOut  => Output_sysCtrlSend_capability( sysCode : 1 );
 usbKeyOut   => Output_usbCodeSend_capability( usbCode : 1 );
 

diff --git a/Output/pjrcUSB/output_com.c b/Output/pjrcUSB/output_com.c
index a556490d6df50d43a53cf06eeffae392b2124563..7a9b84b7b2f0454e5e7c83c8ea191aceabdea2e2 100644 (file)
--- a/Output/pjrcUSB/output_com.c
+++ b/Output/pjrcUSB/output_com.c
@@ -229,6 +229,21 @@ void Output_consCtrlSend_capability( uint8_t state, uint8_t stateType, uint8_t *
 }
 
 
+// Ignores the given key status update
+// Used to prevent fall-through, this is the None keyword in KLL
+void Output_noneSend_capability( uint8_t state, uint8_t stateType, uint8_t *args )
+{
+       // Display capability name
+       if ( stateType == 0xFF && state == 0xFF )
+       {
+               print("Output_noneSend()");
+               return;
+       }
+
+       // Nothing to do, because that's the point :P
+}
+
+
 // Sends a System Control code to the USB Output buffer
 void Output_sysCtrlSend_capability( uint8_t state, uint8_t stateType, uint8_t *args )
 {

diff --git a/Output/pjrcUSB/output_com.h b/Output/pjrcUSB/output_com.h
index aeddc0986f108ef1351ff099f7a0e953cd71b225..ab1e05f3443b7c00755e83ad151052aded4c7002 100644 (file)
--- a/Output/pjrcUSB/output_com.h
+++ b/Output/pjrcUSB/output_com.h
@@ -89,6 +89,7 @@ extern          uint8_t  Output_DebugMode; // 0 - Debug disabled, 1 - Debug enab
 
 // Output capabilities
 void Output_consCtrlSend_capability( uint8_t state, uint8_t stateType, uint8_t *args );
+void Output_noneSend_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 );