From b9858777b057059128d4e3c05f75a2fada7c0f7b Mon Sep 17 00:00:00 2001
From: johnny9 <985648+johnny9@users.noreply.github.com>
Date: Fri, 26 May 2023 08:58:52 -0400
Subject: [PATCH] stratum: move prettyHex and flip32 into utils

---
 components/stratum/include/utils.h |  2 ++
 components/stratum/mining.c        |  1 -
 components/stratum/utils.c         |  9 +++++++++
 main/CMakeLists.txt                |  2 --
 main/bm1397.c                      |  2 +-
 main/pretty.c                      | 27 ---------------------------
 main/pretty.h                      |  9 ---------
 main/serial.c                      |  2 +-
 8 files changed, 13 insertions(+), 41 deletions(-)
 delete mode 100644 main/pretty.c
 delete mode 100644 main/pretty.h

diff --git a/components/stratum/include/utils.h b/components/stratum/include/utils.h
index 62b8f039..c37ab551 100644
--- a/components/stratum/include/utils.h
+++ b/components/stratum/include/utils.h
@@ -32,4 +32,6 @@ double le256todouble(const void *target);
 
 void prettyHex(unsigned char * buf, int len);
 
+uint32_t flip32(uint32_t val);
+
 #endif // STRATUM_UTILS_H
\ No newline at end of file
diff --git a/components/stratum/mining.c b/components/stratum/mining.c
index 00682a0a..b048c95e 100644
--- a/components/stratum/mining.c
+++ b/components/stratum/mining.c
@@ -3,7 +3,6 @@
 #include <limits.h>
 #include "mining.h"
 #include "utils.h"
-#include "../../main/pretty.h"
 #include "mbedtls/sha256.h"
 
 void free_bm_job(bm_job * job)
diff --git a/components/stratum/utils.c b/components/stratum/utils.c
index 81ecf653..e1f09fb9 100644
--- a/components/stratum/utils.c
+++ b/components/stratum/utils.c
@@ -265,4 +265,13 @@ void prettyHex(unsigned char * buf, int len) {
         printf("%02X ", buf[i]);
     }
     printf("%02X]\n", buf[len-1]);
+}
+
+uint32_t flip32(uint32_t val) {
+    uint32_t ret = 0;
+    ret |= (val & 0xFF) << 24;
+    ret |= (val & 0xFF00) << 8;
+    ret |= (val & 0xFF0000) >> 8;
+    ret |= (val & 0xFF000000) >> 24;
+    return ret;
 }
\ No newline at end of file
diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt
index 827360a8..b625fd0f 100755
--- a/main/CMakeLists.txt
+++ b/main/CMakeLists.txt
@@ -1,5 +1,4 @@
 idf_component_register(SRCS
-"pretty.c"
 "crc.c"
 "serial.c"
 "system.c"
@@ -18,7 +17,6 @@ idf_component_register(SRCS
 "serial"
 "bm1397.c"
 "crc.c"
-"pretty.c"
 "miner.c"
 "work_queue.c"
 INCLUDE_DIRS ".")
diff --git a/main/bm1397.c b/main/bm1397.c
index d743ec81..85a76b6c 100644
--- a/main/bm1397.c
+++ b/main/bm1397.c
@@ -8,8 +8,8 @@
 #include "esp_log.h"
 
 #include "serial.h"
-#include "pretty.h"
 #include "bm1397.h"
+#include "utils.h"
 #include "crc.h"
 
 #define SLEEP_TIME 20
diff --git a/main/pretty.c b/main/pretty.c
deleted file mode 100644
index c8f8f777..00000000
--- a/main/pretty.c
+++ /dev/null
@@ -1,27 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <unistd.h>
-#include <time.h>
-#include <errno.h>    
-
-#include "pretty.h"
-
-void prettyHex(unsigned char * buf, int len) {
-    int i;
-    for (i = 0; i < len; i++) {
-        if ((i > 0) && (buf[i] == 0xAA) && (buf[i+1] == 0x55))
-            printf("\n");
-        printf("%02X ", buf[i]);
-    }
-}
-
-//flip byte order of a 32 bit integer
-uint32_t flip32(uint32_t val) {
-    uint32_t ret = 0;
-    ret |= (val & 0xFF) << 24;
-    ret |= (val & 0xFF00) << 8;
-    ret |= (val & 0xFF0000) >> 8;
-    ret |= (val & 0xFF000000) >> 24;
-    return ret;
-}
diff --git a/main/pretty.h b/main/pretty.h
deleted file mode 100644
index 5d22fb61..00000000
--- a/main/pretty.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef PRETTY_H_
-#define PRETTY_H_
-
-#include <stdint.h>
-
-void prettyHex(unsigned char * buf, int len);
-uint32_t flip32(uint32_t val);
-
-#endif // PRETTY_H_
\ No newline at end of file
diff --git a/main/serial.c b/main/serial.c
index cd9179b5..702520e6 100644
--- a/main/serial.c
+++ b/main/serial.c
@@ -9,9 +9,9 @@
 #include "esp_log.h"
 #include "soc/uart_struct.h"
 
-#include "pretty.h"
 #include "bm1397.h"
 #include "serial.h"
+#include "utils.h"
 
 #define ECHO_TEST_TXD   (17)
 #define ECHO_TEST_RXD   (18)