mirror of
https://github.com/Rhinemann/IoT-Systems.git
synced 2026-03-14 20:50:39 +02:00
Simplify accelerometer parsing and remove int16-specific leftovers
This commit is contained in:
parent
ca790e7306
commit
a25fbfc3ef
@ -14,7 +14,6 @@ import config
|
|||||||
|
|
||||||
class FileDatasource:
|
class FileDatasource:
|
||||||
|
|
||||||
|
|
||||||
def __init__(self, accelerometer_filename: str, gps_filename: str) -> None:
|
def __init__(self, accelerometer_filename: str, gps_filename: str) -> None:
|
||||||
self.accelerometer_filename = accelerometer_filename
|
self.accelerometer_filename = accelerometer_filename
|
||||||
self.gps_filename = gps_filename
|
self.gps_filename = gps_filename
|
||||||
@ -200,21 +199,14 @@ class FileDatasource:
|
|||||||
# Otherwise treat it as header-ish (skip it)
|
# Otherwise treat it as header-ish (skip it)
|
||||||
return True, None
|
return True, None
|
||||||
|
|
||||||
@staticmethod
|
|
||||||
def _parse_int(s: str) -> int:
|
|
||||||
return int(s)
|
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def _parse_acc(row: List[str]) -> Accelerometer:
|
def _parse_acc(row: List[str]) -> Accelerometer:
|
||||||
if len(row) < 3:
|
if len(row) < 3:
|
||||||
raise ValueError(f"Accelerometer row must have 3 values (x,y,z). Got: {row}")
|
raise ValueError(f"Accelerometer row must have 3 values (x,y,z). Got: {row}")
|
||||||
|
|
||||||
try:
|
x = int(row[0])
|
||||||
x = int(row[0])
|
y = int(row[1])
|
||||||
y = int(row[1])
|
z = int(row[2])
|
||||||
z = int(row[2])
|
|
||||||
except ValueError as e:
|
|
||||||
raise ValueError(f"Invalid accelerometer values (expected integers): {row}") from e
|
|
||||||
|
|
||||||
return Accelerometer(x=x, y=y, z=z)
|
return Accelerometer(x=x, y=y, z=z)
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user