Support get/set_powerstat on pcr100

git-svn-id: https://hamlib.svn.sourceforge.net/svnroot/hamlib/trunk@2603 7ae35d74-ebe9-4afe-98af-79ac388436b8

pcr/pcr.c

@@ -3,7 +3,7 @@
  *  Copyright (c) 2001-2005 by Stephane Fillod and Darren Hatcher
  *  Copyright (C) 2007-09 by Alessandro Zummo <a.zummo@towertech.it>
  *
- *	$Id: pcr.c,v 1.24 2009-01-27 19:05:59 fillods Exp $
+ *	$Id: pcr.c,v 1.25 2009-01-29 19:50:33 azummo Exp $
  *
  *   This library is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU Library General Public License as
@@ -369,7 +369,10 @@ pcr_init(RIG * rig)
 	priv->last_freq		= MHz(145);
 	priv->last_mode		= MD_FM;
 	priv->last_filter	= FLT_15kHz;
-
+	priv->power		= RIG_POWER_OFF;
+	priv->volume		= 0.25;
+	priv->squelch		= 0.00;
+	
 	rig->state.priv		= (rig_ptr_t) priv;
 	rig->state.transceive	= RIG_TRN_OFF;
 
@@ -428,25 +431,26 @@ pcr_open(RIG * rig)
 	if (err != RIG_OK)
 		return err;
 
+	priv->power = RIG_POWER_ON;
+
 	/* turn off auto update (just to be sure) */
 	err = pcr_transaction(rig, "G300");
 	if (err != RIG_OK)
 		return err;
 
-	/* turn squelch off */
+	/* set squelch and volume */
-	err = pcr_transaction(rig, "J4100");
+	err = pcr_set_squelch(rig, priv->squelch);
 	if (err != RIG_OK)
 		return err;
 
-	/* set volume to an acceptable default */
+	err = pcr_set_volume(rig, priv->volume);
-	err = pcr_set_volume(rig, 0.25);
 	if (err != RIG_OK)
 		return err;
 
 	/* get device features */
 	pcr_get_info(rig);
 
-	/* tune to default last freq */
+	/* tune to last freq */
 	pcr_set_freq(rig, 0, priv->last_freq);
 
 	/* switch to different speed if requested */
@@ -463,9 +467,11 @@ pcr_open(RIG * rig)
 int
 pcr_close(RIG * rig)
 {
+	struct pcr_priv_data *priv = (struct pcr_priv_data *) rig->state.priv;
 	/* when the pcr turns itself off sometimes we receive
 	 * a malformed answer, so don't check for it.
 	 */
+	priv->power = RIG_POWER_OFF;
 	return pcr_send(rig, "H100");
 }
 
@@ -820,10 +826,7 @@ pcr_set_level(RIG * rig, vfo_t vfo, setting_t level, value_t val)
 		 *      .... rig supports 0 to FF - look at function for
 		 *      squelch "bands"
 		 */
-		err = pcr_set_squelch(rig, (val.f * 0xFF));
+		return pcr_set_squelch(rig, val.f);
-		if (err == RIG_OK)
-			priv->squelch = val.f;
-		return err;
 
 	case RIG_LEVEL_NR:
 		/* This selectss the DSP unit - this isn't a level per se,
@@ -1027,17 +1030,15 @@ pcr_set_level_cmd(RIG * rig, char *base, int level)
  * Format is J40xx - where xx is 00 to FF in hex, and specifies 255 volume levels
  */
 
