mirror of
https://github.com/alexhopeoconnor/firmware.git
synced 2026-10-07 20:50:05 +10:00
Compare commits
21
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f6423aca76 | ||
|
|
fc5670cdad | ||
|
|
ba81da8de0 | ||
|
|
3ca23400ef | ||
|
|
b3497cf688 | ||
|
|
c873833123 | ||
|
|
3c569f6672 | ||
|
|
c12a3916ea | ||
|
|
abbcb57958 | ||
|
|
a0daaf6b5c | ||
|
|
589634c18d | ||
|
|
37b3becdcd | ||
|
|
51e9696f11 | ||
|
|
796d4552f9 | ||
|
|
ebc5b63035 | ||
|
|
f9ab2b2cc0 | ||
|
|
093bc49a73 | ||
|
|
36827d6207 | ||
|
|
ef02cd1dd1 | ||
|
|
a2a0417596 | ||
|
|
f5c2c99150 |
+1
-8
@@ -731,15 +731,8 @@ void setup()
|
||||
#elif defined(USE_SH1107_128_64)
|
||||
screen_model = meshtastic_Config_DisplayConfig_OledType_OLED_SH1107; // keep dimension of 128x64
|
||||
#else
|
||||
if (config.display.oled != meshtastic_Config_DisplayConfig_OledType_OLED_AUTO) {
|
||||
if (config.display.oled != meshtastic_Config_DisplayConfig_OledType_OLED_AUTO)
|
||||
screen_model = config.display.oled;
|
||||
|
||||
// Fix: update geometry for SH1107 128x128 selected via menu
|
||||
if (screen_model == meshtastic_Config_DisplayConfig_OledType_OLED_SH1107_128_128) {
|
||||
screen_geometry = GEOMETRY_128_128;
|
||||
screen_model = meshtastic_Config_DisplayConfig_OledType_OLED_SH1107; // normalize
|
||||
}
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
||||
+1
-1
@@ -2298,7 +2298,7 @@ bool NodeDB::updateUser(uint32_t nodeId, meshtastic_User &p, uint8_t channelInde
|
||||
meshtastic_ClientNotification *cn = clientNotificationPool.allocZeroed();
|
||||
cn->level = meshtastic_LogRecord_Level_WARNING;
|
||||
cn->time = getValidTime(RTCQualityFromNet);
|
||||
snprintf(cn->message, sizeof(cn->message), warning, p.long_name);
|
||||
sprintf(cn->message, warning, p.long_name);
|
||||
service->sendClientNotification(cn);
|
||||
}
|
||||
return false;
|
||||
|
||||
+1
-1
@@ -329,7 +329,7 @@ ErrorCode Router::send(meshtastic_MeshPacket *p)
|
||||
cn->reply_id = p->id;
|
||||
cn->level = meshtastic_LogRecord_Level_WARNING;
|
||||
cn->time = getValidTime(RTCQualityFromNet);
|
||||
snprintf(cn->message, sizeof(cn->message), "Duty cycle limit exceeded. You can send again in %d mins", silentMinutes);
|
||||
sprintf(cn->message, "Duty cycle limit exceeded. You can send again in %d mins", silentMinutes);
|
||||
service->sendClientNotification(cn);
|
||||
|
||||
meshtastic_Routing_Error err = meshtastic_Routing_Error_DUTY_CYCLE_LIMIT;
|
||||
|
||||
Reference in New Issue
Block a user