Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AVRSimV2
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
PSP Fanclub
AVRSimV2
Compare revisions
develop to develop
Compare revisions
Changes are shown as if the
source
revision was being merged into the
target
revision.
Learn more about comparing revisions.
Source
psp-fanclub/avrsimv2
Select target project
No results found
develop
Select Git revision
Branches
develop
master
Tags
v2.3.4
3 results
Swap
Target
qnemann/avrsimv2
Select target project
qnemann/avrsimv2
psp-fanclub/avrsimv2
rdecker/avrsimv2
nils.eisenach/avrsimv2
doriank/avrsimv2
5 results
develop
Select Git revision
Branches
develop
master
Tags
v2.3.4
3 results
Show changes
Only incoming changes from source
Include changes to target since source was created
Compare
Commits on Source (2)
Fix V6 bugs
· 1d9d526b
Dorian Koch
authored
1 year ago
and
Ciarán McKenna
committed
1 year ago
1d9d526b
Merge branch 'pr' into 'develop'
· b355f3fb
Ciarán McKenna
authored
1 year ago
Fix V6 bugs See merge request
!2
b355f3fb
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
.gitignore
+4
-1
4 additions, 1 deletion
.gitignore
boards/board.xsd
+0
-1
0 additions, 1 deletion
boards/board.xsd
boards/psp_V6_ledmatrix.xml
+69
-0
69 additions, 0 deletions
boards/psp_V6_ledmatrix.xml
common/sim_wrapper.c
+2
-0
2 additions, 0 deletions
common/sim_wrapper.c
with
75 additions
and
2 deletions
.gitignore
View file @
b355f3fb
.idea/
.idea/
cmake-build-*/
cmake-build-*/
installs/
installs/
CMakeFiles/
*.elf
build/
This diff is collapsed.
Click to expand it.
boards/board.xsd
View file @
b355f3fb
...
@@ -19,7 +19,6 @@
...
@@ -19,7 +19,6 @@
<xs:sequence>
<xs:sequence>
<xs:group
ref=
"components"
/>
<xs:group
ref=
"components"
/>
<xs:element
name=
"gui"
type=
"layout"
minOccurs=
"0"
/>
<xs:element
name=
"gui"
type=
"layout"
minOccurs=
"0"
/>
<xs:group
ref=
"components"
/>
</xs:sequence>
</xs:sequence>
</xs:complexType>
</xs:complexType>
</xs:element>
</xs:element>
...
...
This diff is collapsed.
Click to expand it.
boards/psp_V6_ledmatrix.xml
0 → 100644
View file @
b355f3fb
<?xml version="1.0"?>
<board>
<lcd
id=
"lcd"
width=
"16"
height=
"2"
>
<d4><ioport
name=
"B"
index=
"0"
/></d4>
<d5><ioport
name=
"B"
index=
"1"
/></d5>
<d6><ioport
name=
"B"
index=
"2"
/></d6>
<d7><ioport
name=
"B"
index=
"3"
/></d7>
<rs><ioport
name=
"B"
index=
"4"
/></rs>
<en><ioport
name=
"B"
index=
"5"
/></en>
<rw><ioport
name=
"B"
index=
"6"
/></rw>
</lcd>
<button
id=
"enterButton"
>
<out><ioport
name=
"C"
index=
"0"
/></out>
<key
code=
"257"
/>
</button>
<button
id=
"downButton"
>
<out><ioport
name=
"C"
index=
"1"
/></out>
<key
code=
"264"
/>
</button>
<button
id=
"upButton"
>
<out><ioport
name=
"C"
index=
"6"
/></out>
<key
code=
"265"
/>
</button>
<button
id=
"escButton"
>
<out><ioport
name=
"C"
index=
"7"
/></out>
<key
code=
"256"
/>
</button>
<led
id=
"led1"
>
<in><ioport
name=
"C"
index=
"0"
/></in>
</led>
<led
id=
"led2"
>
<in><ioport
name=
"C"
index=
"1"
/></in>
</led>
<led
id=
"led3"
>
<in><ioport
name=
"C"
index=
"6"
/></in>
</led>
<led
id=
"led4"
>
<in><ioport
name=
"C"
index=
"7"
/></in>
</led>
<sram
id=
"extSRAM"
>
<cs><ioport
name=
"B"
index=
"4"
/></cs>
<mosi><spi
name=
"0x0"
type=
"output"
/></mosi>
<miso><spi
name=
"0x0"
type=
"input"
/></miso>
</sram>
<gui>
<vertical>
<lcd
id=
"lcd"
/>
<spacer/>
<horizontal>
<spacer/>
<led
id=
"led1"
color=
"#00FF00FF"
/>
<spacer/>
<led
id=
"led4"
color=
"#FF0000FF"
/>
<spacer/>
<led
id=
"led3"
color=
"#FFFFFFFF"
/>
<spacer/>
<led
id=
"led2"
color=
"#FFFFFFFF"
/>
<spacer/>
<spacer/>
<stats/>
<spacer/>
</horizontal>
<spacer/>
<memory
type=
"internal"
/>
<spacer/>
<memory
type=
"sram"
id=
"extSRAM"
size=
"0x10000"
/>
</vertical>
</gui>
</board>
\ No newline at end of file
This diff is collapsed.
Click to expand it.
common/sim_wrapper.c
View file @
b355f3fb
...
@@ -106,6 +106,8 @@ void sim_init(sim_t *sim) {
...
@@ -106,6 +106,8 @@ void sim_init(sim_t *sim) {
avr_load_firmware
(
avr
,
&
sim
->
firmware
);
avr_load_firmware
(
avr
,
&
sim
->
firmware
);
if
(
sim
->
frequency
)
avr
->
frequency
=
sim
->
frequency
;
if
(
sim
->
frequency
)
avr
->
frequency
=
sim
->
frequency
;
sim
->
frequency
=
avr
->
frequency
;
sim
->
frequency
=
avr
->
frequency
;
sim
->
avr
->
avcc
=
sim
->
avr
->
vcc
=
5000
;
if
(
sim
->
gdbPort
)
{
if
(
sim
->
gdbPort
)
{
avr
->
gdb_port
=
sim
->
gdbPort
;
avr
->
gdb_port
=
sim
->
gdbPort
;
avr
->
state
=
cpu_Stopped
;
avr
->
state
=
cpu_Stopped
;
...
...
This diff is collapsed.
Click to expand it.