xdsopl/robot36
1
0
Fork 0
mirror of https://github.com/xdsopl/robot36.git synced 2026-01-04 15:29:59 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Wrasse -> Wraase

Browse source 
The "Wraase SC2 180" mode was invented by Volker Wraase (DL2RZ)
This commit is contained in:
Ahmet Inan 2015-02-11 16:12:57 +01:00
parent a1e9f2fb3a
commit 119813bc4a
12 changed files with 29 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README
View file

@ -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".

8
app/src/main/java/xdsopl/robot36/Decoder.java
View file

@ -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));

4
app/src/main/java/xdsopl/robot36/MainActivity.java
View file

@ -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();

4
app/src/main/res/menu/menu_main.xml
View file

@ -55,7 +55,7 @@
<item android:id="@+id/action_scottie2_mode" android:title="@string/action_scottie2_mode" />
<item android:id="@+id/action_scottieDX_mode" android:title="@string/action_scottieDX_mode" />
</menu></item>
<item android:title="@string/wrasse_modes"><menu>
<item android:id="@+id/action_wrasseSC2_180_mode" android:title="@string/action_wrasseSC2_180_mode" />
<item android:title="@string/wraase_modes"><menu>
<item android:id="@+id/action_wraaseSC2_180_mode" android:title="@string/action_wraaseSC2_180_mode" />
</menu></item>
</menu>

4
app/src/main/res/values-de/strings.xml
View file

@ -24,7 +24,7 @@
<string name="action_scottie1_mode">Scottie1 Modus</string>
<string name="action_scottie2_mode">Scottie2 Modus</string>
<string name="action_scottieDX_mode">ScottieDX Modus</string>
<string name="action_wrasseSC2_180_mode">WrasseSC2 180 Modus</string>
<string name="action_wraaseSC2_180_mode">WraaseSC2 180 Modus</string>
<string name="action_softer_image">Weicheres Bild</string>
<string name="action_sharper_image">Schärferes Bild</string>
<string name="action_toggle_scaling">Skalierung umschalten</string>
@ -37,5 +37,5 @@
<string name="pd_modes">PD Modi</string>
<string name="martin_modes">Martin Modi</string>
<string name="scottie_modes">Scottie Modi</string>
<string name="wrasse_modes">Wrasse Modi</string>
<string name="wraase_modes">Wraase Modi</string>
</resources>

4
app/src/main/res/values/strings.xml
View file

@ -24,7 +24,7 @@
<string name="action_scottie1_mode">Scottie1 Mode</string>
<string name="action_scottie2_mode">Scottie2 Mode</string>
<string name="action_scottieDX_mode">ScottieDX Mode</string>
<string name="action_wrasseSC2_180_mode">WrasseSC2 180 Mode</string>
<string name="action_wraaseSC2_180_mode">WraaseSC2 180 Mode</string>
<string name="action_softer_image">Softer Image</string>
<string name="action_sharper_image">Sharper Image</string>
<string name="action_toggle_scaling">Toggle Scaling</string>
@ -37,5 +37,5 @@
<string name="pd_modes">PD Modes</string>
<string name="martin_modes">Martin Modes</string>
<string name="scottie_modes">Scottie Modes</string>
<string name="wrasse_modes">Wrasse Modes</string>
<string name="wraase_modes">Wraase Modes</string>
</resources>

2
app/src/main/rs/calibration_detector.rsh
View file

@ -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:

4
app/src/main/rs/constants.rsh
View file

@ -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;

2
app/src/main/rs/initialization.rsh
View file

@ -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);

14
app/src/main/rs/modes.rsh
View file

@ -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();

8
app/src/main/rs/scanline_estimator.rsh
View file

@ -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)

2
app/src/main/rs/state.rsh
View file

@ -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;