Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
picsimlab
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
xpstem
picsimlab
Commits
d106025e
Commit
d106025e
authored
Mar 03, 2024
by
lcgamboa
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: Fix spare parts window position on start.
parent
6c1b4ecf
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
4 deletions
+11
-4
src/boards/board_Blue_Pill.cc
src/boards/board_Blue_Pill.cc
+5
-0
src/boards/board_STM32_H103.cc
src/boards/board_STM32_H103.cc
+1
-0
src/picsimlab1.cc
src/picsimlab1.cc
+5
-0
src/picsimlab4.cc
src/picsimlab4.cc
+0
-1
src/picsimlab5.cc
src/picsimlab5.cc
+0
-3
No files found.
src/boards/board_Blue_Pill.cc
View file @
d106025e
...
@@ -260,6 +260,7 @@ cboard_Blue_Pill::cboard_Blue_Pill(void) {
...
@@ -260,6 +260,7 @@ cboard_Blue_Pill::cboard_Blue_Pill(void) {
master_uart
[
2
].
rx_pin
=
0
;
master_uart
[
2
].
rx_pin
=
0
;
bitbang_pwm_init
(
&
pwm_out
,
this
,
20
);
bitbang_pwm_init
(
&
pwm_out
,
this
,
20
);
bitbang_out_init
(
&
rmt_out
,
this
,
0
);
PICSimLab
.
UpdateGUI
(
MIPS
,
GT_COMBO
,
GA_ADD
,
(
void
*
)
"Qemu CPU MIPS"
);
PICSimLab
.
UpdateGUI
(
MIPS
,
GT_COMBO
,
GA_ADD
,
(
void
*
)
"Qemu CPU MIPS"
);
buffer
[
0
]
=
','
;
buffer
[
0
]
=
','
;
...
@@ -278,6 +279,10 @@ cboard_Blue_Pill::~cboard_Blue_Pill(void) {
...
@@ -278,6 +279,10 @@ cboard_Blue_Pill::~cboard_Blue_Pill(void) {
// Reset board status
// Reset board status
void
cboard_Blue_Pill
::
Reset
(
void
)
{
void
cboard_Blue_Pill
::
Reset
(
void
)
{
if
(
qemu_started
!=
1
)
{
return
;
}
MReset
(
1
);
MReset
(
1
);
PICSimLab
.
UpdateStatus
(
PS_SERIAL
,
"Serial: "
+
std
::
string
(
SERIALDEVICE
));
PICSimLab
.
UpdateStatus
(
PS_SERIAL
,
"Serial: "
+
std
::
string
(
SERIALDEVICE
));
...
...
src/boards/board_STM32_H103.cc
View file @
d106025e
...
@@ -283,6 +283,7 @@ cboard_STM32_H103::cboard_STM32_H103(void) {
...
@@ -283,6 +283,7 @@ cboard_STM32_H103::cboard_STM32_H103(void) {
master_uart
[
2
].
rx_pin
=
0
;
master_uart
[
2
].
rx_pin
=
0
;
bitbang_pwm_init
(
&
pwm_out
,
this
,
20
);
bitbang_pwm_init
(
&
pwm_out
,
this
,
20
);
bitbang_out_init
(
&
rmt_out
,
this
,
0
);
PICSimLab
.
UpdateGUI
(
MIPS
,
GT_COMBO
,
GA_ADD
,
(
void
*
)
"Qemu CPU MIPS"
);
PICSimLab
.
UpdateGUI
(
MIPS
,
GT_COMBO
,
GA_ADD
,
(
void
*
)
"Qemu CPU MIPS"
);
buffer
[
0
]
=
','
;
buffer
[
0
]
=
','
;
...
...
src/picsimlab1.cc
View file @
d106025e
...
@@ -694,6 +694,11 @@ void CPWindow1::_EvOnCreate(CControl* control) {
...
@@ -694,6 +694,11 @@ void CPWindow1::_EvOnCreate(CControl* control) {
PICSimLab
.
OnWindowCmd
=
&
CPWindow1
::
OnWindowCmd
;
PICSimLab
.
OnWindowCmd
=
&
CPWindow1
::
OnWindowCmd
;
PICSimLab
.
OnSystemCmd
=
&
CPWindow1
::
OnSystemCmd
;
PICSimLab
.
OnSystemCmd
=
&
CPWindow1
::
OnSystemCmd
;
SpareParts
.
OnCanvasCmd
=
&
CPWindow5
::
OnCanvasCmd
;
SpareParts
.
OnWindowCmd
=
&
CPWindow5
::
OnWindowCmd
;
Oscilloscope
.
OnWindowCmd
=
&
CPWindow4
::
OnWindowCmd
;
PICSimLab
.
Init
();
PICSimLab
.
Init
();
// board menu
// board menu
...
...
src/picsimlab4.cc
View file @
d106025e
...
@@ -360,7 +360,6 @@ void CPWindow4::_EvOnCreate(CControl* control) {
...
@@ -360,7 +360,6 @@ void CPWindow4::_EvOnCreate(CControl* control) {
?
(
"PICSimLab["
+
std
::
to_string
(
PICSimLab
.
GetInstanceNumber
())
+
"] - "
)
?
(
"PICSimLab["
+
std
::
to_string
(
PICSimLab
.
GetInstanceNumber
())
+
"] - "
)
:
(
"PICSimLab - "
))
+
:
(
"PICSimLab - "
))
+
"Oscilloscope"
);
"Oscilloscope"
);
Oscilloscope
.
OnWindowCmd
=
&
CPWindow4
::
OnWindowCmd
;
}
}
void
CPWindow4
::
_EvOnShow
(
CControl
*
control
)
{
void
CPWindow4
::
_EvOnShow
(
CControl
*
control
)
{
...
...
src/picsimlab5.cc
View file @
d106025e
...
@@ -73,9 +73,6 @@ void CPWindow5::menu1_EvMenuActive(CControl* control) {
...
@@ -73,9 +73,6 @@ void CPWindow5::menu1_EvMenuActive(CControl* control) {
}
}
void
CPWindow5
::
_EvOnCreate
(
CControl
*
control
)
{
void
CPWindow5
::
_EvOnCreate
(
CControl
*
control
)
{
SpareParts
.
OnCanvasCmd
=
&
CPWindow5
::
OnCanvasCmd
;
SpareParts
.
OnWindowCmd
=
&
CPWindow5
::
OnWindowCmd
;
if
(
SpareParts
.
GetLoadConfigFile
().
length
()
>
0
)
if
(
SpareParts
.
GetLoadConfigFile
().
length
()
>
0
)
SpareParts
.
LoadConfig
(
SpareParts
.
GetLoadConfigFile
());
SpareParts
.
LoadConfig
(
SpareParts
.
GetLoadConfigFile
());
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment