File tree Expand file tree Collapse file tree 5 files changed +17
-7
lines changed Expand file tree Collapse file tree 5 files changed +17
-7
lines changed Original file line number Diff line number Diff line change 130
130
Change GNSS maximum rate to 25Hz as per:
131
131
https://github.com/sparkfun/OpenLog_Artemis/issues/121
132
132
https://forum.sparkfun.com/viewtopic.php?f=172&t=57512
133
+ Decided not to include this in the next full release.
134
+ I suspect it will cause major badness on (e.g.) M8 modules that cannot support 25Hz.
135
+
136
+ v2.3:
137
+ Resolve https://forum.sparkfun.com/viewtopic.php?f=171&t=58109
138
+
139
+
133
140
*/
134
141
135
142
const int FIRMWARE_VERSION_MAJOR = 2 ;
@@ -143,7 +150,7 @@ const int FIRMWARE_VERSION_MINOR = 3;
143
150
// the variant * 0x100 (OLA = 1; GNSS_LOGGER = 2; GEOPHONE_LOGGER = 3)
144
151
// the major firmware version * 0x10
145
152
// the minor firmware version
146
- #define OLA_IDENTIFIER 0x122 // Stored as 290 decimal in OLA_settings.txt
153
+ #define OLA_IDENTIFIER 0x123 // Stored as 291 decimal in OLA_settings.txt
147
154
148
155
#include " settings.h"
149
156
@@ -1031,7 +1038,7 @@ void beginIMU()
1031
1038
{
1032
1039
printDebug (" beginIMU: second attempt at myICM.begin failed. myICM.status = " + (String)myICM.status + " \r\n " );
1033
1040
digitalWrite (PIN_IMU_CHIP_SELECT, HIGH); // Be sure IMU is deselected
1034
- SerialPrintln (F (" ICM-20948 failed to init." ));
1041
+ // SerialPrintln(F("ICM-20948 failed to init."));
1035
1042
imuPowerOff ();
1036
1043
online.IMU = false ;
1037
1044
return ;
Original file line number Diff line number Diff line change @@ -674,10 +674,10 @@ void configureDevice(node * temp)
674
674
// So the slowest rate we can set with setNavigationFrequency is 1Hz
675
675
// (Whereas UBX_CFG_RATE can actually support intervals as slow as 65535ms)
676
676
sensor->setNavigationFrequency (1 ); // Set output rate to 1Hz
677
- else if (1000000ULL / settings.usBetweenReadings <= 25 ) // If we are slower than 25Hz logging rate
677
+ else if (1000000ULL / settings.usBetweenReadings <= 10 ) // If we are slower than 10Hz logging rate
678
678
sensor->setNavigationFrequency ((uint8_t )(1000000ULL / settings.usBetweenReadings )); // Set output rate equal to our query rate
679
679
else
680
- sensor->setNavigationFrequency (25 ); // Set nav freq to 25Hz . Max output depends on the module used.
680
+ sensor->setNavigationFrequency (10 ); // Set nav freq to 10Hz . Max output depends on the module used.
681
681
682
682
setQwiicPullups (settings.qwiicBusPullUps ); // Re-enable pullups.
683
683
}
Original file line number Diff line number Diff line change @@ -95,7 +95,8 @@ void powerDownOLA(void)
95
95
powerControlADC (false ); // power_adc_disable(); //Power down ADC. It it started by default before setup().
96
96
97
97
Serial.end (); // Power down UART
98
- Serial1.end ();
98
+ if ((settings.useTxRxPinsForTerminal == true ) || (online.serialLogging == true ))
99
+ Serial1.end ();
99
100
100
101
// Force the peripherals off
101
102
// This will cause badness with v2.1 of the core but we don't care as we are waiting for a reset
@@ -182,7 +183,8 @@ void resetArtemis(void)
182
183
powerControlADC (false ); // power_adc_disable(); //Power down ADC. It it started by default before setup().
183
184
184
185
Serial.end (); // Power down UART
185
- Serial1.end ();
186
+ if ((settings.useTxRxPinsForTerminal == true ) || (online.serialLogging == true ))
187
+ Serial1.end ();
186
188
187
189
// Force the peripherals off
188
190
// This will cause badness with v2.1 of the core but we don't care as we are going to force a WDT reset
@@ -282,7 +284,8 @@ void goToSleep(uint32_t sysTicksToSleep)
282
284
283
285
SerialFlush (); // Finish any prints
284
286
Serial.end ();
285
- Serial1.end ();
287
+ if ((settings.useTxRxPinsForTerminal == true ) || (online.serialLogging == true ))
288
+ Serial1.end ();
286
289
287
290
// Force the peripherals off
288
291
You can’t perform that action at this time.
0 commit comments