Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor TFT branch cherry-picks #5682

Merged
merged 5 commits into from
Dec 28, 2024
+18 −5
Merged

Minor TFT branch cherry-picks #5682

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
efbfc99
update indicator board
mverch67 Oct 30, 2024
4333802
Fixed the issue that indicator device uploads via rp2040 serial port …
Wvirgil123 Nov 14, 2024
dff8257
esp debug logs
mverch67 Mar 18, 2024
d565ec2
USB mode=1 messed up the debug log
mverch67 Jul 3, 2024
bdb9a8a
dummy for config transfer (#5154)
caveman99 Oct 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
dummy for config transfer (#5154)
  • Loading branch information
@caveman99 @fifieldt
caveman99 authored and fifieldt committed Dec 27, 2024
commit bdb9a8a6aeb5817c9a6c65c5e89d0fd93bbb742c
2 changes: 1 addition & 1 deletion src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1275,4 +1275,4 @@ void loop()
mainDelay.delay(delayMsec);
}
}
#endif
#endif
4 changes: 4 additions & 0 deletions src/mesh/PhoneAPI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,7 @@ bool PhoneAPI::handleToRadio(const uint8_t *buf, size_t bufLength)
*
* Our sending states progress in the following sequence (the client apps ASSUME THIS SEQUENCE, DO NOT CHANGE IT):
STATE_SEND_MY_INFO, // send our my info record
STATE_SEND_UIDATA,
STATE_SEND_OWN_NODEINFO,
STATE_SEND_METADATA,
STATE_SEND_CHANNELS
Expand Down Expand Up @@ -290,6 +291,9 @@ size_t PhoneAPI::getFromRadio(uint8_t *buf)
LOG_DEBUG("Send config: sessionkey");
fromRadioScratch.config.which_payload_variant = meshtastic_Config_sessionkey_tag;
break;
case meshtastic_Config_device_ui_tag: // NOOP!
fromRadioScratch.config.which_payload_variant = meshtastic_Config_device_ui_tag;
break;
default:
LOG_ERROR("Unknown config type %d", config_state);
}
Expand Down
7 changes: 7 additions & 0 deletions src/modules/AdminModule.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -633,6 +633,9 @@ void AdminModule::handleSetConfig(const meshtastic_Config &c)
requiresReboot = false;

break;
case meshtastic_Config_device_ui_tag:
// NOOP! This is handled by handleStoreDeviceUIConfig
break;
}
if (requiresReboot && !hasOpenEditTransaction) {
disableBluetooth();
Expand Down Expand Up @@ -795,6 +798,10 @@ void AdminModule::handleGetConfig(const meshtastic_MeshPacket &req, const uint32
LOG_INFO("Get config: Sessionkey");
res.get_config_response.which_payload_variant = meshtastic_Config_sessionkey_tag;
break;
case meshtastic_AdminMessage_ConfigType_DEVICEUI_CONFIG:
// NOOP! This is handled by handleGetDeviceUIConfig
res.get_config_response.which_payload_variant = meshtastic_Config_device_ui_tag;
break;
}
// NOTE: The phone app needs to know the ls_secs value so it can properly expect sleep behavior.
// So even if we internally use 0 to represent 'use default' we still need to send the value we are
Expand Down
Loading