Skip to content

Commit 29fb487

Browse files
max-arnoldmax-arnold
committed
Rename serial mode to usb mode
1 parent 2b2bc55 commit 29fb487

File tree

7 files changed

+32
-32
lines changed

7 files changed

+32
-32
lines changed

‎ats-mini/Common.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,9 @@
7474
#define BLE_OFF 0 // Bluetooth is disabled
7575
#define BLE_ADHOC 1 // Ad hoc BLE serial protocol
7676

77-
// Serial modes
78-
#define SERIAL_OFF 0 // Serial is disabled
79-
#define SERIAL_ADHOC 1 // Ad hoc serial protocol
77+
// USB modes
78+
#define USB_OFF 0 // USB is disabled
79+
#define USB_ADHOC 1 // Ad hoc serial protocol
8080

8181
//
8282
// Data Types
@@ -160,7 +160,7 @@ extern int8_t SsbAvcIdx;
160160
extern int8_t AmSoftMuteIdx;
161161
extern int8_t SsbSoftMuteIdx;
162162
extern uint8_t rdsModeIdx;
163-
extern uint8_t serialModeIdx;
163+
extern uint8_t usbModeIdx;
164164
extern uint8_t bleModeIdx;
165165
extern uint8_t wifiModeIdx;
166166
extern uint8_t FmRegionIdx;

‎ats-mini/Menu.cpp‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ static const char *menu[] =
122122
#define MENU_SLEEP 9
123123
#define MENU_SLEEPMODE 10
124124
#define MENU_LOADEIBI 11
125-
#define MENU_SERIALMODE 12
125+
#define MENU_USBMODE 12
126126
#define MENU_BLEMODE 13
127127
#define MENU_WIFIMODE 14
128128
#define MENU_ABOUT 15
@@ -144,7 +144,7 @@ static const char *settings[] =
144144
"Sleep",
145145
"Sleep Mode",
146146
"Load EiBi",
147-
"USB Serial",
147+
"USB Port",
148148
"Bluetooth",
149149
"Wi-Fi",
150150
"About",
@@ -247,14 +247,14 @@ static const char *uiLayoutDesc[] =
247247
{ "Default", "S-Meter" };
248248

249249
//
250-
// USB Serial Mode Menu
250+
// USB Port Mode Menu
251251
//
252252

253-
uint8_t serialModeIdx = SERIAL_OFF;
254-
static const char *serialModeDesc[] =
253+
uint8_t usbModeIdx = USB_OFF;
254+
static const char *usbModeDesc[] =
255255
{ "Off", "Ad hoc" };
256256

257-
int getTotalSerialModes() { return(ITEM_COUNT(serialModeDesc)); }
257+
int getTotalUSBModes() { return(ITEM_COUNT(usbModeDesc)); }
258258

259259
//
260260
// Bluetooth Mode Menu
@@ -596,9 +596,9 @@ static void doSleepMode(int16_t enc)
596596
sleepModeIdx = wrap_range(sleepModeIdx, enc, 0, LAST_ITEM(sleepModeDesc));
597597
}
598598

599-
static void doSerialMode(int16_t enc)
599+
static void doUSBMode(int16_t enc)
600600
{
601-
serialModeIdx = wrap_range(serialModeIdx, enc, 0, LAST_ITEM(serialModeDesc));
601+
usbModeIdx = wrap_range(usbModeIdx, enc, 0, LAST_ITEM(usbModeDesc));
602602
}
603603

604604
static void doBleMode(int16_t enc)
@@ -888,7 +888,7 @@ static void clickSettings(int cmd, bool shortPress)
888888
case MENU_SLEEP: currentCmd = CMD_SLEEP; break;
889889
case MENU_SLEEPMODE: currentCmd = CMD_SLEEPMODE; break;
890890
case MENU_UTCOFFSET: currentCmd = CMD_UTCOFFSET; break;
891-
case MENU_SERIALMODE: currentCmd = CMD_SERIALMODE; break;
891+
case MENU_USBMODE: currentCmd = CMD_USBMODE; break;
892892
case MENU_BLEMODE: currentCmd = CMD_BLEMODE; break;
893893
case MENU_WIFIMODE: currentCmd = CMD_WIFIMODE; break;
894894
case MENU_FM_REGION:
@@ -930,7 +930,7 @@ bool doSideBar(uint16_t cmd, int16_t enc, int16_t enca)
930930
case CMD_MEMORY: doMemory(scrollDirection * enca);break;
931931
case CMD_SLEEP: doSleep(enca);break;
932932
case CMD_SLEEPMODE: doSleepMode(scrollDirection * enc);break;
933-
case CMD_SERIALMODE: doSerialMode(scrollDirection * enc);break;
933+
case CMD_USBMODE: doUSBMode(scrollDirection * enc);break;
934934
case CMD_BLEMODE: doBleMode(scrollDirection * enc);break;
935935
case CMD_WIFIMODE: doWiFiMode(scrollDirection * enc);break;
936936
case CMD_ZOOM: doZoom(enc);break;
@@ -1219,27 +1219,27 @@ static void drawSleepMode(int x, int y, int sx)
12191219
}
12201220
}
12211221

1222-
static void drawSerialMode(int x, int y, int sx)
1222+
static void drawUSBMode(int x, int y, int sx)
12231223
{
1224-
drawCommon(settings[MENU_SERIALMODE], x, y, sx, true);
1224+
drawCommon(settings[MENU_USBMODE], x, y, sx, true);
12251225

1226-
int count = ITEM_COUNT(serialModeDesc);
1226+
int count = ITEM_COUNT(usbModeDesc);
12271227
for(int i=-2 ; i<3 ; i++)
12281228
{
12291229
if(i==0) {
1230-
drawZoomedMenu(serialModeDesc[abs((serialModeIdx+count+i)%count)]);
1230+
drawZoomedMenu(usbModeDesc[abs((usbModeIdx+count+i)%count)]);
12311231
spr.setTextColor(TH.menu_hl_text, TH.menu_hl_bg);
12321232
} else {
12331233
spr.setTextColor(TH.menu_item);
12341234
}
12351235

12361236
// Prevent repeats for short menus
1237-
if (count < 5 && ((serialModeIdx+i) < 0 || (serialModeIdx+i) >= count)) {
1237+
if (count < 5 && ((usbModeIdx+i) < 0 || (usbModeIdx+i) >= count)) {
12381238
continue;
12391239
}
12401240

12411241
spr.setTextDatum(MC_DATUM);
1242-
spr.drawString(serialModeDesc[abs((serialModeIdx+count+i)%count)], 40+x+(sx/2), 64+y+(i*16), 2);
1242+
spr.drawString(usbModeDesc[abs((usbModeIdx+count+i)%count)], 40+x+(sx/2), 64+y+(i*16), 2);
12431243
}
12441244
}
12451245

@@ -1684,7 +1684,7 @@ void drawSideBar(uint16_t cmd, int x, int y, int sx)
16841684
case CMD_MEMORY: drawMemory(x, y, sx); break;
16851685
case CMD_SLEEP: drawSleep(x, y, sx); break;
16861686
case CMD_SLEEPMODE: drawSleepMode(x, y, sx); break;
1687-
case CMD_SERIALMODE: drawSerialMode(x, y, sx); break;
1687+
case CMD_USBMODE: drawUSBMode(x, y, sx); break;
16881688
case CMD_BLEMODE: drawBleMode(x, y, sx); break;
16891689
case CMD_WIFIMODE: drawWiFiMode(x, y, sx); break;
16901690
case CMD_ZOOM: drawZoom(x, y, sx); break;

‎ats-mini/Menu.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
#define CMD_SLEEP 0x2A00 // |
4242
#define CMD_SLEEPMODE 0x2B00 // |
4343
#define CMD_LOADEIBI 0x2C00 // |
44-
#define CMD_SERIALMODE 0x2D00 // |
44+
#define CMD_USBMODE 0x2D00 // |
4545
#define CMD_BLEMODE 0x2E00 // |
4646
#define CMD_WIFIMODE 0x2F00 // |
4747
#define CMD_ABOUT 0x3000 //-+

‎ats-mini/Remote.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -431,18 +431,18 @@ int remoteDoCommand(Stream* stream, RemoteState* state, char key)
431431
return(event | REMOTE_CHANGED);
432432
}
433433

