Merge remote-tracking branch 'origin/master' into develop

16 files changed, 489 insertions, 150 deletions

diff --git a/keyboards/uno/config.h b/keyboards/uno/config.h
index 1cae17f50a..0128ee2d5d 100644
--- a/keyboards/uno/config.h
+++ b/keyboards/uno/config.h
@@ -13,57 +13,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#pragma once
-#include "config_common.h"
-
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0xACC8
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Broekhuijsen
-#define PRODUCT         Uno
-
-/* key matrix size */
-#define MATRIX_ROWS 1
-#define MATRIX_COLS 1
 
-/* Uno default pinout */
-#define DIRECT_PINS { \
-    { B6 } \
-}
-#define UNUSED_PINS
-
-#define RGB_DI_PIN F6
-#ifdef RGB_DI_PIN
-#define RGBLED_NUM 1
-//   #define RGBLIGHT_HUE_STEP 32
-//   #define RGBLIGHT_SAT_STEP 32
-//   #define RGBLIGHT_VAL_STEP 32
-//   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
-//   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-#define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
-// /*== customize breathing effect ==*/
-//   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
-//   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
-//   /*==== use exp() and sin() ====*/
-//   #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
-//   #define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
-#endif
+#pragma once
 
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 5
+#include "config_common.h"
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
+// See rev1/config.h and rev2/config.h to configure your uno.
diff --git a/keyboards/uno/keymaps/copypasta/keymap.c b/keyboards/uno/keymaps/copypasta/keymap.c
new file mode 100644
index 0000000000..74e5f62fc5
--- /dev/null
+++ b/keyboards/uno/keymaps/copypasta/keymap.c
@@ -0,0 +1,85 @@
+/* Copyright 2020 Snipeye
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+enum uno_keycode
+{
+  UNO = SAFE_RANGE
+};
+
+static uint16_t pressTimer = 0xFFFF;
+#define CUSTOM_LONGPRESS 1000
+#define PASTA_COUNT 4
+
+const char *pasta[PASTA_COUNT] =  {
+    "Hey - I'm Uno... V2.  This time, I have uno more features: I support a rotary encoder, too.  That's it.  That's the only difference.",
+    "Did you ever hear the tragedy of Darth Plagueis the Wise?  I thought not. It's not a story the Jedi would tell you. It's a Sith legend. Darth Plagueis was a Dark Lord of the Sith, so powerful and so wise he could use the Force to influence the midichlorians to create life... He had such a knowledge of the dark side that he could even keep the ones he cared about from dying. The dark side of the Force is a pathway to many abilities some consider to be unnatural. He became so powerful... the only thing he was afraid of was losing his power, which eventually, of course, he did. Unfortunately, he taught his apprentice everything he knew, then his apprentice killed him in his sleep. Ironic, he could save others from death, but not himself.",
+    "The intent is to provide players with a sense of pride and accomplishment for unlocking different heroes.  As for cost, we selected initial values based upon data from the Open Beta and other adjustments made to milestone rewards before launch. Among other things, we're looking at average per-player credit earn rates on a daily basis, and we'll be making constant adjustments to ensure that players have challenges that are compelling, rewarding, and of course attainable via gameplay.  We appreciate the candid feedback, and the passion the community has put forth around the current topics here on Reddit, our forums and across numerous social media outlets.  Our team will continue to make changes and monitor community feedback and update everyone as soon and as often as we can.",
+    "The FitnessGram Pacer Test is a multistage aerobic capacity test that progressively gets more difficult as it continues. The 20 meter pacer test will begin in 30 seconds. Line up at the start. The running speed starts slowly, but gets faster each minute after you hear this signal. [beep] A single lap should be completed each time you hear this sound. [ding] Remember to run in a straight line, and run as long as possible. The second time you fail to complete a lap before the sound, your test is over. The test will begin on the word start. On your mark, get ready, start.",
+};
+
+uint8_t pastaIndex = 0;
+
+enum encoder_names {
+	_ENCODER,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+        UNO
+    )
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+	switch (keycode) {
+		case UNO:
+            if (record->event.pressed) {
+                pressTimer = timer_read();
+            } else {
+                uint16_t timeElapsed = timer_elapsed(pressTimer);
+                if (timeElapsed < CUSTOM_LONGPRESS) {
+                    send_string(pasta[pastaIndex]);
+                } else {
+                    reset_keyboard();
+                }
+            }
+        break;
+    }
+    return false;
+}
+
+void keyboard_post_init_user(void) {
+    rgblight_enable_noeeprom();
+    rgblight_sethsv_noeeprom(0, 255, 255);
+    rgblight_mode_noeeprom(1);
+    //rgblight_mode_noeeprom(RGBLIGHT_MODE_RAINBOW_MOOD);
+}
+
+void encoder_update_user(uint8_t index, bool clockwise) {
+    if (index == _ENCODER) { /* First encoder */
+        if (clockwise) {
+            pastaIndex++;
+            pastaIndex %= PASTA_COUNT;
+        } else {
+            pastaIndex += PASTA_COUNT;
+            pastaIndex--;
+            pastaIndex %= PASTA_COUNT;
+        }
+        rgblight_sethsv_noeeprom((255/PASTA_COUNT)*pastaIndex, 255, 255);
+        rgblight_mode_noeeprom(1);
+    }
+}
diff --git a/keyboards/uno/keymaps/copypasta/readme.md b/keyboards/uno/keymaps/copypasta/readme.md
new file mode 100644
index 0000000000..1ad009c16c
--- /dev/null
+++ b/keyboards/uno/keymaps/copypasta/readme.md
@@ -0,0 +1,4 @@
+# A copypasta keymap for uno
+![Picture](https://i.imgur.com/OqPyWbbl.jpg)
+
+[A demo of this keymap can be found here.](https://www.reddit.com/r/MechanicalKeyboards/comments/k7w1j1/qmk_is_a_pathway_to_many_abilities_some_consider/)
diff --git a/keyboards/uno/keymaps/default/keymap.c b/keyboards/uno/keymaps/default/keymap.c
index bb19ea7ddb..43c885c800 100644
--- a/keyboards/uno/keymaps/default/keymap.c
+++ b/keyboards/uno/keymaps/default/keymap.c
@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
 #include QMK_KEYBOARD_H
 
 enum uno_keycode
@@ -20,20 +21,9 @@ enum uno_keycode
   UNO = SAFE_RANGE
 };
 
-static uint16_t pressTimer = 0xFFFF;
-#define CUSTOM_LONGPRESS 150
-#define CUSTOM_LONGERPRESS 750
-#define CUSTOM_STRING "I can put a whole buncha text in here and type it all with a single keypress."
-#define RESET_LENGTH 3000
-const uint8_t PROGMEM RGBLED_RAINBOW_MOOD_INTERVALS[] = { 10, 25, 50 };
-
-char stringToSend[2] = "a";
-char maxLetter = 'z';
-
-uint8_t presetCounter = 0;
-
-#define COUNTER X_A
-
+enum encoder_names {
+	_ENCODER,
+};
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       [0] = LAYOUT(
@@ -44,59 +34,30 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 	switch (keycode) {
 		case UNO:
-            if (record->event.pressed) {
-                pressTimer = timer_read();
-            } else {
-                uint16_t timeElapsed = timer_elapsed(pressTimer);
-                switch (presetCounter) {
-                    case 0:
-                        SEND_STRING(SS_LCMD("n"));
-                    break;
-                    case 1:
-                        SEND_STRING("Hello!");
-                    break;
-                    case 2:
-                        SEND_STRING(SS_TAP(X_ENTER)SS_TAP(X_ENTER)"I am uno!");
-                    break;
-                    case 3:
-                        SEND_STRING(SS_TAP(X_ENTER)SS_TAP(X_ENTER)"I can do all sorts of useless things!");
-                    break;
-                    case 4:
-                        SEND_STRING(SS_TAP(X_ENTER)SS_TAP(X_ENTER)"And I have a built-in RGB LED!"SS_TAP(X_ENTER)SS_TAP(X_ENTER)SS_TAP(X_ENTER));
-                        rgblight_sethsv_noeeprom(255, 255, 255);
-                        rgblight_mode_noeeprom(RGBLIGHT_MODE_RAINBOW_MOOD);
-                    break;
-                    default:
-                        if (timeElapsed < CUSTOM_LONGPRESS) {
-                            // Normal press.  We're going to send the current letter and increment the counter.
-                            SEND_STRING(SS_TAP(X_BSPACE));
-                            send_string(stringToSend);
-                            stringToSend[0]++;
-                            if (stringToSend[0] > maxLetter) {
-                                stringToSend[0] = 'a';
-                            }
-                        } else if (timeElapsed < CUSTOM_LONGERPRESS) {
-                            // Long press, confirm the current letter, reset counter
-                            stringToSend[0] = 'a';
-                            send_string(stringToSend);
-                        } else if (timeElapsed < RESET_LENGTH) {
-                            // Longer press, display macro.
-                            SEND_STRING(CUSTOM_STRING);
-                        } else {
-                            reset_keyboard();
-                        }
-                        presetCounter--;
-                    break;
-                }
-                presetCounter++;
-            }
-        break;
+			if (record->event.pressed) {
+				SEND_STRING("Hello!");
+			}
+			break;
+			return false;
     }
-    return false;
+    return true;
 }
 
 void keyboard_post_init_user(void) {
     rgblight_enable_noeeprom();
-    rgblight_sethsv_noeeprom(0, 0, 0);
-    rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
+    rgblight_sethsv_noeeprom(255, 255, 255);
+    rgblight_mode_noeeprom(RGBLIGHT_MODE_RAINBOW_MOOD);
 }
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    if (index == _ENCODER) { /* First encoder */
+        if (clockwise) {
+            tap_code(KC_A);
+        } else {
+            tap_code(KC_B);
+        }
+		return false;
+    }
+	return true;
+}
+
diff --git a/keyboards/uno/keymaps/default/readme.md b/keyboards/uno/keymaps/default/readme.md
index 53b762f878..d783a80acc 100644
--- a/keyboards/uno/keymaps/default/readme.md
+++ b/keyboards/uno/keymaps/default/readme.md
@@ -1,4 +1,5 @@
 # The default keymap for uno
