diff --git a/data/user_settings.ini b/data/user_settings.ini index 36ba33a..c0850e9 100644 --- a/data/user_settings.ini +++ b/data/user_settings.ini @@ -1,6 +1,6 @@ -vfo_a_freq=7074000 -vfo_b_freq=7100000 -callsign=vu2bvb +vfo_a_freq=7062000 +vfo_b_freq=7062000 +callsign=vu2ese grid=Mk97fj cw_delay=700 data_delay=700 @@ -9,20 +9,20 @@ current_macro= sidetone=10 contest_serial=0 sent_exchange= -r1:freq=7074000 -r1:volume=85 -r1:mode=FT8 -r1:low=200 -r1:high=2450 -r1:agc=OFF -r1:gain=15 -tx_power=30 -tx_gain=24 +r1:freq=7062000 +r1:volume=62 +r1:mode=2TONE +r1:low=0 +r1:high=3050 +r1:agc=FAST +r1:gain=75 +tx_power=15 +tx_gain=43 #split=OFF -tx_compress=30 +tx_compress=40 #rit=OFF #tx_wpm=10 -#rx_pitch=1000 +#rx_pitch=740 #tx= #rx= #record=OFF @@ -57,9 +57,9 @@ freq3=3700000 mode3=1 [40m] -power=30 -freq0=7074000 -mode0=6 +power=15 +freq0=7050000 +mode0=2 freq1=7038000 mode1=2 freq2=7074000 @@ -102,7 +102,7 @@ mode3=0 [15m] power=20 -freq0=21046000 +freq0=21078000 mode0=6 freq1=21040000 mode1=2 diff --git a/modems.c b/modems.c index d6ed704..930011b 100644 --- a/modems.c +++ b/modems.c @@ -209,7 +209,9 @@ void ft8_interpret(char *received, char *transmit){ // this is a fresh call strcpy(contact_callsign, second_word); strcpy(contact_grid, third_word); - sprintf(transmit, "%s %s -10", contact_callsign, mycallsign); + //don't autorespond, wait for the macro to reply + transmit[0] = 0; + //sprintf(transmit, "%s %s -10", contact_callsign, mycallsign); strcpy(sent_rst, "-10"); received_rst[0] = 0; } diff --git a/sbitx b/sbitx index 8af66ae..8ba3c88 100755 Binary files a/sbitx and b/sbitx differ diff --git a/sbitx.c b/sbitx.c index 4f9c8da..acf6f45 100644 --- a/sbitx.c +++ b/sbitx.c @@ -578,7 +578,7 @@ void tx_process( if (r->mode == MODE_2TONE) i_sample = (1.0 * (vfo_read(&tone_a) - + vfo_read(&tone_b))) / 80000000000.0; + + vfo_read(&tone_b))) / 50000000000.0; else if (r->mode == MODE_CW || r->mode == MODE_CWR || r->mode == MODE_FT8) i_sample = modem_next_sample(r->mode) / 3; else diff --git a/sbitx_gtk.c b/sbitx_gtk.c index 1dcdebe..5fcb5c8 100644 --- a/sbitx_gtk.c +++ b/sbitx_gtk.c @@ -1859,7 +1859,7 @@ int do_console(struct field *f, cairo_t *gfx, int event, int a, int b){ char ft8_response[100]; ft8_interpret(console_stream[l].text, ft8_response); if (ft8_response[0] != 0){ - set_field("#text_in", ft8_response); + //set_field("#text_in", ft8_response); update_log_ed(); } }