diff --git a/6/схемотехника/course_project/img/muu-cs2-y7-mdnf.png b/6/схемотехника/course_project/img/muu-cs2-y7-mdnf.png deleted file mode 100644 index e830e64..0000000 Binary files a/6/схемотехника/course_project/img/muu-cs2-y7-mdnf.png and /dev/null differ diff --git a/6/схемотехника/course_project/img/muu-cs2.svg b/6/схемотехника/course_project/img/muu-cs2.svg index cd02d9a..e8a929a 100644 --- a/6/схемотехника/course_project/img/muu-cs2.svg +++ b/6/схемотехника/course_project/img/muu-cs2.svg @@ -1,8 +1,8 @@ + --> G - + Y2 @@ -48,20 +48,20 @@ Y3 - -Y3 + +Y3 Y5 - -Y5 + +Y5 Y3->Y5 - - + + @@ -78,20 +78,32 @@ SKO - -SKO + +SKO - + SKO->Y8 - - + + - + SKO->Y9 - - + + + + + +Y7 + +Y7 + + + +SKO->Y7 + + \ No newline at end of file diff --git a/6/схемотехника/course_project/img/muu-mul-test.png b/6/схемотехника/course_project/img/muu-mul-test.png new file mode 100644 index 0000000..cc0034c Binary files /dev/null and b/6/схемотехника/course_project/img/muu-mul-test.png differ diff --git a/6/схемотехника/course_project/img/muu-set-test.png b/6/схемотехника/course_project/img/muu-set-test.png new file mode 100644 index 0000000..024fdc2 Binary files /dev/null and b/6/схемотехника/course_project/img/muu-set-test.png differ diff --git a/6/схемотехника/course_project/index.html b/6/схемотехника/course_project/index.html index 1900839..6f75bc2 100644 --- a/6/схемотехника/course_project/index.html +++ b/6/схемотехника/course_project/index.html @@ -147,7 +147,8 @@ $RB = 0011$ - Блок схема проверки бита с установкой в единицу + Блок схема проверки бита с установкой в единицу
@@ -519,7 +520,7 @@ 0,1,0,0,0,,0,,0,1,,0,1,0,,0,x,,x,1,0,8; 0,1,0,1,0,,0,,0,0,,1,x,0,,x,x,,x,0,0,10; 0,1,0,x,1,,x,,0,1,,0,1,0,,1,x,,x,x,1,9\, 11; - 0,1,1,x,x,,0,,0,1,,0,1,0,,1,x,,x,1,0,12-15;; + 0,1,1,x,x,,0,,0,1,,0,1,0,,0,x,,x,1,0,12-15;; 1,0,1,x,x,,1,,1,x,,x,x,x,,x,x,,0,x,0,20-23; 1,1,0,x,x,,x,,1,x,,x,x,x,,x,1,,1,x,1,24-27; " class="center"> @@ -528,7 +529,7 @@ $Y_2 \supset Y_1,Y_6,Y_8$ $Y_3 \supset Y_5$ $Y_9 \supset Y_8$ - $SKO \supset Y_8,Y_9$ + $SKO \supset Y_7,Y_8,Y_9$
Подмножества функций CS2 @@ -536,7 +537,7 @@
$Y_1, Y_6, Y_8 := Y_2$ $Y_5 := Y_3$ - $Y_9 := SKO$ + $Y_7, Y_9 := SKO$
@@ -554,22 +555,19 @@
$МДНФ: Y_4 = Q_1 \cdot \overline{Q_0} \cdot F_1 \cdot \overline{FC}$ - Минимизация Y2 + Минимизация Y4
- $МДНФ: Y_7 = Q_0 + Q_1 \cdot FC$ - Минимизация Y3 + $МКНФ: Y_{ct} = (Q_1) \cdot (Q_0 + \overline{F_1})$ + Минимизация Yct
-
- $МКНФ: Y_{ct} = (Q_1) \cdot (Q_0 + \overline{F_1})$ - Минимизация Y2 -
$МКНФ: SKO = (Q_1) \cdot (\overline{Q_0}) \cdot (COP + FC)$ - Минимизация Y3 + Минимизация SKO
+
diff --git a/6/схемотехника/course_project/subsets.json b/6/схемотехника/course_project/subsets.json index ca8775c..8f568b9 100644 --- a/6/схемотехника/course_project/subsets.json +++ b/6/схемотехника/course_project/subsets.json @@ -24,7 +24,7 @@ "name": "Y6" }, { - "str": "0x0x11xx", + "str": "0x0x10xx", "name": "Y7" }, {