-![Keymap](https://i.imgur.com/lCPZZpO.png)
+![Picture](https://i.imgur.com/OqPyWbbl.jpg)
 
-The 'Macro' key does a few things: If you open up textedit (was made for a mac), it sends "Command+n" for the first press to make a new document.  It then types a few different messages, activates the RGB LED, and finally ends in a "scroll through the alphabet with a long press to confirm a certain character" keyboard mode.
+This keymap types "Hello!" when pressed and presses 'A' and 'B' when turning the
+encoder.
diff --git a/keyboards/uno/keymaps/demo/keymap.c b/keyboards/uno/keymaps/demo/keymap.c
new file mode 100644
index 0000000000..cd3c3dadef
--- /dev/null
+++ b/keyboards/uno/keymaps/demo/keymap.c
@@ -0,0 +1,123 @@
+/* Copyright 2020 Snipeye
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+enum uno_keycode
+{
+  UNO = SAFE_RANGE
+};
+
+static uint16_t pressTimer = 0xFFFF;
+#define CUSTOM_LONGPRESS 150
+#define CUSTOM_LONGERPRESS 750
+#define CUSTOM_STRING "I can put a whole buncha text in here and type it all with a single keypress."
+#define RESET_LENGTH 3000
+const uint8_t PROGMEM RGBLED_RAINBOW_MOOD_INTERVALS[] = { 10, 25, 50 };
+
+char stringToSend[2] = "a";
+char maxLetter = 'z';
+
+uint8_t presetCounter = 0;
+
+#define COUNTER X_A
+
+enum encoder_names {
+	_ENCODER,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+      [0] = LAYOUT(
+            UNO
+          )
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+	switch (keycode) {
+		case UNO:
+            if (record->event.pressed) {
+                pressTimer = timer_read();
+            } else {
+                uint16_t timeElapsed = timer_elapsed(pressTimer);
+                switch (presetCounter) {
+                    case 0:
+                        SEND_STRING(SS_LCMD("n"));
+                    break;
+                    case 1:
+                        SEND_STRING("Hello!");
+                    break;
+                    case 2:
+                        SEND_STRING("\n\nI am uno!");
+                    break;
+                    case 3:
+                        SEND_STRING("\n\nI can do all sorts of useless things!");
+                    break;
+                    case 4:
+                        SEND_STRING("\n\nAnd I have a built-in RGB LED!\n\n\n");
+                        rgblight_sethsv_noeeprom(255, 255, 255);
+                        rgblight_mode_noeeprom(RGBLIGHT_MODE_RAINBOW_MOOD);
+                    break;
+                    default:
+                        if (timeElapsed < CUSTOM_LONGPRESS) {
+                            // Normal press.  We're going to send the current letter and increment the counter.
+                            SEND_STRING(SS_TAP(X_BSPACE));
+                            send_string(stringToSend);
+                            stringToSend[0]++;
+                            if (stringToSend[0] > maxLetter) {
+                                stringToSend[0] = 'a';
+                            }
+                        } else if (timeElapsed < CUSTOM_LONGERPRESS) {
+                            // Long press, confirm the current letter, reset counter
+                            stringToSend[0] = 'a';
+                            send_string(stringToSend);
+                        } else if (timeElapsed < RESET_LENGTH) {
+                            // Longer press, display macro.
+                            SEND_STRING(CUSTOM_STRING);
+                        } else {
+                            reset_keyboard();
+                        }
+                        presetCounter--;
+                    break;
+                }
+                presetCounter++;
+            }
+        break;
+    }
+    return false;
+}
+
+void keyboard_post_init_user(void) {
+    rgblight_enable_noeeprom();
+    rgblight_sethsv_noeeprom(0, 0, 0);
+    rgblight_mode(1);
+    // Uncomment to enable rainbow mode when plugged in.
+    // Otherwise, the LED will be revealed after a few keypresses.
+    //rgblight_sethsv_noeeprom(255, 255, 255);
+    //rgblight_mode_noeeprom(RGBLIGHT_MODE_RAINBOW_MOOD);
+}
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    if (index == _ENCODER) { /* First encoder */
+        if (clockwise) {
+            tap_code(KC_A);
+        } else {
+            tap_code(KC_B);
+        }
+		return false;
+    }
+	return true;
+}
+
diff --git a/keyboards/uno/keymaps/demo/readme.md b/keyboards/uno/keymaps/demo/readme.md
new file mode 100644
index 0000000000..ec91247861
--- /dev/null
+++ b/keyboards/uno/keymaps/demo/readme.md
@@ -0,0 +1,4 @@
+# The demo keymap for uno
+![Picture](https://i.imgur.com/OqPyWbbl.jpg)
+
+[You can find a video of this keymap being demoed here](https://imgur.com/a/Z7G5Aam).
diff --git a/keyboards/uno/readme.md b/keyboards/uno/readme.md
index ce4cccd196..b60ef23e97 100644
--- a/keyboards/uno/readme.md
+++ b/keyboards/uno/readme.md
@@ -1,19 +1,34 @@
-# uno
+# Uno
 
- ![uno](https://i.imgur.com/OqPyWbbl.jpg)
+![Uno](https://i.imgur.com/OqPyWbbl.jpg)
 
 A 1-key, in-USB "board" for the lulz
 
- * Keyboard Maintainer: [Snipeye](https://github.com/Snipeye)
- * Hardware Supported: uno pcb
- * Hardware Availability: [GB](https://www.reddit.com/r/mechmarket/comments/gyijm7/gb_uno/)
+* Keyboard Maintainer: [Snipeye](https://github.com/Snipeye)
+* Hardware Availability: [keyhive.xyz](https://keyhive.xyz/shop/uno-single-key-keyboard)
 
- Make example for this keyboard (after setting up your build environment):
+There are two revisions of Uno. If your Uno supports a rotary encoder, use rev2.
+If it *does not* support a rotary encoder, use rev1. The following examples use
+`rev2` &mdash; be sure to change this if you are using `rev1`.
 
-     make uno:default
+Make example for this keyboard (after setting up your build environment; make
+sure to change `rev2` to your Uno's version):
 
- Flashing example for this keyboard:
+    make uno/rev2:default
 
-     make uno:default:flash
+Flashing example for this keyboard (change `rev2` to `rev1` if needed):
 
- See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+    make uno/rev2:default:flash
+
+If you prefer to use the `qmk` tool:
+
+    qmk compile -kb uno/rev2 -km default
+
+Create your own keymap with:
+
+    qmk new-keymap -kb uno/rev2
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+### Credits
++ Everything by Snipeye
diff --git a/keyboards/uno/rev1/config.h b/keyboards/uno/rev1/config.h
new file mode 100644
index 0000000000..11c84ad2ab
--- /dev/null
+++ b/keyboards/uno/rev1/config.h
@@ -0,0 +1,74 @@
+/* Copyright 2020 Snipeye
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0xFEED
+#define PRODUCT_ID      0xACC8
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Broekhuijsen
+#define PRODUCT         Uno rev1
+
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+// #define RGBLIGHT_ANIMATIONS
+
+/* key matrix size */
+#define MATRIX_ROWS 1
+#define MATRIX_COLS 1
+
+/* Uno default pinout */
+#define DIRECT_PINS { \
+    { B6 } \
+}
+#define UNUSED_PINS
+
+#ifdef RGBLIGHT_ENABLE
+#define RGB_DI_PIN F6
+#define RGBLED_NUM 1
+#endif
+
+// #define RGB_DI_PIN E2
+// #ifdef RGB_DI_PIN
+//   #define RGBLED_NUM 16
+//   #define RGBLIGHT_HUE_STEP 32
+//   #define RGBLIGHT_SAT_STEP 32
+//   #define RGBLIGHT_VAL_STEP 32
+//   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+//   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+// /*== all animations enable ==*/
+//   #define RGBLIGHT_ANIMATIONS
+// /*== or choose animations ==*/
+//   #define RGBLIGHT_EFFECT_BREATHING
+//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
+//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+//   #define RGBLIGHT_EFFECT_SNAKE
+//   #define RGBLIGHT_EFFECT_KNIGHT
+//   #define RGBLIGHT_EFFECT_CHRISTMAS
+//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
+//   #define RGBLIGHT_EFFECT_RGB_TEST
+//   #define RGBLIGHT_EFFECT_ALTERNATING
+// /*== customize breathing effect ==*/
+//   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
+//   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
+//   /*==== use exp() and sin() ====*/
+//   #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
+//   #define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
+// #endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
diff --git a/keyboards/uno/rev1/rev1.h b/keyboards/uno/rev1/rev1.h
new file mode 100644
index 0000000000..691bdd1dc3
--- /dev/null
+++ b/keyboards/uno/rev1/rev1.h
@@ -0,0 +1,25 @@
+/* Copyright 2020 Snipeye
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#define LAYOUT( \
+  K00  \
+) { \
+  { K00 } \
+}
diff --git a/keyboards/uno/rev1/rules.mk b/keyboards/uno/rev1/rules.mk
new file mode 100644
index 0000000000..7180be7497
--- /dev/null
+++ b/keyboards/uno/rev1/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no       # Mouse keys
+EXTRAKEY_ENABLE = no       # Audio control and System control
+CONSOLE_ENABLE = no        # Console for debug
+COMMAND_ENABLE = no        # Commands for debug and configuration
+NKRO_ENABLE = no           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
+AUDIO_ENABLE = no          # Audio output
diff --git a/keyboards/uno/rev2/config.h b/keyboards/uno/rev2/config.h
new file mode 100644
index 0000000000..37ea08c017
--- /dev/null
+++ b/keyboards/uno/rev2/config.h
@@ -0,0 +1,49 @@
+/* Copyright 2020 Snipeye
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0xFEED
+#define PRODUCT_ID      0xACC8
+#define DEVICE_VER      0x0002
+#define MANUFACTURER    Broekhuijsen
+#define PRODUCT         Uno rev2
+
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+
+/* ENCODER */
+#define ENCODERS_PAD_A { B2 }
+#define ENCODERS_PAD_B { B3 }
+
+/* key matrix size */
+#define MATRIX_ROWS 1
+#define MATRIX_COLS 1
+
+/* Uno default pinout */
+#define DIRECT_PINS { \
+    { D0 } \
+}
+#define UNUSED_PINS
+
+#ifdef RGBLIGHT_ENABLE
+#define RGB_DI_PIN D1
+#define RGBLED_NUM 1
+#endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
diff --git a/keyboards/uno/rev2/rev2.h b/keyboards/uno/rev2/rev2.h
new file mode 100644
index 0000000000..691bdd1dc3
--- /dev/null
+++ b/keyboards/uno/rev2/rev2.h
@@ -0,0 +1,25 @@
+/* Copyright 2020 Snipeye
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#define LAYOUT( \
+  K00  \
+) { \
+  { K00 } \
+}
diff --git a/keyboards/uno/rev2/rules.mk b/keyboards/uno/rev2/rules.mk
new file mode 100644
index 0000000000..1ce2738442
--- /dev/null
+++ b/keyboards/uno/rev2/rules.mk
@@ -0,0 +1,19 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no       # Mouse keys
+EXTRAKEY_ENABLE = no       # Audio control and System control
+CONSOLE_ENABLE = no        # Console for debug
+COMMAND_ENABLE = no        # Commands for debug and configuration
+NKRO_ENABLE = no           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
+AUDIO_ENABLE = no          # Audio output
+ENCODER_ENABLE = yes
diff --git a/keyboards/uno/rules.mk b/keyboards/uno/rules.mk
index ebbb7bc613..367faedeaf 100644
--- a/keyboards/uno/rules.mk
+++ b/keyboards/uno/rules.mk
@@ -1,18 +1 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
+DEFAULT_FOLDER = uno/rev1
diff --git a/keyboards/uno/uno.h b/keyboards/uno/uno.h
index 91d48d2ad5..bb3248e293 100644
--- a/keyboards/uno/uno.h
+++ b/keyboards/uno/uno.h
@@ -13,12 +13,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
 #pragma once
 
 #include "quantum.h"
 
-#define LAYOUT( \
-  K00  \
-) { \
-  { K00 } \
-}
+#if defined(KEYBOARD_uno_rev1)
+#    include "rev1.h"
+#elif defined(KEYBOARD_uno_rev2)
+#    include "rev2.h"
+#endif