diff options
| author | erikdebruijn <erikdebruijn@cb376a5e-1013-0410-a455-b6b1f9ac8223> | 2010-04-14 11:48:25 +0000 |
|---|---|---|
| committer | erikdebruijn <erikdebruijn@cb376a5e-1013-0410-a455-b6b1f9ac8223> | 2010-04-14 11:48:25 +0000 |
| commit | ab462b8dad1c0de340ec4715dc953037031354ec (patch) | |
| tree | dadecf71a09112aa6bc9753069de7ab936541a2f | |
| parent | c47968736ced709e9965ae4bafe3ce4b0cc0cc5b (diff) | |
| download | reprap-backup-ab462b8dad1c0de340ec4715dc953037031354ec.tar.gz reprap-backup-ab462b8dad1c0de340ec4715dc953037031354ec.zip | |
Homing code was incompatible with this version of the BfB firmware. Updating it.
git-svn-id: https://reprap.svn.sourceforge.net/svnroot/reprap@3577 cb376a5e-1013-0410-a455-b6b1f9ac8223
| -rw-r--r-- | trunk/users/erik/OpenRapMan/EriksBranch/bfb-firmware-dev3/Stepper.c | 96 |
1 files changed, 27 insertions, 69 deletions
diff --git a/trunk/users/erik/OpenRapMan/EriksBranch/bfb-firmware-dev3/Stepper.c b/trunk/users/erik/OpenRapMan/EriksBranch/bfb-firmware-dev3/Stepper.c index ea7c4806..07c48f47 100644 --- a/trunk/users/erik/OpenRapMan/EriksBranch/bfb-firmware-dev3/Stepper.c +++ b/trunk/users/erik/OpenRapMan/EriksBranch/bfb-firmware-dev3/Stepper.c @@ -197,74 +197,8 @@ void Axis_Stepper_Motors(int on_off) }
/******************************************************************/
/******************************************************************/
-int RapMan_Home(char x,char y,char z)
-{
-int i;
-
-while(!XPlusRight_Btn); // loop until button is released
-
-OLED_FastText57(3, 0, "PRESS > FOR MANUAL",0);
-int init_manual_home;
-init_manual_home = 0;
-for(i=0;i<2000000;i++)
-{
-if(!XPlusRight_Btn)
- {
- init_manual_home = 1;
- OLED_FastText57(3, 0, "HOMING MANUALLY ",0);
- for(i=0;i<2000000;i++);
- }
-}
-if(init_manual_home == 1)
-{
- Manual_Mode('1');
- OLED_FastText57(3, 0, "HOME COMPLETE",0);
- while(!Manual_Select); // loop until button is released
- return TRUE;
-}
-
- ClearWDT();
- OLED_Home_Screen();
- moveX = !TRUE; moveY = !TRUE; moveZ = !TRUE; //Turn off all steppers
- Stepper_InitIO();
- Axis_Stepper_Motors(On);
- Manual_Mode_Set = 1;
-
-
- Feed_Rate = HOME_SPEED_Z; //Move tool down to prevent crash
-#ifdef MACHINE_TYPE_V3_V31
- ZDown_YForward();//used for machine home
-#endif
-#ifdef MACHINE_TYPE_PRO_TWIN
- ZDown_YForward();//used for machine home
-#endif
-
-
-if(init_manual_home == 0)
-{
- if (x)Home_X_Axis();
- if (y)Home_Y_Axis();
- if (z)Home_Z_Axis();
-
- Manual_Mode_Set = 0;
- mT4IntEnable(!TRUE);
- if(!Manual_Select)
- {
- OLED_FastText57(3, 0, "HOME ABORTED",0);
- for(i=0;i<2000000;i++);
- return !TRUE;
- }
- else
- {
- OLED_FastText57(3, 0, "HOME COMPLETE",0);
- for(i=0;i<2000000;i++);
- return TRUE;
- }
-}
-}//Rap_Man_Home
-
-/*int RapMan_Home(void)
+int RapMan_Home(void)
{
int i;
OLED_Home_Screen();
@@ -276,6 +210,30 @@ int i; Axis_Stepper_Motors(On);
Manual_Mode_Set = TRUE;
+ // Manual homing function by Erik de Bruijn
+ while(!XPlusRight_Btn); // loop until button is released
+
+ OLED_FastText57(3, 0, "PRESS > FOR MANUAL",0);
+ int init_manual_home;
+ init_manual_home = 0;
+ for(i=0;i<2000000;i++)
+ {
+ if(!XPlusRight_Btn)
+ {
+ init_manual_home = 1;
+ OLED_FastText57(3, 0, "HOMING MANUALLY ",0);
+ for(i=0;i<2000000;i++);
+ }
+ }
+ if(init_manual_home == 1)
+ {
+ Manual_Mode('1');
+ OLED_FastText57(3, 0, "HOME COMPLETE",0);
+ while(!Manual_Select); // loop until button is released
+ return TRUE;
+ }
+ // End of manual homing code.
+
Feed_Rate = HOME_SPEED_Z; //Move tool down to prevent crash
OLED_FastText57(3, 0, "Z DOWN ",0);
Set_Z_Dir = Z_DOWN;
@@ -369,8 +327,8 @@ int i; for(i=0;i<2000000;i++);
return TRUE;
}
-}//Home
-*/
+}//Rap_Man_Home
+
//******************************************************************
void GoToRest(void)
{
|