434-
int serialDoCommand(Stream* stream, RemoteState* state, uint8_t serialMode)
434+
int serialDoCommand(Stream* stream, RemoteState* state, uint8_t usbMode)
435435
{
436-
if(serialMode == SERIAL_OFF) return 0;
436+
if(usbMode == USB_OFF) return 0;
437437

438438
if (Serial.available())
439439
return remoteDoCommand(stream, state, Serial.read());
440440
return 0;
441441
}
442442

443-
void serialTickTime(Stream* stream, RemoteState* state, uint8_t serialMode)
443+
void serialTickTime(Stream* stream, RemoteState* state, uint8_t usbMode)
444444
{
445-
if(serialMode == SERIAL_OFF) return;
445+
if(usbMode == USB_OFF) return;
446446

447447
remoteTickTime(stream, state);
448448
}

‎ats-mini/Remote.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ typedef struct {
99

1010
void remoteTickTime(Stream* stream, RemoteState* state);
1111
int remoteDoCommand(Stream* stream, RemoteState* state, char key);
12-
int serialDoCommand(Stream* stream, RemoteState* state, uint8_t serialMode);
13-
void serialTickTime(Stream* stream, RemoteState* state, uint8_t serialMode);
12+
int serialDoCommand(Stream* stream, RemoteState* state, uint8_t usbMode);
13+
void serialTickTime(Stream* stream, RemoteState* state, uint8_t usbMode);
1414

1515
#endif

‎ats-mini/Storage.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ void prefsSave(uint32_t items)
193193
prefs.putUChar("FmRegion", FmRegionIdx); // FM region
194194
prefs.putUChar("UILayout", uiLayoutIdx); // UI Layout
195195
prefs.putUChar("BLEMode", bleModeIdx); // Bluetooth mode
196-
prefs.putUChar("SerialMode", serialModeIdx); // Serial mode
196+
prefs.putUChar("USBMode", usbModeIdx); // USB mode
197197

198198
// Done with global settings
199199
prefs.end();
@@ -267,7 +267,7 @@ bool prefsLoad(uint32_t items)
267267
FmRegionIdx = prefs.getUChar("FmRegion", FmRegionIdx); // FM region
268268
uiLayoutIdx = prefs.getUChar("UILayout", uiLayoutIdx); // UI Layout
269269
bleModeIdx = prefs.getUChar("BLEMode", bleModeIdx); // Bluetooth mode
270-
serialModeIdx = prefs.getUChar("SerialMode", serialModeIdx); // Serial mode
270+
usbModeIdx = prefs.getUChar("USBMode", usbModeIdx); // USB mode
271271

272272
// Done with global settings
273273
prefs.end();

‎ats-mini/ats-mini.ino‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -754,13 +754,13 @@ void loop()
754754
ButtonTracker::State pb1st = pb1.update(digitalRead(ENCODER_PUSH_BUTTON) == LOW);
755755

756756
// Periodically print status to remote interfaces
757-
serialTickTime(&Serial, &remoteSerialState, serialModeIdx);
757+
serialTickTime(&Serial, &remoteSerialState, usbModeIdx);
758758
remoteBLETickTime(&BLESerial, &remoteBLEState, bleModeIdx);
759759

760760
// if(encCount && getCpuFrequencyMhz()!=240) setCpuFrequencyMhz(240);
761761

762762
// Receive and execute serial command
763-
int ser_event = serialDoCommand(&Serial, &remoteSerialState, serialModeIdx);
763+
int ser_event = serialDoCommand(&Serial, &remoteSerialState, usbModeIdx);
764764
needRedraw |= !!(ser_event & REMOTE_CHANGED);
765765
pb1st.wasClicked |= !!(ser_event & REMOTE_CLICK);
766766
int ser_direction = ser_event >> REMOTE_DIRECTION;

0 commit comments

Comments
 (0)