diff --git a/simulators/sim.h b/simulators/sim.h
index d1829d49e..b90f53293 100644
--- a/simulators/sim.h
+++ b/simulators/sim.h
@@ -3,6 +3,32 @@
 
 #include "../src/misc.h"
 
+/* ID 0310 == 310, Must drop leading zero */
+typedef enum nc_rigid_e
+{
+    NC_RIGID_NONE            = 0,
+    NC_RIGID_FT450           = 241,
+    NC_RIGID_FT450D          = 244,
+    NC_RIGID_FT950           = 310,
+    NC_RIGID_FT891           = 135,
+    NC_RIGID_FT991           = 570,
+    NC_RIGID_FT991A          = 670,
+    NC_RIGID_FT2000          = 251,
+    NC_RIGID_FT2000D         = 252,
+    NC_RIGID_FTDX1200        = 583,
+    NC_RIGID_FTDX10          = 761,
+    NC_RIGID_FTDX9000D       = 101,
+    NC_RIGID_FTDX9000Contest = 102,
+    NC_RIGID_FTDX9000MP      = 103,
+    NC_RIGID_FTDX5000        = 362,
+    NC_RIGID_FTDX3000        = 460,
+    NC_RIGID_FTDX3000DM      = 462, // an undocumented FT-DX3000DM 50W rig
+    NC_RIGID_FTDX101D        = 681,
+    NC_RIGID_FTDX101MP       = 682,
+    NC_RIGID_FT710           = 800,
+    NC_RIGID_FTX1            = 840,
+} nc_rigid_t;
+
 #define WRITE(f,b,l) write_sim(f,(const unsigned char*)b,l,__func__,__LINE__)
 
 int write_sim(int fd, const unsigned char *buf, int buflen, const char *func,
diff --git a/simulators/simft450.c b/simulators/simft450.c
index 7ab974d74..09584e8be 100644
--- a/simulators/simft450.c
+++ b/simulators/simft450.c
@@ -52,27 +52,6 @@ int gt = 0;
 int ex016 = 0;
 int ex020 = 0;
 
-// ID 0310 == 310, Must drop leading zero
-typedef enum nc_rigid_e
-{
-    NC_RIGID_NONE            = 0,
-    NC_RIGID_FT450           = 241,
-    NC_RIGID_FT450D          = 244,
-    NC_RIGID_FT950           = 310,
-    NC_RIGID_FT891           = 135,
-    NC_RIGID_FT991           = 135,
-    NC_RIGID_FT2000          = 251,
-    NC_RIGID_FT2000D         = 252,
-    NC_RIGID_FTDX1200        = 583,
-    NC_RIGID_FTDX9000D       = 101,
-    NC_RIGID_FTDX9000Contest = 102,
-    NC_RIGID_FTDX9000MP      = 103,
-    NC_RIGID_FTDX5000        = 362,
-    NC_RIGID_FTDX3000        = 460,
-    NC_RIGID_FTDX101D        = 681,
-    NC_RIGID_FTDX101MP       = 682
-} nc_rigid_t;
-
 int
 getmyline(int fd, char *buf)
 {
diff --git a/simulators/simft710.c b/simulators/simft710.c
index 824717d5e..d2d6403ed 100644
--- a/simulators/simft710.c
+++ b/simulators/simft710.c
@@ -53,28 +53,6 @@ int ex016 = 0;
 int ex020 = 0;
 int st = 0;
 
-// ID 0310 == 310, Must drop leading zero
-typedef enum nc_rigid_e
-{
-    NC_RIGID_NONE            = 0,
-    NC_RIGID_FT450           = 241,
-    NC_RIGID_FT450D          = 244,
-    NC_RIGID_FT950           = 310,
-    NC_RIGID_FT891           = 135,
-    NC_RIGID_FT991           = 135,
-    NC_RIGID_FT2000          = 251,
-    NC_RIGID_FT2000D         = 252,
-    NC_RIGID_FTDX1200        = 583,
-    NC_RIGID_FTDX9000D       = 101,
-    NC_RIGID_FTDX9000Contest = 102,
-    NC_RIGID_FTDX9000MP      = 103,
-    NC_RIGID_FTDX5000        = 362,
-    NC_RIGID_FTDX3000        = 460,
-    NC_RIGID_FTDX101D        = 681,
-    NC_RIGID_FTDX101MP       = 682,
-    NC_RIGID_FT710           = 800
-} nc_rigid_t;
-
 int
 getmyline(int fd, char *buf)
 {
diff --git a/simulators/simft818.c b/simulators/simft818.c
index a01dc709b..43ef7c6a3 100644
--- a/simulators/simft818.c
+++ b/simulators/simft818.c
@@ -27,28 +27,6 @@ char modeB = '1';
 int width = 0;
 int ptt;
 
-// ID 0310 == 310, Must drop leading zero
-typedef enum nc_rigid_e
-{
-    NC_RIGID_NONE            = 0,
-    NC_RIGID_FT450           = 241,
-    NC_RIGID_FT450D          = 244,
-    NC_RIGID_FT950           = 310,
-    NC_RIGID_FT891           = 135,
-    NC_RIGID_FT991           = 135,
-    NC_RIGID_FT2000          = 251,
-    NC_RIGID_FT2000D         = 252,
-    NC_RIGID_FTDX1200        = 583,
-    NC_RIGID_FTDX9000D       = 101,
-    NC_RIGID_FTDX9000Contest = 102,
-    NC_RIGID_FTDX9000MP      = 103,
-    NC_RIGID_FTDX5000        = 362,
-    NC_RIGID_FTDX3000        = 460,
-    NC_RIGID_FTDX3000DM      = 462,
-    NC_RIGID_FTDX101D        = 681,
-    NC_RIGID_FTDX101MP       = 682
-} nc_rigid_t;
-
 int
 getmyline(int fd, char *buf)
 {
diff --git a/simulators/simft990.c b/simulators/simft990.c
index ab14e9bf8..130705f18 100644
--- a/simulators/simft990.c
+++ b/simulators/simft990.c
@@ -27,27 +27,6 @@ int width_main = 500;
 int width_sub = 700;
 
 
-// ID 0310 == 310, Must drop leading zero
-typedef enum nc_rigid_e
-{
-    NC_RIGID_NONE            = 0,
-    NC_RIGID_FT450           = 241,
-    NC_RIGID_FT450D          = 244,
-    NC_RIGID_FT950           = 310,
-    NC_RIGID_FT891           = 135,
-    NC_RIGID_FT991           = 135,
-    NC_RIGID_FT2000          = 251,
-    NC_RIGID_FT2000D         = 252,
-    NC_RIGID_FTDX1200        = 583,
-    NC_RIGID_FTDX9000D       = 101,
-    NC_RIGID_FTDX9000Contest = 102,
-    NC_RIGID_FTDX9000MP      = 103,
-    NC_RIGID_FTDX5000        = 362,
-    NC_RIGID_FTDX3000        = 460,
-    NC_RIGID_FTDX101D        = 681,
-    NC_RIGID_FTDX101MP       = 682
-} nc_rigid_t;
-
 static void load_dat(const char *filename, unsigned char buf[1492])
 {
     FILE *fp = fopen(filename, "r");
diff --git a/simulators/simft991.c b/simulators/simft991.c
index a894460d1..314b80a80 100644
--- a/simulators/simft991.c
+++ b/simulators/simft991.c
@@ -31,27 +31,6 @@ int vd = 0;
 int sm0 = 0;
 int sm1 = 0;
 
-// ID 0310 == 310, Must drop leading zero
-typedef enum nc_rigid_e
-{
-    NC_RIGID_NONE            = 0,
-    NC_RIGID_FT450           = 241,
-    NC_RIGID_FT450D          = 244,
-    NC_RIGID_FT950           = 310,
-    NC_RIGID_FT891           = 135,
-    NC_RIGID_FT991           = 135,
-    NC_RIGID_FT2000          = 251,
-    NC_RIGID_FT2000D         = 252,
-    NC_RIGID_FTDX1200        = 583,
-    NC_RIGID_FTDX9000D       = 101,
-    NC_RIGID_FTDX9000Contest = 102,
-    NC_RIGID_FTDX9000MP      = 103,
-    NC_RIGID_FTDX5000        = 362,
-    NC_RIGID_FTDX3000        = 460,
-    NC_RIGID_FTDX101D        = 681,
-    NC_RIGID_FTDX101MP       = 682
-} nc_rigid_t;
-
 int
 getmyline(int fd, char *buf)
 {
diff --git a/simulators/simftdx101.c b/simulators/simftdx101.c
index ce1077d9c..93d79c419 100644
--- a/simulators/simftdx101.c
+++ b/simulators/simftdx101.c
@@ -39,27 +39,6 @@ int rport_gain_psk = 50;
 int syncvfo = 0;
 int ant = 1;
 
-// ID 0310 == 310, Must drop leading zero
-typedef enum nc_rigid_e
-{
-    NC_RIGID_NONE            = 0,
-    NC_RIGID_FT450           = 241,
-    NC_RIGID_FT450D          = 244,
-    NC_RIGID_FT950           = 310,
-    NC_RIGID_FT891           = 135,
-    NC_RIGID_FT991           = 135,
-    NC_RIGID_FT2000          = 251,
-    NC_RIGID_FT2000D         = 252,
-    NC_RIGID_FTDX1200        = 583,
-    NC_RIGID_FTDX9000D       = 101,
-    NC_RIGID_FTDX9000Contest = 102,
-    NC_RIGID_FTDX9000MP      = 103,
-    NC_RIGID_FTDX5000        = 362,
-    NC_RIGID_FTDX3000        = 460,
-    NC_RIGID_FTDX101D        = 681,
-    NC_RIGID_FTDX101MP       = 682
-} nc_rigid_t;
-
 int
 getmyline(int fd, char *buf)
 {
diff --git a/simulators/simftdx1200.c b/simulators/simftdx1200.c
index 8e2b06f58..9033d5119 100644
--- a/simulators/simftdx1200.c
+++ b/simulators/simftdx1200.c
@@ -30,27 +30,6 @@ int na = 0;
 int ex039 = 0;
 int keyspd = 20;
 
-// ID 0310 == 310, Must drop leading zero
-typedef enum nc_rigid_e
-{
-    NC_RIGID_NONE            = 0,
-    NC_RIGID_FT450           = 241,
-    NC_RIGID_FT450D          = 244,
-    NC_RIGID_FT950           = 310,
-    NC_RIGID_FT891           = 135,
-    NC_RIGID_FT991           = 135,
-    NC_RIGID_FT2000          = 251,
-    NC_RIGID_FT2000D         = 252,
-    NC_RIGID_FTDX1200        = 583,
-    NC_RIGID_FTDX9000D       = 101,
-    NC_RIGID_FTDX9000Contest = 102,
-    NC_RIGID_FTDX9000MP      = 103,
-    NC_RIGID_FTDX5000        = 362,
-    NC_RIGID_FTDX3000        = 460,
-    NC_RIGID_FTDX101D        = 681,
-    NC_RIGID_FTDX101MP       = 682
-} nc_rigid_t;
-
 int
 getmyline(int fd, char *buf)
 {
diff --git a/simulators/simftdx3000.c b/simulators/simftdx3000.c
index 22ea15ad8..b8192a682 100644
--- a/simulators/simftdx3000.c
+++ b/simulators/simftdx3000.c
@@ -29,27 +29,6 @@ int sh = 25;
 int na = 0;
 int ex039 = 0;
 
-// ID 0310 == 310, Must drop leading zero
-typedef enum nc_rigid_e
-{
-    NC_RIGID_NONE            = 0,
-    NC_RIGID_FT450           = 241,
-    NC_RIGID_FT450D          = 244,
-    NC_RIGID_FT950           = 310,
-    NC_RIGID_FT891           = 135,
-    NC_RIGID_FT991           = 135,
-    NC_RIGID_FT2000          = 251,
-    NC_RIGID_FT2000D         = 252,
-    NC_RIGID_FTDX1200        = 583,
-    NC_RIGID_FTDX9000D       = 101,
-    NC_RIGID_FTDX9000Contest = 102,
-    NC_RIGID_FTDX9000MP      = 103,
-    NC_RIGID_FTDX5000        = 362,
-    NC_RIGID_FTDX3000        = 460,
-    NC_RIGID_FTDX101D        = 681,
-    NC_RIGID_FTDX101MP       = 682
-} nc_rigid_t;
-
 int
 getmyline(int fd, char *buf)
 {
diff --git a/simulators/simftdx5000.c b/simulators/simftdx5000.c
index efa3b987d..dd7223b64 100644
--- a/simulators/simftdx5000.c
+++ b/simulators/simftdx5000.c
@@ -31,27 +31,6 @@ int na = 0;
 int ex039 = 0;
 int ex103 = 0;
 
-// ID 0310 == 310, Must drop leading zero
-typedef enum nc_rigid_e
-{
-    NC_RIGID_NONE            = 0,
-    NC_RIGID_FT450           = 241,
-    NC_RIGID_FT450D          = 244,
-    NC_RIGID_FT950           = 310,
-    NC_RIGID_FT891           = 135,
-    NC_RIGID_FT991           = 135,
-    NC_RIGID_FT2000          = 251,
-    NC_RIGID_FT2000D         = 252,
-    NC_RIGID_FTDX1200        = 583,
-    NC_RIGID_FTDX9000D       = 101,
-    NC_RIGID_FTDX9000Contest = 102,
-    NC_RIGID_FTDX9000MP      = 103,
-    NC_RIGID_FTDX5000        = 362,
-    NC_RIGID_FTDX3000        = 460,
-    NC_RIGID_FTDX101D        = 681,
-    NC_RIGID_FTDX101MP       = 682
-} nc_rigid_t;
-
 int
 getmyline(int fd, char *buf)
 {
diff --git a/simulators/simyaesu.c b/simulators/simyaesu.c
index dbc099334..1aa7097d2 100644
--- a/simulators/simyaesu.c
+++ b/simulators/simyaesu.c
@@ -33,28 +33,6 @@ int width_sub = 0;
 int ex039 = 0;
 int lk = 0;
 
-// ID 0310 == 310, Must drop leading zero
-typedef enum nc_rigid_e
-{
-    NC_RIGID_NONE            = 0,
-    NC_RIGID_FT450           = 241,
-    NC_RIGID_FT450D          = 244,
-    NC_RIGID_FT950           = 310,
-    NC_RIGID_FT891           = 135,
-    NC_RIGID_FT991           = 135,
-    NC_RIGID_FT2000          = 251,
-    NC_RIGID_FT2000D         = 252,
-    NC_RIGID_FTDX1200        = 583,
-    NC_RIGID_FTDX9000D       = 101,
-    NC_RIGID_FTDX9000Contest = 102,
-    NC_RIGID_FTDX9000MP      = 103,
-    NC_RIGID_FTDX5000        = 362,
-    NC_RIGID_FTDX3000        = 460,
-    NC_RIGID_FTDX3000DM      = 462,
-    NC_RIGID_FTDX101D        = 681,
-    NC_RIGID_FTDX101MP       = 682
-} nc_rigid_t;
-
 int
 getmyline(int fd, char *buf)
 {