From f93597d66b0698cbea87b24aad79f60e5a9db6ad Mon Sep 17 00:00:00 2001
From: Takeshi ISHII <2170248+mtei@users.noreply.github.com>
Date: Sat, 18 Sep 2021 11:51:04 +0900
Subject: [PATCH] fix link error for helix/rev3_5rows:five_rows (#14466)
This is a tentative quick fix.
I was adding the same functions for both #14426 and #14427 and they were in conflict.
---
.../keymaps/five_rows/oled_display.c | 53 ++-----------------
1 file changed, 4 insertions(+), 49 deletions(-)
diff --git a/keyboards/helix/rev3_5rows/keymaps/five_rows/oled_display.c b/keyboards/helix/rev3_5rows/keymaps/five_rows/oled_display.c
index fcbd81c9b6..e8ba0d720f 100644
--- a/keyboards/helix/rev3_5rows/keymaps/five_rows/oled_display.c
+++ b/keyboards/helix/rev3_5rows/keymaps/five_rows/oled_display.c
@@ -25,6 +25,10 @@
#include <string.h>
#include "layer_number.h"
+char *sprints(char *buf, char *src);
+char *sprintd(char *buf, char *leadstr, int data);
+char *sprint2d(char *buf, char *leadstr, int data);
+
extern int current_default_layer;
void init_helix_oled(void) {
@@ -64,55 +68,6 @@ void matrix_update(struct CharacterMatrix *dest,
}
# endif
-static char *sprint_decimal(char *buf, int data) {
- if (data > 9) {
- buf = sprint_decimal(buf, data/10);
- }
- *buf++ = "0123456789"[data%10];
- *buf = '\0';
- return buf;
-}
-
-static char *sprint_hex(char *buf, uint32_t data) {
- if (data > 0xf) {
- buf = sprint_hex(buf, data/0x10);
- }
- *buf++ = "0123456789abcdef"[data & 0xf];
- *buf = '\0';
- return buf;
-}
-
-char *sprints(char *buf, char *src) {
- while (*src) {
- *buf++ = *src++;
- }
- *buf = '\0';
- return buf;
-}
-
-char *sprintx(char *buf, char *leadstr, uint32_t data) {
- buf = sprints(buf, leadstr);
- buf = sprint_hex(buf, data);
- return buf;
-}
-
-char *sprintd(char *buf, char *leadstr, int data) {
- buf = sprints(buf, leadstr);
- buf = sprint_decimal(buf, data);
- return buf;
-}
-
-char *sprint2d(char *buf, char *leadstr, int data) {
- buf = sprints(buf, leadstr);
- if (data > 99) {
- return sprint_decimal(buf, data);
- }
- if (data < 10) {
- *buf++ = ' ';
- }
- return sprint_decimal(buf, data);
-}
-
# ifdef SSD1306OLED
static void render_logo(struct CharacterMatrix *matrix) {
# else