odie/ubitxv6
1
0
Fork 0
mirror of https://codeberg.org/mclemens/ubitxv6.git synced 2025-02-21 06:57:27 -05:00
Code Issues Packages Projects Releases Wiki Activity

Strip out some code, and add some so that inputs (button, knob, touch) generate outputs (screen + speaker) for debugging purposes

Browse Source
This commit is contained in:
Reed Nightingale 2020-05-11 19:57:05 -07:00
parent 84f47b0a23
commit 6821d8abf2
2 changed files with 58 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
menu_main_buttons.cpp
View File

@ -625,7 +625,7 @@ ButtonStatus_e bsIgnore(){
} }
void osQuickList(){ void osQuickList(){
enterSubmenu(quickListMenu); //enterSubmenu(quickListMenu);
} }
void osMenu(){ void osMenu(){
@ -633,5 +633,5 @@ void osMenu(){
} }
void osNumpad(){ void osNumpad(){
enterSubmenu(numpadMenu); //enterSubmenu(numpadMenu);
} }

58
ubitxv6.ino
View File

@ -154,7 +154,7 @@ void setup()
runBfoSetting(); runBfoSetting();
} }
rootMenu->initMenu(); //rootMenu->initMenu();
} }
@ -162,6 +162,8 @@ void setup()
* The loop checks for keydown, ptt, function button and tuning. * The loop checks for keydown, ptt, function button and tuning.
*/ */
#include "toneAC2/toneAC2.h"
#include "colors.h"
void loop(){ void loop(){
if(TuningMode_e::TUNE_CW == globalSettings.tuningMode){ if(TuningMode_e::TUNE_CW == globalSettings.tuningMode){
cwKeyer(); cwKeyer();
@ -181,5 +183,57 @@ void loop(){
Point touch_point; Point touch_point;
ButtonPress_e touch_button = checkTouch(&touch_point); ButtonPress_e touch_button = checkTouch(&touch_point);
int16_t knob = enc_read(); 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);
} }