diff --git a/mitdevices/l8212.c b/mitdevices/l8212.c index 7046d4a367..9d75965edf 100644 --- a/mitdevices/l8212.c +++ b/mitdevices/l8212.c @@ -217,19 +217,19 @@ static int FreqToClock(int chans, int noc, int freq_nid, int *clock) switch (*clock) { case 4: if (noc > 8) - status = L8212$_FREQ_TO_HIGH; + status = L8212$_FREQ_TOO_HIGH; break; case 5: if (noc > 4) - status = L8212$_FREQ_TO_HIGH; + status = L8212$_FREQ_TOO_HIGH; break; case 6: if (noc > 2) - status = L8212$_FREQ_TO_HIGH; + status = L8212$_FREQ_TOO_HIGH; break; case 7: if (noc > 1) - status = L8212$_FREQ_TO_HIGH; + status = L8212$_FREQ_TOO_HIGH; break; } break; @@ -237,19 +237,19 @@ static int FreqToClock(int chans, int noc, int freq_nid, int *clock) switch (*clock) { case 4: if (noc > 32) - status = L8212$_FREQ_TO_HIGH; + status = L8212$_FREQ_TOO_HIGH; break; case 5: if (noc > 16) - status = L8212$_FREQ_TO_HIGH; + status = L8212$_FREQ_TOO_HIGH; break; case 6: if (noc > 8) - status = L8212$_FREQ_TO_HIGH; + status = L8212$_FREQ_TOO_HIGH; break; case 7: if (noc > 4) - status = L8212$_FREQ_TO_HIGH; + status = L8212$_FREQ_TOO_HIGH; break; } break; diff --git a/mitdevices/mds_gendevice.h b/mitdevices/mds_gendevice.h index 3109e72d3a..bed901208d 100644 --- a/mitdevices/mds_gendevice.h +++ b/mitdevices/mds_gendevice.h @@ -58,7 +58,7 @@ extern int GenDeviceHeadNid(); (MSG_MASK + 2015 * MSG_FACNUM_M + 11 * MSG_MSGNUM_M + MSG_ERROR) #define DEV$_NOT_TRIGGERED \ (MSG_MASK + 2015 * MSG_FACNUM_M + 12 * MSG_MSGNUM_M + MSG_ERROR) -#define DEV$_FREQ_TO_HIGH \ +#define DEV$_FREQ_TOO_HIGH \ (MSG_MASK + 2015 * MSG_FACNUM_M + 13 * MSG_MSGNUM_M + MSG_ERROR) #define DEV$_INVALID_NOC \ (MSG_MASK + 2015 * MSG_FACNUM_M + 14 * MSG_MSGNUM_M + MSG_ERROR) @@ -134,7 +134,7 @@ int getmsg(int sts, char **facnam, char **msgnam, char **msgtext) "unable to read start index for channel"}, {DEV$_NOT_TRIGGERED, "DEV", "NOT_TRIGGERED", "device was not triggered, check wires and triggering device"}, - {DEV$_FREQ_TO_HIGH, "DEV", "FREQ_TO_HIGH", + {DEV$_FREQ_TOO_HIGH, "DEV", "FREQ_TOO_HIGH", "the frequency is set to high for the requested number of channels"}, {DEV$_INVALID_NOC, "DEV", "INVALID_NOC", "the NOC (number of channels) requested is greater than the physical " diff --git a/mitdevices/mitdevices_messages.xml b/mitdevices/mitdevices_messages.xml index b1f1bc6efb..e8fa41252a 100644 --- a/mitdevices/mitdevices_messages.xml +++ b/mitdevices/mitdevices_messages.xml @@ -61,7 +61,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - - mbclk_max: - raise MDSplus.mdsExceptions.DevFREQ_TO_HIGH() + raise MDSplus.mdsExceptions.DevFREQ_TOO_HIGH() clkdiv = int(math.ceil(mbclk_min/freq)) mbclk = int(freq * clkdiv) diff --git a/pydevices/phantomhighspeed/phantom.py b/pydevices/phantomhighspeed/phantom.py index 71dbd14f89..3d0ad8723c 100644 --- a/pydevices/phantomhighspeed/phantom.py +++ b/pydevices/phantomhighspeed/phantom.py @@ -985,7 +985,7 @@ def arm(self): if pers is not None: stream = pers.get('stream', None) if stream is not None: - raise MDSplus.DevUNKOWN_STATE + raise MDSplus.DevUNKNOWN_STATE try: self.lib.arm() pers['stream'] = stream = self.Stream(self) diff --git a/python/MDSplus/tests/dcl_case.py b/python/MDSplus/tests/dcl_case.py index 7bc7a68b5e..0a26de1d25 100755 --- a/python/MDSplus/tests/dcl_case.py +++ b/python/MDSplus/tests/dcl_case.py @@ -80,13 +80,13 @@ def interface(self): self._doTCLTest('do TESTDEVICE_S:TASK_TEST') self._doTCLTest('do TESTDEVICE_S:ACTIONSERVER:MANUAL') self._doExceptionTest('do TESTDEVICE_I:TASK_ERROR1', - Exc.DevUNKOWN_STATE) # w/o timeout + Exc.DevUNKNOWN_STATE) # w/o timeout self._doExceptionTest('do TESTDEVICE_S:TASK_ERROR1', - Exc.DevUNKOWN_STATE) # w/o timeout + Exc.DevUNKNOWN_STATE) # w/o timeout self._doExceptionTest('do TESTDEVICE_I:TASK_ERROR2', - Exc.DevUNKOWN_STATE) # w/ timeout + Exc.DevUNKNOWN_STATE) # w/ timeout self._doExceptionTest('do TESTDEVICE_S:TASK_ERROR2', - Exc.DevUNKOWN_STATE) # w/ timeout + Exc.DevUNKNOWN_STATE) # w/ timeout self._doExceptionTest('close', Exc.TreeWRITEFIRST) self._doTCLTest('write') self._doTCLTest('close') diff --git a/python/MDSplus/tests/devices/TestDevice.py b/python/MDSplus/tests/devices/TestDevice.py index 7eca111401..78db0e9eb6 100644 --- a/python/MDSplus/tests/devices/TestDevice.py +++ b/python/MDSplus/tests/devices/TestDevice.py @@ -25,7 +25,7 @@ import time import threading -from MDSplus import Device, DevUNKOWN_STATE, Int32Array +from MDSplus import Device, DevUNKNOWN_STATE, Int32Array from MDSplus import with_mdsrecords, mdsrecord, cached_property @@ -196,8 +196,8 @@ def test(self): return 'TEST' def error(self): - """Raise an DevUNKOWN_STATE exception.""" - raise DevUNKOWN_STATE + """Raise an DevUNKNOWN_STATE exception.""" + raise DevUNKNOWN_STATE def timeout(self): """Simulate a long running process.""" diff --git a/python/MDSplus/tests/task_case.py b/python/MDSplus/tests/task_case.py index 76438e487c..9f58531246 100755 --- a/python/MDSplus/tests/task_case.py +++ b/python/MDSplus/tests/task_case.py @@ -50,9 +50,9 @@ def do(self): self._doTCLTest( 'do TESTDEVICE:TASK_TEST', tree=tree) self._doExceptionTest( - 'do TESTDEVICE:TASK_ERROR1', Exc.DevUNKOWN_STATE, tree) + 'do TESTDEVICE:TASK_ERROR1', Exc.DevUNKNOWN_STATE, tree) self._doExceptionTest( - 'do TESTDEVICE:TASK_ERROR2', Exc.DevUNKOWN_STATE, tree) + 'do TESTDEVICE:TASK_ERROR2', Exc.DevUNKNOWN_STATE, tree) self._doExceptionTest( 'do TESTDEVICE:TASK_TIMEOUT', Exc.TdiTIMEOUT, tree) diff --git a/treeshr/RemoteAccess.c b/treeshr/RemoteAccess.c index b811398d2e..844535fe60 100644 --- a/treeshr/RemoteAccess.c +++ b/treeshr/RemoteAccess.c @@ -1848,7 +1848,7 @@ inline static int io_open_one_remote(char *host, char *filepath, MDS_IO_LOCK_RD | MDS_IO_LOCK_NOWAIT, 0))) { - status = TreeEDITTING; + status = TreeEDITING; *fd = -2; } } @@ -1979,7 +1979,7 @@ EXPORT int MDS_IO_OPEN_ONE(char *filepath_in, char const *treename_in, int shot, if (IS_NOT_OK(io_lock_local((fdinfo_t){conid, fd, enhanced}, 1, 1, MDS_IO_LOCK_RD | MDS_IO_LOCK_NOWAIT, 0))) { - status = TreeEDITTING; + status = TreeEDITING; fd = -2; } } diff --git a/treeshr/treeshr_messages.xml b/treeshr/treeshr_messages.xml index fde13d48ff..58e01f2980 100644 --- a/treeshr/treeshr_messages.xml +++ b/treeshr/treeshr_messages.xml @@ -36,7 +36,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - +