Merge branch 'master' of https://github.com/qmk/qmk_firmware

115 files changed, 8135 insertions, 1102 deletions

diff --git a/users/333fred/333fred.h b/users/333fred/333fred.h
index 8599198a57..443930a6b1 100644
--- a/users/333fred/333fred.h
+++ b/users/333fred/333fred.h
@@ -4,10 +4,12 @@
 
 #define BASE 0
 #define CODE 1 // code layer
-#define SYMB 2
-#define MDIA 3 // media keys
-#define VIM  4
-#define GAME 5
+#define CODEFLOW 2
+#define SYMB 3
+#define MDIA 4 // media keys
+#define VIM  5
+#define GAME 6
+#define GAME_ARROW 7
 
 // Tap dance config shared between my keyboards
 enum tap_dance_declarations {
diff --git a/users/333fred/333fred_config.h b/users/333fred/333fred_config.h
index 7c637d8d36..b158e2d5a2 100644
--- a/users/333fred/333fred_config.h
+++ b/users/333fred/333fred_config.h
@@ -1,4 +1,3 @@
 #pragma once
 
-#define PREVENT_STUCK_MODIFIERS
 #define PERMISSIVE_HOLD
diff --git a/users/arkag/arkag.c b/users/arkag/arkag.c
new file mode 100644
index 0000000000..212d06de67
--- /dev/null
+++ b/users/arkag/arkag.c
@@ -0,0 +1,528 @@
+#include "arkag.h"
+
+/*
+ Current Layout and Keeb:
+ https://github.com/arkag/qmk_firmware/blob/master/keyboards/mechmini/v2/keymaps/arkag/keymap.c
+*/
+
+// Start: Written by konstantin: vomindoraan
+#include <ctype.h>
+#include <stdlib.h>
+#include <string.h>
+
+void send_unicode_hex_string(const char *str) {
+  if (!str) { return; } // Saftey net
+  while (*str) {
+    // Find the next code point (token) in the string
+    for (; *str == ' '; str++);
+    size_t n = strcspn(str, " "); // Length of the current token
+    char code_point[n+1];
+    strncpy(code_point, str, n);
+    code_point[n] = '\0'; // Make sure it's null-terminated
+
+    // Normalize the code point: make all hex digits lowercase
+    for (char *p = code_point; *p; p++) {
+            *p = tolower(*p);
+    }
+
+    // Send the code point as a Unicode input string
+    unicode_input_start();
+    send_string(code_point);
+    unicode_input_finish();
+    str += n; // Move to the first ' ' (or '\0') after the current token
+  }
+}
+// End: Written by konstantin: vomindoraan
+
+// Start: Written by Chris Lewis
+#ifndef MIN
+#define MIN(a,b) (((a)<(b))?(a):(b))
+#endif
+#ifndef MAX
+#define MAX(a,b) (((a)>(b))?(a):(b))
+#endif
+
+#define TYPING_SPEED_MAX_VALUE 200
+uint8_t typing_speed = 0;
+
+void velocikey_accelerate() {
+    if (typing_speed < TYPING_SPEED_MAX_VALUE) typing_speed += (TYPING_SPEED_MAX_VALUE / 50);
+}
+
+void velocikey_decelerate() {
+  static uint16_t decay_timer = 0;
+
+  if (timer_elapsed(decay_timer) > 500 || decay_timer == 0) {
+    if (typing_speed > 0) typing_speed -= 1;
+    //Decay a little faster at half of max speed
+    if (typing_speed > TYPING_SPEED_MAX_VALUE / 2) typing_speed -= 1;
+    //Decay even faster at 3/4 of max speed
+    if (typing_speed > TYPING_SPEED_MAX_VALUE / 4 * 3) typing_speed -= 3;
+    decay_timer = timer_read();
+  }
+}
+
+uint8_t velocikey_match_speed(uint8_t minValue, uint8_t maxValue) {
+  return MAX(minValue, maxValue - (maxValue - minValue) * ((float)typing_speed / TYPING_SPEED_MAX_VALUE));
+}
+// End: Written by Chris Lewis
+
+uint8_t       current_os,
+              mod_primary_mask,
+              fade_interval,
+              num_extra_flashes_off = 0;
+Color         underglow,
+              flash_color,
+              saved_color,
+              hsv_none      = {0,0,0};
+flashState    flash_state   = no_flash;
+fadeState     fade_state    = add_fade;
+activityState state         = boot;
+
+void set_color (Color new, bool update) {
+  rgblight_sethsv_eeprom_helper(new.h, new.s, new.v, update);
+}
+
+void save_color(Color to_save) {
+  saved_color = to_save;
+}
+
+void reset_color(void) {
+  underglow = saved_color;
+}
+
+Color mod_color(Color current_color, bool should_add, uint8_t change_amount) {
+  save_color(underglow);
+  int addlim = 359 - change_amount;
+  int sublim = change_amount;
+  int leftovers;
+  if (should_add) {
+    if (current_color.h <= addlim) {
+      current_color.h += change_amount;
+    } else {
+      leftovers = (359 + change_amount) % 359;
+      current_color.h  = 0 + leftovers;
+    }
+  } else {
+    if (current_color.h >= sublim) {
+      current_color.h -= change_amount;
+    } else {
+      leftovers = change_amount - current_color.h;
+      current_color.h  = 359 - leftovers;
+    }
+  }
+  return current_color;
+}
+
+void check_state (void) {
+  static uint16_t active_timer;
+  if (!active_timer) {active_timer = timer_read();}
+  static bool activated, deactivated, slept;
+  switch (state) {
+  case active:
+    if (!activated) {
+      if (slept) {rgblight_mode_noeeprom(1);}
+      activated = true;
+      deactivated = false;
+      slept = false;
+    }
+    fade_interval = velocikey_match_speed(1, 25);
+    if (timer_elapsed(active_timer) < INACTIVE_DELAY) {return;}
+    active_timer = timer_read();
+    state = inactive;
+    return;
+
+  case inactive:
+    if (!deactivated) {
+      deactivated = true;
+      activated = false;
+      slept = false;
+    }
+    velocikey_decelerate();
+    fade_interval = velocikey_match_speed(1, 25);
+    if (timer_elapsed(active_timer) < SLEEP_DELAY) {return;}
+    state = sleeping;
+    return;
+
+  case sleeping:
+    if (!slept) {
+      rgblight_mode_noeeprom(4);
+      slept = true;
+      activated = false;
+      deactivated = false;
+    }
+    return;
+
+  case boot:
+    return;
+  }
+}
+
+void fade_rgb (void) {
+  static uint16_t fade_timer;
+  if (state == boot) {return;}
+  if (!fade_timer) {fade_timer = timer_read();}
+  if (timer_elapsed(fade_timer) < fade_interval) {return;}