Skip to content

Commit a94cd83

Browse files
Merge pull request #846 from ISISComputingGroup/Ticket3918_1240_1262
Ticket3918 1240 1262
2 parents 283ba56 + 0730e01 commit a94cd83

File tree

9 files changed

+3803
-57
lines changed

9 files changed

+3803
-57
lines changed

base/uk.ac.stfc.isis.ibex.devicescreens/src/uk/ac/stfc/isis/ibex/devicescreens/components/ComponentType.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,8 @@ public enum ComponentType {
148148
POWER_SUPPLY,
149149
/** Oscilloscope. */
150150
OSCILLOSCOPE,
151-
/** Moxa ioLogik e1210 Remote I/O. */
152-
MOXA_1210,
151+
/** Moxa ioLogik e12XX Remote I/O. */
152+
MOXA_12XX,
153153
/** Furnace temperature controller. */
154154
FURNACE,
155155
/** Generic Multimeter. */

0 commit comments

Comments
 (0)