Skip to content

Commit ed628ca

Browse files
committed
Rename to GNSSDO
1 parent 2fd0523 commit ed628ca

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+351
-306
lines changed

.github/workflows/build-for-release.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
name: Build RTK GPSDO Firmware
1+
name: Build RTK GNSSDO Firmware
22
on:
33
workflow_dispatch:
44
branches:
55

66
env:
7-
FILENAME_PREFIX: GPSDO_Firmware
7+
FILENAME_PREFIX: GNSSDO_Firmware
88
FIRMWARE_VERSION_MAJOR: 1
99
FIRMWARE_VERSION_MINOR: 0
1010
CORE_VERSION: 3.0.1
@@ -85,16 +85,16 @@ jobs:
8585
cp Firmware/app3M_fat9M_16MB.csv /home/runner/.arduino15/packages/esp32/hardware/esp32/${{ env.CORE_VERSION }}/tools/partitions/app3M_fat9M_16MB.csv
8686

8787
- name: Compile Sketch
88-
run: arduino-cli compile --fqbn "esp32:esp32:esp32":DebugLevel=${{ env.DEBUG_LEVEL }} ./Firmware/GPSDO_Firmware/GPSDO_Firmware.ino
88+
run: arduino-cli compile --fqbn "esp32:esp32:esp32":DebugLevel=${{ env.DEBUG_LEVEL }} ./Firmware/GNSSDO_Firmware/GNSSDO_Firmware.ino
8989
--build-property build.partitions=app3M_fat9M_16MB
9090
--build-property upload.maximum_size=3145728
9191
--build-property "compiler.cpp.extra_flags=-MMD -c \"-DFIRMWARE_VERSION_MAJOR=$FIRMWARE_VERSION_MAJOR\" \"-DFIRMWARE_VERSION_MINOR=$FIRMWARE_VERSION_MINOR\""
9292
--export-binaries
9393

9494
- name: Rename binary
9595
run: |
96-
cd Firmware/GPSDO_Firmware/build/esp32.esp32.esp32/
97-
mv GPSDO_Firmware.ino.bin ../../../Binaries/${{ env.FILENAME_PREFIX }}${{ env.FILE_ENDING_UNDERSCORE }}.bin
96+
cd Firmware/GNSSDO_Firmware/build/esp32.esp32.esp32/
97+
mv GNSSDO_Firmware.ino.bin ../../../Binaries/${{ env.FILENAME_PREFIX }}${{ env.FILE_ENDING_UNDERSCORE }}.bin
9898
9999
- name: Commit and push binary
100100
uses: actions-js/push@master

.github/workflows/non-release-build.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
branches:
55

66
env:
7-
FILENAME_PREFIX: GPSDO_Firmware
7+
FILENAME_PREFIX: GNSSDO_Firmware
88
FIRMWARE_VERSION_MAJOR: 9
99
FIRMWARE_VERSION_MINOR: 9
1010
CORE_VERSION: 3.0.1
@@ -85,7 +85,7 @@ jobs:
8585
cp Firmware/app3M_fat9M_16MB.csv /home/runner/.arduino15/packages/esp32/hardware/esp32/${{ env.CORE_VERSION }}/tools/partitions/app3M_fat9M_16MB.csv
8686

