From dedda09ad80a17238bf57cbabec670436bfa24b2 Mon Sep 17 00:00:00 2001 From: Rob McKenzie Date: Fri, 20 Sep 2019 11:34:31 +1000 Subject: [PATCH] IncreaseLoadSteps4Types0&2 --- src/Buttons.cpp | 4 ++-- src/config.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Buttons.cpp b/src/Buttons.cpp index ec2a90b7..6ee219f6 100644 --- a/src/Buttons.cpp +++ b/src/Buttons.cpp @@ -147,7 +147,7 @@ void settings_bowden_length() Done }; S state = S::NotExtruded; - for (uint8_t i = 0; i < 12; i++) bowdenLength.increase(); + for (uint8_t i = 0; i < 7; i++) bowdenLength.increase(); uint8_t tempBowLenUpper = (0xFF & (((bowdenLength.m_length - 150u)/AX_PUL_STEP_MM_Ratio) >> 8)); uint8_t tempBowLenLower = (0xFF & ((bowdenLength.m_length - 150u)/AX_PUL_STEP_MM_Ratio)); unsigned char tempW[5] = {'W', tempBowLenUpper, tempBowLenLower, BLK, BLK}; @@ -163,7 +163,7 @@ void settings_bowden_length() switch (state) { case S::NotExtruded: state = S::Done; - for (uint8_t i = 0; i < 12; i++) bowdenLength.decrease(); + for (uint8_t i = 0; i < 7; i++) bowdenLength.decrease(); bowdenLength.~BowdenLength(); BOWDEN_LENGTH = BowdenLength::get(); txPayload((unsigned char*)"ZZR--"); diff --git a/src/config.h b/src/config.h index 194abbc0..6fe0a856 100644 --- a/src/config.h +++ b/src/config.h @@ -2,7 +2,7 @@ #define FW_VERSION 300 // example: 103 means version 1.0.3 -#define FW_BUILDNR 346 // number of commits in 'master' +#define FW_BUILDNR 352 // number of commits in 'master' #define WAKE_TIMER 300000 // 5m @@ -141,7 +141,7 @@ #define TYPE_0_MAX_SPPED_PUL 4000 // S/S #define TYPE_0_ACC_FEED_PUL 3000 // S/S/S #define TYPE_0_FILAMENT_PARKING_STEPS -650 // STEPS -#define TYPE_0_FSensor_Sense_STEPS 1000 // STEPS +#define TYPE_0_FSensor_Sense_STEPS 1500 // STEPS #define TYPE_0_FEED_SPEED_PUL 760 // S/S #define TYPE_0_L2ExStageOne 350 // S/S #define TYPE_0_L2ExStageTwo 440 // S/S @@ -159,7 +159,7 @@ #define TYPE_2_MAX_SPPED_PUL 2800 // S/S #define TYPE_2_ACC_FEED_PUL 2000 // S/S/S #define TYPE_2_FILAMENT_PARKING_STEPS -650 // STEPS -#define TYPE_2_FSensor_Sense_STEPS 1000 // STEPS +#define TYPE_2_FSensor_Sense_STEPS 1500 // STEPS #define TYPE_2_FEED_SPEED_PUL 760 // S/S #define TYPE_2_L2ExStageOne 350 // S/S #define TYPE_2_L2ExStageTwo 440 // S/S