Skip to content

Commit

Permalink
rename EOR and ENOR to XOR and XNOR. EOR and ENOR are still defined but
Browse files Browse the repository at this point in the history
not displayd in the default toolbox.
  • Loading branch information
kazuhikoarase committed Nov 8, 2017
1 parent 3bf0243 commit 3208856
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
7 changes: 5 additions & 2 deletions simcir-basicset.js
Expand Up @@ -724,8 +724,11 @@
$s.registerDevice('NAND', createLogicGateFactory(AND, NOT, drawNAND) );
$s.registerDevice('OR', createLogicGateFactory(OR, BUF, drawOR) );
$s.registerDevice('NOR', createLogicGateFactory(OR, NOT, drawNOR) );
$s.registerDevice('EOR', createLogicGateFactory(EOR, BUF, drawEOR) );
$s.registerDevice('ENOR', createLogicGateFactory(EOR, NOT, drawENOR) );
$s.registerDevice('XOR', createLogicGateFactory(EOR, BUF, drawEOR) );
$s.registerDevice('XNOR', createLogicGateFactory(EOR, NOT, drawENOR) );
// deprecated. not displayed in the default toolbox.
$s.registerDevice('EOR', createLogicGateFactory(EOR, BUF, drawEOR), true);
$s.registerDevice('ENOR', createLogicGateFactory(EOR, NOT, drawENOR), true);

// register Oscillator
$s.registerDevice('OSC', function(device) {
Expand Down
2 changes: 1 addition & 1 deletion simcir-library.js
Expand Up @@ -262,7 +262,7 @@ simcir.registerDevice('HalfAdder',
{"type":"Toggle","id":"dev0","x":96,"y":80,"label":"Toggle"},
{"type":"DC","id":"dev1","x":48,"y":56,"label":"DC"},
{"type":"AND","id":"dev2","x":192,"y":80,"label":"AND"},
{"type":"EOR","id":"dev3","x":192,"y":32,"label":"EOR"},
{"type":"XOR","id":"dev3","x":192,"y":32,"label":"XOR"},
{"type":"In","id":"dev4","x":144,"y":32,"label":"A"},
{"type":"In","id":"dev5","x":144,"y":80,"label":"B"},
{"type":"Out","id":"dev6","x":240,"y":32,"label":"S"},
Expand Down

0 comments on commit 3208856

Please sign in to comment.