add scope functions

icom/frame.h

@@ -22,7 +22,7 @@
 #ifndef _FRAME_H
 #define _FRAME_H 1
 
-#define MAXFRAMELEN 80
+#define MAXFRAMELEN 512
 
 /*
  * helper functions

icom/icom.c

@@ -421,6 +421,9 @@ const struct confparams icom_ext_parms[] =
     { TOK_DRIVE_GAIN, "drive_gain", "Drive gain", "", "", RIG_CONF_NUMERIC, {} },
     { TOK_DIGI_SEL_FUNC, "digi_sel", "DIGI-SEL enable", "", "", RIG_CONF_CHECKBUTTON, {} },
     { TOK_DIGI_SEL_LEVEL, "digi_sel_level", "DIGI-SEL level", "", "", RIG_CONF_NUMERIC, {} },
+    { TOK_SCOPE_DAT, "scpdat", "Scope data", "", "", RIG_CONF_BINARY, {} },
+    { TOK_SCOPE_STS, "scpsts", "Scope status", "", "", RIG_CONF_CHECKBUTTON, {} },
+    { TOK_SCOPE_DOP, "scpdop", "Scope data output", "", "", RIG_CONF_CHECKBUTTON, {} },
     { RIG_CONF_END, NULL, }
 };
 
@@ -444,6 +447,20 @@ const struct cmdparams icom_ext_cmd[] =
     { {.t=TOK_DRIVE_GAIN}, C_CTL_LVL, S_LVL_DRIVE, SC_MOD_RW, 1, {0}, CMD_DAT_FLT, 2 },
     { {.t=TOK_DIGI_SEL_FUNC}, C_CTL_FUNC, S_FUNC_DIGISEL, SC_MOD_RW, 1, {0}, CMD_DAT_BOL, 1 },
     { {.t=TOK_DIGI_SEL_LEVEL}, C_CTL_LVL, S_LVL_DIGI, SC_MOD_RW, 1, {0}, CMD_DAT_FLT, 2 },
+    { {.t=TOK_SCOPE_DAT}, C_CTL_SCP, S_SCP_DAT, SC_MOD_RD, 0, {0}, CMD_DAT_BUF, 481 },
+    { {.t=TOK_SCOPE_STS}, C_CTL_SCP, S_SCP_STS, SC_MOD_RW, 0, {0}, CMD_DAT_BOL, 1 },
+    { {.t=TOK_SCOPE_DOP}, C_CTL_SCP, S_SCP_DOP, SC_MOD_RW, 0, {0}, CMD_DAT_BOL, 1 },
+    { {.t=TOK_SCOPE_MSS}, C_CTL_SCP, S_SCP_MSS, SC_MOD_RW, 0, {0}, CMD_DAT_BOL, 1 },
+    { {.t=TOK_SCOPE_MOD}, C_CTL_SCP, S_SCP_MOD, SC_MOD_RW, 0, {0}, CMD_DAT_WRD, 2 },
+    { {.t=TOK_SCOPE_SPN}, C_CTL_SCP, S_SCP_SPN, SC_MOD_RW, 0, {0}, CMD_DAT_BUF, 6 },
+    { {.t=TOK_SCOPE_EDG}, C_CTL_SCP, S_SCP_EDG, SC_MOD_RW, 0, {0}, CMD_DAT_WRD, 2 },
+    { {.t=TOK_SCOPE_HLD}, C_CTL_SCP, S_SCP_HLD, SC_MOD_RW, 0, {0}, CMD_DAT_WRD, 2 },
+    { {.t=TOK_SCOPE_REF}, C_CTL_SCP, S_SCP_REF, SC_MOD_RW, 0, {0}, CMD_DAT_BUF, 4 },
+    { {.t=TOK_SCOPE_SWP}, C_CTL_SCP, S_SCP_SWP, SC_MOD_RW, 0, {0}, CMD_DAT_WRD, 2 },
+    { {.t=TOK_SCOPE_STX}, C_CTL_SCP, S_SCP_STX, SC_MOD_RW, 0, {0}, CMD_DAT_BOL, 1 },
+    { {.t=TOK_SCOPE_TYP}, C_CTL_SCP, S_SCP_TYP, SC_MOD_RW, 0, {0}, CMD_DAT_INT, 1 },
+    { {.t=TOK_SCOPE_VBW}, C_CTL_SCP, S_SCP_VBW, SC_MOD_RW, 0, {0}, CMD_DAT_WRD, 2 },
+    { {.t=TOK_SCOPE_FEF}, C_CTL_SCP, S_SCP_FEF, SC_MOD_RW, 0, {0}, CMD_DAT_BUF, 12 },
     { {0} }
 };
 

icom/icom_defs.h

@@ -97,6 +97,7 @@
 #define C_CTL_RIT	0x21		/* RIT/XIT control */
 #define C_CTL_DSD	0x22		/* D-STAR Data */
 #define C_SEND_SEL_FREQ 0x25 /* Send/Recv sel/unsel VFO frequency */
