ham-ref/fldigi
1
0
Fork 0
mirror of https://git.code.sf.net/p/fldigi/fldigi synced 2026-08-13 17:47:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

mode_state file

Browse source 
* correct location for >= fltk-1.4.0
This commit is contained in:
dave-w1hkj 2025-06-21 10:00:10 -05:00
parent 0975eae722
commit fbce31a189
3 changed files with 38 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/include/squelch_status.h
View file

@ -60,9 +60,28 @@ struct MODEBAND { int txlevel; int rev; int afc; int sqstate; int sqlevel; };
enum SQL_STATE { STATE_OFF, STATE_ON };
#define SS_160 1800000
#define SS_80 3500000
#define SS_75 3800000
#define SS_40 7000000
#define SS_30 10100000
#define SS_20 14000000
#define SS_17 18068000
#define SS_15 21000000
#define SS_12 24890000
#define SS_10 28000000
#define SS_6 50000000
#define SS_2 144000000
#define SS_220 222000000
#define SS_440 420000000
#define SS_HI 902000000
enum BANDS {
BND_LO, BND_160, BND_80, BND_75, BND_40, BND_30, BND_20,
BND_17, BND_15, BND_12, BND_10, BND_6, BND_2, BND_220, BND_440, BND_HI, NUMBANDS
BND_LO,
BND_160, BND_80, BND_75, BND_40, BND_30,
BND_20, BND_17, BND_15, BND_12, BND_10,
BND_6, BND_2, BND_220, BND_440,
BND_HI, NUMBANDS
};
static const char *bands[];

35
src/status/squelch_status.cxx
View file

@ -43,22 +43,6 @@
static int firstuse = 1;
#define SS_160 1800000
#define SS_80 3500000
#define SS_75 3800000
#define SS_40 7000000
#define SS_30 10100000
#define SS_20 14000000
#define SS_17 18068000
#define SS_15 21000000
#define SS_12 24890000
#define SS_10 28000000
#define SS_6 50000000
#define SS_2 144000000
#define SS_220 222000000
#define SS_440 420000000
#define SS_HI 902000000
ModeBand modeband;
void show_band_mode_change();
@ -69,7 +53,8 @@ const char * ModeBand::bands[NUMBANDS] = {
int ModeBand::get_band_in_use()
{
int band = -1;
int band = BND_LO;
if (wf->rfcarrier() < SS_160) band = BND_LO;
else if (wf->rfcarrier() < SS_80) band = BND_160;
else if (wf->rfcarrier() < SS_75) band = BND_80;
@ -86,6 +71,7 @@ int ModeBand::get_band_in_use()
else if (wf->rfcarrier() < SS_440) band = BND_220;
else if (wf->rfcarrier() < SS_HI) band = BND_440;
else band = BND_HI;
return band;
}
@ -136,7 +122,11 @@ void ModeBand::save_mode_state()
#if FLDIGI_FLTK_API_MINOR < 4
Fl_Preferences spref(HomeDir.c_str(), "w1hkj.org", "mode_state");
#else
Fl_Preferences spref(std::string(HomeDir).append("fldigi.prefs").c_str(), "w1hkj.org", "mode_state", (Fl_Preferences::Root)0);
Fl_Preferences spref(
HomeDir.c_str(),
"w1hkj.com",
"mode_state",
Fl_Preferences::C_LOCALE);
#endif
spref.set("firstuse", 0);
@ -168,7 +158,11 @@ void ModeBand::load_mode_state() {
#if FLDIGI_FLTK_API_MINOR < 4
Fl_Preferences spref(HomeDir.c_str(), "w1hkj.org", "mode_state");
#else
Fl_Preferences spref(std::string(HomeDir).append("fldigi.prefs").c_str(), "w1hkj.org", "mode_state", (Fl_Preferences::Root)0);
Fl_Preferences spref(
HomeDir.c_str(),
"w1hkj.com",
"mode_state",
Fl_Preferences::C_LOCALE);
#endif
spref.get("firstuse", firstuse, firstuse);
@ -367,6 +361,7 @@ void show_band_mode_change()
btnSQL->redraw();
}
#if 0
std::ostringstream os;
os << "\n" <<
" band ..... " << modeband.band_name() << "\n" <<
@ -375,7 +370,7 @@ void show_band_mode_change()
" reverse .. " << (progStatus.reverse ? "true" : "false") << "\n" <<
" afc ...... " << (progdefaults.afc_by_mode ? "true" : "false") << " / " << progStatus.afconoff << "\n" <<
" squelch .. " << (progdefaults.sqlch_by_mode ? "true" : "false") << " / " << progStatus.sldrSquelchValue << "\n";
std::cout << os.str();
#endif
}

4
src/status/status.cxx
View file

@ -500,7 +500,7 @@ void status::saveLastState()
Fl_Preferences spref(HomeDir.c_str(), "w1hkj.org", PACKAGE_TARNAME);
#else
Fl_Preferences spref(
std::string(HomeDir).c_str(),
HomeDir.c_str(),
"w1hkj.com",
PACKAGE_TARNAME,
Fl_Preferences::C_LOCALE);
@ -788,7 +788,7 @@ void status::loadLastState()
Fl_Preferences spref(HomeDir.c_str(), "w1hkj.org", PACKAGE_TARNAME);
#else
Fl_Preferences spref(
std::string(HomeDir).c_str(),
HomeDir.c_str(),
"w1hkj.com",
PACKAGE_TARNAME,
Fl_Preferences::C_LOCALE);