diff --git a/README b/README index dc18c22..145623d 100644 --- a/README +++ b/README @@ -30,7 +30,7 @@ Robot Modes: 36 & 72 PD Modes: 50, 90, 120, 160, 180, 240 and 290 Martin Modes: 1 & 2 Scottie Modes: 1, 2 & DX -Wrasse Modes: SC2 180 +Wraase Modes: SC2 180 Watching of old B/W or unsupported transmission modes works even in the "Raw Mode". diff --git a/app/src/main/java/xdsopl/robot36/Decoder.java b/app/src/main/java/xdsopl/robot36/Decoder.java index af884f1..9d86bfd 100644 --- a/app/src/main/java/xdsopl/robot36/Decoder.java +++ b/app/src/main/java/xdsopl/robot36/Decoder.java @@ -71,7 +71,7 @@ public class Decoder { private final int mode_scottie1 = 5; private final int mode_scottie2 = 6; private final int mode_scottieDX = 7; - private final int mode_wrasseSC2_180 = 8; + private final int mode_wraaseSC2_180 = 8; private final int mode_pd50 = 9; private final int mode_pd90 = 10; private final int mode_pd120 = 11; @@ -173,7 +173,7 @@ public class Decoder { void scottie1_mode() { rsDecoder.invoke_scottie1_mode(); } void scottie2_mode() { rsDecoder.invoke_scottie2_mode(); } void scottieDX_mode() { rsDecoder.invoke_scottieDX_mode(); } - void wrasseSC2_180_mode() { rsDecoder.invoke_wrasseSC2_180_mode(); } + void wraaseSC2_180_mode() { rsDecoder.invoke_wraaseSC2_180_mode(); } void pd50_mode() { rsDecoder.invoke_pd50_mode(); } void pd90_mode() { rsDecoder.invoke_pd90_mode(); } void pd120_mode() { rsDecoder.invoke_pd120_mode(); } @@ -222,9 +222,9 @@ public class Decoder { image.setImageResolution(320, freeRunReserve(256)); updateTitle(R.string.action_scottieDX_mode); break; - case mode_wrasseSC2_180: + case mode_wraaseSC2_180: image.setImageResolution(320, freeRunReserve(256)); - updateTitle(R.string.action_wrasseSC2_180_mode); + updateTitle(R.string.action_wraaseSC2_180_mode); break; case mode_pd50: image.setImageResolution(320, freeRunReserve(256)); diff --git a/app/src/main/java/xdsopl/robot36/MainActivity.java b/app/src/main/java/xdsopl/robot36/MainActivity.java index 2aa2f29..c157a43 100644 --- a/app/src/main/java/xdsopl/robot36/MainActivity.java +++ b/app/src/main/java/xdsopl/robot36/MainActivity.java @@ -237,8 +237,8 @@ public class MainActivity extends Activity { case R.id.action_scottieDX_mode: decoder.scottieDX_mode(); return true; - case R.id.action_wrasseSC2_180_mode: - decoder.wrasseSC2_180_mode(); + case R.id.action_wraaseSC2_180_mode: + decoder.wraaseSC2_180_mode(); return true; case R.id.action_pd50_mode: decoder.pd50_mode(); diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml index 1793906..a6fb30a 100644 --- a/app/src/main/res/menu/menu_main.xml +++ b/app/src/main/res/menu/menu_main.xml @@ -55,7 +55,7 @@ - - + + diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index dd050ad..a9aef8a 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -24,7 +24,7 @@ Scottie1 Modus Scottie2 Modus ScottieDX Modus - WrasseSC2 180 Modus + WraaseSC2 180 Modus Weicheres Bild Schärferes Bild Skalierung umschalten @@ -37,5 +37,5 @@ PD Modi Martin Modi Scottie Modi - Wrasse Modi + Wraase Modi diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4a2955a..1ac0cc8 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -24,7 +24,7 @@ Scottie1 Mode Scottie2 Mode ScottieDX Mode - WrasseSC2 180 Mode + WraaseSC2 180 Mode Softer Image Sharper Image Toggle Scaling @@ -37,5 +37,5 @@ PD Modes Martin Modes Scottie Modes - Wrasse Modes + Wraase Modes diff --git a/app/src/main/rs/calibration_detector.rsh b/app/src/main/rs/calibration_detector.rsh index 4cfbe90..dd6e9bf 100644 --- a/app/src/main/rs/calibration_detector.rsh +++ b/app/src/main/rs/calibration_detector.rsh @@ -110,7 +110,7 @@ static int calibration_detector(float dat_value, int cnt_quantized) case 0xcc: return mode_scottieDX; case 0xb7: - return mode_wrasseSC2_180; + return mode_wraaseSC2_180; case 0xdd: return mode_pd50; case 0x63: diff --git a/app/src/main/rs/constants.rsh b/app/src/main/rs/constants.rsh index 18f7fc2..0fe8f52 100644 --- a/app/src/main/rs/constants.rsh +++ b/app/src/main/rs/constants.rsh @@ -32,7 +32,7 @@ static const int mode_martin2 = 4; static const int mode_scottie1 = 5; static const int mode_scottie2 = 6; static const int mode_scottieDX = 7; -static const int mode_wrasseSC2_180 = 8; +static const int mode_wraaseSC2_180 = 8; static const int mode_pd50 = 9; static const int mode_pd90 = 10; static const int mode_pd120 = 11; @@ -50,7 +50,7 @@ static const float martin2_scanline_ms = 226.798f; static const float scottie1_scanline_ms = 428.22f; static const float scottie2_scanline_ms = 277.692f; static const float scottieDX_scanline_ms = 1050.3f; -static const float wrasseSC2_180_scanline_ms = 711.0225f; +static const float wraaseSC2_180_scanline_ms = 711.0225f; static const float pd50_scanline_ms = 388.16f; static const float pd90_scanline_ms = 703.04f; static const float pd120_scanline_ms = 508.48f; diff --git a/app/src/main/rs/initialization.rsh b/app/src/main/rs/initialization.rsh index 6c8cce0..a2ff16d 100644 --- a/app/src/main/rs/initialization.rsh +++ b/app/src/main/rs/initialization.rsh @@ -55,7 +55,7 @@ void initialize(float rate, int length, int iw, int ih, int sw, int sh, int sgw, scottie1_scanline_length = round((scottie1_scanline_ms * sample_rate) / 1000.0f); scottie2_scanline_length = round((scottie2_scanline_ms * sample_rate) / 1000.0f); scottieDX_scanline_length = round((scottieDX_scanline_ms * sample_rate) / 1000.0f); - wrasseSC2_180_scanline_length = round((wrasseSC2_180_scanline_ms * sample_rate) / 1000.0f); + wraaseSC2_180_scanline_length = round((wraaseSC2_180_scanline_ms * sample_rate) / 1000.0f); pd50_scanline_length = round((pd50_scanline_ms * sample_rate) / 1000.0f); pd90_scanline_length = round((pd90_scanline_ms * sample_rate) / 1000.0f); pd120_scanline_length = round((pd120_scanline_ms * sample_rate) / 1000.0f); diff --git a/app/src/main/rs/modes.rsh b/app/src/main/rs/modes.rsh index 01e840b..c2990c8 100644 --- a/app/src/main/rs/modes.rsh +++ b/app/src/main/rs/modes.rsh @@ -237,10 +237,10 @@ void scottie1_mode() { scottie_mode(mode_scottie1, scottie1_scanline_length, 3, void scottie2_mode() { scottie_mode(mode_scottie2, scottie2_scanline_length, 2, 88.064f); } void scottieDX_mode() { scottie_mode(mode_scottieDX, scottieDX_scanline_length, 5, 345.6f); } -void wrasseSC2_180_mode() +void wraaseSC2_180_mode() { blur_power = 4; - *current_mode = mode_wrasseSC2_180; + *current_mode = mode_wraaseSC2_180; current_decoder = decoder_rgb; bitmap_width = 320; bitmap_height = 256; @@ -265,9 +265,9 @@ void wrasseSC2_180_mode() b_end = round((b_end_ms * sample_rate) / 1000.0f); b_begin = round((b_begin_ms * sample_rate) / 1000.0f); - scanline_length = wrasseSC2_180_scanline_length; - minimum_length = (1.0f - scanline_tolerance) * wrasseSC2_180_scanline_length; - maximum_length = (1.0f + scanline_tolerance) * wrasseSC2_180_scanline_length; + scanline_length = wraaseSC2_180_scanline_length; + minimum_length = (1.0f - scanline_tolerance) * wraaseSC2_180_scanline_length; + maximum_length = (1.0f + scanline_tolerance) * wraaseSC2_180_scanline_length; } static void switch_mode(int new_mode) @@ -296,8 +296,8 @@ static void switch_mode(int new_mode) case mode_scottieDX: scottieDX_mode(); break; - case mode_wrasseSC2_180: - wrasseSC2_180_mode(); + case mode_wraaseSC2_180: + wraaseSC2_180_mode(); break; case mode_pd50: pd50_mode(); diff --git a/app/src/main/rs/scanline_estimator.rsh b/app/src/main/rs/scanline_estimator.rsh index b643a68..28bae8a 100644 --- a/app/src/main/rs/scanline_estimator.rsh +++ b/app/src/main/rs/scanline_estimator.rsh @@ -52,7 +52,7 @@ static int scanline_estimator(int sync_level) int scottie1_adev = abs(mean - scottie1_scanline_length); int scottie2_adev = abs(mean - scottie2_scanline_length); int scottieDX_adev = abs(mean - scottieDX_scanline_length); - int wrasseSC2_180_adev = abs(mean - wrasseSC2_180_scanline_length); + int wraaseSC2_180_adev = abs(mean - wraaseSC2_180_scanline_length); int pd50_adev = abs(mean - pd50_scanline_length); int pd90_adev = abs(mean - pd90_scanline_length); int pd120_adev = abs(mean - pd120_scanline_length); @@ -68,7 +68,7 @@ static int scanline_estimator(int sync_level) min(martin1_adev, martin2_adev) ), min( min(scottie1_adev, scottie2_adev), - min(scottieDX_adev, wrasseSC2_180_adev) + min(scottieDX_adev, wraaseSC2_180_adev) ) ), min( @@ -99,8 +99,8 @@ static int scanline_estimator(int sync_level) return mode_scottie2; else if (min_adev == scottieDX_adev) return mode_scottieDX; - else if (min_adev == wrasseSC2_180_adev) - return mode_wrasseSC2_180; + else if (min_adev == wraaseSC2_180_adev) + return mode_wraaseSC2_180; else if (min_adev == pd50_adev) return mode_pd50; else if (min_adev == pd90_adev) diff --git a/app/src/main/rs/state.rsh b/app/src/main/rs/state.rsh index aadbb72..a4e54dc 100644 --- a/app/src/main/rs/state.rsh +++ b/app/src/main/rs/state.rsh @@ -54,7 +54,7 @@ static int martin2_scanline_length; static int scottie1_scanline_length; static int scottie2_scanline_length; static int scottieDX_scanline_length; -static int wrasseSC2_180_scanline_length; +static int wraaseSC2_180_scanline_length; static int pd50_scanline_length; static int pd90_scanline_length; static int pd120_scanline_length;