Merge branch 'recupHER' into Main

This commit is contained in:
2021-12-20 10:31:07 +01:00
25 changed files with 40710 additions and 363 deletions
+21
View File
@@ -0,0 +1,21 @@
{
"configurations": [
{
"name": "Win32",
"includePath": [
"${workspaceFolder}/**"
],
"defines": [
"_DEBUG",
"UNICODE",
"_UNICODE"
],
"windowsSdkVersion": "10.0.20348.0",
"compilerPath": "C:/Program Files/Microsoft Visual Studio/2022/Community/VC/Tools/MSVC/14.30.30705/bin/Hostx64/x64/cl.exe",
"cStandard": "c17",
"cppStandard": "c++17",
"intelliSenseMode": "windows-msvc-x64"
}
],
"version": 4
}
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
+13 -20
View File
@@ -506,7 +506,7 @@ value "C:\\Users\\remi\\OneDrive\\Documents\\Cours\\05-HEVS\\S1fb\\electricity\\
) )
(vvPair (vvPair
variable "date" variable "date"
value "07.12.2021" value "14.12.2021"
) )
(vvPair (vvPair
variable "day" variable "day"
@@ -518,7 +518,7 @@ value "mardi"
) )
(vvPair (vvPair
variable "dd" variable "dd"
value "07" value "14"
) )
(vvPair (vvPair
variable "entity_name" variable "entity_name"
@@ -546,7 +546,7 @@ value "remi"
) )
(vvPair (vvPair
variable "graphical_source_date" variable "graphical_source_date"
value "07.12.2021" value "14.12.2021"
) )
(vvPair (vvPair
variable "graphical_source_group" variable "graphical_source_group"
@@ -558,7 +558,7 @@ value "MARVIN"
) )
(vvPair (vvPair
variable "graphical_source_time" variable "graphical_source_time"
value "08:21:37" value "16:00:58"
) )
(vvPair (vvPair
variable "group" variable "group"
@@ -630,7 +630,7 @@ value "interface"
) )
(vvPair (vvPair
variable "time" variable "time"
value "08:21:37" value "16:00:58"
) )
(vvPair (vvPair
variable "unit" variable "unit"
@@ -697,8 +697,7 @@ va (VaSet
font "Courier New,8,0" font "Courier New,8,0"
) )
xt "44000,3200,61000,4000" xt "44000,3200,61000,4000"
st "clock : IN std_ulogic ; st "clock : IN std_ulogic ;"
"
) )
thePort (LogicalPort thePort (LogicalPort
decl (Decl decl (Decl
@@ -742,8 +741,7 @@ va (VaSet
font "Courier New,8,0" font "Courier New,8,0"
) )
xt "44000,4000,61000,4800" xt "44000,4000,61000,4800"
st "encoderA : IN std_uLogic ; st "encoderA : IN std_uLogic ;"
"
) )
thePort (LogicalPort thePort (LogicalPort
decl (Decl decl (Decl
@@ -787,8 +785,7 @@ va (VaSet
font "Courier New,8,0" font "Courier New,8,0"
) )
xt "44000,4800,61000,5600" xt "44000,4800,61000,5600"
st "encoderB : IN std_uLogic ; st "encoderB : IN std_uLogic ;"
"
) )
thePort (LogicalPort thePort (LogicalPort
decl (Decl decl (Decl
@@ -832,8 +829,7 @@ va (VaSet
font "Courier New,8,0" font "Courier New,8,0"
) )
xt "44000,5600,61000,6400" xt "44000,5600,61000,6400"
st "encoderI : IN std_uLogic ; st "encoderI : IN std_uLogic ;"
"
) )
thePort (LogicalPort thePort (LogicalPort
decl (Decl decl (Decl
@@ -878,8 +874,7 @@ va (VaSet
font "Courier New,8,0" font "Courier New,8,0"
) )
xt "44000,7200,66000,8000" xt "44000,7200,66000,8000"
st "Position : OUT unsigned (15 DOWNTO 0) st "Position : OUT unsigned (15 DOWNTO 0)"
"
) )
thePort (LogicalPort thePort (LogicalPort
lang 11 lang 11
@@ -927,8 +922,7 @@ va (VaSet
font "Courier New,8,0" font "Courier New,8,0"
) )
xt "44000,2400,61000,3200" xt "44000,2400,61000,3200"
st "RaZ : IN std_ulogic ; st "RaZ : IN std_ulogic ;"
"
) )
thePort (LogicalPort thePort (LogicalPort
lang 11 lang 11
@@ -973,8 +967,7 @@ va (VaSet
font "Courier New,8,0" font "Courier New,8,0"
) )
xt "44000,6400,61000,7200" xt "44000,6400,61000,7200"
st "reset : IN std_ulogic ; st "reset : IN std_ulogic ;"
"
) )
thePort (LogicalPort thePort (LogicalPort
decl (Decl decl (Decl
@@ -1692,6 +1685,6 @@ xt "42000,0,42000,0"
tm "SyDeclarativeTextMgr" tm "SyDeclarativeTextMgr"
) )
) )
lastUid 378,0 lastUid 539,0
activeModelName "Symbol:CDM" activeModelName "Symbol:CDM"
) )
File diff suppressed because it is too large Load Diff
+2
View File
@@ -0,0 +1,2 @@
DEFAULT_ARCHITECTURE atom compteurt
DEFAULT_FILE atom @compteur/compteurt.bd
+2
View File
@@ -0,0 +1,2 @@
DEFAULT_ARCHITECTURE atom struct
DEFAULT_FILE atom compteur@up@down@rsync@all/struct.bd
+2
View File
@@ -0,0 +1,2 @@
DEFAULT_ARCHITECTURE atom fsm
DEFAULT_FILE atom convertissor_position/fsm.sm
+2
View File
@@ -0,0 +1,2 @@
DEFAULT_ARCHITECTURE atom struct
DEFAULT_FILE atom cpt1bit/struct.bd
+2
View File
@@ -0,0 +1,2 @@
DEFAULT_ARCHITECTURE atom struct
DEFAULT_FILE atom cpt4bit/struct.bd
+2
View File
@@ -0,0 +1,2 @@
DEFAULT_ARCHITECTURE atom encoder
DEFAULT_FILE atom @encoder/encoder.sm
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
+12 -13
View File
@@ -2554,7 +2554,7 @@ second ""
) )
(pair (pair
first "hierLevel" first "hierLevel"
second "1" second "3"
) )
(pair (pair
first "onPulldownMenu" first "onPulldownMenu"
@@ -4181,7 +4181,7 @@ hdsWorkspaceLocation ""
relativeLibraryRootDir "" relativeLibraryRootDir ""
vmLabelLatestDontAskAgain 0 vmLabelLatestDontAskAgain 0
vmLabelWorkspaceDontAskAgain 0 vmLabelWorkspaceDontAskAgain 0
logWindowGeometry "600x389+980+96" logWindowGeometry "600x200+920+0"
diagramBrowserTabNo 0 diagramBrowserTabNo 0
showInsertPortHint 0 showInsertPortHint 0
showContentFirstTime 0 showContentFirstTime 0
@@ -6211,27 +6211,26 @@ activeSidePanelTab 2
activeLibraryTab 2 activeLibraryTab 2
sidePanelSize 278 sidePanelSize 278
showUnixHiddenFiles 0 showUnixHiddenFiles 0
componentBrowserXpos 1173 componentBrowserXpos 158
componentBrowserYpos 526 componentBrowserYpos 308
componentBrowserWidth 300 componentBrowserWidth 483
componentBrowserHeight 340 componentBrowserHeight 491
componentBrowserLibraryNames [ componentBrowserLibraryNames [
"Board" "Board"
"gates" "gates"
"Common" "Common"
"io" "io"
"sequential" "sequential"
"Cursor_test" "LCD_test"
"Cursor" "synopsys"
"verilog"
"vital2000"
"LCD" "LCD"
"Memory" "Memory"
"ieee"
"std" "std"
"vital2000"
"verilog"
"LCD_test"
"Memory_test" "Memory_test"
"synopsys" "ieee"
"Cursor"
] ]
) )
(SmPreferences (SmPreferences
@@ -29,7 +29,7 @@ onShortcutBar 1
onPulldownMenu 1 onPulldownMenu 1
onToolbar 1 onToolbar 1
enabled 1 enabled 1
hierDepth 1 hierDepth 3
subTasks [ subTasks [
(HDSTaskRef (HDSTaskRef
TaskName "Generate" TaskName "Generate"
View File