Skip to content

Commit 619f608

Browse files
committed
Update to version 1.8.0.
1 parent d880b35 commit 619f608

File tree

4 files changed

+693
-251
lines changed

4 files changed

+693
-251
lines changed

gps/src/nmeaparser.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ DEFINE_FUNCTION_ELSE(GGA, 54, ISVALID, XOR_CALCULATED_CHECKSUM, IS('*'), INC_STA
169169
DEFINE_FUNCTION_STEP(GGA, 55, ISHEXDIGIT, INC_STATE; SET_RECEIVED_CHECKSUM(16 * HEXVALUE))
170170
DEFINE_FUNCTION_STEP(GGA, 56, ISHEXDIGIT, ZERO_STATE; XOR_RECEIVED_CHECKSUM(HEXVALUE); TEST_CHECKSUM_AND_SET_STATUS)
171171

172-
void (*GGAfunctions[])(char, NMEA_parserState_t*, NMEA_parserResultGGA_t*) = {GGA00, GGA01, GGA02, GGA03, GGA04, GGA05, GGA06, GGA07, \
172+
void (*const GGAfunctions[])(char, NMEA_parserState_t*, NMEA_parserResultGGA_t*) = {GGA00, GGA01, GGA02, GGA03, GGA04, GGA05, GGA06, GGA07, \
173173
GGA08, GGA09, GGA10, GGA11, GGA12, GGA13, GGA14, GGA15, \
174174
GGA16, GGA17, GGA18, GGA19, GGA20, GGA21, GGA22, GGA23, \
175175
GGA24, GGA25, GGA26, GGA27, GGA28, GGA29, GGA30, GGA31, \
@@ -237,7 +237,7 @@ DEFINE_FUNCTION_ELSE(RMC, 53, ISVALID, XOR_CALCULATED_CHECKSUM, IS('*'), INC_STA
237237
DEFINE_FUNCTION_STEP(RMC, 54, ISHEXDIGIT, INC_STATE; SET_RECEIVED_CHECKSUM(16 * HEXVALUE))
238238
DEFINE_FUNCTION_STEP(RMC, 55, ISHEXDIGIT, ZERO_STATE; XOR_RECEIVED_CHECKSUM(HEXVALUE); TEST_CHECKSUM_AND_SET_STATUS)
239239

240-
void (*RMCfunctions[])(char, NMEA_parserState_t*, NMEA_parserResultRMC_t*) = {RMC00, RMC01, RMC02, RMC03, RMC04, RMC05, RMC06, RMC07, \
240+
void (*const RMCfunctions[])(char, NMEA_parserState_t*, NMEA_parserResultRMC_t*) = {RMC00, RMC01, RMC02, RMC03, RMC04, RMC05, RMC06, RMC07, \
241241
RMC08, RMC09, RMC10, RMC11, RMC12, RMC13, RMC14, RMC15, \
242242
RMC16, RMC17, RMC18, RMC19, RMC20, RMC21, RMC22, RMC23, \
243243
RMC24, RMC25, RMC26, RMC27, RMC28, RMC29, RMC30, RMC31, \
@@ -252,7 +252,7 @@ DEFINE_FUNCTION_ELSE(DEFAULT, 01, ISVALID, XOR_CALCULATED_CHECKSUM; ADD_TO_BUFFE
252252
DEFINE_FUNCTION_STEP(DEFAULT, 02, ISHEXDIGIT, INC_STATE; SET_RECEIVED_CHECKSUM(16 * HEXVALUE))
253253
DEFINE_FUNCTION_STEP(DEFAULT, 03, ISHEXDIGIT, ZERO_STATE; XOR_RECEIVED_CHECKSUM(HEXVALUE); TEST_CHECKSUM_AND_SET_STATUS)
254254

255-
void (*DEFAULTfunctions[])(char, NMEA_parserState_t*, NMEA_parserResultDEFAULT_t*) = {DEFAULT00, DEFAULT01, DEFAULT02, DEFAULT03};
255+
void (*const DEFAULTfunctions[])(char, NMEA_parserState_t*, NMEA_parserResultDEFAULT_t*) = {DEFAULT00, DEFAULT01, DEFAULT02, DEFAULT03};
256256

257257
/* Define parsers */
258258

inc/digitalFilter.h

+10-2
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,24 @@ typedef enum {DF_BAND_PASS_FILTER, DF_HIGH_PASS_FILTER} DF_filterType_t;
1818

1919
void DigitalFilter_reset();
2020

21-
void DigitalFilter_applyAdditionalGain(float gain);
21+
bool DigitalFilter_applyFilter(int16_t *source, int16_t *dest, uint32_t sampleRateDivider, uint32_t size);
2222

23-
bool DigitalFilter_filter(int16_t *source, int16_t *dest, uint32_t sampleRateDivider, uint32_t size, uint16_t amplitudeThreshold);
23+
bool DigitalFilter_applyFrequencyTrigger(int16_t *source, uint32_t size);
2424

2525
/* Design filters */
2626

2727
void DigitalFilter_designHighPassFilter(uint32_t sampleRate, uint32_t freq);
2828

2929
void DigitalFilter_designBandPassFilter(uint32_t sampleRate, uint32_t freq1, uint32_t freq2);
3030

31+
/* Set filter options */
32+
33+
void DigitalFilter_setAdditionalGain(float gain);
34+
35+
void DigitalFilter_setAmplitudeThreshold(uint16_t amplitudeThreshold);
36+
37+
void DigitalFilter_setFrequencyTrigger(uint32_t windowLength, uint32_t sampleRate, uint32_t frequency, float percentageThreshold);
38+
3139
/* Read back filter setting */
3240

3341
void DigitalFilter_readSettings(float *gain, float *yc0, float *yc1, DF_filterType_t *filterType);

0 commit comments

Comments
 (0)