Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Finished GPS driver. #305

Open
wants to merge 17 commits into
base: master
Choose a base branch
from
Open

Finished GPS driver. #305

wants to merge 17 commits into from

Conversation

Shade-MC
Copy link
Member

No description provided.

warior4356 and others added 16 commits October 7, 2019 17:58
…oftware into ADCS-GPS

# Conflicts:
#	CougSat1-ADCS/src/drivers/Venus838FLPx.cpp
# Conflicts:
#	CougSat1-ADCS/src/ADCS.cpp
#	CougSat1-ADCS/src/ADCS.h
#	CougSat1-ADCS/src/ADCSPins.h
#	CougSat1-ADCS/src/drivers/Venus838FLPx.cpp
#	CougSat1-ADCS/src/drivers/Venus838FLPx.h
#	CougSat1-ADCS/src/main.cpp
#	CougSat1-ADCS/src/tools/CISConsole.cpp
# Conflicts:
#	CISLibrary/components/Thermistor.cpp
#	CISLibrary/components/Thermistor.h
#	CISLibrary/drivers/ADC/AD7291.cpp
#	CISLibrary/drivers/ADC/AD7291.h
#	CISLibrary/drivers/ADC/AD7689.cpp
#	CISLibrary/drivers/ADC/AD7689.h
#	CISLibrary/drivers/ADC/ADC.h
#	CISLibrary/drivers/GPS/Venus838FLPx.cpp
#	CISLibrary/drivers/GPS/Venus838FLPx.h
#	CougSat1-ADCS/platformio.ini
#	CougSat1-ADCS/src/ADCS.cpp
#	CougSat1-ADCS/src/ADCS.h
#	CougSat1-ADCS/src/Configuration.h
#	CougSat1-ADCS/src/interfaces/CDH.cpp
#	CougSat1-ADCS/src/interfaces/CDH.h
#	CougSat1-ADCS/src/main.cpp
#	CougSat1-Ground/.gitignore
#	CougSat1-Ground/.vscode/c_cpp_properties.json
#	CougSat1-Ground/Ground.vcxproj
#	CougSat1-Ground/http/cougsat-1/images/adcs.png
#	CougSat1-Ground/http/cougsat-1/images/c&dh.png
#	CougSat1-Ground/http/cougsat-1/images/camera.png
#	CougSat1-Ground/http/cougsat-1/images/comms.png
#	CougSat1-Ground/http/cougsat-1/images/eps.png
#	CougSat1-Ground/http/cougsat-1/images/health.png
#	CougSat1-Ground/http/cougsat-1/images/ifjr.png
#	CougSat1-Ground/http/cougsat-1/images/map.jpg
#	CougSat1-Ground/http/cougsat-1/images/plant.png
#	CougSat1-Ground/http/index.html
#	CougSat1-Ground/lib/ehbanana
#	CougSat1-Ground/source/main.cpp
#	CougSat1-PMIC/src/CISBoard/PinNames.h
#	CougSat1-PMIC/src/Configuration.h
#	CougSat1-PMIC/src/PMICObjects.cpp
#	CougSat1-PMIC/src/PMICObjects.h
#	CougSat1-PMIC/src/events/EventPeriodic.cpp
#	CougSat1-PMIC/src/main.cpp
Commented out function in system_clock.c that was causing errors
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants