DVM-V1 Rev C Updates (#4)

* initial changes for rev C * more work on digipots, fixed clock freq * init SPI the right way * SPI working now? The STD Peripheral Library sucks * removed SPI debug prints --------- Co-authored-by: W3AXL <29879554+W3AXL@users.noreply.github.com>
DVMProject · Jan 7, 2024 · 4393f07 · 4393f07
1 parent c9e9f41
commit 4393f07
Show file tree

Hide file tree

Showing 14 changed files with 192 additions and 604 deletions.
diff --git a/DWT_delay.cpp b/DWT_delay.cpp
diff --git a/DWT_delay.h b/DWT_delay.h
diff --git a/Defines.h b/Defines.h
@@ -130,14 +130,21 @@ typedef unsigned long long  ulong64_t;
 // Frequencies such as 10.0 Mhz (48000 * 208.333) or 20 Mhz (48000 * 416.666) are not suitable.
 //
 // For 12 MHz
+#ifndef EXTERNAL_OSC
 #define EXTERNAL_OSC 12000000
+#endif
 // For 12.288 MHz
 // #define EXTERNAL_OSC 12288000
 // For 14.4 MHz
 // #define EXTERNAL_OSC 14400000
 // For 19.2 MHz
 // #define EXTERNAL_OSC 19200000
 
+// Sanity check to make sure EXTERNAL_OSC is a valid integer multiple of 48kHz
+#if (EXTERNAL_OSC % 48000 != 0)
+#error "Invalid EXTERNAL_OSC specified! Must be an integer multiple of 48000"
+#endif
+
 // Pass RSSI information to the host
 // #define SEND_RSSI_DATA
 

diff --git a/Digipot.cpp b/Digipot.cpp
diff --git a/Digipot.h b/Digipot.h
diff --git a/FirmwareMain.cpp b/FirmwareMain.cpp
@@ -80,21 +80,13 @@ CWIdTX cwIdTX;
 SerialPort serial;
 IO io;
 
-#if defined(DIGIPOT_ENABLED)
-/** Digipot */
-Digipot digipot;
-#endif
-
 // ---------------------------------------------------------------------------
 //  Global Functions
 // ---------------------------------------------------------------------------
 
 void setup()
 {
     serial.start();
-#if defined(DIGIPOT_ENABLED)
-    digipot.initialize();
-#endif
 }
 
 void loop()

diff --git a/Globals.h b/Globals.h
@@ -54,7 +54,6 @@
 #include "nxdn/CalNXDN.h"
 #include "CalRSSI.h"
 #include "CWIdTX.h"
-#include "Digipot.h"
 #include "IO.h"
 
 // ---------------------------------------------------------------------------
@@ -128,9 +127,4 @@ extern CalRSSI calRSSI;
 /** CW */
 extern CWIdTX cwIdTX;
 
-#if defined(DIGIPOT_ENABLED)
-/** Digipot */
-extern Digipot digipot;
-#endif
-
 #endif // __GLOBALS_H__