Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP: Improve tap_random_base64 implementation #16

Merged
merged 4 commits into from
Nov 6, 2018
Merged

WIP: Improve tap_random_base64 implementation #16

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
167396d
Improve tap_random_base64 implementation
Nov 5, 2018
50b3c17
Split up tap_code(KC_PLUS) as it's a 16-bit keycode
Nov 5, 2018
c068a87
Add TODO comment
Nov 5, 2018
14ec49d
Add missing semicolon
vomindoraan Nov 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 25 additions & 26 deletions quantum/quantum.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand All @@ -911,40 +911,39 @@ 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;
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rand() should be available on ATmega32U4 as well, so I'm not sure why this was done.

I'm looking into effective ways to seed the PRNG on these chips, so this is a WIP.

#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:
case 62: // +
register_code(KC_LSFT);
register_code(KC_EQL);
unregister_code(KC_EQL);
tap_code(KC_EQL); // TODO: Replace with tap_code16(KC_PLUS); and test
unregister_code(KC_LSFT);
break;
case 63:
register_code(KC_SLSH);
unregister_code(KC_SLSH);
case 63: // /
tap_code(KC_SLSH);
break;
}
}
Expand Down