diff --git a/amplifiers/expert/expert.c b/amplifiers/expert/expert.c index 913ac6db5..2be064a90 100644 --- a/amplifiers/expert/expert.c +++ b/amplifiers/expert/expert.c @@ -111,7 +111,7 @@ int expert_transaction(AMP *amp, const unsigned char *cmd, int cmd_len, unsigned int loop; char cmdbuf[64]; int checksum=0; - int bytes; + int bytes = 0; rig_debug(RIG_DEBUG_VERBOSE, "%s called, cmd=%s\n", __func__, cmd); @@ -626,9 +626,6 @@ struct expert_priv_data *expert_priv; * Private helper function prototypes */ -//static int kpa1500_send_priv_cmd(AMP *amp, const char *cmd); -//static int kpa1500_flush_buffer(AMP *amp); - /* ************************************* * * Separate model capabilities @@ -643,7 +640,7 @@ struct expert_priv_data *expert_priv; const struct amp_caps expert_amp_caps = { - AMP_MODEL(AMP_MODEL_ELECRAFT_KPA1500), + AMP_MODEL(AMP_MODEL_EXPERT_FA), .model_name = "1.3K-FA/1.5K-FA/2K-FA", .mfg_name = "Expert", .version = "20230320.0", @@ -693,7 +690,7 @@ const struct amp_caps expert_amp_caps = * Send command string to amplifier */ -static int kpa1500_send_priv_cmd(AMP *amp, const char *cmdstr) +static int expert_send_priv_cmd(AMP *amp, const char *cmdstr) { struct amp_state *rs; int err; diff --git a/src/amp_reg.c b/src/amp_reg.c index 988927902..95187c4a4 100644 --- a/src/amp_reg.c +++ b/src/amp_reg.c @@ -89,6 +89,7 @@ static struct { AMP_DUMMY, AMP_BACKEND_DUMMY, AMP_FUNCNAMA(dummy) }, { AMP_ELECRAFT, AMP_BACKEND_ELECRAFT, AMP_FUNCNAMA(kpa1500) }, { AMP_GEMINI, AMP_BACKEND_GEMINI, AMP_FUNCNAMA(gemini) }, + { AMP_EXPERT, AMP_BACKEND_EXPERT, AMP_FUNCNAMA(expert) }, { 0, NULL }, /* end */ };