Simplify the "shifted" case too

Like in the unshifted case, avoid injecting keys, and fiddle with `mapped_key`
instead. This allows us to get rid of the `TOPSYTURVY` bitflag.

Signed-off-by: Gergely Nagy <algernon@keyboard.io>

src/Kaleidoscope/TopsyTurvy.cpp

@@ -18,17 +18,12 @@
 #include <Kaleidoscope-TopsyTurvy.h>
 #include "kaleidoscope/hid.h"
 
-#define TOPSYTURVY 0b01000000
-
 namespace kaleidoscope {
 
 uint8_t TopsyTurvy::mod_state_;
 uint8_t TopsyTurvy::last_pressed_position_;
 
 EventHandlerResult TopsyTurvy::onKeyswitchEvent(Key &mapped_key, byte row, byte col, uint8_t key_state) {
-  if (key_state & TOPSYTURVY)
-    return EventHandlerResult::OK;
-
   if (mapped_key.raw == Key_LeftShift.raw)
     bitWrite(mod_state_, 0, keyIsPressed(key_state));
   if (mapped_key.raw == Key_RightShift.raw)
@@ -50,26 +45,20 @@ EventHandlerResult TopsyTurvy::onKeyswitchEvent(Key &mapped_key, byte row, byte
     }
   }
 
-  Key new_key = {.raw = mapped_key.raw - ranges::TT_FIRST};
-  if (new_key.raw == Key_NoKey.raw)
-    return EventHandlerResult::OK;
 
   // invert the shift state
   if (!mod_state_) {
     mapped_key.raw = mapped_key.raw - ranges::TT_FIRST;
     mapped_key.flags |= SHIFT_HELD;
     return EventHandlerResult::OK;
-  } else {
+  }
-    hid::releaseRawKey(Key_LeftShift);
+
-    hid::releaseRawKey(Key_RightShift);
+  if (keyIsPressed(key_state)) {
-    hid::sendKeyboardReport();
+    hid::releaseKey(Key_LeftShift);
-    handleKeyswitchEvent(new_key, row, col, key_state | TOPSYTURVY | INJECTED);
+    hid::releaseKey(Key_RightShift);
-    hid::sendKeyboardReport();
 
-    if (bitRead(mod_state_, 0))
+    mapped_key.raw = mapped_key.raw - ranges::TT_FIRST;
-      hid::pressRawKey(Key_LeftShift);
+    return EventHandlerResult::OK;
-    if (bitRead(mod_state_, 1))
-      hid::pressRawKey(Key_RightShift);
   }
 
   return EventHandlerResult::EVENT_CONSUMED;