new pin mapping, disable rotary encoder with #if

diff --git a/AD9850/AD9850.ino b/AD9850/AD9850.ino
index 2cf65fe..a3b9d19 100644 (file)
--- a/AD9850/AD9850.ino
+++ b/AD9850/AD9850.ino
@@ -7,14 +7,15 @@
  * Use freely
  */
  
-#define W_CLK 8       // Pin 8 - connect to AD9850 module word load clock pin (CLK)
-#define FQ_UD 9       // Pin 9 - connect to freq update pin (FQ)
-#define DATA 10       // Pin 10 - connect to serial data load pin (DATA)
-#define RESET 11      // Pin 11 - connect to reset pin (RST).
+#define W_CLK 6        // connect to AD9850 module word load clock pin (CLK)
+#define FQ_UD 5        // connect to freq update pin (FQ)
+#define DATA  4        // connect to serial data load pin (DATA)
+#define RESET 3        // connect to reset pin (RST).
 
-#define encoder_a 3
-#define encoder_b 4
-#define encoder_click 5
+#define ENCODER 0
+#define encoder_a 7
+#define encoder_b 8
+#define encoder_click 9
  
 #define pulseHigh(pin) {digitalWrite(pin, HIGH); digitalWrite(pin, LOW); }
 
@@ -56,10 +57,12 @@ void setup() {
   pulseHigh(W_CLK);
   pulseHigh(FQ_UD);  // this pulse enables serial mode - Datasheet page 12 figure 10
 
+#if ENCODER
   // encoder
   pinMode(encoder_a, INPUT);
   pinMode(encoder_b, INPUT);
   pinMode(encoder_click, INPUT);
+#endif
   
   Serial.begin(9600);
   sendFrequency(user_freq);
@@ -91,6 +94,7 @@ void loop() {
      }
   }
 
+#if ENCODER
   encoder_state = digitalRead(encoder_a);
   if ((encoder_last == LOW) && (encoder_state == HIGH)) {
     if (digitalRead(encoder_b) == LOW) {
@@ -103,5 +107,6 @@ void loop() {
   encoder_last = encoder_state;
   
   if(digitalRead(encoder_click) == LOW) sendFrequency( 1.e6 ); // reset to 1MHz
+#endif
 
 }