pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-04-26 09:59:01 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Merge pull request #730 from geeksville/dev1.2

Browse Source 
1.2.4
This commit is contained in:
Kevin Hester 2021-03-05 13:46:18 +08:00 committed by GitHub
commit c5b67d821d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/software/TODO.md
View File

@ -34,6 +34,8 @@ You probably don't care about this section - skip to the next one.
* DONE combine acks and responses in a single message if possible (do routing plugin LAST and drop ACK if someone else has already replied) * DONE combine acks and responses in a single message if possible (do routing plugin LAST and drop ACK if someone else has already replied)
* DONE don't send packets we received from the phone BACK TOWARDS THE PHONE (possibly use fromnode 0 for packets the phone sends?) * DONE don't send packets we received from the phone BACK TOWARDS THE PHONE (possibly use fromnode 0 for packets the phone sends?)
* fix 1.1.50 android debug panel display * fix 1.1.50 android debug panel display
* test android channel setting
* release to users
* DONE warn in android app about unset regions * DONE warn in android app about unset regions
* DONE use set-channel from android * DONE use set-channel from android
* DONE add gui in android app for setting region * DONE add gui in android app for setting region

6
src/mesh/MeshPlugin.cpp
View File

@ -109,7 +109,11 @@ void setReplyTo(MeshPacket *p, const MeshPacket &to)
{ {
assert(p->which_payloadVariant == MeshPacket_decoded_tag); // Should already be set by now assert(p->which_payloadVariant == MeshPacket_decoded_tag); // Should already be set by now
p->to = getFrom(&to); p->to = getFrom(&to);
p->want_ack = to.want_ack;
// No need for an ack if we are just delivering locally (it just generates an ignored ack)
p->want_ack = (to.from != 0) ? to.want_ack : false;
if(p->priority == MeshPacket_Priority_UNSET)
p->priority = MeshPacket_Priority_RELIABLE;
p->decoded.request_id = to.id; p->decoded.request_id = to.id;
} }

2
version.properties
View File

@ -1,4 +1,4 @@
[VERSION] [VERSION]
major = 1 major = 1
minor = 2 minor = 2
build = 1 build = 4