From: Keith Packard Date: Fri, 27 Jun 2025 16:48:34 +0000 (-0700) Subject: altoslib: Add TeleMega v7 .eeprom parsing support X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=78944aad76a7ff52b0be691c0e47cc691f86df11;p=fw%2Faltos altoslib: Add TeleMega v7 .eeprom parsing support Need to be more careful about following the process when adding a new product Signed-off-by: Keith Packard --- diff --git a/altoslib/AltosConfigData.java b/altoslib/AltosConfigData.java index b076357d..90730ce3 100644 --- a/altoslib/AltosConfigData.java +++ b/altoslib/AltosConfigData.java @@ -222,6 +222,7 @@ public class AltosConfigData { case AltosLib.AO_LOG_FORMAT_TELEMEGA_4: case AltosLib.AO_LOG_FORMAT_TELEMEGA_5: case AltosLib.AO_LOG_FORMAT_TELEMEGA_6: + case AltosLib.AO_LOG_FORMAT_TELEMEGA_7: case AltosLib.AO_LOG_FORMAT_EASYMEGA_2: case AltosLib.AO_LOG_FORMAT_EASYMEGA_3: case AltosLib.AO_LOG_FORMAT_EASYMOTOR: @@ -692,6 +693,8 @@ public class AltosConfigData { return true; if (product.startsWith("TeleMega-v6")) return true; + if (product.startsWith("TeleMega-v7")) + return true; if (product.startsWith("EasyMotor-v2")) return true; if (product.startsWith("EasyMotor-v3")) @@ -714,6 +717,8 @@ public class AltosConfigData { return AltosAdxl375.X_AXIS; if (product.startsWith("TeleMega-v6")) return AltosAdxl375.X_AXIS; + if (product.startsWith("TeleMega-v7")) + return AltosAdxl375.X_AXIS; if (product.startsWith("EasyMotor-v2")) return AltosAdxl375.X_AXIS; if (product.startsWith("EasyMotor-v3")) diff --git a/altoslib/AltosEepromRecordMega.java b/altoslib/AltosEepromRecordMega.java index fab17b49..b9dcea58 100644 --- a/altoslib/AltosEepromRecordMega.java +++ b/altoslib/AltosEepromRecordMega.java @@ -36,6 +36,7 @@ public class AltosEepromRecordMega extends AltosEepromRecord { case AltosLib.AO_LOG_FORMAT_TELEMEGA_4: case AltosLib.AO_LOG_FORMAT_TELEMEGA_5: case AltosLib.AO_LOG_FORMAT_TELEMEGA_6: + case AltosLib.AO_LOG_FORMAT_TELEMEGA_7: return data32(16); case AltosLib.AO_LOG_FORMAT_TELEMEGA_OLD: return data16(14); @@ -51,6 +52,7 @@ public class AltosEepromRecordMega extends AltosEepromRecord { case AltosLib.AO_LOG_FORMAT_TELEMEGA_4: case AltosLib.AO_LOG_FORMAT_TELEMEGA_5: case AltosLib.AO_LOG_FORMAT_TELEMEGA_6: + case AltosLib.AO_LOG_FORMAT_TELEMEGA_7: return data32(20); case AltosLib.AO_LOG_FORMAT_TELEMEGA_OLD: return data16(16); @@ -66,6 +68,7 @@ public class AltosEepromRecordMega extends AltosEepromRecord { case AltosLib.AO_LOG_FORMAT_TELEMEGA_4: case AltosLib.AO_LOG_FORMAT_TELEMEGA_5: case AltosLib.AO_LOG_FORMAT_TELEMEGA_6: + case AltosLib.AO_LOG_FORMAT_TELEMEGA_7: return data32(24); case AltosLib.AO_LOG_FORMAT_TELEMEGA_OLD: return data16(18); @@ -123,6 +126,7 @@ public class AltosEepromRecordMega extends AltosEepromRecord { case AltosLib.AO_LOG_FORMAT_TELEMEGA_5: return AltosLib.model_mpu6000; case AltosLib.AO_LOG_FORMAT_TELEMEGA_6: + case AltosLib.AO_LOG_FORMAT_TELEMEGA_7: return AltosLib.model_bmi088; } return AltosLib.MISSING; @@ -132,6 +136,7 @@ public class AltosEepromRecordMega extends AltosEepromRecord { switch (log_format) { case AltosLib.AO_LOG_FORMAT_TELEMEGA_5: case AltosLib.AO_LOG_FORMAT_TELEMEGA_6: + case AltosLib.AO_LOG_FORMAT_TELEMEGA_7: return true; } return false; @@ -141,6 +146,7 @@ public class AltosEepromRecordMega extends AltosEepromRecord { switch (log_format) { case AltosLib.AO_LOG_FORMAT_TELEMEGA_5: case AltosLib.AO_LOG_FORMAT_TELEMEGA_6: + case AltosLib.AO_LOG_FORMAT_TELEMEGA_7: return AltosLib.model_mmc5983; } return AltosLib.MISSING; diff --git a/altoslib/AltosEepromRecordSet.java b/altoslib/AltosEepromRecordSet.java index f0819a81..842675c9 100644 --- a/altoslib/AltosEepromRecordSet.java +++ b/altoslib/AltosEepromRecordSet.java @@ -89,6 +89,7 @@ public class AltosEepromRecordSet implements AltosRecordSet { case AltosLib.AO_LOG_FORMAT_TELEMEGA_5: case AltosLib.AO_LOG_FORMAT_TELEMEGA_6: case AltosLib.AO_LOG_FORMAT_EASYMEGA_3: + case AltosLib.AO_LOG_FORMAT_TELEMEGA_7: record = new AltosEepromRecordMega(eeprom); break; case AltosLib.AO_LOG_FORMAT_TELEMETRUM: diff --git a/altoslib/AltosLib.java b/altoslib/AltosLib.java index af945165..48fa9b04 100644 --- a/altoslib/AltosLib.java +++ b/altoslib/AltosLib.java @@ -703,6 +703,8 @@ public class AltosLib { return product_telemega; case AO_LOG_FORMAT_TELEMEGA_6: return product_telemega; + case AO_LOG_FORMAT_TELEMEGA_7: + return product_telemega; case AO_LOG_FORMAT_NONE: return product_altusmetrum; default: