mirrors/uv-k5-firmware-custom
0
Fork 0
mirror of https://github.com/OneOfEleven/uv-k5-firmware-custom.git synced 2025-05-19 08:21:18 +03:00
Code Issues Releases Activity

Reduced low and mid TX powers

Browse Source
This commit is contained in:
OneOfEleven 2023-10-15 21:32:57 +01:00
parent 0449314a00
commit 1ecc6e8769
7 changed files with 165 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -17,6 +17,7 @@ ENABLE_NOAA := 0
ENABLE_VOICE := 0 ENABLE_VOICE := 0
ENABLE_MUTE_RADIO_FOR_VOICE := 1 ENABLE_MUTE_RADIO_FOR_VOICE := 1
ENABLE_VOX := 1 ENABLE_VOX := 1
ENABLE_LOWER_LOW_MID_TX := 1
ENABLE_ALARM := 1 ENABLE_ALARM := 1
ENABLE_TX1750 := 1 ENABLE_TX1750 := 1
ENABLE_PWRON_PASSWORD := 0 ENABLE_PWRON_PASSWORD := 0
@ -278,6 +279,9 @@ endif
ifeq ($(ENABLE_VOX),1) ifeq ($(ENABLE_VOX),1)
CFLAGS += -DENABLE_VOX CFLAGS += -DENABLE_VOX
endif endif
ifeq ($(ENABLE_LOWER_LOW_MID_TX),1)
CFLAGS += -DENABLE_LOWER_LOW_MID_TX
endif
ifeq ($(ENABLE_ALARM),1) ifeq ($(ENABLE_ALARM),1)
CFLAGS += -DENABLE_ALARM CFLAGS += -DENABLE_ALARM
endif endif

1
README.md
View File

