Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: Skriware/SkriwareFirmware
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1.1.9.8
Choose a base ref
...
head repository: Skriware/SkriwareFirmware
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
  • 2 commits
  • 4 files changed
  • 1 contributor

Commits on Apr 16, 2021

  1. Copy the full SHA
    b6ab9b3 View commit details

Commits on Jul 7, 2021

  1. Update led_and_scale.ino

    Lukkoz committed Jul 7, 2021
    Copy the full SHA
    73ee7db View commit details
Showing with 13 additions and 26 deletions.
  1. +8 −24 Atmega_Soft/led_and_scale/led_and_scale.ino
  2. +1 −1 Marlin/Skriware_Conf_Advanced.h
  3. +3 −0 Marlin/Skriware_Functions.cpp
  4. +1 −1 Marlin/Version.h
32 changes: 8 additions & 24 deletions Atmega_Soft/led_and_scale/led_and_scale.ino
Original file line number Diff line number Diff line change
@@ -97,7 +97,7 @@ long LeftRead;
long RightRead;

HX711 LeftScale;
//HX711 RightScale;
HX711 RightScale;
char out_buffer[32];
byte frame[6];

@@ -123,7 +123,7 @@ void setup() {
Wire.onReceive(receiveEvent); // register event
Wire.onRequest(requestEvent);
LeftScale.begin(SCALE1_DT, SCALE1_SCK, 64);
//RightScale.begin(SCALE2_DT, SCALE2_SCK, 64);
RightScale.begin(SCALE2_DT, SCALE2_SCK, 64);

#ifdef DEBUG
Serial.begin(9600); // start serial for output
@@ -300,13 +300,6 @@ long measure_weight1() {
long WL = 0;
long weightLT[5];
int i = 0;

while(!LeftScale.is_ready()){

}
LeftScale.set_gain(64);


while(true){
if(digitalRead(PowerButtonInterruptPin) == HIGH)PowerButtonPressed();
if(LeftScale.is_ready()) {
@@ -331,6 +324,8 @@ long measure_weight1() {
minid = jj;
}
}


for(byte kk = 0; kk <5 ; kk++){
if(kk != maxid && kk != minid) WL += weightLT[kk];
}
@@ -342,19 +337,11 @@ long measure_weight2() {
long WR = 0;
long weightRT[5];
int i = 0;
while(!LeftScale.is_ready()){

}
LeftScale.set_gain(32);
while(true){
if(digitalRead(PowerButtonInterruptPin) == HIGH)PowerButtonPressed();
/*if(RightScale.is_ready()) {
if(RightScale.is_ready()) {
weightRT[i] = RightScale.read_average(2);
i++;
}*/
if(LeftScale.is_ready()) {
weightRT[i] = LeftScale.read_average(2);
i++;
}
if(i == 5)break;
}
@@ -378,6 +365,8 @@ long measure_weight2() {
for(byte kk = 0; kk <5 ; kk++){
if(kk != maxid && kk != minid) WR += weightRT[kk];
}


return(WR/3);
}

@@ -634,9 +623,4 @@ void PowerButtonPressed(){
digitalWrite(SlaveFlagPin,LOW);
delay(2500);
}
}





}
2 changes: 1 addition & 1 deletion Marlin/Skriware_Conf_Advanced.h
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@

#if ENABLED(THERMAL_PROTECTION_HOTENDS)
#define THERMAL_PROTECTION_PERIOD 45 // Seconds
#define THERMAL_PROTECTION_HYSTERESIS 5 // Degrees Celsius
#define THERMAL_PROTECTION_HYSTERESIS 12 // Degrees Celsius
#define WATCH_TEMP_PERIOD 45 // Seconds
#define WATCH_TEMP_INCREASE 1 // Degrees Celsius
#endif
3 changes: 3 additions & 0 deletions Marlin/Skriware_Functions.cpp
Original file line number Diff line number Diff line change
@@ -176,9 +176,11 @@ void Extruder_Down(){
void extruder_swap(uint8_t tmp_extruder,uint8_t active){
bool extruder_change = tmp_extruder != active;
float tmp_Z = current_position[Z_AXIS];
float tmp_feedrate = feedrate_mm_s;
if(extruder_type != 0 && tmp_extruder == 1 && extruder_change){
planner.synchronize();
destination[Z_AXIS] = tmp_Z+3.0;
feedrate_mm_s = 10;
prepare_move_to_destination();
planner.synchronize();
Extruder_Down();
@@ -190,6 +192,7 @@ void extruder_swap(uint8_t tmp_extruder,uint8_t active){
destination[Z_AXIS] = tmp_Z;
prepare_move_to_destination();
planner.synchronize();
feedrate_mm_s = tmp_feedrate;
}
if(extruder_type != 0 && tmp_extruder == 0 && extruder_change){
planner.synchronize();
2 changes: 1 addition & 1 deletion Marlin/Version.h
Original file line number Diff line number Diff line change
@@ -36,7 +36,7 @@
* Marlin release version identifier
*/

#define SHORT_BUILD_VERSION "1.1.9.8"
#define SHORT_BUILD_VERSION "1.1.9.9"

/**
* Verbose version identifier which should contain a reference to the location