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

Jump to bottom

Tidy up various code (main, gps) #34

Open
wants to merge 39 commits into
base: master
Choose a base branch
from
Open

Tidy up various code (main, gps) #34

wants to merge 39 commits into from

Conversation

tormodvolden
Copy link
Contributor

@tormodvolden tormodvolden commented Jan 21, 2022 •
edited
Loading

These changes should not affect the functionality at all, and are mostly "cosmetic" code cleanup. Only the debug output concerning GPS will have some visible changes. And there is a new debug feature: GPS raw data output with AT+LOGGPS=2.

tormodvolden and others added 29 commits March 18, 2022 13:49
@tormodvolden
Revert previous commit "1.6.7"
e88631a 
This reverts commit 9e15412.

The commit had inadvertently reverted many previous changes and
also contains several independent changes, some of which are not
necessary.
@tormodvolden
Add AS923 channels
8c7ed9d
@tormodvolden
Add app and AT feature for turning off GPS
bcf6e78
@tormodvolden
gps: Comment out spurious debug print
749a46a
@tormodvolden
gps: Whitespace fix in GPS_INPUT()
1488564
@tormodvolden
Updated MDK project settings
b6ee51c
@tormodvolden
Delete autogenerated HTML file from repository
bf51c50 
This file doesn't need to be under revision control.
@tormodvolden
gcc: Use openocd 0.11 or newer for dual-bank support
716040e 
Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
@tormodvolden
gcc: Link code in two sections around the flash settings
2c5e757 
The current firmware is using the three flash pages at 0x08018F80,
0x08019000, and 0x08019080 for storing settings.

Lay out the firmware so that a hole at 0x08018800 - 0x0801A000 is
reserved for settings.

Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
@tormodvolden
gcc: Add printf with float support
f4d0497 
Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
@tormodvolden
gcc: Add README.gcc with build/flash instructions
b53999d
@tormodvolden
gcc: Add make targets for reading or writing flash settings
6ada1e2 
Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
@ubahnverleih @tormodvolden
Fix hardcoded value for APP_TX_DUTYCYCLE
59af65b
@tormodvolden
Move flash address definitions to lora.h
71bfb62 
Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
@tormodvolden
New FLASH_USER_START_ADDR_FDR macro instead of magic address
7c3a278 
Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
@tormodvolden
main: Tidy up gps_Identify()
42f9911 
Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
@tormodvolden
Tidy up battery voltage processing
bed394e 
Improve variable scope and names, and use integer calculation. This
rework shouldn't change the resulting values.

Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
@tormodvolden
lora: Avoid using library atoi()
7523be2 
Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
@tormodvolden
main: Eliminate TIMES variable that would never change
238ddbb 
A constant or macro with a good name could be better.

Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
@tormodvolden
main: Factor out uplink debug timestamp
cf5d13c 
We don't need so many timestamps.

Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
@tormodvolden
main: Rename printf_uplink() to normalize_gps_coord()
a877c3d 
The function was doing many things apart from debug printing, so rename it
and move some parts to the caller for better readability.

Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
@tormodvolden
Allow overriding debug baud rate
a942870 
Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
@tormodvolden
gps: Comment out spurious debug print
d0c3e97 
And use AT_PRINTF consistently otherwise.

Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
@tormodvolden
gps: Print GPS debug info when buffers are updated
9373089 
Check if any buffers were updated, not only the last.

Only dump buffers if any of them were updated.

Allow LOGGPS levels higher than 1.

Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
@tormodvolden
gps: Dump GPS buffer if debug level LOGGPS > 1
ba6b794 
Use the non-polling PRINTF which might lose data if it gets too busy,
but is also less prone to affect operation.

Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
@tormodvolden
gps: Print date/time/satellites first in debug output
942818f 
Print UTC time instead of hard-coded +0800 local time.

Also print all timestamp elements with 2 digits, and
make latitude and longitude output consistent.

Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
@tormodvolden
main: Fit more debug output on one line
93ac44b 
Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
@tormodvolden
Tidy up normalize_gps_coord() whitespace and redundant PPRINTF
dab7fbf
@tormodvolden
gps: Compacter debug output
f4889ae 
Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
@tormodvolden
Copy link
Contributor Author

I have rebased this on top my other PR #35. It now also includes the remaining change from #11.

@tormodvolden tormodvolden mentioned this pull request Mar 22, 2022
Open
@tormodvolden
gps: Rearrange compact debug output
20e02a4 
The most important location data on one line.

Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
@tormodvolden
gps: Use polling printf for gps buffer debug output
3d47cac 
This has currently higher risk of deadlocking but is also necessary
to not miss debug info.

Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
@tormodvolden
gps: Do not parse empty fields
e0d479c 
Each word is checked against NULL in GPS_parse() but if a field is
missing, split() would return a valid pointer to a zero-length
string. The subsequent parsing with sscanf() would yield random
coordinates calculated from uninitialized stack variables.

By returning NULL instead of an empty string, we'll match the logic
in gps_parse() and the exisiting checks will work correctly.

Fixes dragino#26

Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
@tormodvolden
gps: Check result of coordinate parsing
595b2bb 
Avoid using uninitialized values in coordinate calculation due to
incomplete data strings.

Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
@tormodvolden
gps: Correct return whether parsing found a match or not
843ff3a 
Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
@tormodvolden
gps: Guard against incomplete checksum
41a3f17 
Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
@tormodvolden
gps: Zero-terminate previous sentence when new is started
3ff3a3e 
Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
@tormodvolden
gps: Remove old code destroying sentences
5099114 
The buffer overflow is guarded against already. This code was
randomly deleting sentences every 255 characters - about every
fourth sentence.

Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
@tormodvolden
gps: Zero-terminate incoming sentence on CR or NL
4f1c338 
This simplifies the check() function and further parsing.

Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
@tormodvolden
gcc: Display git revision in AT version info
78f3992 
Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
@tormodvolden tormodvolden mentioned this pull request Apr 20, 2022
Open
@tormodvolden
Copy link
Contributor Author

The newly added changes also fix serious bugs, such as #26.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@tormodvolden @ubahnverleih