From e08fd3031f4fef0592f3d66c7d1330cffaa0d6b0 Mon Sep 17 00:00:00 2001 From: Stelios Bounanos Date: Sat, 26 Jul 2008 19:03:49 +0100 Subject: [PATCH] Upstream version 3.0preZ --- configure.ac | 2 +- src/dialogs/fl_digi.cxx | 15 +++++++++++---- src/main.cxx | 3 ++- src/psk/psk.cxx | 4 ++++ 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index 07372253..edd2724b 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl major and minor must be integers; patch may dnl contain other characters or be empty m4_define(FLDIGI_MAJOR, [3]) m4_define(FLDIGI_MINOR, [0]) -m4_define(FLDIGI_PATCH, [preY]) +m4_define(FLDIGI_PATCH, [preZ]) AC_INIT([fldigi], FLDIGI_MAJOR.FLDIGI_MINOR[FLDIGI_PATCH], [w1hkj AT w1hkj DOT com]) diff --git a/src/dialogs/fl_digi.cxx b/src/dialogs/fl_digi.cxx index 069ccf08..d3558425 100644 --- a/src/dialogs/fl_digi.cxx +++ b/src/dialogs/fl_digi.cxx @@ -231,7 +231,6 @@ Fl_Menu_Item quick_change_thor[] = { { mode_info[MODE_THOR5].name, 0, cb_init_mode, (void *)MODE_THOR5 }, { mode_info[MODE_THOR8].name, 0, cb_init_mode, (void *)MODE_THOR8 }, { mode_info[MODE_THOR11].name, 0, cb_init_mode, (void *)MODE_THOR11 }, -// { mode_info[MODE_TSOR11].name, 0, cb_init_mode, (void *)MODE_TSOR11 }, { mode_info[MODE_THOR16].name, 0, cb_init_mode, (void *)MODE_THOR16 }, { mode_info[MODE_THOR22].name, 0, cb_init_mode, (void *)MODE_THOR22 }, { 0 } @@ -551,7 +550,7 @@ void init_modem(trx_mode mode) break; case MODE_THOR4: case MODE_THOR5: case MODE_THOR8: - case MODE_THOR11:case MODE_THOR16: case MODE_THOR22: //case MODE_TSOR11: + case MODE_THOR11:case MODE_THOR16: case MODE_THOR22: startup_modem(*mode_info[mode].modem ? *mode_info[mode].modem : *mode_info[mode].modem = new thor(mode)); quick_change = quick_change_thor; @@ -1379,7 +1378,6 @@ Fl_Menu_Item menu_[] = { { mode_info[MODE_THOR5].name, 0, cb_init_mode, (void *)MODE_THOR5, 0, FL_NORMAL_LABEL, 0, 14, 0}, { mode_info[MODE_THOR8].name, 0, cb_init_mode, (void *)MODE_THOR8, 0, FL_NORMAL_LABEL, 0, 14, 0}, { mode_info[MODE_THOR11].name, 0, cb_init_mode, (void *)MODE_THOR11, 0, FL_NORMAL_LABEL, 0, 14, 0}, -//{ mode_info[MODE_TSOR11].name, 0, cb_init_mode, (void *)MODE_TSOR11, 0, FL_NORMAL_LABEL, 0, 14, 0}, { mode_info[MODE_THOR16].name, 0, cb_init_mode, (void *)MODE_THOR16, 0, FL_NORMAL_LABEL, 0, 14, 0}, { mode_info[MODE_THOR22].name, 0, cb_init_mode, (void *)MODE_THOR22, 0, FL_NORMAL_LABEL, 0, 14, 0}, {0,0,0,0,0,0,0,0,0}, @@ -1393,6 +1391,15 @@ Fl_Menu_Item menu_[] = { { mode_info[MODE_THROBX4].name, 0, cb_init_mode, (void *)MODE_THROBX4, 0, FL_NORMAL_LABEL, 0, 14, 0}, {0,0,0,0,0,0,0,0,0}, +{"NBEMS modes", 0, 0, 0, FL_SUBMENU, FL_NORMAL_LABEL, 0, 14, 0}, +{ mode_info[MODE_DOMINOEX11].name, 0, cb_init_mode, (void *)MODE_DOMINOEX11, 0, FL_NORMAL_LABEL, 0, 14, 0}, +{ mode_info[MODE_DOMINOEX22].name, 0, cb_init_mode, (void *)MODE_DOMINOEX22, FL_MENU_DIVIDER, FL_NORMAL_LABEL, 0, 14, 0}, +{ mode_info[MODE_MFSK16].name, 0, cb_init_mode, (void *)MODE_MFSK16, 0, FL_NORMAL_LABEL, 0, 14, 0}, +{ mode_info[MODE_MFSK32].name, 0, cb_init_mode, (void *)MODE_MFSK32, FL_MENU_DIVIDER, FL_NORMAL_LABEL, 0, 14, 0}, +{ mode_info[MODE_PSK125].name, 0, cb_init_mode, (void *)MODE_PSK125, 0, FL_NORMAL_LABEL, 0, 14, 0}, +{ mode_info[MODE_PSK250].name, 0, cb_init_mode, (void *)MODE_PSK250, 0, FL_NORMAL_LABEL, 0, 14, 0}, +{0,0,0,0,0,0,0,0,0}, + { mode_info[MODE_WWV].name, 0, cb_init_mode, (void *)MODE_WWV, 0, FL_NORMAL_LABEL, 0, 14, 0}, { mode_info[MODE_ANALYSIS].name, 0, cb_init_mode, (void *)MODE_ANALYSIS, 0, FL_NORMAL_LABEL, 0, 14, 0}, @@ -2274,7 +2281,7 @@ void resetOLIVIA() { void resetTHOR() { trx_mode md = active_modem->get_mode(); if (md == MODE_THOR4 || md == MODE_THOR5 || md == MODE_THOR8 || - md == MODE_THOR11 || /* md == MODE_TSOR11 || */ + md == MODE_THOR11 || md == MODE_THOR16 || md == MODE_THOR22 ) trx_start_modem(active_modem); } diff --git a/src/main.cxx b/src/main.cxx index 4e88245d..c01156cc 100644 --- a/src/main.cxx +++ b/src/main.cxx @@ -153,7 +153,8 @@ int main(int argc, char ** argv) setlocale(LC_TIME, ""); #ifdef __CYGWIN__ - HomeDir = "C:/fldigi.files/"; + fl_filename_expand(szHomedir, 119, "$USERPROFILE/fldigi.files/"); + HomeDir = szHomedir; redirect_streams(HomeDir); atexit(restore_streams); #else diff --git a/src/psk/psk.cxx b/src/psk/psk.cxx index ce2ce58a..3c4b0b00 100644 --- a/src/psk/psk.cxx +++ b/src/psk/psk.cxx @@ -135,6 +135,7 @@ psk::psk(trx_mode pskmode) : modem() symbollen = 256; _qpsk = true; dcdbits = 32; + cap |= CAP_REV; break; case MODE_PSK63: symbollen = 128; @@ -145,6 +146,7 @@ psk::psk(trx_mode pskmode) : modem() symbollen = 128; _qpsk = true; dcdbits = 64; + cap |= CAP_REV; break; case MODE_PSK125: symbollen = 64; @@ -155,6 +157,7 @@ psk::psk(trx_mode pskmode) : modem() symbollen = 64; _qpsk = true; dcdbits = 128; + cap |= CAP_REV; break; case MODE_PSK250: symbollen = 32; @@ -165,6 +168,7 @@ psk::psk(trx_mode pskmode) : modem() symbollen = 32; _qpsk = true; dcdbits = 256; + cap |= CAP_REV; break; default: mode = MODE_BPSK31;