@ -48,6 +48,7 @@ ENABLE_NOAA := 1 everything NOAA (only of any use in t
ENABLE_VOICE := 0 want to hear voices ? ENABLE_VOICE := 0 want to hear voices ?
ENABLE_MUTE_RADIO_FOR_VOICE := 1 mute the radios audio when a voice is playing ENABLE_MUTE_RADIO_FOR_VOICE := 1 mute the radios audio when a voice is playing
ENABLE_VOX := 1 voice operated transmission ENABLE_VOX := 1 voice operated transmission
ENABLE_LOWER_LOW_MID_TX := 1 reduce the low and mid TX power levels (high remains unchanged)
ENABLE_ALARM := 1 TX alarms ENABLE_ALARM := 1 TX alarms
ENABLE_1750HZ := 1 side key 1750Hz TX tone (older style repeater access) ENABLE_1750HZ := 1 side key 1750Hz TX tone (older style repeater access)
ENABLE_PWRON_PASSWORD := 0 '1' = allow power-on password ENABLE_PWRON_PASSWORD := 0 '1' = allow power-on password

BIN
firmware.bin
View File

Binary file not shown.

BIN
firmware.packed.bin
View File

Binary file not shown.

17
radio.c
View File

@ -529,6 +529,23 @@ void RADIO_ConfigureSquelchAndOutputPower(vfo_info_t *pInfo)
EEPROM_ReadBuffer(0x1ED0 + (Band * 16) + (pInfo->output_power * 3), TX_power, 3); EEPROM_ReadBuffer(0x1ED0 + (Band * 16) + (pInfo->output_power * 3), TX_power, 3);
#ifdef ENABLE_LOWER_LOW_MID_TX
// make low and mid even lower
if (pInfo->output_power == OUTPUT_POWER_LOW)
{
TX_power[0] /= 5;
TX_power[1] /= 5;
TX_power[2] /= 5;
}
else
if (pInfo->output_power == OUTPUT_POWER_MID)
{
TX_power[0] /= 3;
TX_power[1] /= 3;
TX_power[2] /= 3;
}
#endif
pInfo->txp_calculated_setting = FREQUENCY_CalculateOutputPower( pInfo->txp_calculated_setting = FREQUENCY_CalculateOutputPower(
TX_power[0], TX_power[0],
TX_power[1], TX_power[1],

280
settings.h
View File

@ -142,31 +142,36 @@ typedef struct {
uint8_t tx_ctcss_cdcss_code; // uint8_t tx_ctcss_cdcss_code; //
// [10] // [10]
uint8_t rx_ctcss_cdcss_type:2; // uint8_t rx_ctcss_cdcss_type:2; //
uint8_t unused1:2; uint8_t unused1:2; //
uint8_t tx_ctcss_cdcss_type:2; // uint8_t tx_ctcss_cdcss_type:2; //
uint8_t unused2:2; uint8_t unused2:2; //
// [11] // [11]
uint8_t tx_offset_dir:2; // uint8_t tx_offset_dir:2; //
uint8_t unused3:2; uint8_t unused3:2; //
uint8_t am_mode:1; // uint8_t am_mode:1; //
uint8_t unused4:3; uint8_t unused4:3; //
// [12] // [12]
uint8_t frequency_reverse:1; // reverse repeater uint8_t frequency_reverse:1; // reverse repeater
uint8_t channel_bandwidth:1; // wide/narrow uint8_t channel_bandwidth:1; // wide/narrow
uint8_t tx_power:2; // 0, 1 or 2 .. L, M or H uint8_t tx_power:2; // 0, 1 or 2 .. L, M or H
uint8_t busy_channel_lockout:1; // uint8_t busy_channel_lockout:1; //
uint8_t unused5:3; #if 0
uint8_t unused5:3; //
#else
uint8_t unused5:1; //
uint8_t compander:2; // 0 = off, 1 = TX, 2 = RX, 3 = TX/RX
#endif
// [13] // [13]
uint8_t dtmf_decoding_enable:1; // uint8_t dtmf_decoding_enable:1; //
uint8_t dtmf_ptt_id_tx_mode:3; // uint8_t dtmf_ptt_id_tx_mode:3; //
uint8_t unused6:4; uint8_t unused6:4; //
// [14] // [14]
uint8_t step_setting:3; // uint8_t step_setting:3; //
uint8_t unused7:5; uint8_t unused7:5; //
// [15] // [15]
uint8_t scrambler:4; // uint8_t scrambler:4; //
uint8_t unused8:4; uint8_t unused8:4; //
} __attribute__((packed)) t_channel; } __attribute__((packed)) t_channel; //
// 512 bytes // 512 bytes
typedef struct { typedef struct {
@ -175,19 +180,14 @@ typedef struct {
struct { struct {
uint8_t open_rssi_thresh[10]; uint8_t open_rssi_thresh[10];
uint8_t unused1[6]; uint8_t unused1[6];
uint8_t close_rssi_thresh[10]; uint8_t close_rssi_thresh[10];
uint8_t unused2[6]; uint8_t unused2[6];
uint8_t open_noise_thresh[10]; uint8_t open_noise_thresh[10];
uint8_t unused3[6]; uint8_t unused3[6];
uint8_t close_noise_thresh[10]; uint8_t close_noise_thresh[10];
uint8_t unused4[6]; uint8_t unused4[6];
uint8_t open_glitch_thresh[10]; uint8_t open_glitch_thresh[10];
uint8_t unused5[6]; uint8_t unused5[6];
uint8_t close_glitch_thresh[10]; uint8_t close_glitch_thresh[10];
uint8_t unused6[6]; uint8_t unused6[6];
} __attribute__((packed)) squelch_band_4567[6]; } __attribute__((packed)) squelch_band_4567[6];
@ -196,57 +196,52 @@ typedef struct {
struct { struct {
uint8_t open_rssi_thresh[10]; uint8_t open_rssi_thresh[10];
uint8_t unused1[6]; uint8_t unused1[6];
uint8_t close_rssi_thresh[10]; uint8_t close_rssi_thresh[10];
uint8_t unused2[6]; uint8_t unused2[6];
uint8_t open_noise_thresh[10]; uint8_t open_noise_thresh[10];
uint8_t unused3[6]; uint8_t unused3[6];
uint8_t close_noise_thresh[10]; uint8_t close_noise_thresh[10];
uint8_t unused4[6]; uint8_t unused4[6];
uint8_t open_glitch_thresh[10]; uint8_t open_glitch_thresh[10];
uint8_t unused5[6]; uint8_t unused5[6];
uint8_t close_glitch_thresh[10]; uint8_t close_glitch_thresh[10];
uint8_t unused6[6]; uint8_t unused6[6];
} __attribute__((packed)) squelch_band_123[6]; } __attribute__((packed)) squelch_band_123[6];
// 0x1EC0 // 0x1EC0
uint16_t rssi_band_4567[4]; uint16_t rssi_band_4567[4]; //
uint16_t rssi_band_123[4]; uint16_t rssi_band_123[4]; //
// 0x1ED0 // 0x1ED0
struct struct
{ {
uint8_t low[3]; uint8_t low[3]; //
uint8_t mid[3]; uint8_t mid[3]; //
uint8_t high[3]; uint8_t high[3]; //
uint8_t unused[7]; uint8_t unused[7]; //
} tx_band_power[7]; } tx_band_power[7]; //
// 0x1F40 // 0x1F40
uint16_t battery[6]; uint16_t battery[6]; //
uint8_t unused1[4]; uint8_t unused1[4]; //
// 0x1F50 // 0x1F50
struct struct
{ {
uint16_t threshold[10]; uint16_t threshold[10]; //
uint8_t unused[4]; uint8_t unused[4]; //
} __attribute__((packed)) vox[2]; } __attribute__((packed)) vox[2]; //
// 0x1F80 // 0x1F80
uint8_t mic_gain_dB2[5]; uint8_t mic_gain_dB2[5]; //
uint8_t unused4[3]; uint8_t unused4[3]; //
int16_t bk4819_xtal_freq_low; int16_t bk4819_xtal_freq_low; //
uint16_t unknown2; uint16_t unknown2; //
uint16_t unknown3; uint16_t unknown3; //
uint8_t volume_gain; uint8_t volume_gain; //
uint8_t dac_gain; uint8_t dac_gain; //
uint8_t unused5[8 * 10]; uint8_t unused5[8 * 10]; //
} __attribute__((packed)) t_calibration; } __attribute__((packed)) t_calibration;
@ -254,143 +249,148 @@ typedef struct {
typedef struct { typedef struct {
// 0x0000 // 0x0000
t_channel channel[200]; // unused channels are set to all '0xff' t_channel channel[200]; // unused channels are set to all '0xff'
// 0x0C80 // 0x0C80
#if 0 #if 0
t_channel vfo[14]; // 2 VFO's (upper/lower) per band, 7 frequency bands t_channel vfo[14]; // 2 VFO's (upper/lower) per band, 7 frequency bands
#else #else
union { // 2 VFO's (upper/lower) per band, 7 frequency bands union { // 2 VFO's (upper/lower) per band, 7 frequency bands
t_channel vfo[14]; t_channel vfo[14]; //
struct { struct { //
t_channel a; t_channel a; //
t_channel b; t_channel b; //
} __attribute__((packed)) vfo_band[7]; } __attribute__((packed)) vfo_band[7]; //
} __attribute__((packed)); } __attribute__((packed)); //
#endif #endif
// 0x0D60 // 0x0D60
struct { // these channel attribute settings could have been in the t_channel structure ! struct { // these channel attribute settings could have been in the t_channel structure !
uint8_t band:4; // why do QS have these 4 bits ? .. band can/is computed from the frequency uint8_t band:4; // why do QS have these 4 bits ? .. band can/is computed from the frequency
uint8_t compander:2; // TODO: move this to the t_channel structure uint8_t unused:2; //
uint8_t scanlist2:1; // set if is in scan list 2 // uint8_t compander:2; // smoved this to the t_channel structure
uint8_t scanlist1:1; // set if is in scan list 1 uint8_t scanlist2:1; // set if is in scan list 2
} __attribute__((packed)) channel_attr[200]; uint8_t scanlist1:1; // set if is in scan list 1
} __attribute__((packed)) channel_attr[200]; //
uint8_t unused1[8]; uint8_t unused1[8]; //
// 0x0E30 // 0x0E30
uint8_t unused2[16]; uint8_t unused2[16]; //
// 0x0E40 // 0x0E40
uint16_t fm_channel[20]; uint16_t fm_channel[20]; //
uint8_t unused3[8]; uint8_t unused3[8]; //
// 0x0E70 // 0x0E70
uint8_t call1; uint8_t call1; //
uint8_t squelch; uint8_t squelch; //
uint8_t tx_timeout; uint8_t tx_timeout; //
uint8_t noaa_auto_scan; uint8_t noaa_auto_scan; //
uint8_t key_lock; uint8_t key_lock; //
uint8_t vox_switch; uint8_t vox_switch; //
uint8_t vox_level; uint8_t vox_level; //
uint8_t mic_sensitivity; uint8_t mic_sensitivity; //
uint8_t lcd_contrast; // 1of11 uint8_t lcd_contrast; // 1of11
uint8_t channel_display_mode; uint8_t channel_display_mode; //
uint8_t cross_vfo; uint8_t cross_vfo; //
uint8_t battery_save; uint8_t battery_save; //
uint8_t dual_watch; uint8_t dual_watch; //
uint8_t backlight; uint8_t backlight; //
uint8_t tail_tone_elimination; uint8_t tail_tone_elimination; //
uint8_t vfo_open; uint8_t vfo_open; //
// 0x0E80 // 0x0E80
uint8_t screen_channel_a; uint8_t screen_channel_a; //
uint8_t channel_a; uint8_t channel_a; //
uint8_t freq_channel_a; uint8_t freq_channel_a; //
uint8_t screen_channel_b; uint8_t screen_channel_b; //
uint8_t channel_b; uint8_t channel_b; //
uint8_t freq_channel_b; uint8_t freq_channel_b; //
uint8_t noaa_channel_a; uint8_t noaa_channel_a; //
uint8_t noaa_channel_b; uint8_t noaa_channel_b; //
uint8_t fm_selected_frequency; uint8_t fm_selected_frequency; //
uint8_t fm_selected_channel; uint8_t fm_selected_channel; //
uint8_t fm_is_channel_mode; uint8_t fm_is_channel_mode; //
uint8_t unused5[5]; uint8_t unused5[5]; //
// 0x0E90 // 0x0E90
uint8_t beep_control; uint8_t beep_control; //
uint8_t key1_short; uint8_t key1_short; //
uint8_t key1_long; uint8_t key1_long; //
uint8_t key2_short; uint8_t key2_short; //
uint8_t key2_long; uint8_t key2_long; //
uint8_t carrier_search_mode; // sc_rev; uint8_t carrier_search_mode; // sc_rev;
uint8_t auto_key_lock; uint8_t auto_key_lock; //
uint8_t display_mode; uint8_t display_mode; //
uint32_t power_on_password; uint32_t power_on_password; //
uint8_t unused6[4]; uint8_t unused6[4]; //
// 0x0EA0 // 0x0EA0
uint8_t voice_prompt; uint8_t voice_prompt; //
uint8_t unused7[7]; uint8_t unused7[7]; //
uint8_t alarm_mode; uint8_t alarm_mode; //
uint8_t roger_mode; uint8_t roger_mode; //
uint8_t repeater_tail_tone_elimination; // rp_ste uint8_t repeater_tail_tone_elimination; // rp_ste
uint8_t tx_channel; uint8_t tx_channel; //
uint8_t air_copy_freq; // 1of11 #ifdef ENABLE_AIRCOPY
uint32_t air_copy_freq; // 1of11
#else
uint8_t unused8[4]; //
#endif
// 0x0EB0 // 0x0EB0
char welcome_line1[16]; char welcome_line1[16]; //
char welcome_line2[16]; char welcome_line2[16]; //
// 0x0ED0 // 0x0ED0
uint8_t dtmf_side_tone; uint8_t dtmf_side_tone; //
uint8_t dtmf_separate_code; uint8_t dtmf_separate_code; //
uint8_t dtmf_group_call_code; uint8_t dtmf_group_call_code; //
uint8_t dtmf_rsp; uint8_t dtmf_rsp; //
uint8_t dtmf_auto_reset_time; uint8_t dtmf_auto_reset_time; //
uint8_t dtmf_preload_time; uint8_t dtmf_preload_time; //
uint8_t dtmf_first_code_time; uint8_t dtmf_first_code_time; //
uint8_t dtmf_hash_code_time; uint8_t dtmf_hash_code_time; //
uint8_t dtmf_code_time; uint8_t dtmf_code_time; //
uint8_t dtmf_code_interval; uint8_t dtmf_code_interval; //
uint8_t dtmf_permit_kill; uint8_t dtmf_permit_kill; //
uint8_t unused9[5]; uint8_t unused9[5]; //
// 0x0EE0 // 0x0EE0
uint8_t dtmf_ani_id[8]; uint8_t dtmf_ani_id[8]; //
uint8_t dtmf_kill_code[8]; uint8_t dtmf_kill_code[8]; //
uint8_t dtmf_revive_code[8]; uint8_t dtmf_revive_code[8]; //
uint8_t dtmf_key_up_code[16]; uint8_t dtmf_key_up_code[16]; //
uint8_t dtmf_key_down_code[16]; uint8_t dtmf_key_down_code[16]; //
// 0x0F18 // 0x0F18
uint8_t s_list_default; uint8_t s_list_default; //
uint8_t priority1_enable; uint8_t priority1_enable; //
uint8_t priority1_channel1; uint8_t priority1_channel1; //
uint8_t priority1_channel2; uint8_t priority1_channel2; //
uint8_t priority2_enable; uint8_t priority2_enable; //
uint8_t priority2_channel1; uint8_t priority2_channel1; //
uint8_t priority2_channel2; uint8_t priority2_channel2; //
uint8_t unused10; uint8_t unused10; //
// 0x0F20 // 0x0F20
uint8_t unused11[8]; uint8_t unused11[8]; //
// 0x0F30 // 0x0F30
uint8_t aes_key[16]; // disabled = all 0xff uint8_t aes_key[16]; // disabled = all 0xff
// 0x0F40 // 0x0F40
uint8_t freq_lock; // uint8_t freq_lock; //
uint8_t enable_tx_350; // 350MHz ~ 400MHz uint8_t enable_tx_350; // 350MHz ~ 400MHz
uint8_t killed; // uint8_t killed; //
uint8_t enable_tx_200; // uint8_t enable_tx_200; //
uint8_t enable_tx_500; // uint8_t enable_tx_500; //
uint8_t enable_350; // uint8_t enable_350; //
uint8_t enable_scrambler; // uint8_t enable_scrambler; //
#if 0 #if 0
// QS // QS
uint8_t unused12[9]; // uint8_t unused12[9]; //
#else #else
// 1of11 // 1of11
uint8_t tx_enable:1; // 0 = completely disable TX, 1 = allow TX uint8_t tx_enable:1; // 0 = completely disable TX, 1 = allow TX
@ -414,7 +414,7 @@ typedef struct {
char name[8]; char name[8];
uint8_t number[8]; uint8_t number[8];
} __attribute__((packed)) dtmf_contact[16]; } __attribute__((packed)) dtmf_contact[16];
} __attribute__((packed)) t_config; } __attribute__((packed)) t_config;
// entire eeprom // entire eeprom

4
ui/main.c
View File

@ -390,7 +390,7 @@ void UI_DisplayMain(void)
{ {
const unsigned int line0 = 0; // text screen line const unsigned int line0 = 0; // text screen line
const unsigned int line1 = 4; const unsigned int line1 = 4;
char String[16]; char String[17];
unsigned int vfo_num; unsigned int vfo_num;
center_line = CENTER_LINE_NONE; center_line = CENTER_LINE_NONE;
@ -476,6 +476,7 @@ void UI_DisplayMain(void)
{ {
sprintf(String, ">%s", g_dtmf_input_box); sprintf(String, ">%s", g_dtmf_input_box);
} }
String[16] = 0;
UI_PrintString(String, 2, 0, 0 + (vfo_num * 3), 8); UI_PrintString(String, 2, 0, 0 + (vfo_num * 3), 8);
memset(String, 0, sizeof(String)); memset(String, 0, sizeof(String));
@ -501,6 +502,7 @@ void UI_DisplayMain(void)
sprintf(String, ">%s", g_dtmf_string); sprintf(String, ">%s", g_dtmf_string);
} }
} }
String[16] = 0;
UI_PrintString(String, 2, 0, 2 + (vfo_num * 3), 8); UI_PrintString(String, 2, 0, 2 + (vfo_num * 3), 8);
center_line = CENTER_LINE_IN_USE; center_line = CENTER_LINE_IN_USE;