From 4fa55fca45159ebc3a97912999f88ad8c9b08206 Mon Sep 17 00:00:00 2001
From: Jet Hughes <hugje043@student.otago.ac.nz>
Date: Tue, 19 Jul 2022 20:51:12 +1200
Subject: [PATCH] vault backup: 2022-07-19 20:51:12

---
 content/notes/01-big-picture.md              |  4 ++++
 content/notes/01-security-audit.md           |  8 +++++++
 content/notes/combinatorial-logic-circuit.md | 23 ++++++++++++++++++++
 content/notes/comp-210.md                    |  5 +++--
 4 files changed, 38 insertions(+), 2 deletions(-)
 create mode 100644 content/notes/01-security-audit.md

diff --git a/content/notes/01-big-picture.md b/content/notes/01-big-picture.md
index c150cfa22..0108cf1c5 100644
--- a/content/notes/01-big-picture.md
+++ b/content/notes/01-big-picture.md
@@ -3,6 +3,10 @@ title: "01-big-picture"
 aliases: 
 tags: 
 - comp210
+- lecture
+sr-due: 2022-07-22
+sr-interval: 3
+sr-ease: 250
 ---
 
 # In the news
diff --git a/content/notes/01-security-audit.md b/content/notes/01-security-audit.md
new file mode 100644
index 000000000..0ac60ea69
--- /dev/null
+++ b/content/notes/01-security-audit.md
@@ -0,0 +1,8 @@
+---
+title: "01-security-audit"
+aliases: <% tp.file.cursor(2) %>
+tags: 
+<% tp.file.cursor(3) %>
+---
+
+<% tp.file.cursor(4) %>
diff --git a/content/notes/combinatorial-logic-circuit.md b/content/notes/combinatorial-logic-circuit.md
index 81b706cc6..5809fab79 100644
--- a/content/notes/combinatorial-logic-circuit.md
+++ b/content/notes/combinatorial-logic-circuit.md
@@ -5,4 +5,27 @@ tags:
 - cosc204
 ---
 
+> [!Definition]
+> Combinatorial Logic Circuit is a circuit whose digital outputs are dependent only on its digital inputs
+They can be described using logic expressions and therefore logic gates. We assume the outputs respond immediately^[1]
 
+- current flows from + to -
+- input to a unit (e.g., LED) is at the + end
+
+They can be defined:
+- Using a truth table
+- Using boolean equations ($Q\ =\ A+\ B$) 
+- Using graphical symbols
+
+
+# Notable Examples
+- [1 Bit half adder](https://i.imgur.com/mjCVU4I.png)
+- [1 Bit full adder: (includes carry input)](https://i.imgur.com/yu6kS83.png)
+- [Ripple carry adder](https://i.imgur.com/HtEIZ5t.png)
+- 3 Bit parity Generator
+	- Adds an extra bit to the input data so that the number of ones in the output is always odd
+	- Used for error checking
+	- [truth table](https://i.imgur.com/KDUiJbN.png)
+	- [boolean equation](https://i.imgur.com/mwBpnlO.png)
+	- [circuit](https://i.imgur.com/tsgDISC.png)
+- [7 segment displlay](https://i.imgur.com/qtPmtwR.png)
\ No newline at end of file
diff --git a/content/notes/comp-210.md b/content/notes/comp-210.md
index 2a04a6bc3..c0cd6b9bf 100644
--- a/content/notes/comp-210.md
+++ b/content/notes/comp-210.md
@@ -10,8 +10,8 @@ tags:
 
 # Assignments
 No final exam
-- [assignment 1](notes/01-security-audit)
-- [assignment 2](notes/02-repaired-system)
+- [assignment 1](notes/ass01-security-audit)
+- [assignment 2](notes/ass02-repaired-system)
 
 # Notes
 - Risks
@@ -24,5 +24,6 @@ No final exam
 
 # Lectures
 - [01-big-picture](notes/01-big-picture.md)
+- [02-concepts-and-roles](notes/02-concepts-and-roles.md)
 
 # Archive