Fixing Infinity Ergodox slaves not working

- Fixes Issue #349 - Likely some of the errors were causing issues and not allowing the keyboard to initialize - Cleaned up the error messages - Fixed the USB VID:PID pairs for Infinity Ergodox - Cleaned up K-Type defaults
kiibohd · Mar 17, 2019 · ff26c9d · ff26c9d
1 parent 239cdce
commit ff26c9d
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 11 deletions.
diff --git a/Keyboards/ergodox-l.bash b/Keyboards/ergodox-l.bash
@@ -3,7 +3,7 @@
 # Keyboard: Ergodox
 #
 # These build scripts are just a convenience for configuring your keyboard (less daunting than CMake)
-# Jacob Alexander 2015-2017
+# Jacob Alexander 2015-2019
 
 
 
@@ -12,6 +12,11 @@
 #################
 
 
+# VID:PID Mapping
+export VENDOR_ID="0x308F"
+export PRODUCT_ID="0x0004"
+
+
 # Feel free to change the variables in this section to configure your keyboard
 
 BuildPath="ICED-L"

diff --git a/Keyboards/ergodox-r.bash b/Keyboards/ergodox-r.bash
@@ -3,14 +3,20 @@
 # Keyboard: Ergodox
 #
 # These build scripts are just a convenience for configuring your keyboard (less daunting than CMake)
-# Jacob Alexander 2015-2017
+# Jacob Alexander 2015-2019
 
 
 
 #################
 # Configuration #
 #################
 
+
+# VID:PID Mapping
+export VENDOR_ID="0x308F"
+export PRODUCT_ID="0x0025"
+
+
 # Feel free to change the variables in this section to configure your keyboard
 
 BuildPath="ICED-R"

diff --git a/Keyboards/ergodox.bash b/Keyboards/ergodox.bash
@@ -3,12 +3,7 @@
 # Keyboard: Ergodox
 #
 # These build scripts are just a convenience for configuring your keyboard (less daunting than CMake)
-# Jacob Alexander 2015-2018
-
-
-# VID:PID Mapping
-export VENDOR_ID="0x308F"
-export PRODUCT_ID="0x0004"
+# Jacob Alexander 2015-2019
 
 
 # Build the Left Side

diff --git a/Keyboards/k-type.bash b/Keyboards/k-type.bash
@@ -1,7 +1,7 @@
 #!/bin/bash
 # This is a build script template
 # These build scripts are just a convenience for configuring your keyboard (less daunting than CMake)
-# Jacob Alexander 2016-2018
+# Jacob Alexander 2016-2019
 
 
 
@@ -27,14 +27,16 @@ BaseMap="scancode_map"
 # This is the default layer of the keyboard
 # NOTE: To combine kll files into a single layout, separate them by spaces
 # e.g.  DefaultMap="mylayout mylayoutmod"
-DefaultMap="k-type/release.1 stdFuncMap"
+DefaultMap="k-type/update.1 stdFuncMap"
 
 # This is where you set the additional layers
 # NOTE: Indexing starts at 1
 # NOTE: Each new layer is another array entry
 # e.g.  PartialMaps[1]="layer1 layer1mod"
 #       PartialMaps[2]="layer2"
 #       PartialMaps[3]="layer3"
+PartialMaps[1]="k-type/update.1.layer.1 stdFuncMap"
+PartialMaps[2]="k-type/update.1.layer.2 stdFuncMap"
 
 
 

diff --git a/Macro/PartialMap/macro.c b/Macro/PartialMap/macro.c
@@ -531,6 +531,16 @@ uint8_t Macro_pressReleaseAdd( void *trigger_ptr )
 	case TriggerType_Rotation1:
 		break;
 
+	case TriggerType_Animation1:
+	case TriggerType_Animation2:
+	case TriggerType_Animation3:
+	case TriggerType_Animation4:
+	case TriggerType_Sleep1:
+	case TriggerType_Resume1:
+	case TriggerType_Active1:
+	case TriggerType_Inactive1:
+		break;
+
 	// Invalid TriggerGuide type for Interconnect
 	default:
 		erro_msg("Invalid type - ");
@@ -1058,13 +1068,21 @@ void Macro_periodic()
 				break;
 
 			case TriggerType_Rotation1:
+			case TriggerType_Animation1:
+			case TriggerType_Animation2:
+			case TriggerType_Animation3:
+			case TriggerType_Animation4:
+			case TriggerType_Sleep1:
+			case TriggerType_Resume1:
+			case TriggerType_Active1:
+			case TriggerType_Inactive1:
 				// Do not re-add
 				break;
 
 			// Not implemented
 			default:
 				erro_msg("Interconnect Trigger Event Type - Not Implemented ");
-				printInt8( macroInterconnectCache[ c ].type );
+				printHex( macroInterconnectCache[ c ].type );
 				print( NL );
 				break;
 			}