scopes: Factor out TOGGLE_CALIBRATION_PIN().

diff --git a/hantek_6022be.c b/hantek_6022be.c
index 84e37876e1d485bba87e4fbf150311cdcdf70bf7..4dc34f2b4cfefd7d4517fa0a0e2a6734c13f8d3b 100644 (file)
--- a/hantek_6022be.c
+++ b/hantek_6022be.c
@@ -26,6 +26,9 @@
 
 #define SET_ANALOG_MODE()
 
+/* Toggle the 1kHz calibration pin, only accurate up to ca. 8MHz. */
+#define TOGGLE_CALIBRATION_PIN() PA7 = !PA7
+
 /* Change to support as many interfaces as you need. */
 static BYTE altiface = 0;
 
@@ -68,8 +71,7 @@ void suspend_isr(void) __interrupt SUSPEND_ISR
 
 void timer2_isr(void) __interrupt TF2_ISR
 {
-       /* Toggle the 1kHz calibration pin, only accurate up to ca. 8MHz. */
-       PA7 = !PA7;
+       TOGGLE_CALIBRATION_PIN();
 
        if (ledcounter) {
                if (--ledcounter == 0) {

diff --git a/hantek_6022bl.c b/hantek_6022bl.c
index a380ad08dc1a34d078004f22d867a2391462c038..4920047cdfed7ccf0a4e294465fd6c1683b5f71e 100644 (file)
--- a/hantek_6022bl.c
+++ b/hantek_6022bl.c
@@ -26,6 +26,9 @@
 
 #define SET_ANALOG_MODE() PA7 = 1
 
+/* Toggle the 1kHz calibration pin, only accurate up to ca. 8MHz. */
+#define TOGGLE_CALIBRATION_PIN() PC2 = !PC2
+
 /* Change to support as many interfaces as you need. */
 static BYTE altiface = 0;
 
@@ -68,8 +71,7 @@ void suspend_isr(void) __interrupt SUSPEND_ISR
 
 void timer2_isr(void) __interrupt TF2_ISR
 {
-       /* Toggle the 1kHz calibration pin, only accurate up to ca. 8MHz. */
-       PC2 = !PC2;
+       TOGGLE_CALIBRATION_PIN();
 
        if (ledcounter) {
                if (--ledcounter == 0) {

diff --git a/sainsmart_dds120.c b/sainsmart_dds120.c
index 26d099711203cfd76e348484486c1509bc710778..a45919619b4957485800d595ce990b1c58420394 100644 (file)
--- a/sainsmart_dds120.c
+++ b/sainsmart_dds120.c
@@ -26,6 +26,10 @@
 
 #define SET_ANALOG_MODE() PA7 = 1
 
+/* Toggle the 1kHz calibration pin, only accurate up to ca. 8MHz. */
+/* Note: There's no PE2 as IOE is not bit-addressable (see TRM 15.2). */
+#define TOGGLE_CALIBRATION_PIN() IOE = IOE ^ 0x04
+
 /* Change to support as many interfaces as you need. */
 static BYTE altiface = 0;
 
@@ -66,8 +70,8 @@ void suspend_isr(void) __interrupt SUSPEND_ISR
 
 void timer2_isr(void) __interrupt TF2_ISR
 {
-       /* Toggle the 1kHz calibration pin, only accurate up to ca. 8MHz. */
-       IOE = IOE^0x04;
+       TOGGLE_CALIBRATION_PIN();
+
        TF2 = 0;
 }