louis/kiibohd-controller: Macro/PartialMap/macro.c comparison

comparison Macro/PartialMap/macro.c @ 361:7c6ac7b88cda

Working support for Interconnect - Supports up to 255 slave nodes (you'll run into ScanCode limitations before then) - Requires most recent kll compiler update - Additional debugging output and stats counters - Noise and parity checking - Fixed TxFIFO issue when sending buffers larger than the FIFO - Cleaned up defaultMap.kll - Added ScanCode caching (reduces interconnect traffic significantly) - Interconnect module code is conditionally compiled into PartialMap module if required

author	Jacob Alexander <haata@kiibohd.com>
date	Sat, 15 Aug 2015 21:53:59 -0700
parents	dbefb68411e1
children	e4be15c39cce

comparison

equal deleted inserted replaced

-:dbefb68411e1
+:7c6ac7b88cda
 // Pending Result Macro Index List
 //  * Any result macro that needs processing from a previous macro processing loop
 uint16_t macroResultMacroPendingList[ ResultMacroNum ] = { 0 };
 uint16_t macroResultMacroPendingListSize = 0;
+// Interconnect ScanCode Cache
+#if defined(ConnectEnabled_define)
+// TODO This can be shrunk by the size of the max node 0 ScanCode
+TriggerGuide macroInterconnectCache[ MaxScanCode ];
+uint8_t macroInterconnectCacheSize = 0;
+#endif
 // ----- Capabilities -----
 // Sets the given layer with the specified layerState
 	}
 	// Otherwise no defined Trigger Macro
 	erro_msg("Scan Code has no defined Trigger Macro: ");
 	printHex( scanCode );
+	print( NL );
 	return 0;
 }
