From 6821d8abf2d3e0d2f296eafcb398d1e1f37df265 Mon Sep 17 00:00:00 2001
From: Reed Nightingale <reed.nightingale@gmail.com>
Date: Mon, 11 May 2020 19:57:05 -0700
Subject: [PATCH] Strip out some code, and add some so that inputs (button,
 knob, touch) generate outputs (screen + speaker) for debugging purposes

---
 menu_main_buttons.cpp |  4 +--
 ubitxv6.ino           | 58 +++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 58 insertions(+), 4 deletions(-)

diff --git a/menu_main_buttons.cpp b/menu_main_buttons.cpp
index 034b830..1bbb425 100644
--- a/menu_main_buttons.cpp
+++ b/menu_main_buttons.cpp
@@ -625,7 +625,7 @@ ButtonStatus_e bsIgnore(){
 }
 
 void osQuickList(){
-  enterSubmenu(quickListMenu);
+  //enterSubmenu(quickListMenu);
 }
 
 void osMenu(){
@@ -633,5 +633,5 @@ void osMenu(){
 }
 
 void osNumpad(){
-  enterSubmenu(numpadMenu);
+  //enterSubmenu(numpadMenu);
 }
diff --git a/ubitxv6.ino b/ubitxv6.ino
index 38f4da4..893d992 100644
--- a/ubitxv6.ino
+++ b/ubitxv6.ino
@@ -154,7 +154,7 @@ void setup()
     runBfoSetting();
   }
 
-  rootMenu->initMenu();
+  //rootMenu->initMenu();
 }
 
 
@@ -162,6 +162,8 @@ void setup()
  * The loop checks for keydown, ptt, function button and tuning.
  */
 
+#include "toneAC2/toneAC2.h"
+#include "colors.h"
 void loop(){
   if(TuningMode_e::TUNE_CW == globalSettings.tuningMode){
     cwKeyer();
@@ -181,5 +183,57 @@ void loop(){
   Point touch_point;
   ButtonPress_e touch_button = checkTouch(&touch_point);
   int16_t knob = enc_read();
-  runActiveMenu(tuner_button,touch_button,touch_point,knob);
+
+  //runActiveMenu(tuner_button,touch_button,touch_point,knob);
+
+  if(ButtonPress_e::ShortPress == tuner_button){
+    toneAC2(PIN_CW_TONE,440);
+    displayFillrect(0,0,20,20,DISPLAY_WHITE);
+    delay(10);
+  }
+  else if(ButtonPress_e::LongPress == tuner_button){
+    toneAC2(PIN_CW_TONE,880);
+    displayFillrect(0,0,20,20,DISPLAY_RED);
+    delay(10);
+  }
+  else if(ButtonPress_e::ShortPress == touch_button){
+    toneAC2(PIN_CW_TONE,659);
+    displayFillrect(220,0,20,20,DISPLAY_WHITE);
+    delay(10);
+  }
+  else if(ButtonPress_e::LongPress == touch_button){
+    toneAC2(PIN_CW_TONE,1319);
+    displayFillrect(220,0,20,20,DISPLAY_RED);
+    delay(10);
+  }
+  else if(knob > 0){
+    toneAC2(PIN_CW_TONE,100*knob);
+    delay(10);
+  }
+  else if(knob < 0){
+    toneAC2(PIN_CW_TONE,-500*knob);
+    delay(10);
+  }
+  else{
+    noToneAC2();
+    displayFillrect(0,0,20,20,DISPLAY_BLACK);
+    displayFillrect(220,0,20,20,DISPLAY_BLACK);
+  }
+
+  ltoa(knob,b,10);
+  displayText(b,20,40,100,20,DISPLAY_WHITE,DISPLAY_NAVY,DISPLAY_GREEN);
+
+  ltoa(touch_point.x,b,10);
+  char* p = b + strlen(b);
+  *p = ',';
+  ++p;
+  ltoa(touch_point.y,p,10);
+  displayText(b,40,70,200,20,DISPLAY_WHITE,DISPLAY_DARKGREEN,DISPLAY_YELLOW);
+
+  Serial.print(tuner_button);Serial.print(F(","));
+  Serial.print(knob);Serial.print(F(","));
+  Serial.print(touch_button);Serial.print(F(","));
+  Serial.print(touch_point.x);Serial.print(F(","));
+  Serial.println(touch_point.y);
+
 }