Atom CPLD: Discriminate dark green/dark orange text background

Change-Id: I102e31a6955c2cef4c97cec3f052742c8f2b0334
pull/12/head
David Banks 2018-11-28 16:02:53 +00:00
rodzic f5144ae984
commit 124739addb
2 zmienionych plików z 23 dodań i 7 usunięć

Wyświetl plik

@ -217,17 +217,20 @@ begin
--RED WL 2.0 1.5 0 1 0 0 X X 0 0 0 1
--MAGENTA WM 2.0 2.0 0 1 0 1 X X 0 1 0 1
--BUFF WH 1.5 1.5 0 0 0 0 1 X 0 1 1 1
--BRIGHT ORANGE WL 2.0 1.0 0 1 1 0 X 1 1 0 0 1
--BRIGHT ORANGE WH 2.0 1.0 0 1 1 0 X 1 1 0 0 1
--DARK ORANGE BL 2.0 1.0 0 1 1 0 0 X 1 0 1 1
R <= (NOT AL AND NOT AH AND BL AND NOT BH) OR (NOT AL AND AH AND NOT BL AND NOT BH) OR (NOT AL AND AH AND NOT BL AND BH) OR (NOT AL AND NOT AH AND NOT BL AND NOT BH AND LL) OR (NOT AL AND AH AND BL AND NOT BH AND LH);
R <= (NOT AL AND NOT AH AND BL AND NOT BH) OR (NOT AL AND AH AND NOT BL AND NOT BH) OR (NOT AL AND AH AND NOT BL AND BH) OR (NOT AL AND NOT AH AND NOT BL AND NOT BH AND LL) OR (NOT AL AND AH AND BL AND NOT BH AND LH) OR (NOT AL AND AH AND BL AND NOT BH AND LH) OR (NOT AL AND AH AND BL AND NOT BH AND NOT LL);
-- AL AH BL BH LL LH X B G R
--YELLOW WM 1.5 1.0 0 0 1 0 X X 0 0 1 1
--CYAN WM 1.0 1.5 1 0 0 0 X X 0 1 1 0
--GREEN WM 1.0 1.0 1 0 1 0 1 X 0 0 1 0
--DARK GREEN BL 1.0 1.0 1 0 1 0 0 X 1 0 1 0
--BUFF WM 1.5 1.5 0 0 0 0 1 X 0 1 1 1
--DARK ORANGE BL 2.0 1.0 0 1 1 0 0 X 1 0 1 1
G <= (NOT AL AND NOT AH AND BL AND NOT BH) OR (AL AND NOT AH AND NOT BL AND NOT BH) OR (AL AND NOT AH AND BL AND NOT BH AND LL) OR (NOT AL AND NOT AH AND NOT BL AND NOT BH AND LL);
G <= (NOT AL AND NOT AH AND BL AND NOT BH) OR (AL AND NOT AH AND NOT BL AND NOT BH) OR (AL AND NOT AH AND BL AND NOT BH) OR (NOT AL AND NOT AH AND NOT BL AND NOT BH AND LL) OR (NOT AL AND AH AND BL AND NOT BH AND NOT LL);
-- AL AH BL BH LL LH X B G R
--BLUE WL 1.5 2.0 0 0 0 1 X X 0 1 0 0
@ -238,10 +241,12 @@ begin
B <= (NOT AL AND NOT AH AND NOT BL AND BH) OR (AL AND NOT AH AND NOT BL AND NOT BH) OR (NOT AL AND AH AND NOT BL AND BH) OR (NOT AL AND NOT AH AND NOT BL AND NOT BH AND LL);
-- AL AH BL BH LL LH X B G R
--DARK ORANGE WM 2.0 1.0 0 1 1 0 1 0 1 0 0 0
--BRIGHT ORANGE WM 2.0 1.0 0 1 1 0 1 1 1 0 0 1
--NORMAL ORANGE WM 2.0 1.0 0 1 1 0 1 0 1 0 0 0
--BRIGHT ORANGE WH 2.0 1.0 0 1 1 0 1 1 1 0 0 1
--DARK GREEN BL 1.0 1.0 1 0 1 0 0 X 1 0 1 0
--DARK ORANGE BL 2.0 1.0 0 1 1 0 0 X 1 0 1 1
X <= (NOT AL AND AH AND BL AND NOT BH AND LL);
X <= (NOT AL AND AH AND BL AND NOT BH) OR (AL AND NOT AH AND BL AND NOT BH AND NOT LL);
end if;

Wyświetl plik

@ -86,7 +86,7 @@ FB4 18/18* 27/54 36/90 7/ 7*
----- ----- ----- -----
65/72 102/216 166/360 27/34
9. Atom CPLD: Discriminate dark and bright orange
9. Atom CPLD: Discriminate normal and bright orange
Function Mcells FB Inps Pterms IO
Block Used/Tot Used/Tot Used/Tot Used/Tot
@ -96,3 +96,14 @@ FB3 18/18* 28/54 63/90 8/ 9
FB4 18/18* 29/54 39/90 7/ 7*
----- ----- ----- -----
69/72 109/216 173/360 28/34
10. Atom CPLD: Discriminate dark green/dark orange text background
Function Mcells FB Inps Pterms IO
Block Used/Tot Used/Tot Used/Tot Used/Tot
FB1 18/18* 28/54 48/90 8/ 9
FB2 15/18 24/54 25/90 5/ 9
FB3 18/18* 28/54 63/90 8/ 9
FB4 18/18* 29/54 39/90 7/ 7*
----- ----- ----- -----
69/72 109/216 175/360 28/34