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

135 gps driver refactor #136

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Added more descriptive errors to gps driver, if statements to science…
…, and config edits
panyab committed Mar 29, 2024
commit 6c15b791e46249b9547bd24ece01cb55cd3b13c7
5 changes: 4 additions & 1 deletion EosPayload/drivers/GPS_driver.py
Original file line number Diff line number Diff line change
@@ -40,7 +40,10 @@ def device_read(self, logger: logging.Logger) -> None:
geo = self.gps.geo_coords()
if geo is not None:
gps_fix = geo.fixType # fix type
#if int(gps_fix) < 3:
if gps_fix == 0:
logger.info("No fix")
if int(gps_fix) < 3:
logger.info("GPS fix quality low, consider changing location")
else:
# Try again if we don't have a fix yet.
logger.info("Waiting for fix...")
76 changes: 47 additions & 29 deletions EosPayload/drivers/science_driver.py
Original file line number Diff line number Diff line change
@@ -82,35 +82,53 @@ def device_read(self, logger: logging.Logger) -> None:
atmospheric conditions (288.15 K, 1013.25 hPa), and “environmental” concentrations are those
measured in the current atmospheric conditions.
'''
air_quality_data = list(self.air_quality_sensor.read().values())
data = ScienceData(
temperature_celsius=self.temp_humidity_sensor.temperature,
relative_humidity_percent=self.temp_humidity_sensor.relative_humidity,
temperature_celsius_2=self.barometer.temperature,
pressure_hpa=self.barometer.pressure,
altitude_meters=self.barometer.altitude,
ambient_light_count=self.uv_light_sensor.light,
ambient_light_lux=self.uv_light_sensor.lux,
uv_count=self.uv_light_sensor.uvs,
uv_index=self.uv_light_sensor.uvi,
infrared_count=self.ir_light_sensor.infrared,
visible_count=self.ir_light_sensor.visible,
full_spectrum_count=self.ir_light_sensor.full_spectrum,
ir_visible_lux=self.ir_light_sensor.lux,
pm10_standard_ug_m3=air_quality_data[0],
pm25_standard_ug_m3=air_quality_data[1],
pm100_standard_ug_m3=air_quality_data[2],
pm10_environmental_ug_m3=air_quality_data[3],
pm25_environmental_ug_m3=air_quality_data[4],
pm100_environmental_ug_m3=air_quality_data[5],
particulate_03um_per_01L=air_quality_data[6],
particulate_05um_per_01L=air_quality_data[7],
particulate_10um_per_01L=air_quality_data[8],
particulate_25um_per_01L=air_quality_data[9],
particulate_50um_per_01L=air_quality_data[10],
particulate_100um_per_01L=air_quality_data[11],
timestamp=datetime.now(),
)
if air_quality_data is not None:
air_quality_data = list(self.air_quality_sensor.read().values())
data = ScienceData(
temperature_celsius=self.temp_humidity_sensor.temperature,
relative_humidity_percent=self.temp_humidity_sensor.relative_humidity,
temperature_celsius_2=self.barometer.temperature,
pressure_hpa=self.barometer.pressure,
altitude_meters=self.barometer.altitude,
ambient_light_count=self.uv_light_sensor.light,
ambient_light_lux=self.uv_light_sensor.lux,
uv_count=self.uv_light_sensor.uvs,
uv_index=self.uv_light_sensor.uvi,
infrared_count=self.ir_light_sensor.infrared,
visible_count=self.ir_light_sensor.visible,
full_spectrum_count=self.ir_light_sensor.full_spectrum,
ir_visible_lux=self.ir_light_sensor.lux,
pm10_standard_ug_m3=air_quality_data[0],
pm25_standard_ug_m3=air_quality_data[1],
pm100_standard_ug_m3=air_quality_data[2],
pm10_environmental_ug_m3=air_quality_data[3],
pm25_environmental_ug_m3=air_quality_data[4],
pm100_environmental_ug_m3=air_quality_data[5],
particulate_03um_per_01L=air_quality_data[6],
particulate_05um_per_01L=air_quality_data[7],
particulate_10um_per_01L=air_quality_data[8],
particulate_25um_per_01L=air_quality_data[9],
particulate_50um_per_01L=air_quality_data[10],
particulate_100um_per_01L=air_quality_data[11],
timestamp=datetime.now(),
)
else:
data = ScienceData(
temperature_celsius=self.temp_humidity_sensor.temperature,
relative_humidity_percent=self.temp_humidity_sensor.relative_humidity,
temperature_celsius_2=self.barometer.temperature,
pressure_hpa=self.barometer.pressure,
altitude_meters=self.barometer.altitude,
ambient_light_count=self.uv_light_sensor.light,
ambient_light_lux=self.uv_light_sensor.lux,
uv_count=self.uv_light_sensor.uvs,
uv_index=self.uv_light_sensor.uvi,
infrared_count=self.ir_light_sensor.infrared,
visible_count=self.ir_light_sensor.visible,
full_spectrum_count=self.ir_light_sensor.full_spectrum,
ir_visible_lux=self.ir_light_sensor.lux,
timestamp=datetime.now(),
)

except Exception as e:
logger.error(f"An unhandled exception occurred while reading data from sensors: {e}"
8 changes: 4 additions & 4 deletions config.json
Original file line number Diff line number Diff line change
@@ -19,21 +19,21 @@
"name": "camera-driver",
"driver_class": "CameraDriver",
"device_id": "CAMERA_1",
"enabled": true
"enabled": false
},

{
"name": "cutdown-driver",
"driver_class": "CutdownDriver",
"device_id": "CUTDOWN",
"enabled": true
"enabled": false
},

{
"name": "valve-driver",
"driver_class": "ValveDriver",
"device_id": "VALVE",
"enabled": true
"enabled": false
},

{
@@ -75,7 +75,7 @@
"name": "electric-field-sensor",
"driver_class": "ElectricFieldSensor",
"device_id": "MISC_SENSOR_3",
"enabled": true
"enabled": false
}
]
}