-int
+static int
 pcr_set_volume(RIG * rig, float level)
 {
 	int err;
 	struct pcr_priv_data *priv = (struct pcr_priv_data *) rig->state.priv;
 
-	int hwlevel = level * 0xFF;
-
 	rig_debug(RIG_DEBUG_TRACE, "%s: level = %f\n", __func__, level);
 
-	err = pcr_set_level_cmd(rig, "J40", hwlevel);
+	err = pcr_set_level_cmd(rig, "J40", level * 0xff);
 	if (err == RIG_OK)
 		priv->volume = level;
 
@@ -1062,13 +1063,22 @@ pcr_set_volume(RIG * rig, float level)
  *	use of Hamlib API. Otherwise may get unexpected squelch settings if have to do by hand.
  */
 
-int
+static int
-pcr_set_squelch(RIG * rig, int level)
+pcr_set_squelch(RIG * rig, float level)
 {
-	rig_debug(RIG_DEBUG_TRACE, "%s: level is %d\n", __func__, level);
+	int err;
-	return pcr_set_level_cmd(rig, "J41", level);
+	struct pcr_priv_data *priv = (struct pcr_priv_data *) rig->state.priv;
+
+	rig_debug(RIG_DEBUG_TRACE, "%s: level = %f\n", __func__, level);
+
+	err = pcr_set_level_cmd(rig, "J41", level * 0xff);
+	if (err == RIG_OK)
+		priv->squelch = level;
+
+	return err;
 }
 
+
 /*
  * pcr_set_if_shift
  * Assumes rig!=NULL, rig->state.priv!=NULL
@@ -1328,6 +1338,28 @@ int pcr_decode_event(RIG *rig)
 	return RIG_OK;
 }
 
+int pcr_set_powerstat(RIG * rig, powerstat_t status)
+{
+	if (status == RIG_POWER_ON)
+		return pcr_open(rig);
+	else if (status == RIG_POWER_OFF)
+		return pcr_close(rig);
+
+	return -RIG_ENIMPL;
+}
+
+int pcr_get_powerstat(RIG * rig, powerstat_t *status)
+{
+	struct pcr_priv_data *priv = (struct pcr_priv_data *) rig->state.priv;
+
+	/* XXX There's a command to check the status, it's worthwhile
+	 * to use it?
+	 */
+	*status = priv->power;
+
+	return RIG_OK;
+}
+     
 
 /* *********************************************************************************************
  * int pcr_set_comm_mode(RIG *rig, int mode_type);  // Set radio to fast/diagnostic mode  G3xx

pcr/pcr.h

@@ -2,7 +2,7 @@
  *  Hamlib PCR backend - main header
  *  Copyright (c) 2001-2003 by Stephane Fillod
  *
- *	$Id: pcr.h,v 1.13 2009-01-27 19:05:59 fillods Exp $
+ *	$Id: pcr.h,v 1.14 2009-01-29 19:50:33 azummo Exp $
  *
  *   This library is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU Library General Public License as
@@ -52,6 +52,8 @@ struct pcr_priv_data {
 	int options;
 
 	int sync;
+
+	powerstat_t power;
 };
 
 extern const tone_t pcr_ctcss_list[];
@@ -77,8 +79,8 @@ int pcr_set_func(RIG *rig, vfo_t vfo, setting_t func, int status);
 
 int pcr_set_comm_rate(RIG *rig, int baud_rate);
 
-int pcr_set_volume(RIG *rig, float level);
+static int pcr_set_volume(RIG *rig, float level);
-int pcr_set_squelch(RIG *rig, int level);
+static int pcr_set_squelch(RIG *rig, float level);
 int pcr_set_if_shift(RIG *rig, int level);
 int pcr_set_agc(RIG *rig, int status);			// J45xx
 int pcr_set_nb(RIG *rig, int status);			// J46xx
@@ -96,7 +98,8 @@ int pcr_get_ctcss_sql(RIG *rig, vfo_t vfo, tone_t *tone);
 int pcr_set_ctcss_sql(RIG *rig, vfo_t vfo, tone_t tone);
 int pcr_set_trn(RIG * rig, int trn);
 int pcr_decode_event(RIG *rig);
-
+int pcr_set_powerstat(RIG * rig, powerstat_t status);
+int pcr_get_powerstat(RIG * rig, powerstat_t *status);
 static int pcr_check_ok(RIG * rig);
 
 /* ------------------------------------------------------------------ */

pcr/pcr100.c

@@ -2,7 +2,7 @@
  *  Hamlib PCR backend - PCR-100 description
  *  Copyright (c) 2001-2004 by Stephane Fillod
  *
- *	$Id: pcr100.c,v 1.8 2009-01-27 19:05:59 fillods Exp $
+ *	$Id: pcr100.c,v 1.9 2009-01-29 19:50:33 azummo Exp $
  *
  *   This library is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU Library General Public License as
@@ -167,4 +167,7 @@ const struct rig_caps pcr100_caps = {
 
 	.set_trn	= pcr_set_trn,
 	.decode_event	= pcr_decode_event,
+
+	.set_powerstat	= pcr_set_powerstat,
+	.get_powerstat	= pcr_get_powerstat,
 };