mirror
/
dl-fldigi
kopia lustrzana https://github.com/jamescoxon/dl-fldigi
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Upstream version 3.04AA

pull/2/head
Stelios Bounanos 2008-09-16 20:02:38 +01:00
rodzic eda3c52982
commit 9cfa07997f
10 zmienionych plików z 93 dodań i 8 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
ChangeLog
Wyświetl plik

@ -1,5 +1,9 @@
Change Log:
3.04
1) Changes to irrxml functions; added main.set_sideband <USB/LSB>
2) Change to macro timer implementation - bug fix for Windows
3.03
1) Changes to socket server to correct shutdown process
2) Added event logging and an event viewer

2
configure.ac
Wyświetl plik

@ -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, [3])
m4_define(FLDIGI_PATCH, [4AA])
AC_INIT([fldigi], FLDIGI_MAJOR.FLDIGI_MINOR[FLDIGI_PATCH], [w1hkj AT w1hkj DOT com])

21
src/dialogs/confdialog.cxx
Wyświetl plik

@ -422,6 +422,10 @@ static void cb_chkUSEHAMLIB(Fl_Check_Button* o, void*) {
cboHamlibRig->activate();
inpRIGdev->activate();
mnuBaudRate->activate();
progdefaults.chkUSEMEMMAPis = false;
progdefaults.chkUSEHAMLIBis = true;
progdefaults.chkUSERIGCATis = false;
progdefaults.chkUSEXMLRPCis = false;
} else {
if (btnPTT[1]->value()==1)
btnPTT[0]->value(1);
@ -430,6 +434,7 @@ static void cb_chkUSEHAMLIB(Fl_Check_Button* o, void*) {
cboHamlibRig->deactivate();
inpRIGdev->deactivate();
mnuBaudRate->deactivate();
progdefaults.chkUSEHAMLIBis = false;
}
for (int i = 0; i < 4; btnPTT[i++]->redraw());
progdefaults.changed = true;
@ -477,11 +482,16 @@ static void cb_chkUSERIGCAT(Fl_Check_Button* o, void*) {
cboHamlibRig->deactivate();
inpRIGdev->deactivate();
mnuBaudRate->deactivate();
progdefaults.chkUSEMEMMAPis = false;
progdefaults.chkUSEHAMLIBis = false;
progdefaults.chkUSERIGCATis = true;
progdefaults.chkUSEXMLRPCis = false;
} else {
if (btnPTT[3]->value() == 1)
btnPTT[0]->value(1);
btnPTT[3]->value(0);
btnPTT[3]->deactivate();
progdefaults.chkUSERIGCATis = false;
}
for (int i = 0; i < 4; btnPTT[i++]->redraw());
progdefaults.changed = true;
@ -511,11 +521,16 @@ static void cb_chkUSEMEMMAP(Fl_Check_Button* o, void*) {
cboHamlibRig->deactivate();
inpRIGdev->deactivate();
mnuBaudRate->deactivate();
progdefaults.chkUSEMEMMAPis = true;
progdefaults.chkUSEHAMLIBis = false;
progdefaults.chkUSERIGCATis = false;
progdefaults.chkUSEXMLRPCis = false;
} else {
if (btnPTT[2]->value()==1)
btnPTT[0]->value(1);
btnPTT[2]->value(0);
btnPTT[2]->deactivate();
progdefaults.chkUSEMEMMAPis = false;
}
for (int i = 0; i < 4; btnPTT[i++]->redraw());
progdefaults.changed = true;
@ -545,6 +560,12 @@ static void cb_chkUSEXMLRPC(Fl_Check_Button* o, void*) {
cboHamlibRig->deactivate();
inpRIGdev->deactivate();
mnuBaudRate->deactivate();
progdefaults.chkUSEMEMMAPis = false;
progdefaults.chkUSEHAMLIBis = false;
progdefaults.chkUSERIGCATis = false;
progdefaults.chkUSEXMLRPCis = true;
} else {
progdefaults.chkUSEXMLRPCis = false;
}
for (int i = 0; i < 4; btnPTT[i++]->redraw());
progdefaults.changed = true;

21
src/dialogs/confdialog.fl
Wyświetl plik

@ -529,6 +529,10 @@ progdefaults.changed = true;}
cboHamlibRig->activate();
inpRIGdev->activate();
mnuBaudRate->activate();
progdefaults.chkUSEMEMMAPis = false;
progdefaults.chkUSEHAMLIBis = true;
progdefaults.chkUSERIGCATis = false;
progdefaults.chkUSEXMLRPCis = false;
} else {
if (btnPTT[1]->value()==1)
btnPTT[0]->value(1);
@ -537,6 +541,7 @@ progdefaults.changed = true;}
cboHamlibRig->deactivate();
inpRIGdev->deactivate();
mnuBaudRate->deactivate();
progdefaults.chkUSEHAMLIBis = false;
}
for (int i = 0; i < 4; btnPTT[i++]->redraw());
progdefaults.changed = true;}
@ -589,11 +594,16 @@ progdefaults.changed = true;}
cboHamlibRig->deactivate();
inpRIGdev->deactivate();
mnuBaudRate->deactivate();
progdefaults.chkUSEMEMMAPis = false;
progdefaults.chkUSEHAMLIBis = false;
progdefaults.chkUSERIGCATis = true;
progdefaults.chkUSEXMLRPCis = false;
} else {
if (btnPTT[3]->value() == 1)
btnPTT[0]->value(1);
btnPTT[3]->value(0);
btnPTT[3]->deactivate();
progdefaults.chkUSERIGCATis = false;
}
for (int i = 0; i < 4; btnPTT[i++]->redraw());
progdefaults.changed = true;}
@ -632,11 +642,16 @@ progdefaults.changed = true;}
cboHamlibRig->deactivate();
inpRIGdev->deactivate();
mnuBaudRate->deactivate();
progdefaults.chkUSEMEMMAPis = true;
progdefaults.chkUSEHAMLIBis = false;
progdefaults.chkUSERIGCATis = false;
progdefaults.chkUSEXMLRPCis = false;
} else {
if (btnPTT[2]->value()==1)
btnPTT[0]->value(1);
btnPTT[2]->value(0);
btnPTT[2]->deactivate();
progdefaults.chkUSEMEMMAPis = false;
}
for (int i = 0; i < 4; btnPTT[i++]->redraw());
progdefaults.changed = true;}
@ -675,6 +690,12 @@ progdefaults.changed = true;}
cboHamlibRig->deactivate();
inpRIGdev->deactivate();
mnuBaudRate->deactivate();
progdefaults.chkUSEMEMMAPis = false;
progdefaults.chkUSEHAMLIBis = false;
progdefaults.chkUSERIGCATis = false;
progdefaults.chkUSEXMLRPCis = true;
} else {
progdefaults.chkUSEXMLRPCis = false;
}
for (int i = 0; i < 4; btnPTT[i++]->redraw());
progdefaults.changed = true;}

