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.

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

Add option for disabling periodic telemetry and bump version #160

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions Inc/targets.h
Original file line number Diff line number Diff line change
Expand Up @@ -1478,6 +1478,7 @@
#define CURRENT_ADC_CHANNEL LL_ADC_CHANNEL_3
#define CURRENT_ADC_PIN LL_GPIO_PIN_3
#define USE_SERIAL_TELEMETRY
#define NO_PERIODIC_TELEMETRY
#define USE_DRV8328_NSLEEP
#define NSLEEP_PORT GPIOA
#define NSLEEP_PIN LL_GPIO_PIN_15
Expand Down
2 changes: 1 addition & 1 deletion Inc/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
update this file for new releases
*/
#define VERSION_MAJOR 2
#define VERSION_MINOR 17
#define VERSION_MINOR 18
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

version will only be incremented on release

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would rather the release tag in main is bumped after the release. Then anything built on main you know is newer than the last release.

Right now, you build a binary from main, and it has the same 2.17 release name.


#define EEPROM_VERSION 2
2 changes: 2 additions & 0 deletions Src/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -1264,13 +1264,15 @@ void tenKhzRoutine()
}
}

#ifndef NO_PERIODIC_TELEMETRY
if (eepromBuffer.telementry_on_interval) {
telem_ms_count++;
if (telem_ms_count > telemetry_interval_ms * 20) {
send_telemetry = 1;
telem_ms_count = 0;
}
}
#endif

#ifndef BRUSHED_MODE

Expand Down
Loading