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

keyboards/0xcb/static/config.h

@@ -48,7 +48,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION COL2ROW
 
 #define TAP_CODE_DELAY 10
-#define ENCODER_DIRECTION_FLIP
 #define ENCODER_RESOLUTION 4
 #define ENCODERS_PAD_A { D0 }
 #define ENCODERS_PAD_B { D1 }

keyboards/0xcb/static/keymaps/bongocat/keymap.c

@@ -107,7 +107,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
 #endif
 
 /* oled stuff :) */
-#ifdef OLED_DRIVER_ENABLE
+#ifdef OLED_ENABLE
 #define IDLE_FRAMES 5
 #define IDLE_SPEED 20 // below this wpm value your animation will idle
 #define TAP_FRAMES 2

keyboards/0xcb/static/readme.md

@@ -4,7 +4,7 @@ Macro keypad
 
 * Keyboard Maintainer: [Conor Burns](https://github.com/conor-burns)
 * Hardware Supported: https://github.com/0xCB-dev/0xcb-static
-* Hardware Availability: Soon on tindie or order your own parts - the hardware in the repo is Open Source :D
+* Hardware Availability: On CandyKeys or order your own parts - the hardware in the repo is Open Source :D
 * PCB renders :)
 
 ![](https://github.com/0xCB-dev/0xcb-static/blob/main/PCB/rev1.0/top.png)