+#define C_CTL_SCP	0x27		/* Scope control & data */
 #define C_CTL_MTEXT	0x70		/* Microtelecom Extension */
 #define C_CTL_MISC	0x7f		/* Miscellaneous control, Sc */
 
@@ -458,6 +459,24 @@
 #define S_DVT_DSTXMS	 0x02		/* D-STAR Tx Mess */
 #define S_DSD_DSTXDT	 0x00		/* D-STAR Tx Data */
 
+/*
+ * S_CTL_SCP	Scope control & data subcommands
+ */
+#define S_SCP_DAT		0x00        /* Read data */
+#define S_SCP_STS		0x10        /* On/Off status */
+#define S_SCP_DOP		0x11        /* Data O/P Control */
+#define S_SCP_MSS		0x12        /* Main/Sub setting */
+#define S_SCP_MOD		0x14        /* Centre/Fixed mode */
+#define S_SCP_SPN		0x15        /* Span setting */
+#define S_SCP_EDG		0x16        /* Edge setting */
+#define S_SCP_HLD		0x17        /* Hold On/Off */
+#define S_SCP_REF		0x19        /* Reference level */
+#define S_SCP_SWP		0x1a        /* Sweep speed */
+#define S_SCP_STX		0x1b        /* Scope during Tx */
+#define S_SCP_TYP		0x1c        /* Display type */
+#define S_SCP_VBW		0x1d        /* VBW setting */
+#define S_SCP_FEF		0x1e        /* Fixed edge freqs */
+
 /*
  * C_CTL_MISC	OptoScan extension
  */
@@ -520,6 +539,20 @@
 #define TOK_DSTAR_TX_MESS TOKEN_BACKEND(128)
 #define TOK_DSTAR_TX_DATA TOKEN_BACKEND(129)
 #define TOK_DSTAR_CODE TOKEN_BACKEND(130)
+#define TOK_SCOPE_DAT TOKEN_BACKEND(131)
+#define TOK_SCOPE_STS TOKEN_BACKEND(132)
+#define TOK_SCOPE_DOP TOKEN_BACKEND(133)
+#define TOK_SCOPE_MSS TOKEN_BACKEND(134)
+#define TOK_SCOPE_MOD TOKEN_BACKEND(135)
+#define TOK_SCOPE_SPN TOKEN_BACKEND(136)
+#define TOK_SCOPE_EDG TOKEN_BACKEND(137)
+#define TOK_SCOPE_HLD TOKEN_BACKEND(138)
+#define TOK_SCOPE_REF TOKEN_BACKEND(139)
+#define TOK_SCOPE_SWP TOKEN_BACKEND(140)
+#define TOK_SCOPE_STX TOKEN_BACKEND(141)
+#define TOK_SCOPE_TYP TOKEN_BACKEND(142)
+#define TOK_SCOPE_VBW TOKEN_BACKEND(143)
+#define TOK_SCOPE_FEF TOKEN_BACKEND(144)
 
 /*
  * icom_ext_parm table subcommand modifiers

icom/icr8600.c

@@ -77,6 +77,7 @@ struct cmdparams icr8600_rigparms[] = {
 
 int icr8600_tokens[] = { TOK_DSTAR_DSQL, TOK_DSTAR_CALL_SIGN, TOK_DSTAR_MESSAGE, TOK_DSTAR_STATUS,
     TOK_DSTAR_GPS_DATA, TOK_DSTAR_GPS_MESS, TOK_DSTAR_CODE, TOK_DSTAR_TX_DATA,
+    TOK_SCOPE_DAT, TOK_SCOPE_STS, TOK_SCOPE_DOP,
     TOK_BACKEND_NONE };
 
 struct confparams icr8600_ext[] = {
@@ -125,7 +126,7 @@ const struct rig_caps icr8600_caps =
     .dcd_type = RIG_DCD_RIG,
     .port_type = RIG_PORT_SERIAL,
     .serial_rate_min = 300,
-    .serial_rate_max = 19200, // USB can do up to 115000
+    .serial_rate_max = 115200,
     .serial_data_bits = 8,
     .serial_stop_bits = 1,
     .serial_parity = RIG_PARITY_NONE,