gpio compile option can be swithed on; with restrictions

diff --git a/gpio.c b/gpio.c
index 835bcab28e955b8fedb065c325b7fffb7ea88195..beb40ce9675339c4f4f8c688b6fc525b7ff2a374 100644 (file)
--- a/gpio.c
+++ b/gpio.c
@@ -986,33 +986,6 @@ static void cwAlert(int gpio, int level, uint32_t tick) {
        keyer_event(gpio, cw_active_level == 0 ? level : (level==0));
        }
 }
-
-/*
-static unsigned long cwl_debounce=0;
-static void cwlAlert() {
-    int t=millis();
-    if(t - cwl_debounce > settle_time) {
-      int level=digitalRead(CWL_BUTTON);
-      if (cw_keyer_internal == 0 ){
-               fprintf(stderr,"call keyer_event CWL Button \n");
-               keyer_event(CWL_BUTTON, cw_active_level == 0 ? level : (level==0));
-               }
-      cwl_debounce=t;
-    }
-}
-static unsigned long cwr_debounce=0;
-static void cwrAlert() {
-    int t=millis();
-    if(t - cwr_debounce > settle_time) {
-      int level=digitalRead(CWR_BUTTON);
-      if (cw_keyer_internal == 0 ){
-               fprintf(stderr,"call keyer_event CWR Button \n");
-               keyer_event(CWR_BUTTON, cw_active_level == 0 ? level : (level==0));
-               }
-      cwr_debounce=t;
-    }
-}
-*/
 #endif
 #endif
 
@@ -1053,28 +1026,28 @@ int gpio_init() {
     vfoEncoderPos=0;
   }
 
-  setup_pin(E1_FUNCTION, PUD_UP, &e1FunctionAlert);
-  e1Function=0;
-
   if(ENABLE_E1_ENCODER) {
+       setup_pin(E1_FUNCTION, PUD_UP, &e1FunctionAlert);
+       e1Function=0;  
+         
     setup_encoder_pin(E1_ENCODER_A,ENABLE_E1_PULLUP?PUD_UP:PUD_OFF,&e1EncoderA);
     setup_encoder_pin(E1_ENCODER_B,ENABLE_E1_PULLUP?PUD_UP:PUD_OFF,&e1EncoderB);
     e1EncoderPos=0;
   }
 
-  setup_pin(E2_FUNCTION, PUD_UP, &e2FunctionAlert);
-  e2Function=0;
-
   if(ENABLE_E2_ENCODER) {
+       setup_pin(E2_FUNCTION, PUD_UP, &e2FunctionAlert);
+       e2Function=0;
+       
     setup_encoder_pin(E2_ENCODER_A,ENABLE_E2_PULLUP?PUD_UP:PUD_OFF,&e2EncoderA);
     setup_encoder_pin(E2_ENCODER_B,ENABLE_E2_PULLUP?PUD_UP:PUD_OFF,&e2EncoderB);
     e2EncoderPos=0;
   }
 
-  setup_pin(E3_FUNCTION, PUD_UP, &e3FunctionAlert);
-  e3Function=0;
-
   if(ENABLE_E3_ENCODER) {
+       setup_pin(E3_FUNCTION, PUD_UP, &e3FunctionAlert);
+       e3Function=0;  
+         
     setup_encoder_pin(E3_ENCODER_A,ENABLE_E3_PULLUP?PUD_UP:PUD_OFF,&e3EncoderA);
     setup_encoder_pin(E3_ENCODER_B,ENABLE_E3_PULLUP?PUD_UP:PUD_OFF,&e3EncoderB);
     e3EncoderPos=0;
@@ -1149,18 +1122,11 @@ int gpio_init() {
 
 #ifdef LOCALCW
        fprintf(stderr,"GPIO: ENABLE_CW_BUTTONS=%d  CWL_BUTTON=%d CWR_BUTTON=%d\n",ENABLE_CW_BUTTONS, CWL_BUTTON, CWR_BUTTON);
-       if(ENABLE_CW_BUTTONS) {
-               /*
-               setup_pin(CWL_BUTTON, PUD_UP, &cwlAlert);
-               setup_pin(CWR_BUTTON, PUD_UP, &cwrAlert);
-               */
-               
+       if(ENABLE_CW_BUTTONS) { 
                #ifdef RADIOBERRY
                        setup_button(CWL_BUTTON, cwAlert);
                        setup_button(CWR_BUTTON, cwAlert);
                #endif
-               
-               
        }
 #endif
 

diff --git a/radioberry.c b/radioberry.c
index 18b114a40f5e5ed9104ba3c2e8401a5e7d841749..16e3c596cd0d7ee7e5d08a6a6cff0be55b718302 100644 (file)
--- a/radioberry.c
+++ b/radioberry.c
@@ -144,7 +144,6 @@ void radioberry_protocol_init(int rx,int pixels) {
        
        setup_handler(17, cwPTT_Alert); 
        
-   
        rx1_spi_handler = spiOpen(0, 15625000, 49155);  //channel 0
        if (rx1_spi_handler < 0) {
                fprintf(stderr,"radioberry_protocol: spi bus rx1 could not be initialized. \n");