Skip to content

Update motor tests to work with BrickPi#213

Merged
dwalton76 merged 2 commits intoev3dev:developfrom
ddemidov:brickpi
Sep 21, 2017
Merged

Update motor tests to work with BrickPi#213
dwalton76 merged 2 commits intoev3dev:developfrom
ddemidov:brickpi

Conversation

@ddemidov
Copy link
Copy Markdown
Member

This resolves merge conflicts in #152.

@ddemidov
Copy link
Copy Markdown
Member Author

@dlech, could you please check if this still does what was intended originally?

@dlech
Copy link
Copy Markdown
Member

dlech commented Sep 22, 2016

Yes. Ping me if I haven't done this in a week or two.

@ddemidov
Copy link
Copy Markdown
Member Author

ddemidov commented Oct 3, 2016

Ping me if I haven't done this in a week or two.

ping

@dwalton76
Copy link
Copy Markdown
Collaborator

@ddemidov two more sync conflicts have cropped up...can you take a quick look and we can get this in?

@ddemidov
Copy link
Copy Markdown
Member Author

ddemidov commented Sep 1, 2017

I've rebased on current develop, but I can not test the changes on brickpi (don't have it).

@dwalton76
Copy link
Copy Markdown
Collaborator

me neither mine died a while back :( @dlech can you give this a quick test and let us know if it looks good?

'speed_pid': { 'kP': 1000, 'kI': 60, 'kD': 0 },
'hold_pid': { 'kP': 20000, 'kI': 0, 'kD': 0 },
}
paramsA = pistorms_params
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This should probably be paramsA = ev3_params.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Is this still an issue?

@dlech
Copy link
Copy Markdown
Member

dlech commented Sep 2, 2017

I updated my brickpi branch with some more commits, but #152 seems to have ignored it since it is closed and it won't let me re-open.

https://github.com/dlech/ev3dev-lang-python/tree/brickpi

@ddemidov
Copy link
Copy Markdown
Member Author

ddemidov commented Sep 4, 2017

I've pulled commits from https://github.com/dlech/ev3dev-lang-python/tree/brickpi here.

@WasabiFan
Copy link
Copy Markdown
Member

What's the situation here: do we want to resolve conflicts and merge? I'm happy with this if you guys believe it doesn't break anything.

@dwalton76
Copy link
Copy Markdown
Collaborator

+1 for merging it

@ddemidov
Copy link
Copy Markdown
Member Author

I've just reset contents of tests/motor to that of 'brickpi' branch at dlech/ev3dev-lang-python. This narrows the PR to this particular folder and (I hope) makes sure we don't screw up other parts of the repo.

@dwalton76
Copy link
Copy Markdown
Collaborator

I don't have a brickpi but I'll at least test out the patch tonight to make sure tests are ok on EV3 and EVB...assuming so will merge it after that.

@dwalton76 dwalton76 merged commit 5febabf into ev3dev:develop Sep 21, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants