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

Reverted CW Pitch value<->knob conversion for non-ICR75 radios. Apparently R75 is the only one using the set mode command. 

Edited out all non-essential code commenting that was done during local testing.
pull/1776/head
Mark J. Fine 2025-06-26 13:38:23 -04:00
rodzic 82dd540d3a
commit ef0b7e30bd
3 zmienionych plików z 21 dodań i 26 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

21
rigs/icom/icom.c
Wyświetl plik

@ -3683,8 +3683,15 @@ int icom_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
icom_val = 900; icom_val = 900;
} }
else else
{
icom_val = val.i; icom_val = val.i;
//icom_val = (int) lroundf(((float) icom_val - 300) * (255.0f / 600.0f)); }
if (!RIG_IS_ICR75)
{
//interpolate to return knob value
icom_val = (int) lroundf(((float) icom_val - 300) * (255.0f / 600.0f));
}
break; break;
default: default:
@ -3877,7 +3884,6 @@ int icom_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
} }
else else
{ {
// Legacy mapping that does not apply to all rigs
switch (val.i) switch (val.i)
{ {
case RIG_AGC_OFF: case RIG_AGC_OFF:
@ -4686,8 +4692,15 @@ int icom_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
break; break;
case RIG_LEVEL_CWPITCH: case RIG_LEVEL_CWPITCH:
//val->i = (int) lroundf(300.0f + ((float) icom_val * 600.0f / 255.0f)); if (!RIG_IS_ICR75)
val->i = icom_val; {
//use knob value and interpolate
val->i = (int) lroundf(300.0f + ((float) icom_val * 600.0f / 255.0f));
}
else
{
val->i = icom_val;
}
break; break;
case RIG_LEVEL_KEYSPD: case RIG_LEVEL_KEYSPD:

18
rigs/icom/icom_alt_agc.c
Wyświetl plik

@ -19,25 +19,11 @@
* *
*/ */
//#include <stdlib.h>
//#include <string.h> /* String function definitions */
//#include <unistd.h> /* UNIX standard function definitions */
//#include <math.h>
//#include <hamlib/rig.h>
//#include <serial.h>
//#include <cal.h>
//#include <token.h>
//#include <register.h>
#include "icom.h" #include "icom.h"
#include "icom_defs.h" #include "icom_defs.h"
#include "icom_alt_agc.h" #include "icom_alt_agc.h"
#include "frame.h" #include "frame.h"
#include "misc.h" #include "misc.h"
//#include "event.h"
//#include "cache.h"
/* /*
* Note: * Note:
@ -259,7 +245,6 @@ int icom_rig_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
} }
else else
{ {
//struct rig_state *rs = STATE(rig);
unsigned char cmdbuf[MAXFRAMELEN], ackbuf[MAXFRAMELEN]; unsigned char cmdbuf[MAXFRAMELEN], ackbuf[MAXFRAMELEN];
int cmd_len, ack_len = sizeof(ackbuf); int cmd_len, ack_len = sizeof(ackbuf);
int lvl_cn, lvl_sc; /* Command Number, Subcommand */ int lvl_cn, lvl_sc; /* Command Number, Subcommand */
@ -387,7 +372,6 @@ int icom_rig_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
} }
else else
{ {
//struct rig_state *rs;
unsigned char cmdbuf[MAXFRAMELEN], respbuf[MAXFRAMELEN]; unsigned char cmdbuf[MAXFRAMELEN], respbuf[MAXFRAMELEN];
int cmd_len, resp_len; int cmd_len, resp_len;
int lvl_cn, lvl_sc; /* Command Number, Subcommand */ int lvl_cn, lvl_sc; /* Command Number, Subcommand */
@ -413,8 +397,6 @@ int icom_rig_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
rig_debug(RIG_DEBUG_TRACE, "%s: no extcmd found\n", __func__); rig_debug(RIG_DEBUG_TRACE, "%s: no extcmd found\n", __func__);
//rs = STATE(rig);
cmd_len = 0; cmd_len = 0;
lvl_cn = C_CTL_FUNC; lvl_cn = C_CTL_FUNC;

8
rigs/icom/icom_defs.h
Wyświetl plik

@ -233,11 +233,11 @@
* Set AGC (S_FUNC_AGC) data * Set AGC (S_FUNC_AGC) data
*/ */
#define D_AGC_OFF 0x00 #define D_AGC_OFF 0x00
#define D_AGC_SUPERFAST 0x01 //was 0x03 /* IC746 pro */ #define D_AGC_SUPERFAST 0x01
#define D_AGC_FAST 0x02 //was 0x00 #define D_AGC_FAST 0x02
#define D_AGC_SLOW 0x03 //was 0x02 #define D_AGC_SLOW 0x03
#define D_AGC_USER 0x04 #define D_AGC_USER 0x04
#define D_AGC_MID 0x05 //was 0x01 #define D_AGC_MID 0x05
#define D_AGC_AUTO 0x06 #define D_AGC_AUTO 0x06
/* /*