Fixed most compilation warnings and a delay issue

* Fixed most compilation warnings (Compiler warning level: All)
* Fixed a delay issue in enc_read function.
This commit is contained in:
Qi Wenmin
2018-01-17 14:42:15 +08:00
parent 95e5c1dfe5
commit 209cd3a49c
6 changed files with 27 additions and 34 deletions

View File

@@ -13,7 +13,7 @@
#define printLineF1(x) (printLineF(1, x))
#define printLineF2(x) (printLineF(0, x))
int menuBand(int btn){
void menuBand(int btn){
int knob = 0;
int stepChangeCount = 0;
byte btnPressCount = 0;
@@ -301,7 +301,7 @@ void menuExit(int btn){
}
}
int menuCWSpeed(int btn){
void menuCWSpeed(int btn){
int knob = 0;
int wpm;
@@ -356,7 +356,7 @@ int menuCWSpeed(int btn){
menuOn = 0;
}
int menuCWAutoKey(int btn){
void menuCWAutoKey(int btn){
if (!btn){
printLineF2(F("CW AutoKey Mode?"));
return;
@@ -379,7 +379,7 @@ int menuCWAutoKey(int btn){
menuOn = 0;
}
int menuSetupCwDelay(int btn){
void menuSetupCwDelay(int btn){
int knob = 0;
int tmpCWDelay = cwDelayTime * 10;
@@ -427,7 +427,7 @@ int menuSetupCwDelay(int btn){
menuOn = 0;
}
int menuSetupTXCWInterval(int btn){
void menuSetupTXCWInterval(int btn){
int knob = 0;
int tmpTXCWInterval = delayBeforeCWStartTime * 2;
@@ -490,10 +490,8 @@ int menuSetupTXCWInterval(int btn){
extern int32_t calibration;
extern uint32_t si5351bx_vcoa;
int factoryCalibration(int btn){
void factoryCalibration(int btn){
int knob = 0;
int32_t prev_calibration;
//keep clear of any previous button press
while (btnDown())
@@ -502,10 +500,9 @@ int factoryCalibration(int btn){
if (!btn){
printLineF2(F("Set Calibration?"));
return 0;
return;
}
prev_calibration = calibration;
calibration = 0;
isUSB = true;
@@ -560,13 +557,13 @@ int factoryCalibration(int btn){
delay(100);
}
int menuSetupCalibration(int btn){
void menuSetupCalibration(int btn){
int knob = 0;
int32_t prev_calibration;
if (!btn){
printLineF2(F("Set Calibration?"));
return 0;
return;
}
printLineF1(F("Set to Zero-beat,"));