Added more SSTV modes

A bit more work done on Replay (still not enabled)
This commit is contained in:
furrtek
2017-03-23 21:28:21 +00:00
parent 6a0bcb9cca
commit 685e4c6e4b
19 changed files with 288 additions and 172 deletions

View File

@@ -40,7 +40,7 @@ void SSTVTXProcessor::execute(const buffer_c8_t& buffer) {
// of the scanline. Todo: simplify !
if (state == STATE_CALIBRATION) {
// Once per scanline
// Once per picture
tone_delta = calibration_sequence[substep].first;
sample_count = calibration_sequence[substep].second;
if (substep == 2) {
@@ -49,17 +49,15 @@ void SSTVTXProcessor::execute(const buffer_c8_t& buffer) {
} else
substep++;
} else if (state == STATE_VIS) {
// Once per scanline
// Once per picture
if (substep == 10) {
current_scanline = &scanline_buffer[buffer_flip];
buffer_flip ^= 1;
if (asked == false) {
// Ask application for a new scanline
shared_memory.application_queue.push(sig_message);
asked = true;
}
// Ask application for a new scanline
shared_memory.application_queue.push(sig_message);
// Do we have to transmit a start tone ?
if (current_scanline->start_tone.duration) {
state = STATE_START;
state = STATE_SYNC;
tone_delta = current_scanline->start_tone.frequency;
sample_count = current_scanline->start_tone.duration;
} else {
@@ -69,23 +67,19 @@ void SSTVTXProcessor::execute(const buffer_c8_t& buffer) {
}
} else {
tone_delta = vis_code_sequence[substep];
sample_count = SSTV_MS2S(30); // VIS code bit is 30ms
sample_count = SSTV_MS2S(30); // A VIS code bit is 30ms
substep++;
}
} else if (state == STATE_START) {
} else if (state == STATE_SYNC) {
// Once per scanline, optional
state = STATE_PIXELS;
tone_delta = current_scanline->gap_tone.frequency;
sample_count = current_scanline->gap_tone.duration;
} else if (state == STATE_PIXELS) {
// Many times per scanline
pixel_luma = current_scanline->luma[pixel_index];
pixel_index++;
tone_delta = SSTV_F2D(1500 + ((pixel_luma * 800) / 256));
tone_delta = SSTV_F2D(1500 + ((current_scanline->luma[pixel_index] * 800) / 256));
sample_count = pixel_duration;
pixel_index++;
if (pixel_index >= 320) {
// Scanline done, (dirty) state jump
@@ -98,6 +92,7 @@ void SSTVTXProcessor::execute(const buffer_c8_t& buffer) {
sample_count--;
}
// Tone synth
tone_sample = (sine_table_i8[(tone_phase & 0xFF000000U) >> 24]);
tone_phase += tone_delta;
@@ -116,29 +111,27 @@ void SSTVTXProcessor::execute(const buffer_c8_t& buffer) {
void SSTVTXProcessor::on_message(const Message* const msg) {
const auto message = *reinterpret_cast<const SSTVConfigureMessage*>(msg);
uint8_t vis_code;
switch(msg->id) {
case Message::ID::SSTVConfigure:
pixel_duration = message.pixel_duration;
if (!pixel_duration) {
configured = false;
configured = false; // Shutdown
return;
}
vis_code = message.vis_code;
// VIS code:
// 1200
// 00011101 (0=1300, 1=1100)
// 1200
// 1200, (0=1300, 1=1100), 1200
vis_code_sequence[0] = SSTV_VIS_SS;
for (uint32_t c = 0; c < 8; c++) {
vis_code_sequence[c + 1] = ((vis_code << c) & 0x80) ? SSTV_VIS_ONE : SSTV_VIS_ZERO;
}
for (uint32_t c = 0; c < 8; c++)
vis_code_sequence[c + 1] = ((vis_code >> c) & 1) ? SSTV_VIS_ONE : SSTV_VIS_ZERO;
vis_code_sequence[9] = SSTV_VIS_SS;
fm_delta = 9000 * (0xFFFFFFULL / 3072000); // Fixed for now
fm_delta = 9000 * (0xFFFFFFULL / 3072000); // Fixed bw for now
pixel_index = 0;
sample_count = 0;
@@ -151,7 +144,6 @@ void SSTVTXProcessor::on_message(const Message* const msg) {
case Message::ID::FIFOData:
memcpy(&scanline_buffer[buffer_flip], static_cast<const FIFODataMessage*>(msg)->data, sizeof(sstv_scanline));
asked = false;
break;
default: