second non-working pass at mouse warping

ArduinoKeyboard.ino

@@ -64,14 +64,11 @@ void reset_matrix()
 
 
 
-void set_keymap_keymap(Key keymapEntry, byte matrixStateEntry) {
+void set_keymap(Key keymapEntry, byte matrixStateEntry) {
   if (keymapEntry.flags & SWITCH_TO_KEYMAP) {
-
     // this logic sucks. there is a better way TODO this
     if (! (keymapEntry.flags ^ ( MOMENTARY | SWITCH_TO_KEYMAP))) {
       if (key_is_pressed(matrixStateEntry)) {
-
-
         if ( keymapEntry.rawKey == KEYMAP_NEXT) {
           active_keymap++;
         } else if ( keymapEntry.rawKey == KEYMAP_PREVIOUS) {
@@ -83,22 +80,17 @@ void set_keymap_keymap(Key keymapEntry, byte matrixStateEntry) {
     } else if (! (keymapEntry.flags ^ (  SWITCH_TO_KEYMAP))) {
       // switch keymap and stay there
       if (key_toggled_on(matrixStateEntry)) {
-        primary_keymap = active_keymap =  keymapEntry.rawKey;
+        active_keymap = primary_keymap = keymapEntry.rawKey;
         save_primary_keymap(primary_keymap);
+        Serial.print("keymap is now:");
+        Serial.print(active_keymap);
       }
     }
   }
 }
-void handle_immediate_action_during_matrix_scan(Key keymapEntry, byte matrixStateEntry) {
-
-  set_keymap_keymap(keymapEntry, matrixStateEntry);
-
-}
 
 void scan_matrix()
 {
-
-
   //scan the Keyboard matrix looking for connections
   for (byte row = 0; row < ROWS; row++) {
     digitalWrite(rowPins[row], LOW);
@@ -113,10 +105,11 @@ void scan_matrix()
       // while we're inspecting the electrical matrix, we look
       // to see if the Key being held is a firmware level
       // metakey, so we can act on it, lest we only discover
-      // that we should be looking at a seconary Keymap halfway through the matrix scan
+      // that we should be looking at a seconary Keymap halfway
+      // through the matrix scan
 
 
-      handle_immediate_action_during_matrix_scan(keymaps[active_keymap][row][col], matrixState[row][col]);
+      set_keymap(keymaps[active_keymap][row][col], matrixState[row][col]);
 
     }
     digitalWrite(rowPins[row], HIGH);
@@ -133,7 +126,6 @@ void setup()
   setup_matrix();
   setup_pins();
   primary_keymap = load_primary_keymap();
-  active_keymap = primary_keymap;
 }
 
 void loop()
@@ -142,6 +134,7 @@ void loop()
   scan_matrix();
   send_key_events();
   reset_matrix();
+  reset_key_report();
 }
 
 
@@ -281,73 +274,123 @@ void report(byte row, byte col, boolean value)
 int last_x;
 int last_y;
 
+// apparently, the mac discards 15% of the value space for mouse movement.
+// need to test this on other platforms
+//
+
+int abs_left = -27852; //-32767;
+int abs_right = 27852;//32767;
+int abs_bottom = 27852; //32767;
+int abs_top = -27852; //-32767;
 
-int abs_left = -32767;
+long section_top;
-int abs_right = 32767;
+long section_bottom;
-int abs_bottom = -32767;
+long section_left;
-int abs_top = 32767;
+long section_right;
+boolean is_warping = false;
 
-int section_top;
-int section_bottom;
-int section_left;
-int section_right;
 void begin_warping() {
   section_left = abs_left;
   section_right = abs_right;
   section_top = abs_top;
   section_bottom = abs_bottom;
+  Serial.print ("just reset the warp");
+    is_warping = true;
+
 
 }
-boolean is_warping = false;
+
 void warp_mouse(Key ninth) {
 
   // 1 2 3
   // 4 5 6
   // 7 8 9
 
-  if (is_warping == false) {
+
-    is_warping = true;
+  if (!is_warping) {
     begin_warping();
     }
 
+  long next_width = (section_right - section_left) / 3;
+  long next_height = (section_bottom - section_top) / 3;
 
-  int next_width = (section_right - section_left) / 3;
-  int next_height = (section_bottom - section_top) / 3;
-  Keyboard.print("warping - the next width is ");
-  Keyboard.print(next_width);
-  Keyboard.print("warping - the next height is ");
-  Keyboard.print(next_height);
     
-  if (ninth.rawKey * MOUSE_END_WARP) {
+  if (next_width <=1 || ninth.rawKey & MOUSE_END_WARP) {
+  Serial.print ("done warping");
     is_warping = false;
+    return;
   }
 
+
+  Serial.print("Left: ");
+  Serial.print(section_left);
+  Serial.print("Right: ");
+  Serial.print(section_right);
+  Serial.print("top: ");
+  Serial.print(section_top);
+  Serial.print("bottom: ");
+  Serial.print(section_bottom);
+  Serial.print("\nwarping - the next width is ");
+  Serial.print(next_width);
+  Serial.print("\nwarping - the next height is ");
+  Serial.print(next_height);
+
+
   if (ninth.rawKey & MOUSE_UP) {
-  Keyboard.print(" - up ");
+    Serial.print(" - up ");
     section_bottom = section_top + next_height;
   } else if (ninth.rawKey & MOUSE_DN) {
-  Keyboard.print(" - down ");
+    Serial.print(" - down ");
-    section_top = section_bottom - next_width;
+    section_top = section_bottom - next_height;
   } else {
-  Keyboard.print(" - vcenter ");
+    Serial.print(" - vcenter ");
     section_top = section_top + next_height;
     section_bottom = section_bottom - next_height;
   }
 
   if (ninth.rawKey & MOUSE_L) {
     section_right = section_left + next_width;
-  Keyboard.print(" - left ");
+    Serial.print(" - left ");
 
   } else if (ninth.rawKey & MOUSE_R) {
     section_left = section_right - next_width;
-  Keyboard.print(" - right ");
+    Serial.print(" - right ");
   } else  {
     section_left = section_left + next_width;
     section_right = section_right - next_width;
-  Keyboard.print(" - center horizontal ");
+    Serial.print(" - center horizontal ");
-  }
+  }
-
+
-  Mouse.moveAbs(section_left + (section_right - section_left / 2),  section_top + (section_bottom - section_top) / 2, 0);
+  Serial.print("\nMoving to ");
+  Serial.print(section_left + next_width/ 2);
+  Serial.print(",");
+  Serial.print(section_top + next_height / 2);
+  Serial.print("That should be half way between ");
+  Serial.print(section_left);
+  Serial.print(",");
+  Serial.print(section_top);
+  Serial.print(" and ");
+  Serial.print(section_right);
+  Serial.print(",");
+  Serial.print(section_bottom);
+  Serial.print("\n");
+  Mouse.moveAbs(section_left, section_top,0);
+  delay(150);
+  Mouse.moveAbs(section_right, section_top,0);
+  delay(150);
+  Mouse.moveAbs(section_right, section_bottom,0);
+  delay(150);
+  Mouse.moveAbs(section_left, section_bottom,0);
+  delay(150);
+  int16_t gotox = section_left + next_width / 2;
+  int16_t gotoy = section_top + next_height / 2;
+  Serial.print("Going to ");
+  Serial.print(gotox);
+  Serial.print(", ");
+  Serial.print(gotoy);
+  Serial.print("\n");
+  Mouse.moveAbs(gotox,gotoy,0);
+  Mouse.moveAbs(gotox,gotoy,0);
 }
 
 double mouse_accel (double cycles)
@@ -476,7 +519,7 @@ void handle_synthetic_key_press(byte switchState, Key mappedKey) {
   else  if (mappedKey.flags & IS_MACRO) {
     if (key_toggled_on (switchState)) {
       if (mappedKey.rawKey == 1) {
-        Keyboard.print("Keyboard.IO keyboard driver v0.00");
+        Serial.print("Keyboard.IO keyboard driver v0.00");
       }
     }
   } else if (mappedKey.rawKey == KEY_MOUSE_BTN_L

Makefile

@@ -2,7 +2,7 @@
 
 #BOARD_TAG    = keyboardio
 BOARD    = micro
-PORT = /dev/cu.usbmodem1421
+PORT = /dev/cu.usbmodem1411
 ARDUINO_LIBS = 
 #ARDUINO_CORE_PATH = hardware/keyboardio/cores/keyboardio
 #ALTERNATE_CORE = keyboardio

keymaps_generated.h

@@ -25,7 +25,7 @@
 #define KEYMAP_NUMPAD { /* Generated keymap for NUMPAD */ 	{Key_skip, Key_skip, Key_skip, Key_skip, Key_skip, Key_skip, Key_skip, Key_skip, Key_skip, Key_7, Key_8, Key_9, Key_skip, Key_skip},\
 	{Key_skip, Key_skip, Key_skip, Key_mouseWarp1, Key_mouseWarp2, Key_mouseWarp3, Key_skip, Key_skip, Key_skip, Key_4, Key_5, Key_6, Key_Minus, Key_skip},\
 	{Key_PageUp, Key_skip, Key_skip, Key_mouseWarp4, Key_mouseWarp5, Key_mouseWarp6, Key_Tab, Key_Return, Key_skip, Key_1, Key_2, Key_3, Key_skip, Key_Equals},\
-	{Key_PageDn, Key_skip, Key_skip, Key_mouseWarp7, Key_mouseWarp8, Key_mouseWarp9, Key_Esc, Key_Keymap1, Key_skip, Key_0, Key_Comma, Key_Period, Key_Enter, Key_skip},\
+	{Key_PageDn, Key_skip, Key_skip, Key_mouseWarp7, Key_mouseWarp8, Key_mouseWarp9, Key_mouseWarp0, Key_Enter, Key_skip, Key_0, Key_Comma, Key_Period, Key_Enter, Key_skip},\
 	{Key_LGUI, Key_Backspace, Key_LShift, Key_LCtrl, Key_KeymapNext_Momentary, Key_skip, Key_skip, Key_skip, Key_skip, Key_KeymapNext_Momentary, Key_RCtrl, Key_RShift, Key_Space, Key_RAlt},\
 },
 #define KEYMAP_QWERTY { /* Generated keymap for QWERTY */ 	{Key_skip, Key_1, Key_2, Key_3, Key_4, Key_5, Key_skip, Key_skip, Key_6, Key_7, Key_8, Key_9, Key_0, Key_skip},\
@@ -45,8 +45,8 @@
 static const Key keymaps[KEYMAPS][ROWS][COLS] = {
 	KEYMAP_QWERTY
 	KEYMAP_GENERIC_FN2
+	KEYMAP_NUMPAD
 	KEYMAP_COLEMAK
-	KEYMAP_GENERIC_FN2
     KEYMAP_DVORAK
 	KEYMAP_GENERIC_FN2
     KEYMAP_WORKMAN

keymaps_h-template

@@ -3,8 +3,8 @@
 static const Key keymaps[KEYMAPS][ROWS][COLS] = {
 	KEYMAP_QWERTY
 	KEYMAP_GENERIC_FN2
+	KEYMAP_NUMPAD
 	KEYMAP_COLEMAK
-	KEYMAP_GENERIC_FN2
     KEYMAP_DVORAK
 	KEYMAP_GENERIC_FN2
     KEYMAP_WORKMAN

layouts/numpad

@@ -2,5 +2,5 @@
 skip 	skip skip skip skip skip skip 	skip        skip 7 8 9 skip skip  
 skip    skip skip mouseWarp1 mouseWarp2 mouseWarp3 skip 	skip        skip 4 5 6 - skip
 PageUp 	skip skip mouseWarp4 mouseWarp5 mouseWarp6 Tab  	Return      skip 1 2 3 skip =
-PageDn 	skip skip mouseWarp7 mouseWarp8 mouseWarp9 Esc  	Keymap1     skip 0 , . Enter skip
+PageDn 	skip skip mouseWarp7 mouseWarp8 mouseWarp9 mouseWarp0  	Enter     skip 0 , . Enter skip
 LGUI Backspace LShift LCtrl KeymapNext_Momentary skip  skip skip skip  KeymapNext_Momentary RCtrl RShift Space  RAlt