Skip to content

Commit

Permalink
Renamed callchangecomment to personallabel
Browse files Browse the repository at this point in the history
  • Loading branch information
1tilen committed Sep 30, 2024
1 parent ada48ec commit b77b0e5
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
6 changes: 3 additions & 3 deletions data/tracker_config.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"comment": "",
"smartBeaconActive": true,
"smartBeaconSetting": 0,
"callchangecomment": ""
"profilelabel": ""
},
{
"callsign": "NOCALL-7",
Expand All @@ -20,7 +20,7 @@
"comment": "",
"smartBeaconActive": true,
"smartBeaconSetting": 2,
"callchangecomment": ""
"profilelabel": ""
},
{
"callsign": "NOCALL-7",
Expand All @@ -31,7 +31,7 @@
"comment": "",
"smartBeaconActive": true,
"smartBeaconSetting": 1,
"callchangecomment": ""
"profilelabel": ""
}
],
"display": {
Expand Down
2 changes: 1 addition & 1 deletion src/configuration.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ void Configuration::readFile(fs::FS &fs, const char *fileName) {
bcn.smartBeaconSetting = BeaconsArray[i]["smartBeaconSetting"] | 0;
bcn.micE = BeaconsArray[i]["micE"] | "";
bcn.gpsEcoMode = BeaconsArray[i]["gpsEcoMode"] | false;
bcn.callchangecomment = BeaconsArray[i]["callchangecomment"] | "";
bcn.profilelabel = BeaconsArray[i]["profilelabel"] | "";

beacons.push_back(bcn);
}
Expand Down
2 changes: 1 addition & 1 deletion src/configuration.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class Beacon {
byte smartBeaconSetting;
String micE;
bool gpsEcoMode;
String callchangecomment;
String profilelabel;
};

class Display {
Expand Down
10 changes: 5 additions & 5 deletions src/keyboard_utils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ int downCounter = 0;
int leftCounter = 0;
int rightCounter = 0;
int trackBallSensitivity = 5;
String callchangecomment = "";
String profilelabel = "";


namespace KEYBOARD_Utils {
Expand Down Expand Up @@ -336,13 +336,13 @@ namespace KEYBOARD_Utils {
statusState = true;
statusTime = millis();
winlinkCommentState = false;
if(strlen(Config.beacons[myBeaconsIndex].callchangecomment.c_str()) >0 ){ //if length of the callchangecomment is > 0 then print the comment when changing callsign. Else don't.
callchangecomment = " (" + Config.beacons[myBeaconsIndex].callchangecomment + ")";
if(strlen(Config.beacons[myBeaconsIndex].profilelabel.c_str()) >0 ){ //if length of the profilelabel is > 0 then print the comment when changing callsign. Else don't.
profilelabel = " (" + Config.beacons[myBeaconsIndex].profilelabel + ")";
}
else{
callchangecomment = "";
profilelabel = "";
}
displayShow("__ INFO __", "", " CHANGING CALLSIGN!", "", "--> " + Config.beacons[myBeaconsIndex].callsign + callchangecomment, "", 2000);
displayShow("__ INFO __", "", " CHANGING CALLSIGN!", "", "--> " + Config.beacons[myBeaconsIndex].callsign + profilelabel, "", 2000);
STATION_Utils::saveIndex(0, myBeaconsIndex);
if (menuDisplay == 200) {
menuDisplay = 20;
Expand Down

0 comments on commit b77b0e5

Please sign in to comment.