projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/telelco-v3.0: Merge info into one screen
[fw/altos]
/
altoslib
/
AltosConfigData.java
diff --git
a/altoslib/AltosConfigData.java
b/altoslib/AltosConfigData.java
index 5b9ee03120689d829d7f789a40218c143837daa8..b076357d77af888e0030919548dbbbfe9529df8c 100644
(file)
--- a/
altoslib/AltosConfigData.java
+++ b/
altoslib/AltosConfigData.java
@@
-88,6
+88,9
@@
public class AltosConfigData {
public int report_feet;
public int report_feet;
+ /* HAS_GPS_MOSAIC */
+ public int gps_receiver;
+
/* Storage info replies */
public int storage_size;
public int storage_erase_unit;
/* Storage info replies */
public int storage_size;
public int storage_erase_unit;
@@
-217,8
+220,15
@@
public class AltosConfigData {
return 4095 - value;
/* fall through */
case AltosLib.AO_LOG_FORMAT_TELEMEGA_4:
return 4095 - value;
/* fall through */
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_EASYMEGA_2:
case AltosLib.AO_LOG_FORMAT_EASYMEGA_2:
+ case AltosLib.AO_LOG_FORMAT_EASYMEGA_3:
case AltosLib.AO_LOG_FORMAT_EASYMOTOR:
case AltosLib.AO_LOG_FORMAT_EASYMOTOR:
+ /* ADXL375 */
+ return -value;
+ case AltosLib.AO_LOG_FORMAT_EASYTIMER_2:
+ /* BMI088 */
return -value;
default:
if (product.startsWith("EasyTimer-"))
return -value;
default:
if (product.startsWith("EasyTimer-"))
@@
-235,6
+245,10
@@
public class AltosConfigData {
return false;
}
return false;
}
+ public boolean has_radio() {
+ return product.startsWith("Tele");
+ }
+
int[] parse_version(String v) {
String[] parts = v.split("\\.");
int r[] = new int[parts.length];
int[] parse_version(String v) {
String[] parts = v.split("\\.");
int r[] = new int[parts.length];
@@
-324,6
+338,8
@@
public class AltosConfigData {
report_feet = AltosLib.MISSING;
report_feet = AltosLib.MISSING;
+ gps_receiver = AltosLib.MISSING;
+
tracker_motion = AltosLib.MISSING;
tracker_interval = AltosLib.MISSING;
tracker_motion = AltosLib.MISSING;
tracker_interval = AltosLib.MISSING;
@@
-519,6
+535,8
@@
public class AltosConfigData {
try { report_feet = get_int(line, "Report in feet:"); } catch (Exception e) {}
try { report_feet = get_int(line, "Report in feet:"); } catch (Exception e) {}
+ try { gps_receiver = get_int(line, "GPS receiver:"); } catch (Exception e) {}
+
/* HAS_TRACKER */
try {
int[] values = get_values(line, "Tracker setting:");
/* HAS_TRACKER */
try {
int[] values = get_values(line, "Tracker setting:");
@@
-638,6
+656,8
@@
public class AltosConfigData {
return false;
if (product.startsWith("TeleMetrum-v3"))
return false;
return false;
if (product.startsWith("TeleMetrum-v3"))
return false;
+ if (product.startsWith("TeleMetrum-v4"))
+ return true;
if (product.startsWith("EasyMega"))
return false;
return true;
if (product.startsWith("EasyMega"))
return false;
return true;
@@
-664,8
+684,14
@@
public class AltosConfigData {
return true;
if (product.startsWith("TeleMetrum-v3"))
return true;
return true;
if (product.startsWith("TeleMetrum-v3"))
return true;
+ if (product.startsWith("TeleMetrum-v4"))
+ return true;
if (product.startsWith("TeleMega-v4"))
return true;
if (product.startsWith("TeleMega-v4"))
return true;
+ if (product.startsWith("TeleMega-v5"))
+ return true;
+ if (product.startsWith("TeleMega-v6"))
+ return true;
if (product.startsWith("EasyMotor-v2"))
return true;
if (product.startsWith("EasyMotor-v3"))
if (product.startsWith("EasyMotor-v2"))
return true;
if (product.startsWith("EasyMotor-v3"))
@@
-680,8
+706,14
@@
public class AltosConfigData {
return AltosAdxl375.X_AXIS;
if (product.startsWith("TeleMetrum-v3"))
return AltosAdxl375.X_AXIS;
return AltosAdxl375.X_AXIS;
if (product.startsWith("TeleMetrum-v3"))
return AltosAdxl375.X_AXIS;
+ if (product.startsWith("TeleMetrum-v4"))
+ return AltosAdxl375.X_AXIS;
if (product.startsWith("TeleMega-v4"))
return AltosAdxl375.X_AXIS;
if (product.startsWith("TeleMega-v4"))
return AltosAdxl375.X_AXIS;
+ if (product.startsWith("TeleMega-v5"))
+ return AltosAdxl375.X_AXIS;
+ if (product.startsWith("TeleMega-v6"))
+ return AltosAdxl375.X_AXIS;
if (product.startsWith("EasyMotor-v2"))
return AltosAdxl375.X_AXIS;
if (product.startsWith("EasyMotor-v3"))
if (product.startsWith("EasyMotor-v2"))
return AltosAdxl375.X_AXIS;
if (product.startsWith("EasyMotor-v3"))
@@
-756,6
+788,9
@@
public class AltosConfigData {
if (report_feet != AltosLib.MISSING)
report_feet = source.report_feet();
if (report_feet != AltosLib.MISSING)
report_feet = source.report_feet();
+ if (gps_receiver != AltosLib.MISSING)
+ gps_receiver = source.gps_receiver();
+
/* HAS_TRACKER */
if (tracker_motion != AltosLib.MISSING)
tracker_motion = source.tracker_motion();
/* HAS_TRACKER */
if (tracker_motion != AltosLib.MISSING)
tracker_motion = source.tracker_motion();
@@
-813,6
+848,7
@@
public class AltosConfigData {
dest.set_beep(beep);
dest.set_radio_10mw(radio_10mw);
dest.set_report_feet(report_feet);
dest.set_beep(beep);
dest.set_radio_10mw(radio_10mw);
dest.set_report_feet(report_feet);
+ dest.set_gps_receiver(gps_receiver);
dest.set_tracker_motion(tracker_motion);
dest.set_tracker_interval(tracker_interval);
}
dest.set_tracker_motion(tracker_motion);
dest.set_tracker_interval(tracker_interval);
}
@@
-936,10
+972,13
@@
public class AltosConfigData {
if (radio_10mw != AltosLib.MISSING)
link.printf("c p %d\n", radio_10mw);
if (radio_10mw != AltosLib.MISSING)
link.printf("c p %d\n", radio_10mw);
- /* HAS_RADIO_10MW */
if (report_feet != AltosLib.MISSING)
link.printf("c u %d\n", report_feet);
if (report_feet != AltosLib.MISSING)
link.printf("c u %d\n", report_feet);
+ /* HAS_GPS_MOSAIC */
+ if (gps_receiver != AltosLib.MISSING)
+ link.printf("c g %d\n", gps_receiver);
+
/* HAS_TRACKER */
if (tracker_motion != AltosLib.MISSING && tracker_interval != AltosLib.MISSING)
link.printf("c t %d %d\n", tracker_motion, tracker_interval);
/* HAS_TRACKER */
if (tracker_motion != AltosLib.MISSING && tracker_interval != AltosLib.MISSING)
link.printf("c t %d %d\n", tracker_motion, tracker_interval);