From 167396def2c924233149c9ae4866efa6860c1256 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20=C4=90or=C4=91evi=C4=87?=
 <konstantin.djordjevic@tradecore.com>
Date: Mon, 5 Nov 2018 13:10:32 +0100
Subject: [PATCH 1/4] Improve tap_random_base64 implementation

---
 quantum/quantum.c | 53 ++++++++++++++++++++++-------------------------
 1 file changed, 25 insertions(+), 28 deletions(-)

diff --git a/quantum/quantum.c b/quantum/quantum.c
index 5f1a691c8841..200bfe67939e 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -894,9 +894,9 @@ void send_char(char ascii_code) {
 }
 
 void set_single_persistent_default_layer(uint8_t default_layer) {
-  #if defined(AUDIO_ENABLE) && defined(DEFAULT_LAYER_SONGS)
-    PLAY_SONG(default_layer_songs[default_layer]);
-  #endif
+#if defined(AUDIO_ENABLE) && defined(DEFAULT_LAYER_SONGS)
+  PLAY_SONG(default_layer_songs[default_layer]);
+#endif
   eeconfig_update_default_layer(1U<<default_layer);
   default_layer_set(1U<<default_layer);
 }
@@ -911,40 +911,37 @@ void update_tri_layer(uint8_t layer1, uint8_t layer2, uint8_t layer3) {
   layer_state_set(update_tri_layer_state(layer_state, layer1, layer2, layer3));
 }
 
+/* Return a pseudorandom integer in the range [low, high) */
+static int randrange(int low, int high) {
+#ifdef __AVR_ATmega32U4__
+  return (TCNT0+TCNT1+TCNT3+TCNT4) % (high-low) + low;
+#else
+  return rand()/(RAND_MAX+1.0) * (high-low+1) + low
+#endif
+}
+
 void tap_random_base64(void) {
-  #if defined(__AVR_ATmega32U4__)
-    uint8_t key = (TCNT0 + TCNT1 + TCNT3 + TCNT4) % 64;
-  #else
-    uint8_t key = rand() % 64;
-  #endif
+  uint8_t key = randrange(0, 64);
   switch (key) {
-    case 0 ... 25:
+    case 0 ... 25:  // A–Z
       register_code(KC_LSFT);
-      register_code(key + KC_A);
-      unregister_code(key + KC_A);
+      tap_code(KC_A + key);
       unregister_code(KC_LSFT);
       break;
-    case 26 ... 51:
-      register_code(key - 26 + KC_A);
-      unregister_code(key - 26 + KC_A);
+    case 26 ... 51: // a–z
+      tap_code(KC_A + key-26);
       break;
-    case 52:
-      register_code(KC_0);
-      unregister_code(KC_0);
+    case 52:        // 0
+      tap_code(KC_0);
       break;
-    case 53 ... 61:
-      register_code(key - 53 + KC_1);
-      unregister_code(key - 53 + KC_1);
+    case 53 ... 61: // 1–9
+      tap_code(KC_1 + key-53);
       break;
-    case 62:
-      register_code(KC_LSFT);
-      register_code(KC_EQL);
-      unregister_code(KC_EQL);
-      unregister_code(KC_LSFT);
+    case 62:        // +
+      tap_code(KC_PLUS);
       break;
-    case 63:
-      register_code(KC_SLSH);
-      unregister_code(KC_SLSH);
+    case 63:        // /
+      tap_code(KC_SLSH);
       break;
   }
 }

From 50b3c177e1f13d1a921a7f93ed763a06b02dcb36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20=C4=90or=C4=91evi=C4=87?=
 <konstantin.djordjevic@tradecore.com>
Date: Mon, 5 Nov 2018 13:17:26 +0100
Subject: [PATCH 2/4] Split up tap_code(KC_PLUS) as it's a 16-bit keycode

---
 quantum/quantum.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/quantum/quantum.c b/quantum/quantum.c
index 200bfe67939e..9da223540f0b 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -938,7 +938,9 @@ void tap_random_base64(void) {
       tap_code(KC_1 + key-53);
       break;
     case 62:        // +
-      tap_code(KC_PLUS);
+      register_code(KC_LSFT);
+      tap_code(KC_EQL);
+      unregister_code(KC_LSFT);
       break;
     case 63:        // /
       tap_code(KC_SLSH);

From c068a87005a7d5e8258969dd568a54716b2d43c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20=C4=90or=C4=91evi=C4=87?=
 <konstantin.djordjevic@tradecore.com>
Date: Mon, 5 Nov 2018 13:32:29 +0100
Subject: [PATCH 3/4] Add TODO comment

---
 quantum/quantum.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quantum/quantum.c b/quantum/quantum.c
index 9da223540f0b..367cf0f3062f 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -939,7 +939,7 @@ void tap_random_base64(void) {
       break;
     case 62:        // +
       register_code(KC_LSFT);
-      tap_code(KC_EQL);
+      tap_code(KC_EQL); // TODO: Replace with tap_code16(KC_PLUS); and test
       unregister_code(KC_LSFT);
       break;
     case 63:        // /

From 14ec49d150225851ba38ccbf5f1ee0bd551c6fc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20=C4=90or=C4=91evi=C4=87?=
 <vomindoraan@gmail.com>
Date: Mon, 5 Nov 2018 15:47:32 +0100
Subject: [PATCH 4/4] Add missing semicolon

---
 quantum/quantum.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quantum/quantum.c b/quantum/quantum.c
index 367cf0f3062f..42b943c738f9 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -916,7 +916,7 @@ static int randrange(int low, int high) {
 #ifdef __AVR_ATmega32U4__
   return (TCNT0+TCNT1+TCNT3+TCNT4) % (high-low) + low;
 #else
-  return rand()/(RAND_MAX+1.0) * (high-low+1) + low
+  return rand()/(RAND_MAX+1.0) * (high-low+1) + low;
 #endif
 }