Skip to content

Implement Wraase SC-2 60 #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sjlongland wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Implement Wraase SC-2 60 #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d70bcdf
vis, modespec: Handle VIS codes that use odd parity
sjlongland Dec 9, 2024
5b668ca
modespec, slowrx UI: Add Wraase SC-2 60
sjlongland Dec 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ extern guchar *StoredLum;
extern pthread_t thread1;
extern guchar VISmap[];

#define VIS_PARITY_ODD (1 << 7)

typedef struct _FFTStuff FFTStuff;
struct _FFTStuff {
double *in;
Expand Down Expand Up @@ -93,12 +95,12 @@ extern PicMeta CurrentPic;
// SSTV modes
enum {
UNKNOWN=0,
M1, M2, M3, M4,
S1, S2, SDX,
R72, R36, R24, R24BW, R12BW, R8BW,
PD50, PD90, PD120, PD160, PD180, PD240, PD290,
P3, P5, P7,
W2120, W2180
M1, M2, M3, M4,
S1, S2, SDX,
R72, R36, R24, R24BW, R12BW, R8BW,
PD50, PD90, PD120, PD160, PD180, PD240, PD290,
P3, P5, P7,
W260, W2120, W2180
};

// Color encodings
Expand Down
52 changes: 39 additions & 13 deletions modespec.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,22 @@ _ModeSpec ModeSpec[] = {
.NumLines = 120,
.LineHeight = 2,
.ColorEnc = BW },


[W260] = {
// Reverse-engineered by taking half the W2120 pixel time as an educated guess then
// tweaking the generated image timings until QSSTV decoded them without slant. -- VK4MSL
.Name = "Wraase SC-2 60",
.ShortName = "W260",
.SyncTime = 5.5225e-3,
.PorchTime = 0.0e-3,
.SeptrTime = 0.5e-3,
.PixelTime = 0.2425859375e-3,
.LineTime = 240.405e-3,
.ImgWidth = 320,
.NumLines = 256,
.LineHeight = 1,
.ColorEnc = RGB },

[W2120] = { // KB4YZ, 1999
.Name = "Wraase SC-2 120",
.ShortName = "W2120",
Expand Down Expand Up @@ -371,15 +386,26 @@ _ModeSpec ModeSpec[] = {
*
*/

// 0 1 2 3 4 5 6 7 8 9 A B C D E F

guchar VISmap[] = { 0, 0, R8BW, 0, R24, 0, R12BW,0, R36, 0, R24BW,0, R72, 0, 0, 0, // 0
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1
M4, 0, 0, 0, M3, 0, 0, 0, M2, 0, 0, 0, M1, 0, 0, 0, // 2
0, 0, 0, 0, 0, 0, 0, W2180,S2, 0, 0, 0, S1, 0, 0, W2120, // 3
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, SDX, 0, 0, 0, // 4
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, PD50,PD290,PD120, // 5
PD180,PD240,PD160,PD90,0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 6
0, P3, P5, P7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; // 7

// 0 1 2 3 4 5 6 7 8 9 A B C D E F
// 0 1 2 3 4 5 6 7 8 9 A B C D E F

guchar VISmap[] = {
// Normal (even) parity
0, 0, R8BW, 0, R24, 0, 0, 0, R36, 0, R24BW,0, R72, 0, 0, 0, // 0
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1
M4, 0, 0, 0, M3, 0, 0, 0, M2, 0, 0, 0, M1, 0, 0, 0, // 2
0, 0, 0, 0, 0, 0, 0, W2180,S2, 0, 0, 0, S1, 0, 0, W2120, // 3
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, SDX, 0, 0, 0, // 4
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, PD50,PD290,PD120, // 5
PD180,PD240,PD160,PD90,0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 6
0, P3, P5, P7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 7
// Inverted (odd) parity
0, 0, 0, 0, 0, 0, R12BW,0, 0, 0, 0, 0, 0, 0, 0, 0, // 8
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 9
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // A
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, W260, 0, 0, 0, 0, // B
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // C
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // D
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // E
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; // F

// 0 1 2 3 4 5 6 7 8 9 A B C D E F
1 change: 1 addition & 0 deletions slowrx.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -638,6 +638,7 @@
<item translatable="yes">Pasokon P3</item>
<item translatable="yes">Pasokon P5</item>
<item translatable="yes">Pasokon P7</item>
<item translatable="yes">Wraase SC-2 60</item>
<item translatable="yes">Wraase SC-2 120</item>
<item translatable="yes">Wraase SC-2 180</item>
</items>
Expand Down
29 changes: 21 additions & 8 deletions vis.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,14 @@

#include "common.h"

/* Handle selection of the VIS mode in the GUI */
static void onGotVis(guchar VIS) {
gdk_threads_enter();
gtk_combo_box_set_active (GTK_COMBO_BOX(gui.combo_mode), VISmap[VIS]-1);
gtk_spin_button_set_value (GTK_SPIN_BUTTON(gui.spin_shift), CurrentPic.HedrShift);
gdk_threads_leave();
}

/*
*
* Detect VIS & frequency shift
Expand Down Expand Up @@ -113,19 +121,24 @@ guchar GetVIS () {

Parity = Bit[0] ^ Bit[1] ^ Bit[2] ^ Bit[3] ^ Bit[4] ^ Bit[5] ^ Bit[6];

if (VISmap[VIS] == R12BW) Parity = !Parity;

if (Parity != ParityBit) {
printf(" Parity fail\n");
gotvis = FALSE;
// Maybe this mode uses odd parity?
printf(" Parity inconclusive, trying odd parity\n");
if (VISmap[VIS | VIS_PARITY_ODD] == UNKNOWN) {
// Nope!
printf(" Parity fail\n");
gotvis = FALSE;
} else {
// Yep, that was it. Inverted parity.
VIS |= VIS_PARITY_ODD;
onGotVis(VIS);
break;
}
} else if (VISmap[VIS] == UNKNOWN) {
printf(" Unknown VIS\n");
gotvis = FALSE;
} else {
gdk_threads_enter();
gtk_combo_box_set_active (GTK_COMBO_BOX(gui.combo_mode), VISmap[VIS]-1);
gtk_spin_button_set_value (GTK_SPIN_BUTTON(gui.spin_shift), CurrentPic.HedrShift);
gdk_threads_leave();
onGotVis(VIS);
break;
}
}
Expand Down