ua1zbe
/
rdz_ttgo_sonde_dl9rdz
mirror of https://github.com/dl9rdz/rdz_ttgo_sonde
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

limit ssid strings to screen width; loglevel 3 as default until config file is read

This commit is contained in:
Hansi, dl9rdz 2024-12-29 11:20:58 +01:00
parent 30915c334a
commit d3c7763fbd
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
RX_FSK/RX_FSK.ino
View File

@ -1960,6 +1960,7 @@ void setup()
// Open serial communications and wait for port to open:
Serial.begin(115200);
Log.init();
for (int i = 0; i < 39; i++) {
int v = gpio_get_level((gpio_num_t)i);
@ -2667,7 +2668,9 @@ void wifiConnect(int16_t res) {
}
WiFi.scanDelete();
if (bestEntry >= 0) {
LOG_D(TAG, "WiFi Connecting BSSID: %02X:%02X:%02X:%02X:%02X:%02X SSID: %s PW %s Channel: %d (RSSI %d)\n", bestBSSID[0], bestBSSID[1], bestBSSID[2], bestBSSID[3], bestBSSID[4], bestBSSID[5], fetchWifiSSID(bestEntry), fetchWifiPw(bestEntry), bestChannel, bestRSSI);
LOG_D(TAG, "WiFi Connecting BSSID: %02X:%02X:%02X:%02X:%02X:%02X SSID: %s PW %s Channel: %d (RSSI %d)\n",
bestBSSID[0], bestBSSID[1], bestBSSID[2], bestBSSID[3], bestBSSID[4], bestBSSID[5],
fetchWifiSSID(bestEntry), fetchWifiPw(bestEntry), bestChannel, bestRSSI);
wifi_state = WIFI_CONNECT;
WiFi.begin(fetchWifiSSID(bestEntry), fetchWifiPw(bestEntry), bestChannel, bestBSSID);
} else {
@ -2812,7 +2815,8 @@ void loopWifiScan() {
wifi_state = WIFI_DISABLED;
disp.rdis->setFont(FONT_SMALL);
uint8_t dispw, disph, dispxs, dispys;
disp.rdis->getDispSize(&disph, &dispw, &dispxs, &dispys);
disp.rdis->getDispSize(&disph, &dispw, &dispys, &dispxs);
int dwidth = dispw / dispxs;
int lastl = (disph / dispys - 2) * dispys;
int cnt = 0;
char abort = 0; // abort on keypress
@ -2846,7 +2850,7 @@ void loopWifiScan() {
int n = WiFi.scanNetworks();
for (int i = 0; i < n; i++) {
String ssid = WiFi.SSID(i);
disp.rdis->drawString(0, dispys * (1 + line), ssid.c_str());
disp.rdis->drawString(0, dispys * (1 + line), ssid.c_str(), dwidth);
line = (line + 1) % (disph / dispys);
String mac = WiFi.BSSIDstr(i);
const char *encryptionTypeDescription = translateEncryptionType(WiFi.encryptionType(i));

4
RX_FSK/src/logger.cpp
View File

@ -15,6 +15,10 @@ extern const char *version_id;
const char *lvlcol[]={RED, YEL, GRN, BLU};
void Logger::init() {
sonde.config.debug = 3; // Use as initial value until config file is read from file system
}
void Logger::logf(LOGLEVEL lvl, const char *module, const char *fmt, ...) {
int color = sonde.config.debug >= 10 ? 1 : 0;
int cfglvl = sonde.config.debug - 10*color;

1
RX_FSK/src/logger.h
View File

@ -13,6 +13,7 @@ enum LOGLEVEL { L_ERR, L_WARN, L_INFO, L_DBG };
class Logger {
public:
void init();
void logf(LOGLEVEL lvl, const char *module, const char *fmt, ...);
void sendImprov(int type, int len, const char *data);
void sendImprovResult(int cmd, const char *data[]);