Grigo/LoraMapTester
1
0
Fork 0
generated from Grigo/AndroidTemplate
Code Issues 1 Pull Requests Packages Projects Releases 11 Wiki Activity

added refference point

Browse Source
This commit is contained in:
Grigo
2026-06-25 11:27:10 +03:00
parent b5258b4f82
commit 157e1484d3
11 changed files with 42 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/grigowashere/loratester/ReferencePointRecorder.java
-12
View File
@@ -4,7 +4,6 @@ import android.os.Handler;
import android.os.Looper;
import android.util.Log;
import com.grigowashere.loratester.api.MacroPreset;
import com.grigowashere.loratester.api.ServerApi;
import com.grigowashere.loratester.location.GeoUtils;
import com.grigowashere.loratester.net.NetworkMonitor;
@@ -49,7 +48,6 @@ public class ReferencePointRecorder {
private volatile boolean recording;
private volatile long sessionId = -1;
private volatile int sampleCount;
private volatile MacroPreset activePreset;
private ScheduledFuture<?> sampleTask;
private ScheduledFuture<?> flushTask;
private Listener listener;
@@ -77,10 +75,6 @@ public class ReferencePointRecorder {
this.listener = listener;
}
public void setActivePreset(MacroPreset preset) {
this.activePreset = preset;
}
public boolean isRecording() {
return recording;
}
@@ -193,12 +187,6 @@ public class ReferencePointRecorder {
if (stats.role != null) point.put("role", stats.role);
if (stats.metaJson != null) point.put("meta", stats.metaJson);
}
MacroPreset preset = activePreset;
if (preset != null) {
if (preset.id != null) point.put("preset_id", preset.id);
if (preset.name != null) point.put("preset_name", preset.name);
if (preset.params != null) point.put("params", preset.params);
}
synchronized (buffer) {
buffer.add(point);
}
app/src/main/java/com/grigowashere/loratester/ui/AtFragment.java
-16
View File
@@ -25,7 +25,6 @@ import com.grigowashere.loratester.LoraApp;
import com.grigowashere.loratester.MacroPresetRepository;
import com.grigowashere.loratester.PeerDevices;
import com.grigowashere.loratester.R;
import com.grigowashere.loratester.ReferencePointRecorder;
import com.grigowashere.loratester.TelemetryUploader;
import com.grigowashere.loratester.api.DeviceInfo;
import com.grigowashere.loratester.api.MacroPreset;
@@ -50,7 +49,6 @@ public class AtFragment extends Fragment {
private FragmentPollHelper pollHelper;
private TelemetryUploader uploader;
private CommandPoller commandPoller;
private ReferencePointRecorder referencePointRecorder;
private MacroPresetRepository macroPresetRepository;
private TextView atStatus;
private TextView atCurrentSnapshot;
@@ -78,7 +76,6 @@ public class AtFragment extends Fragment {
LoraApp app = (LoraApp) context.getApplicationContext();
uploader = app.getTelemetryUploader();
commandPoller = app.getCommandPoller();
referencePointRecorder = app.getReferencePointRecorder();
macroPresetRepository = app.getMacroPresetRepository();
}
@@ -236,9 +233,6 @@ public class AtFragment extends Fragment {
List<String> lines = preset != null && preset.lines != null && !preset.lines.isEmpty()
? preset.lines
: RadioMacroBuilder.apply(buildParams());
if (referencePointRecorder != null) {
referencePointRecorder.setActivePreset(preset != null ? preset : buildTransientPreset(lines));
}
sendLines(lines);
}
@@ -253,16 +247,6 @@ public class AtFragment extends Fragment {
return presets.get(pos - 1);
}
private MacroPreset buildTransientPreset(List<String> lines) {
MacroPreset preset = new MacroPreset();
preset.id = "manual";
preset.name = getString(R.string.at_preset_manual);
preset.params = paramsMap(buildParams());
preset.lines = lines;
preset.local = true;
return preset;
}
private void saveCurrentAsLocalPreset() {
if (macroPresetRepository == null) {
return;