From d70fa1b7b4d1ccd35771731062ed6df2b5147a7e Mon Sep 17 00:00:00 2001
From: Krzysiek Egzmont <egzumer@gmail.com>
Date: Mon, 30 Oct 2023 16:39:18 +0100
Subject: [PATCH] Refactor

---
 app/app.c            |  2 +-
 app/spectrum.c       | 14 +++++++-------
 driver/bk4819-regs.h |  1 +
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/app.c b/app/app.c
index 1cc5155..56a7471 100644
--- a/app/app.c
+++ b/app/app.c
@@ -541,7 +541,7 @@ void APP_StartListening(FUNCTION_Type_t Function, const bool reset_am_fix)
 
 	// AF gain - original QS values
 	if (gRxVfo->AM_mode){
-		BK4819_WriteRegister(0x48, 0xB3A8);
+		BK4819_WriteRegister(BK4819_REG_48, 0xB3A8);
 	}
 	else {
 	BK4819_WriteRegister(BK4819_REG_48,
diff --git a/app/spectrum.c b/app/spectrum.c
index fc08667..8f32126 100644
--- a/app/spectrum.c
+++ b/app/spectrum.c
@@ -79,10 +79,10 @@ uint16_t listenT = 0;
 
 RegisterSpec registerSpecs[] = {
     {},
-    {"LNAs", 0x13, 8, 0b11, 1},
-    {"LNA", 0x13, 5, 0b111, 1},
-    {"PGA", 0x13, 0, 0b111, 1},
-    {"IF", 0x3D, 0, 0xFFFF, 0x2aaa},
+    {"LNAs", BK4819_REG_13, 8, 0b11, 1},
+    {"LNA", BK4819_REG_13, 5, 0b111, 1},
+    {"PGA", BK4819_REG_13, 0, 0b111, 1},
+    {"IF", BK4819_REG_3D, 0, 0xFFFF, 0x2aaa},
     // {"MIX", 0x13, 3, 0b11, 1}, // TODO: hidden
 };
 
@@ -208,7 +208,7 @@ static void ToggleAFBit(bool on) {
 static void BackupRegisters() {
   R30 = BK4819_ReadRegister(BK4819_REG_30);
   R37 = BK4819_ReadRegister(BK4819_REG_37);
-  R3D = BK4819_ReadRegister(0x3D);
+  R3D = BK4819_ReadRegister(BK4819_REG_3D);
   R43 = BK4819_ReadRegister(BK4819_REG_43);
   R47 = BK4819_ReadRegister(BK4819_REG_47);
   R48 = BK4819_ReadRegister(BK4819_REG_48);
@@ -218,7 +218,7 @@ static void BackupRegisters() {
 static void RestoreRegisters() {
   BK4819_WriteRegister(BK4819_REG_30, R30);
   BK4819_WriteRegister(BK4819_REG_37, R37);
-  BK4819_WriteRegister(0x3D, R3D);
+  BK4819_WriteRegister(BK4819_REG_3D, R3D);
   BK4819_WriteRegister(BK4819_REG_43, R43);
   BK4819_WriteRegister(BK4819_REG_47, R47);
   BK4819_WriteRegister(BK4819_REG_48, R48);
@@ -231,7 +231,7 @@ static void SetModulation(ModulationType type) {
   reg &= ~(0b111 << 8);
   BK4819_WriteRegister(BK4819_REG_47, reg | (modTypeReg47Values[type] << 8));
   if (type == MOD_USB) {
-    BK4819_WriteRegister(0x3D, 0b0010101101000101);
+    BK4819_WriteRegister(BK4819_REG_3D, 0b0010101101000101);
     BK4819_WriteRegister(BK4819_REG_37, 0x160F);
     BK4819_WriteRegister(BK4819_REG_48, 0b0000001110101000);
   }
diff --git a/driver/bk4819-regs.h b/driver/bk4819-regs.h
index c24ed2f..055541a 100644
--- a/driver/bk4819-regs.h
+++ b/driver/bk4819-regs.h
@@ -52,6 +52,7 @@ enum BK4819_REGISTER_t {
 	BK4819_REG_3A = 0x3AU,
 	BK4819_REG_3B = 0x3BU,
 	BK4819_REG_3C = 0x3CU,
+	BK4819_REG_3D = 0x3DU,
 	BK4819_REG_3E = 0x3EU,
 	BK4819_REG_3F = 0x3FU,
 	BK4819_REG_43 = 0x43U,