Skip to content

Commit 90d219a

Browse files
committed
Correct ublox spelling. Update production test. Add X04 BETA binary.
1 parent 3f44c78 commit 90d219a

File tree

9 files changed

+24
-18
lines changed

9 files changed

+24
-18
lines changed
40 Bytes
Binary file not shown.
358 KB
Binary file not shown.

Firmware/OpenLog_Artemis/Sensors.ino

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ void gatherDeviceValues()
278278
setQwiicPullups(0); //Disable pullups to minimize CRC issues
279279

280280
SFE_UBLOX_GNSS *nodeDevice = (SFE_UBLOX_GNSS *)temp->classPtr;
281-
struct_uBlox *nodeSetting = (struct_uBlox *)temp->configPtr;
281+
struct_ublox *nodeSetting = (struct_ublox *)temp->configPtr;
282282

283283
if (nodeSetting->log == true)
284284
{
@@ -1188,7 +1188,7 @@ void printHelperText(bool terminalOnly)
11881188
break;
11891189
case DEVICE_GPS_UBLOX:
11901190
{
1191-
struct_uBlox *nodeSetting = (struct_uBlox *)temp->configPtr;
1191+
struct_ublox *nodeSetting = (struct_ublox *)temp->configPtr;
11921192
if (nodeSetting->log)
11931193
{
11941194
if (nodeSetting->logDate)
@@ -1572,7 +1572,7 @@ void setMaxI2CSpeed()
15721572
if (temp->deviceType == DEVICE_GPS_UBLOX)
15731573
{
15741574
//Check if i2cSpeed is lowered
1575-
struct_uBlox *sensor = (struct_uBlox*)temp->configPtr;
1575+
struct_ublox *sensor = (struct_ublox*)temp->configPtr;
15761576
if (sensor->i2cSpeed == 100000)
15771577
{
15781578
//printDebug("setMaxI2CSpeed: sensor->i2cSpeed is 100000. Reducing maxSpeed to 100kHz\r\n");

Firmware/OpenLog_Artemis/autoDetect.ino

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ bool addDevice(deviceType_e deviceType, uint8_t address, uint8_t muxAddress, uin
138138
case DEVICE_GPS_UBLOX:
139139
{
140140
temp->classPtr = new SFE_UBLOX_GNSS;
141-
temp->configPtr = new struct_uBlox;
141+
temp->configPtr = new struct_ublox;
142142
}
143143
break;
144144
case DEVICE_PROXIMITY_VCNL4040:
@@ -351,7 +351,7 @@ bool beginQwiicDevices()
351351
{
352352
setQwiicPullups(0); //Disable pullups for u-blox comms.
353353
SFE_UBLOX_GNSS *tempDevice = (SFE_UBLOX_GNSS *)temp->classPtr;
354-
struct_uBlox *nodeSetting = (struct_uBlox *)temp->configPtr; //Create a local pointer that points to same spot as node does
354+
struct_ublox *nodeSetting = (struct_ublox *)temp->configPtr; //Create a local pointer that points to same spot as node does
355355
if (nodeSetting->powerOnDelayMillis > qwiicPowerOnDelayMillis) qwiicPowerOnDelayMillis = nodeSetting->powerOnDelayMillis; // Increase qwiicPowerOnDelayMillis if required
356356
if(settings.printGNSSDebugMessages == true) tempDevice->enableDebugging(); // Enable debug messages if required
357357
temp->online = tempDevice->begin(qwiic, temp->address); //Wire port, Address
@@ -661,7 +661,7 @@ void configureDevice(node * temp)
661661
setQwiicPullups(0); //Disable pullups for u-blox comms.
662662

663663
SFE_UBLOX_GNSS *sensor = (SFE_UBLOX_GNSS *)temp->classPtr;
664-
struct_uBlox *nodeSetting = (struct_uBlox *)temp->configPtr;
664+
struct_ublox *nodeSetting = (struct_ublox *)temp->configPtr;
665665

666666
sensor->setI2COutput(COM_TYPE_UBX); //Set the I2C port to output UBX only (turn off NMEA noise)
667667

@@ -882,7 +882,7 @@ FunctionPointer getConfigFunctionPtr(uint8_t nodeNumber)
882882
ptr = (FunctionPointer)menuConfigure_VL53L1X;
883883
break;
884884
case DEVICE_GPS_UBLOX:
885-
ptr = (FunctionPointer)menuConfigure_uBlox;
885+
ptr = (FunctionPointer)menuConfigure_ublox;
886886
break;
887887
case DEVICE_PROXIMITY_VCNL4040:
888888
ptr = (FunctionPointer)menuConfigure_VCNL4040;

Firmware/OpenLog_Artemis/menuAttachedDevices.ino

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -961,14 +961,14 @@ void menuConfigure_NAU7802(void *configPtr)
961961
}
962962
}
963963

964-
void menuConfigure_uBlox(void *configPtr)
964+
void menuConfigure_ublox(void *configPtr)
965965
{
966-
struct_uBlox *sensorSetting = (struct_uBlox*)configPtr;
966+
struct_ublox *sensorSetting = (struct_ublox*)configPtr;
967967

968968
while (1)
969969
{
970970
SerialPrintln(F(""));
971-
SerialPrintln(F("Menu: Configure uBlox GPS Receiver"));
971+
SerialPrintln(F("Menu: Configure u-blox GPS Receiver"));
972972

973973
SerialPrint(F("1) Sensor Logging: "));
974974
if (sensorSetting->log == true) SerialPrintln(F("Enabled"));
@@ -1137,7 +1137,7 @@ void getUbloxDateTime(int &year, int &month, int &day, int &hour, int &minute, i
11371137
setQwiicPullups(0); //Disable pullups to minimize CRC issues
11381138

11391139
SFE_UBLOX_GNSS *nodeDevice = (SFE_UBLOX_GNSS *)temp->classPtr;
1140-
struct_uBlox *nodeSetting = (struct_uBlox *)temp->configPtr;
1140+
struct_ublox *nodeSetting = (struct_ublox *)temp->configPtr;
11411141

11421142
//If autoPVT is enabled, flush the data to make sure we get fresh date and time
11431143
if (nodeSetting->useAutoPVT) nodeDevice->flushPVT();
@@ -1175,7 +1175,7 @@ void gnssFactoryDefault(void)
11751175
setQwiicPullups(0); //Disable pullups to minimize CRC issues
11761176

11771177
SFE_UBLOX_GNSS *nodeDevice = (SFE_UBLOX_GNSS *)temp->classPtr;
1178-
struct_uBlox *nodeSetting = (struct_uBlox *)temp->configPtr;
1178+
struct_ublox *nodeSetting = (struct_ublox *)temp->configPtr;
11791179

11801180
//Reset the module to the factory defaults
11811181
nodeDevice->factoryDefault();

Firmware/OpenLog_Artemis/nvm.ino

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,7 @@ void recordDeviceSettingsToFile()
537537
break;
538538
case DEVICE_GPS_UBLOX:
539539
{
540-
struct_uBlox *nodeSetting = (struct_uBlox *)temp->configPtr;
540+
struct_ublox *nodeSetting = (struct_ublox *)temp->configPtr;
541541
settingsFile.println((String)base + "log=" + nodeSetting->log);
542542
settingsFile.println((String)base + "logDate=" + nodeSetting->logDate);
543543
settingsFile.println((String)base + "logTime=" + nodeSetting->logTime);
@@ -980,7 +980,7 @@ bool parseDeviceLine(char* str) {
980980
break;
981981
case DEVICE_GPS_UBLOX:
982982
{
983-
struct_uBlox *nodeSetting = (struct_uBlox *)deviceConfigPtr;
983+
struct_ublox *nodeSetting = (struct_ublox *)deviceConfigPtr;
984984

985985
//Apply the appropriate settings
986986
if (strcmp(deviceSettingName, "log") == 0)

Firmware/OpenLog_Artemis/productionTest.ino

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,8 @@ void productionTest()
171171
if (myICM.dataReady())
172172
{
173173
myICM.getAGMT(); //Update values
174+
delay(10);
175+
myICM.getAGMT(); //Update values
174176
#ifdef verboseProdTest
175177
olaftoa(myICM.temp(), tempData1, 2, sizeof(tempData1) / sizeof(char));
176178
Serial.printf("IMU Temp is: %sC\r\n", tempData1);
@@ -212,6 +214,8 @@ void productionTest()
212214
if (myICM.dataReady())
213215
{
214216
myICM.getAGMT(); //Update values
217+
delay(10);
218+
myICM.getAGMT(); //Update values
215219
#ifdef verboseProdTest
216220
olaftoa(myICM.accX(), tempData1, 2, sizeof(tempData1) / sizeof(char));
217221
olaftoa(myICM.accY(), tempData2, 2, sizeof(tempData2) / sizeof(char));
@@ -257,6 +261,8 @@ void productionTest()
257261
if (myICM.dataReady())
258262
{
259263
myICM.getAGMT(); //Update values
264+
delay(10);
265+
myICM.getAGMT(); //Update values
260266
#ifdef verboseProdTest
261267
olaftoa(myICM.magX(), tempData1, 2, sizeof(tempData1) / sizeof(char));
262268
olaftoa(myICM.magY(), tempData2, 2, sizeof(tempData2) / sizeof(char));

Firmware/OpenLog_Artemis/settings.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ typedef void (*FunctionPointer)(void*); //Used for pointing to device config men
5555
//Begin specific sensor config structs
5656
//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
5757

58-
const unsigned long worstCaseQwiicPowerOnDelay = 1000; // Remember to update this if required when adding a new sensor (currently defined by the uBlox). (This is OK for the SCD30. beginQwiicDevices will extend the delay.)
58+
const unsigned long worstCaseQwiicPowerOnDelay = 1000; // Remember to update this if required when adding a new sensor (currently defined by the u-blox). (This is OK for the SCD30. beginQwiicDevices will extend the delay.)
5959
const unsigned long minimumQwiicPowerOnDelay = 10; //The minimum number of milliseconds between turning on the Qwiic power and attempting to communicate with Qwiic devices
6060

6161
// Power On Delay Testing:
@@ -117,7 +117,7 @@ struct struct_VCNL4040 {
117117
unsigned long powerOnDelayMillis = minimumQwiicPowerOnDelay; // Wait for at least this many millis before communicating with this device. Increase if required!
118118
};
119119

120-
struct struct_uBlox {
120+
struct struct_ublox {
121121
bool log = true;
122122
bool logDate = true;
123123
bool logTime = true;

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ OpenLog Artemis is highly configurable over an easy to use serial interface. Sim
2020

2121
The OpenLog Artemis automatically scans, detects, configures, and logs various Qwiic sensors plugged into the board (no soldering required!). Currently, auto-detection is supported on the following Qwiic products:
2222

23-
* uBlox GPS Modules (Lat/Long, Altitude, Velocity, SIV, Time, Date):
23+
* u-blox GPS Modules (Lat/Long, Altitude, Velocity, SIV, Time, Date):
2424
* [ZED-F9P](https://www.sparkfun.com/products/15136) 1cm High Precision GPS
2525
* [NEO-M8P-2](https://www.sparkfun.com/products/15005) 2.5cm High Precision GPS
2626
* [SAM-M8Q](https://www.sparkfun.com/products/15210) 1.5m 72 Channel GPS
@@ -59,7 +59,7 @@ The OLA can be tailored to many different applications and we will be releasing
5959

6060
* [Latest OLA firmware](https://github.com/sparkfun/OpenLog_Artemis/tree/main/Binaries)
6161
* [Geophone Logger firmware](https://github.com/sparkfun/OpenLog_Artemis_Geophone_Logger) for logging seismic activity
62-
* [GNSS Logger](https://github.com/sparkfun/OpenLog_Artemis_GNSS_Logger) for advanced data logging with the uBlox F9 and M9 GNSS modules including support for RAWX and RELPOSNED
62+
* [GNSS Logger](https://github.com/sparkfun/OpenLog_Artemis_GNSS_Logger) for advanced data logging with the u-blox F9 and M9 GNSS modules including support for RAWX and RELPOSNED
6363

6464
Repository Contents
6565
-------------------

0 commit comments

Comments
 (0)