Skip to content

Commit 418c405

Browse files
committed
v1.2.3
1 parent 6b43745 commit 418c405

File tree

5 files changed

+17
-7
lines changed

5 files changed

+17
-7
lines changed

Binaries/OpenLog_Artemis-X04-v23.bin

360 KB
Binary file not shown.

Firmware/OpenLog_Artemis/OpenLog_Artemis.ino

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,13 @@
130130
Change GNSS maximum rate to 25Hz as per:
131131
https://github.com/sparkfun/OpenLog_Artemis/issues/121
132132
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+
133140
*/
134141

135142
const int FIRMWARE_VERSION_MAJOR = 2;
@@ -143,7 +150,7 @@ const int FIRMWARE_VERSION_MINOR = 3;
143150
// the variant * 0x100 (OLA = 1; GNSS_LOGGER = 2; GEOPHONE_LOGGER = 3)
144151
// the major firmware version * 0x10
145152
// 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
147154

148155
#include "settings.h"
149156

@@ -1031,7 +1038,7 @@ void beginIMU()
10311038
{
10321039
printDebug("beginIMU: second attempt at myICM.begin failed. myICM.status = " + (String)myICM.status + "\r\n");
10331040
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."));
10351042
imuPowerOff();
10361043
online.IMU = false;
10371044
return;

Firmware/OpenLog_Artemis/autoDetect.ino

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -674,10 +674,10 @@ void configureDevice(node * temp)
674674
// So the slowest rate we can set with setNavigationFrequency is 1Hz
675675
// (Whereas UBX_CFG_RATE can actually support intervals as slow as 65535ms)
676676
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
678678
sensor->setNavigationFrequency((uint8_t)(1000000ULL / settings.usBetweenReadings)); //Set output rate equal to our query rate
679679
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.
681681

682682
setQwiicPullups(settings.qwiicBusPullUps); //Re-enable pullups.
683683
}

Firmware/OpenLog_Artemis/lowerPower.ino

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,8 @@ void powerDownOLA(void)
9595
powerControlADC(false); // power_adc_disable(); //Power down ADC. It it started by default before setup().
9696

9797
Serial.end(); //Power down UART
98-
Serial1.end();
98+
if ((settings.useTxRxPinsForTerminal == true) || (online.serialLogging == true))
99+
Serial1.end();
99100

100101
//Force the peripherals off
101102
//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)
182183
powerControlADC(false); // power_adc_disable(); //Power down ADC. It it started by default before setup().
183184

184185
Serial.end(); //Power down UART
185-
Serial1.end();
186+
if ((settings.useTxRxPinsForTerminal == true) || (online.serialLogging == true))
187+
Serial1.end();
186188

187189
//Force the peripherals off
188190
//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)
282284

283285
SerialFlush(); //Finish any prints
284286
Serial.end();
285-
Serial1.end();
287+
if ((settings.useTxRxPinsForTerminal == true) || (online.serialLogging == true))
288+
Serial1.end();
286289

287290
//Force the peripherals off
288291

0 commit comments

Comments
 (0)