2
src/dialogs/fl_digi.cxx
Wyświetl plik

@ -39,6 +39,7 @@
#include "fl_digi.h"
#include <FL/Fl.H>
#include <FL/fl_ask.H>
#include <FL/Fl_Pixmap.H>
#include <FL/Fl_Image.H>
@ -1252,6 +1253,7 @@ void stopMacroTimer()
if (progdefaults.useTimer == false) return;
progdefaults.useTimer = false;
Fl::remove_timeout(macro_timer);
FL_LOCK_D();
btnMacroTimer->hide();
btnMacroDummy->show();

2
src/include/trx.h
Wyświetl plik

@ -52,6 +52,8 @@ extern void wait_modem_ready_prep(void);
extern void wait_modem_ready_cmpl(void);
extern void signal_modem_ready(void);
extern void macro_timer(void *);
extern Fl_Thread trx_thread;
extern state_t trx_state;
extern modem *active_modem;

5
src/misc/configuration.cxx
Wyświetl plik

@ -550,7 +550,7 @@ void configuration::writeDefaultsXML()
writeXMLint(f, "VIEWERCHANNELS", VIEWERchannels);
writeXMLdbl(f, "VIEWERSQUELCH", VIEWERsquelch);
writeXMLint(f, "VIEWERTIMEOUT", VIEWERtimeout);
writeXMLbool(f,"WFAVERAGEING", WFaveraging);
writeXMLbool(f,"WFAVERAGING", WFaveraging);
writeXMLbool(f,"USEGROUPCOLORS", useGroupColors);
writeXMLrgb(f, "FKEYGROUP1", btnGroup1.R, btnGroup1.G, btnGroup1.B);
@ -1599,7 +1599,8 @@ int configuration::setDefaults() {
wf->setPrefilter(wfPreFilter);
valLatency->value(latency);
btnWFaveraging->value(WFaveraging);
for (int i = 0; i < 9; i++) {
palette[i].R = (uchar)cfgpal[i].R;
palette[i].G = (uchar)cfgpal[i].G;

34
src/misc/xmlrpc.cxx
Wyświetl plik

@ -649,6 +649,39 @@ public:
}
};
class Main_set_sb : public xmlrpc_c::method
{
public:
Main_set_sb()
{
_signature = "s:s";
_help = "Sets the Sideband to USB / LSB. Returns the new value.";
}
void execute(const xmlrpc_c::paramList& params, xmlrpc_c::value* retval)
{
string s = params.getString(0);
if (progdefaults.chkUSERIGCATis)
rigCAT_setmode(s);
else if (progdefaults.chkUSEHAMLIBis) {
if (s == "LSB")
hamlib_setmode(RIG_MODE_LSB);
else
hamlib_setmode(RIG_MODE_USB);
}
else if (progdefaults.chkUSEXMLRPCis) {
if (s == "USB") {
wf->USB(true);
} else if (s == "LSB") {
wf->USB(false);
} else {
wf->USB(true);
}
}
*retval = xmlrpc_c::value_string(wf->USB() ? "USB" : "LSB");
}
};
class Main_get_freq : public xmlrpc_c::method
{
public:
@ -1451,6 +1484,7 @@ void XML_RPC_Server::add_methods(void)
methods->push_back(rpc_method(new Main_get_status2, "main.get_status2"));
methods->push_back(rpc_method(new Main_get_sb, "main.get_sideband"));
methods->push_back(rpc_method(new Main_set_sb, "main.set_sideband"));
methods->push_back(rpc_method(new Main_get_freq, "main.get_frequency"));
methods->push_back(rpc_method(new Main_set_freq, "main.set_frequency"));
methods->push_back(rpc_method(new Main_inc_freq, "main.inc_frequency"));

8
src/rigcontrol/rigio.cxx
Wyświetl plik

@ -490,11 +490,11 @@ string rigCAT_getmode()
list<XMLIOS>::iterator itrCmd;
string strCmd;
LOG_DEBUG("get mode");
if (nonCATrig == true)
return noCATmode;
LOG_DEBUG("get mode");
itrCmd = commands.begin();
while (itrCmd != commands.end()) {
if ((*itrCmd).SYMBOL == "GETMODE")
@ -589,7 +589,7 @@ void rigCAT_setmode(const string& md)
list<XMLIOS>::iterator itrCmd;
string strCmd;
LOG_DEBUG("set mode");
LOG_DEBUG("set mode %s", md.c_str());
itrCmd = commands.begin();
while (itrCmd != commands.end()) {
@ -597,7 +597,7 @@ void rigCAT_setmode(const string& md)
break;
++itrCmd;
}
if (itrCmd == commands.end()) {
if (nonCATrig == true) {
noCATmode = md;
return;
}

2
src/trx/trx.cxx
Wyświetl plik

@ -436,7 +436,7 @@ void trx_reset(void)
//=============================================================================
static char timermsg[80];
static int countdown = 1;
static void macro_timer(void *)
void macro_timer(void *)
{
if (progdefaults.useTimer == false)
return;