Skip to content

NAND NOR and XNOR funcionality #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 14, 2019
Merged

NAND NOR and XNOR funcionality #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,13 @@ <h1 class="display-6 h1Options">Options</h1>
<button class="button button-2 button-2c" id="XORBtn">(^) XOR</button>
</p>

<!-- NEW BITWISE OPERATIONS -->
<p class="col-lg-12 BTNRow">
<button class="button button-2 button-2c" id="NANDBtn">(<span style="text-decoration: overline">&</span>) NAND</button>
<button class="button button-2 button-2c" id="NORBtn">(<span style="text-decoration: overline">|</span>) NOR</button>
<button class="button button-2 button-2c" id="XNORBtn">(<span style="text-decoration: overline">^</span>) XNOR</button>
</p>

</div>

<!-- Input Group - Function Buttons - End -->
Expand Down
75 changes: 75 additions & 0 deletions js/scripts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,11 @@ var rechner = (function (rechner) {
var $ORBtn = $('#ORBtn');
var $XORBtn = $('#XORBtn');

// NEW BITWISE OPERATION FUNCTION BUTTONS
var $NANDBtn = $('#NANDBtn');
var $NORBtn = $('#NORBtn');
var $XNORBtn = $('#XNORBtn');

// --------------------------------------------------------------------------------
// Private functions
// --------------------------------------------------------------------------------
Expand Down Expand Up @@ -189,6 +194,15 @@ var rechner = (function (rechner) {
else if ($XORBtn.hasClass("active")) {
binaryXOR($operand1Binary, $operand2Binary);
}
else if ($NANDBtn.hasClass("active")) {
binaryNAND($operand1Binary, $operand2Binary);
}
else if ($NORBtn.hasClass("active")) {
binaryNOR($operand1Binary, $operand2Binary);
}
else if ($XNORBtn.hasClass("active")) {
binaryXNOR($operand1Binary, $operand2Binary);
}
}

console.log("$operand1Decimal input");
Expand Down Expand Up @@ -590,6 +604,67 @@ var rechner = (function (rechner) {
}
}

// NEW BITWISE FUNCTIONS
function binaryNAND(binaryInputID, binaryInputID2) {

if ($operand1Binary.val() != "" && $operand2Binary.val() != "") {

// binary.length == binary2.length
var binary = binaryInputID.val();
var binary2 = binaryInputID2.val();
var binNAND = "";
let bSelect = { true: '1', false: '0' };

for (let d = 0; d < binary.length; d++) {
binNAND += bSelect[!(binary.charAt(d) & binary2.charAt(d))];
}

$resultBinary.val(binNAND);
updateAll($resultDecimal, $resultBinary, $resultSystem, inputEnum.FunctionalButton);
}

}

function binaryNOR(binaryInputID, binaryInputID2) {

if ($operand1Binary.val() != "" && $operand2Binary.val() != "") {

// binary.length == binary2.length
var binary = binaryInputID.val();
var binary2 = binaryInputID2.val();
var binNOR = "";
let bSelect = { true: '1', false: '0' };

for (let d = 0; d < binary.length; d++) {
binNOR += bSelect[!(binary.charAt(d) | binary2.charAt(d))];
}

$resultBinary.val(binNOR);
updateAll($resultDecimal, $resultBinary, $resultSystem, inputEnum.FunctionalButton);
}

}

function binaryXNOR(binaryInputID, binaryInputID2) {

if ($operand1Binary.val() != "" && $operand2Binary.val() != "") {

// binary.length == binary2.length
var binary = binaryInputID.val();
var binary2 = binaryInputID2.val();
var binXNOR = "";
let bSelect = { true: '1', false: '0' };

for (let d = 0; d < binary.length; d++) {
binXNOR += bSelect[!(binary.charAt(d) ^ binary2.charAt(d))];
}

$resultBinary.val(binXNOR);
updateAll($resultDecimal, $resultBinary, $resultSystem, inputEnum.FunctionalButton);
}

}

// Update all fields at the start
updateAll($operand1Decimal, $operand1Binary, $operand1System, inputEnum.Decimal);
updateAll($operand2Decimal, $operand2Binary, $operand2System, inputEnum.Decimal);
Expand Down