-// Update the scancode using a list of TriggerGuides
+// Add an interconnect ScanCode
-// TODO Handle led state and analog
+// These are handled differently (less information is sent, hold/off states must be assumed)
-inline void Macro_triggerState( void *triggers, uint8_t num )
+#if defined(ConnectEnabled_define)
-{
+inline void Macro_interconnectAdd( void *trigger_ptr )
-	// Copy each of the TriggerGuides to the TriggerListBuffer
+{
-	for ( uint8_t c = 0; c < num; c++ )
+	TriggerGuide *trigger = (TriggerGuide*)trigger_ptr;
-		macroTriggerListBuffer[ macroTriggerListBufferSize++ ] = ((TriggerGuide*)triggers)[ c ];
-}
+	// Error checking
+	uint8_t error = 0;
+	switch ( trigger->type )
+	{
+	case 0x00: // Normal key
+		switch ( trigger->state )
+		{
+		case 0x00:
+		case 0x01:
+		case 0x02:
+		case 0x03:
+			break;
+		default:
+			erro_print("Invalid key state");
+			error = 1;
+			break;
+		}
+		break;
+	// Invalid TriggerGuide type
+	default:
+		erro_print("Invalid type");
+		error = 1;
+		break;
+	}
+	// Display TriggerGuide
+	if ( error )
+	{
+		printHex( trigger->type );
+		print(" ");
+		printHex( trigger->state );
+		print(" ");
+		printHex( trigger->scanCode );
+		print( NL );
+		return;
+	}
+	// Add trigger to the Interconnect Cache
+	// During each processing loop, a scancode may be re-added depending on it's state
+	for ( uint8_t c = 0; c < macroInterconnectCacheSize; c++ )
+	{
+		// Check if the same ScanCode
+		if ( macroInterconnectCache[ c ].scanCode == trigger->scanCode )
+		{
+			// Update the state
+			macroInterconnectCache[ c ].state = trigger->state;
+			return;
+		}
+	}
+	// If not in the list, add it
+	macroInterconnectCache[ macroInterconnectCacheSize++ ] = *trigger;
+}
+#endif
 // Update the scancode key state
 // States:
 //   * 0x00 - Off
 //   * 0x02 - Held
 //   * 0x03 - Released
 //   * 0x04 - Unpressed (this is currently ignored)
 inline void Macro_keyState( uint8_t scanCode, uint8_t state )
 {
+#if defined(ConnectEnabled_define)
+	// Only compile in if a Connect node module is available
+	if ( !Connect_master )
+	{
+		// ScanCodes are only added if there was a state change (on/off)
+		switch ( state )
+		{
+		case 0x00: // Off
+		case 0x02: // Held
+			return;
+		}
+	}
+#endif
 	// Only add to macro trigger list if one of three states
 	switch ( state )
 	{
 	case 0x01: // Pressed
 	case 0x02: // Held
 //   * 0x01      - Released
 //   * 0x02-0xFF - Analog value (low to high)
 inline void Macro_analogState( uint8_t scanCode, uint8_t state )
 {
 	// Only add to macro trigger list if non-off
+	// TODO Handle change for interconnect
 	if ( state != 0x00 )
 	{
 		macroTriggerListBuffer[ macroTriggerListBufferSize ].scanCode = scanCode;
 		macroTriggerListBuffer[ macroTriggerListBufferSize ].state    = state;
 		macroTriggerListBuffer[ macroTriggerListBufferSize ].type     = 0x02; // Analog key
 //   * 0x00 - Off
 //   * 0x01 - On
 inline void Macro_ledState( uint8_t ledCode, uint8_t state )
 {
 	// Only add to macro trigger list if non-off
+	// TODO Handle change for interconnect
 	if ( state != 0x00 )
 	{
 		macroTriggerListBuffer[ macroTriggerListBufferSize ].scanCode = ledCode;
 		macroTriggerListBuffer[ macroTriggerListBufferSize ].state    = state;
 		macroTriggerListBuffer[ macroTriggerListBufferSize ].type     = 0x01; // LED key
 		uint8_t latch_expire = macroTriggerListBuffer[ key ].state == 0x03;
 		// Lookup Trigger List
 		nat_ptr_t *triggerList = Macro_layerLookup( &macroTriggerListBuffer[ key ], latch_expire );
+		// If there was an error during lookup, skip
+		if ( triggerList == 0 )
+			continue;
 		// Number of Triggers in list
 		nat_ptr_t triggerListSize = triggerList[0];
 		// Iterate over triggerList to see if any TriggerMacros need to be added
 		// First item is the number of items in the TriggerList
 	// If this is a interconnect slave node, send all scancodes to master node
 	if ( !Connect_master )
 	{
 		if ( macroTriggerListBufferSize > 0 )
 		{
-			dbug_msg("Yuh");
+			Connect_send_ScanCode( Connect_id, macroTriggerListBuffer, macroTriggerListBufferSize );
-			printHex( macroTriggerListBufferSize );
-			print( NL );
-			//Connect_send_ScanCode( Connect_id, macroTriggerListBuffer, macroTriggerListBufferSize );
 			macroTriggerListBufferSize = 0;
 		}
 		return;
 	}
 #endif
 	// Only do one round of macro processing between Output Module timer sends
 	if ( USBKeys_Sent != 0 )
 		return;
+#if defined(ConnectEnabled_define)
+	// Check if there are any ScanCodes in the interconnect cache to process
+	if ( Connect_master && macroInterconnectCacheSize > 0 )
+	{
+		// Iterate over all the cache ScanCodes
+		uint8_t currentInterconnectCacheSize = macroInterconnectCacheSize;
+		macroInterconnectCacheSize = 0;
+		for ( uint8_t c = 0; c < currentInterconnectCacheSize; c++ )
+		{
+			// Add to the trigger list
+			macroTriggerListBuffer[ macroTriggerListBufferSize++ ] = macroInterconnectCache[ c ];
+			// TODO Handle other TriggerGuide types (e.g. analog)
+			switch ( macroInterconnectCache[ c ].type )
+			{
+			// Normal (Press/Hold/Release)
+			case 0x00:
+				// Decide what to do based on the current state
+				switch ( macroInterconnectCache[ c ].state )
+				{
+				// Re-add to interconnect cache in hold state
+				case 0x01: // Press
+				//case 0x02: // Hold // XXX Why does this not work? -HaaTa
+					macroInterconnectCache[ c ].state = 0x02;
+					macroInterconnectCache[ macroInterconnectCacheSize++ ] = macroInterconnectCache[ c ];
+					break;
+				case 0x03: // Remove
+					break;
+				// Otherwise, do not re-add
+				}
+			}
+		}
+	}
+#endif
 	// If the pause flag is set, only process if the step counter is non-zero
 	if ( macroPauseMode )
 	{
 		if ( macroStepCounter == 0 )

Mercurial > louis > kiibohd-controller

comparison Macro/PartialMap/macro.c @ 361:7c6ac7b88cda