8787
- name: Compile Sketch
88-
run: arduino-cli compile --fqbn "esp32:esp32:esp32":DebugLevel=${{ env.DEBUG_LEVEL }} ./Firmware/GPSDO_Firmware/GPSDO_Firmware.ino
88+
run: arduino-cli compile --fqbn "esp32:esp32:esp32":DebugLevel=${{ env.DEBUG_LEVEL }} ./Firmware/GNSSDO_Firmware/GNSSDO_Firmware.ino
8989
--build-property build.partitions=app3M_fat9M_16MB
9090
--build-property upload.maximum_size=3145728
9191
--build-property "compiler.cpp.extra_flags=-MMD -c \"-DFIRMWARE_VERSION_MAJOR=$FIRMWARE_VERSION_MAJOR\" \"-DFIRMWARE_VERSION_MINOR=$FIRMWARE_VERSION_MINOR\""
@@ -97,13 +97,13 @@ jobs:
9797
9898
- name: Create artifact directory
9999
run: |
100-
cd Firmware/GPSDO_Firmware/build/esp32.esp32.esp32/
100+
cd Firmware/GNSSDO_Firmware/build/esp32.esp32.esp32/
101101
mkdir ${{ env.ARTIFACT }}
102-
mv GPSDO_Firmware.ino.bin ${{ env.ARTIFACT }}
102+
mv GNSSDO_Firmware.ino.bin ${{ env.ARTIFACT }}
103103
104104
- name: Upload artifact directory to action - avoid double-zip
105105
uses: actions/upload-artifact@v3
106106
with:
107107
name: ${{ env.ARTIFACT }}
108-
path: Firmware/GPSDO_Firmware/build/esp32.esp32.esp32/${{ env.ARTIFACT }}
108+
path: Firmware/GNSSDO_Firmware/build/esp32.esp32.esp32/${{ env.ARTIFACT }}
109109
retention-days: 7

Firmware/GPSDO_Firmware/Begin.ino renamed to Firmware/GNSSDO_Firmware/Begin.ino

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ void identifyBoard()
5858

5959
// Order the following ID checks, by millivolt values high to low
6060

61-
// GPSDO: 1/1 --> 1571mV < 1650mV < 1729mV
61+
// GNSSDO: 1/1 --> 1571mV < 1650mV < 1729mV
6262
if (idWithAdc(idValue, 1, 1))
6363
productVariant = RTK_MOSAIC_T;
6464

@@ -476,8 +476,21 @@ void pinI2C2Task(void *pvParameters)
476476
break;
477477
}
478478

479-
case 0x60: {
479+
case SFE_GNSSDO_OSC_SIT5811: {
480+
systemPrintf("0x%02x - SiT5811 TCXO\r\n", addr);
481+
presentSIT5811 = true;
482+
i2cTCXO = i2c_2;
483+
break;
484+
485+
case SFE_GNSSDO_OSC_SIT5358: {
480486
systemPrintf("0x%02x - SiT5358 TCXO\r\n", addr);
487+
presentSIT5358 = true;
488+
i2cTCXO = i2c_2;
489+
break;
490+
491+
case SFE_GNSSDO_OSC_STP3593LF: {
492+
systemPrintf("0x%02x - STP3593LF TCXO\r\n", addr);
493+
presentSTP3593LF = true;
481494
i2cTCXO = i2c_2;
482495
break;
483496
}
@@ -502,7 +515,7 @@ void beginTCXO(TwoWire *i2cBus)
502515
if (i2cBus == nullptr)
503516
reportFatalError("Illegal TCXO i2cBus");
504517

505-
if (!myTCXO.begin(*i2cBus, 0x60)) // Initialize the SiT5358
518+
if (!myTCXO.begin(*i2cBus, SFE_GNSSDO_OSC_SIT5358)) // Initialize the SiT5358
506519
return;
507520

508521
myTCXO.setBaseFrequencyHz(10000000.0); // Pass the oscillator base frequency into the driver
File renamed without changes.
File renamed without changes.
File renamed without changes.

Firmware/GPSDO_Firmware/GPSDO_Firmware.ino renamed to Firmware/GNSSDO_Firmware/GNSSDO_Firmware.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
SparkFun Electronics
44
Paul Clark
55
6-
This is the firmware for the SparkFun GPSDO.
6+
This is the firmware for the SparkFun GNSSDO.
77
It runs on an ESP32 and communicates with the mosaic-T and SiT5358.
88
99
Compiled with Arduino v1.8.19 with ESP32 core v3.0.1.
File renamed without changes.

0 commit comments

Comments
 (0)