Release v4.7.2

prusa3d · Aug 1, 2023 · 856f4e7 · 856f4e7
1 parent 10b2c5d
commit 856f4e7
Show file tree

Hide file tree

Showing 35 changed files with 1,000 additions and 644 deletions.
diff --git a/doc/logging_components.md b/doc/logging_components.md
@@ -21,7 +21,6 @@ This file is generated automatically so don't edit it directly
 - FSensor: LOG_SEVERITY_INFO, src/common/filament_sensors_handler.cpp
 - FileSystem: LOG_SEVERITY_INFO, src/buddy/filesystem.cpp
 - GUI: LOG_SEVERITY_DEBUG, src/gui/logger.cpp
-- I2C: LOG_SEVERITY_INFO, src/device/stm32f4/peripherals.cpp
 - Led: LOG_SEVERITY_INFO, src/gui/led_animations/printer_animation_state.cpp
 - Loadcell: LOG_SEVERITY_INFO, src/common/loadcell.cpp
 - MMU2: LOG_SEVERITY_INFO, src/common/appmain.cpp

diff --git a/include/device/stm32f4/device/peripherals.h b/include/device/stm32f4/device/peripherals.h
@@ -310,18 +310,17 @@ void hw_uart8_init();
 
 #if HAS_I2CN(1)
 void hw_i2c1_init();
+void hw_i2c1_pins_init();
 #endif
 #if HAS_I2CN(2)
 void hw_i2c2_init();
+void hw_i2c2_pins_init();
 #endif
 #if HAS_I2CN(3)
 void hw_i2c3_init();
+void hw_i2c3_pins_init();
 #endif
 
-size_t hw_i2c1_get_busy_clear_count();
-size_t hw_i2c2_get_busy_clear_count();
-size_t hw_i2c3_get_busy_clear_count();
-
 void hw_spi2_init();
 void hw_spi3_init();
 void hw_spi4_init();

diff --git a/src/common/PCA9557.hpp b/src/common/PCA9557.hpp
@@ -1,6 +1,6 @@
 #pragma once
 #include "Pin.hpp"
-#include "i2c.h"
+#include "i2c.hpp"
 
 namespace buddy::hw {
 
@@ -53,7 +53,7 @@ class PCA9557 {
 
     void write_reg(Register_t reg, uint8_t value) {
         uint8_t data[2] = { (uint8_t)reg, value };
-        I2C_Transmit(&i2c, write_address, data, sizeof(data), TIMEOUT);
+        (void)i2c::Transmit(i2c, write_address, data, sizeof(data), TIMEOUT);
     }
 };
 

diff --git a/src/common/gcode_info.cpp b/src/common/gcode_info.cpp
@@ -119,8 +119,11 @@ void GCodeInfo::EvaluateToolsValid() {
 #endif
 
         // nozzle diameter of this tool in gcode is different then printer has
-        if (per_extruder_info[e].nozzle_diameter.has_value() && per_extruder_info[e].nozzle_diameter != config_store().get_nozzle_diameter(e)) {
-            valid_printer_settings.wrong_nozzle_diameter.fail();
+        if (per_extruder_info[e].nozzle_diameter.has_value()) {
+            float nozzle_diameter_distance = per_extruder_info[e].nozzle_diameter.value() - config_store().get_nozzle_diameter(e);
+            if (nozzle_diameter_distance > 0.001f || nozzle_diameter_distance < -0.001f) {
+                valid_printer_settings.wrong_nozzle_diameter.fail();
+            }
         }
     }
 }