Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

First implement of Monitor_CheckMemory logic. #211

Merged
merged 4 commits into from
Mar 20, 2017
Merged

First implement of Monitor_CheckMemory logic. #211

merged 4 commits into from
Mar 20, 2017

Conversation

piwi1263
Copy link
Member

@piwi1263 piwi1263 commented Mar 16, 2017

Solves #211.

Signed-off-by: Peter Wessel [email protected]

@nfbot
Copy link
Member

nfbot commented Mar 16, 2017

Hi @piwi1263,

I'm nanoFramework bot.
Thank you for your contribution!

Everything seems to be in order.
A human will be reviewing it shortly. 😉

@josesimoes josesimoes added Area: Interpreter Everything related with the interpreter, execution engine and such Series: STM32xx Everything related specifically with STM32 targets Type: enhancement labels Mar 16, 2017
@josesimoes
Copy link
Member

josesimoes commented Mar 16, 2017

Looks very good!
Just need to have the command enabled by uncommenting line 24 @ targets/CMSIS-OS/ChibiOS/nanoBooter/WireProtocol_App_Interface.c

Copy link
Member

@josesimoes josesimoes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems that there are two WireProtocol_MonitorCommands.h... This has just been fixed with #212. Apologies.

  1. Please either remove the one that you have on CLR\WireProtocol or don't make any changes to it

  2. Uncomment line 24 @ \targets\CMSIS-OS\ChibiOS\nanoBooter\WireProtocol_App_Interface.c

@josesimoes
Copy link
Member

That's about it!

It won't let merge because of the WireProtocol_MonitorCommands.h in wireprotocol folder. See the pr summary in GitHub... Please remove it.

@josesimoes
Copy link
Member

The build is failing because the declaration of Monitor_CheckMemory is missing in WireProtocol_MonitorCommands.h.

Please add bool Monitor_CheckMemory(WP_Message* message); in line 134 of src\CLR\Include\WireProtocol_MonitorCommands.h and this should be good to go.

@nfbot
Copy link
Member

nfbot commented Mar 20, 2017

Hi @piwi1263,

It seems that the DCO or 'obvious fix' mention are missing in some of the commit(s) message(s).
Please make sure that you've either signed off the commit(s) following the instructions regarding the Developer Certificate of Origin or added an Obvious Fix mention.

A human will be reviewing this shortly. 😉

@josesimoes josesimoes changed the title First implement of Monitor_CheckMemory logic. [WIP] First implement of Monitor_CheckMemory logic. Mar 20, 2017
@nfbot
Copy link
Member

nfbot commented Mar 20, 2017

Hi @piwi1263,

It seems that the DCO or 'obvious fix' mention are missing in some of the commit(s) message(s).
Please make sure that you've either signed off the commit(s) following the instructions regarding the Developer Certificate of Origin or added an Obvious Fix mention.

A human will be reviewing this shortly. 😉

@josesimoes josesimoes changed the title [WIP] First implement of Monitor_CheckMemory logic. First implement of Monitor_CheckMemory logic. Mar 20, 2017
@nfbot
Copy link
Member

nfbot commented Mar 20, 2017

Hi @piwi1263,

It seems that the DCO or 'obvious fix' mention are missing in some of the commit(s) message(s).
Please make sure that you've either signed off the commit(s) following the instructions regarding the Developer Certificate of Origin or added an Obvious Fix mention.

A human will be reviewing this shortly. 😉

Corrections per request.

1. To remove duplicate declaration
2. The uncommend line 24 @ \targets\CMSIS-OS\ChibiOS\nanoBooter\WireProtocol_App_Interface.c

This should solve #211.

Signed-off-by: Peter Wessel <[email protected]>
Resolves conflict in #221.

Deleting conflicting file src\CLR\WireProtocol\WireProtocol_MonitorCommands.h

Signed-off-by: Peter Wessel <[email protected]>
Addition of function declare for Monitor_CheckMemory in commands header

Signed-off-by: Peter Wessel <[email protected]>
@josesimoes josesimoes merged commit 64f3ed5 into nanoframework:master Mar 20, 2017
@piwi1263 piwi1263 deleted the Implement-Monitor_CheckMemory branch March 20, 2017 21:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Area: Interpreter Everything related with the interpreter, execution engine and such Series: STM32xx Everything related specifically with STM32 targets Type: enhancement
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants