Skip to content

Merlin "bounce" Support #5

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.

Sign up for GitHub

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

Open
reykroona wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Merlin "bounce" Support #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
75c364b
Update DollyShield.ino
reykroona Aug 14, 2015
31d5122
Update ds_ui.ino
reykroona Aug 14, 2015
31edd8f
Create 0.94X.hex
reykroona Aug 14, 2015
9b062e6
Update README.md
reykroona Aug 14, 2015
bacd66a
Update README.md
reykroona Aug 14, 2015
49ab660
Update README.md
reykroona Aug 14, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions DollyShield/DollyShield.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ TODO:
*) menu timeout?
*) wrap on setting lists?
*/

#include <Arduino.h>
#include <LiquidCrystal.h>
#include "MsTimer2.h"
#include "TimerOne.h"
Expand Down Expand Up @@ -905,4 +905,3 @@ boolean gbtl_trigger() {

return false;
}

31 changes: 29 additions & 2 deletions DollyShield/ds_ui.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ void init_user_interface() {
lcd.setCursor(0,0);
lcd.print("MX2 Dolly Engine");
lcd.setCursor(0,1);
lcd.print(" Version 0.94W ");
lcd.print(" Version 0.94X ");

// setup button input

Expand Down Expand Up @@ -147,6 +147,34 @@ void check_switch(byte which) {
// switch all motor directions!
motor_dir(0, !EE.m_dirs[m_mode][0]);
motor_dir(1, !EE.m_dirs[m_mode][1]);

if( merlin_dir[0] == 1 ) {
merlin_set_dir(0, 0);

}
else {
merlin_set_dir(0, 1);

}

if( merlin_dir[0] == 1 ) {
merlin_set_dir(1, 0);

}
else {
merlin_set_dir(1, 1);

}
if( merlin_speeds[0] > 0.0 ) {
merlin_stop(0);
merlin_run(0);
}
if( merlin_speeds[1] > 0.0 ) {
merlin_stop(1);
merlin_run(1);
}


break;
}
}
Expand Down Expand Up @@ -1190,4 +1218,3 @@ void pop_menu(byte& menu, byte& pos) {
void flush_menu() {
memset(hist_menu, 0, sizeof(hist_menu) / sizeof(hist_menu[0]));
}

Loading