ua1zbe
/
LoRa_APRS_Tracker111
mirror of https://github.com/richonguzman/LoRa_APRS_Tracker.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

code cleaning for(

This commit is contained in:
richonguzman 2024-12-19 11:43:28 -03:00
parent f4c52d88aa
commit 724dc2bba9
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/APRSPacketLib/APRSPacketLib.cpp
View File

@ -295,7 +295,7 @@ namespace APRSPacketLib {
int d28 = (int)informationField[0] - 28; int d28 = (int)informationField[0] - 28;
if (offset) d28 += 100; if (offset) d28 += 100;
temp = String(d28); temp = String(d28);
for(int i = temp.length(); i < 3; i++) { for (int i = temp.length(); i < 3; i++) {
temp = '0' + temp; temp = '0' + temp;
} }
String longitudeString = temp; String longitudeString = temp;

2
src/ble_utils.cpp
View File

@ -172,7 +172,7 @@ namespace BLE_Utils {
delay(200); delay(200);
} }
} else { // TNC2 } else { // TNC2
for(int n = 0; n < frame.length(); n++) txBLE(frame[n]); for (int n = 0; n < frame.length(); n++) txBLE(frame[n]);
txBLE('\n'); txBLE('\n');
} }
} }

14
src/menu_utils.cpp
View File

@ -115,7 +115,7 @@ namespace MENU_Utils {
topHeader2 += " "; topHeader2 += " ";
topHeader2 += String(gps.location.lng(), 4); topHeader2 += String(gps.location.lng(), 4);
for(int i = topHeader2.length(); i < 19; i++) { for (int i = topHeader2.length(); i < 19; i++) {
topHeader2 += " "; topHeader2 += " ";
} }
if (gps.satellites.value() <= 9) topHeader2 += " "; if (gps.satellites.value() <= 9) topHeader2 += " ";
@ -326,13 +326,13 @@ namespace MENU_Utils {
case 300: //3.Stations ---> Packet Decoder case 300: //3.Stations ---> Packet Decoder
if (lastReceivedPacket.sender != currentBeacon->callsign) { if (lastReceivedPacket.sender != currentBeacon->callsign) {
firstLineDecoder = lastReceivedPacket.sender; firstLineDecoder = lastReceivedPacket.sender;
for(int i = firstLineDecoder.length(); i < 9; i++) { for (int i = firstLineDecoder.length(); i < 9; i++) {
firstLineDecoder += ' '; firstLineDecoder += ' ';
} }
firstLineDecoder += lastReceivedPacket.symbol; firstLineDecoder += lastReceivedPacket.symbol;
if (lastReceivedPacket.type == 0 || lastReceivedPacket.type == 4) { // gps and Mic-E gps if (lastReceivedPacket.type == 0 || lastReceivedPacket.type == 4) { // gps and Mic-E gps
courseSpeedAltitude = String(lastReceivedPacket.altitude); courseSpeedAltitude = String(lastReceivedPacket.altitude);
for(int j = courseSpeedAltitude.length(); j < 4; j++) { for (int j = courseSpeedAltitude.length(); j < 4; j++) {
courseSpeedAltitude = '0' + courseSpeedAltitude; courseSpeedAltitude = '0' + courseSpeedAltitude;
} }
courseSpeedAltitude = "A=" + courseSpeedAltitude + "m "; courseSpeedAltitude = "A=" + courseSpeedAltitude + "m ";
@ -341,11 +341,11 @@ namespace MENU_Utils {
speedPacketDec = ' ' + speedPacketDec; speedPacketDec = ' ' + speedPacketDec;
} }
courseSpeedAltitude += speedPacketDec + "km/h "; courseSpeedAltitude += speedPacketDec + "km/h ";
for(int l = courseSpeedAltitude.length(); l < 17; l++) { for (int l = courseSpeedAltitude.length(); l < 17; l++) {
courseSpeedAltitude += ' '; courseSpeedAltitude += ' ';
} }
coursePacketDec = String(lastReceivedPacket.course); coursePacketDec = String(lastReceivedPacket.course);
for(int m = coursePacketDec.length(); m < 3; m++) { for (int m = coursePacketDec.length(); m < 3; m++) {
coursePacketDec = ' ' + coursePacketDec; coursePacketDec = ' ' + coursePacketDec;
} }
courseSpeedAltitude += coursePacketDec; courseSpeedAltitude += coursePacketDec;
@ -584,7 +584,7 @@ namespace MENU_Utils {
} }
} }
for(int i = thirdRowMainMenu.length(); i < 18; i++) { for (int i = thirdRowMainMenu.length(); i < 18; i++) {
thirdRowMainMenu += " "; thirdRowMainMenu += " ";
} }
@ -619,7 +619,7 @@ namespace MENU_Utils {
fourthRowCourse = "---"; fourthRowCourse = "---";
} else { } else {
fourthRowCourse.trim(); fourthRowCourse.trim();
for(int c = fourthRowCourse.length(); c < 3; c++) { for (int c = fourthRowCourse.length(); c < 3; c++) {
fourthRowCourse = "0" + fourthRowCourse; fourthRowCourse = "0" + fourthRowCourse;
} }
} }

6
src/utils.cpp
View File

@ -126,7 +126,7 @@ namespace Utils {
void i2cScannerForPeripherals() { void i2cScannerForPeripherals() {
uint8_t err, addr; uint8_t err, addr;
if (Config.wxsensor.active) { if (Config.wxsensor.active) {
for(addr = 1; addr < 0x7F; addr++) { for (addr = 1; addr < 0x7F; addr++) {
#ifdef HELTEC_V3_GPS #ifdef HELTEC_V3_GPS
Wire1.beginTransmission(addr); Wire1.beginTransmission(addr);
err = Wire1.endTransmission(); err = Wire1.endTransmission();
@ -144,7 +144,7 @@ namespace Utils {
} }
} }
for(addr = 1; addr < 0x7F; addr++) { for (addr = 1; addr < 0x7F; addr++) {
Wire.beginTransmission(addr); Wire.beginTransmission(addr);
err = Wire.endTransmission(); err = Wire.endTransmission();
if (err == 0) { if (err == 0) {
@ -160,7 +160,7 @@ namespace Utils {
} }
#ifdef HAS_TOUCHSCREEN #ifdef HAS_TOUCHSCREEN
for(addr = 1; addr < 0x7F; addr++) { for (addr = 1; addr < 0x7F; addr++) {
Wire.beginTransmission(addr); Wire.beginTransmission(addr);
err = Wire.endTransmission(); err = Wire.endTransmission();
if (err == 0) { if (err == 0) {