From 4f647e14b4c989dcae8509ecd756ec38ec99afde Mon Sep 17 00:00:00 2001 From: Marek Ossowski Date: Thu, 21 Aug 2025 01:02:26 +0200 Subject: [PATCH] Removed some comments and renamed methods in Mode --- app/src/main/java/xdsopl/robot36/Decoder.java | 8 ++-- app/src/main/java/xdsopl/robot36/HFFax.java | 6 +-- app/src/main/java/xdsopl/robot36/Mode.java | 41 ++----------------- app/src/main/java/xdsopl/robot36/PaulDon.java | 6 +-- .../main/java/xdsopl/robot36/RGBDecoder.java | 6 +-- .../main/java/xdsopl/robot36/RawDecoder.java | 6 +-- .../java/xdsopl/robot36/Robot_36_Color.java | 6 +-- .../java/xdsopl/robot36/Robot_72_Color.java | 6 +-- 8 files changed, 26 insertions(+), 59 deletions(-) diff --git a/app/src/main/java/xdsopl/robot36/Decoder.java b/app/src/main/java/xdsopl/robot36/Decoder.java index b49ce81..ccf79cb 100644 --- a/app/src/main/java/xdsopl/robot36/Decoder.java +++ b/app/src/main/java/xdsopl/robot36/Decoder.java @@ -159,7 +159,7 @@ public class Decoder { private Mode findMode(ArrayList modes, int code) { for (Mode mode : modes) - if (mode.getCode() == code) + if (mode.getVISCode() == code) return mode; return null; } @@ -334,7 +334,7 @@ public class Decoder { } if (lockMode && mode != currentMode) return false; - mode.reset(); + mode.resetState(); imageBuffer.width = mode.getWidth(); imageBuffer.height = mode.getHeight(); imageBuffer.line = 0; @@ -348,7 +348,7 @@ public class Decoder { for (int i = 0; i < pulses.length; ++i) pulses[i] = oldestSyncPulseIndex + i * currentScanLineSamples; Arrays.fill(lines, currentScanLineSamples); - shiftSamples(lastSyncPulseIndex + mode.getBegin()); + shiftSamples(lastSyncPulseIndex + mode.getFirstPixelSampleIndex()); drawLines(0xff00ff00, 8); drawLines(0xff000000, 10); return true; @@ -407,7 +407,7 @@ public class Decoder { lastSyncPulseIndex = pulses[pulses.length - 1]; currentScanLineSamples = scanLineSamples; lastFrequencyOffset = frequencyOffset; - shiftSamples(lastSyncPulseIndex + currentMode.getBegin()); + shiftSamples(lastSyncPulseIndex + currentMode.getFirstPixelSampleIndex()); return true; } diff --git a/app/src/main/java/xdsopl/robot36/HFFax.java b/app/src/main/java/xdsopl/robot36/HFFax.java index ee65069..f6f43eb 100644 --- a/app/src/main/java/xdsopl/robot36/HFFax.java +++ b/app/src/main/java/xdsopl/robot36/HFFax.java @@ -32,7 +32,7 @@ public class HFFax extends BaseMode { } @Override - public int getCode() { + public int getVISCode() { return -1; } @@ -47,7 +47,7 @@ public class HFFax extends BaseMode { } @Override - public int getBegin() { + public int getFirstPixelSampleIndex() { return 0; } @@ -62,7 +62,7 @@ public class HFFax extends BaseMode { } @Override - public void reset() { + public void resetState() { } @Override diff --git a/app/src/main/java/xdsopl/robot36/Mode.java b/app/src/main/java/xdsopl/robot36/Mode.java index 46eae04..2650ee5 100644 --- a/app/src/main/java/xdsopl/robot36/Mode.java +++ b/app/src/main/java/xdsopl/robot36/Mode.java @@ -9,59 +9,26 @@ package xdsopl.robot36; import android.graphics.Bitmap; public interface Mode { - /** - * @return mode name - */ String getName(); - /** - * @return VIS code - */ - int getCode(); + int getVISCode(); - /** - * @return image width - */ int getWidth(); - /** - * @return image height - */ int getHeight(); - /** - * @return number of samples from sync pulse to start of image data - */ - int getBegin(); + int getFirstPixelSampleIndex(); - /** - * @return number of samples from start of first scanline to first sync pulse?, nonzero for Scottie - */ int getFirstSyncPulseIndex(); - /** - * @return number of samples in a scanline - */ int getScanLineSamples(); - /** - * Adjust scope image before saving - */ Bitmap postProcessScopeImage(Bitmap bmp); - /** - * Reset internal state. - */ - void reset(); + void resetState(); /** - * @param pixelBuffer buffer to store decoded pixels - * @param scratchBuffer buffer for temporary data - * @param scanLineBuffer raw samples to be decoded, can contain more than one scanline - * @param scopeBufferWidth used in RawDecoder, initializes width? - * @param syncPulseIndex number of samples from array start to sync pulse - * @param scanLineSamples number of samples per scanline - * @param frequencyOffset correction of frequency of expected vs actual sync pulse (normalized to range (-1, 1)) + * @param frequencyOffset normalized correction of frequency (expected vs actual) * @return true if scanline was decoded */ boolean decodeScanLine(PixelBuffer pixelBuffer, float[] scratchBuffer, float[] scanLineBuffer, int scopeBufferWidth, int syncPulseIndex, int scanLineSamples, float frequencyOffset); diff --git a/app/src/main/java/xdsopl/robot36/PaulDon.java b/app/src/main/java/xdsopl/robot36/PaulDon.java index efc369d..ee6e3cb 100644 --- a/app/src/main/java/xdsopl/robot36/PaulDon.java +++ b/app/src/main/java/xdsopl/robot36/PaulDon.java @@ -56,7 +56,7 @@ public class PaulDon extends BaseMode { } @Override - public int getCode() { + public int getVISCode() { return code; } @@ -71,7 +71,7 @@ public class PaulDon extends BaseMode { } @Override - public int getBegin() { + public int getFirstPixelSampleIndex() { return beginSamples; } @@ -86,7 +86,7 @@ public class PaulDon extends BaseMode { } @Override - public void reset() { + public void resetState() { } @Override diff --git a/app/src/main/java/xdsopl/robot36/RGBDecoder.java b/app/src/main/java/xdsopl/robot36/RGBDecoder.java index 34b4034..fa1ef00 100644 --- a/app/src/main/java/xdsopl/robot36/RGBDecoder.java +++ b/app/src/main/java/xdsopl/robot36/RGBDecoder.java @@ -51,7 +51,7 @@ public class RGBDecoder extends BaseMode { } @Override - public int getCode() { + public int getVISCode() { return code; } @@ -66,7 +66,7 @@ public class RGBDecoder extends BaseMode { } @Override - public int getBegin() { + public int getFirstPixelSampleIndex() { return beginSamples; } @@ -81,7 +81,7 @@ public class RGBDecoder extends BaseMode { } @Override - public void reset() { + public void resetState() { } @Override diff --git a/app/src/main/java/xdsopl/robot36/RawDecoder.java b/app/src/main/java/xdsopl/robot36/RawDecoder.java index 3dffa17..931144d 100644 --- a/app/src/main/java/xdsopl/robot36/RawDecoder.java +++ b/app/src/main/java/xdsopl/robot36/RawDecoder.java @@ -29,7 +29,7 @@ public class RawDecoder extends BaseMode { } @Override - public int getCode() { + public int getVISCode() { return -1; } @@ -44,7 +44,7 @@ public class RawDecoder extends BaseMode { } @Override - public int getBegin() { + public int getFirstPixelSampleIndex() { return 0; } @@ -59,7 +59,7 @@ public class RawDecoder extends BaseMode { } @Override - public void reset() { + public void resetState() { } @Override diff --git a/app/src/main/java/xdsopl/robot36/Robot_36_Color.java b/app/src/main/java/xdsopl/robot36/Robot_36_Color.java index 94e22b3..baf448e 100644 --- a/app/src/main/java/xdsopl/robot36/Robot_36_Color.java +++ b/app/src/main/java/xdsopl/robot36/Robot_36_Color.java @@ -59,7 +59,7 @@ public class Robot_36_Color extends BaseMode { } @Override - public int getCode() { + public int getVISCode() { return 8; } @@ -74,7 +74,7 @@ public class Robot_36_Color extends BaseMode { } @Override - public int getBegin() { + public int getFirstPixelSampleIndex() { return beginSamples; } @@ -89,7 +89,7 @@ public class Robot_36_Color extends BaseMode { } @Override - public void reset() { + public void resetState() { lastEven = false; } diff --git a/app/src/main/java/xdsopl/robot36/Robot_72_Color.java b/app/src/main/java/xdsopl/robot36/Robot_72_Color.java index 049f6eb..00414fd 100644 --- a/app/src/main/java/xdsopl/robot36/Robot_72_Color.java +++ b/app/src/main/java/xdsopl/robot36/Robot_72_Color.java @@ -63,7 +63,7 @@ public class Robot_72_Color extends BaseMode { } @Override - public int getCode() { + public int getVISCode() { return 12; } @@ -78,7 +78,7 @@ public class Robot_72_Color extends BaseMode { } @Override - public int getBegin() { + public int getFirstPixelSampleIndex() { return beginSamples; } @@ -93,7 +93,7 @@ public class Robot_72_Color extends BaseMode { } @Override - public void reset() { + public void resetState() { } @Override