Bladeren bron

Organize ubl.h defines by the files they serve

Scott Lahteine 8 jaren geleden
bovenliggende
commit
ca1dd739a3
1 gewijzigde bestanden met toevoegingen van 18 en 10 verwijderingen
  1. 18
    10
      Marlin/ubl.h

+ 18
- 10
Marlin/ubl.h Bestand weergeven

40
     float distance; // When populated, the distance from the search location
40
     float distance; // When populated, the distance from the search location
41
   } mesh_index_pair;
41
   } mesh_index_pair;
42
 
42
 
43
+  // ubl.cpp
44
+
45
+  void bit_clear(uint16_t bits[16], uint8_t x, uint8_t y);
46
+  void bit_set(uint16_t bits[16], uint8_t x, uint8_t y);
47
+  bool is_bit_set(uint16_t bits[16], uint8_t x, uint8_t y);
48
+
49
+  // ubl_motion.cpp
50
+
51
+  void debug_current_and_destination(const char * const title);
52
+  void ubl_line_to_destination(const float&, uint8_t);
53
+
54
+  // ubl_G29.cpp
55
+
43
   enum MeshPointType { INVALID, REAL, SET_IN_BITMAP };
56
   enum MeshPointType { INVALID, REAL, SET_IN_BITMAP };
44
 
57
 
45
   void dump(char * const str, const float &f);
58
   void dump(char * const str, const float &f);
46
-  bool ubl_lcd_clicked();
47
   void probe_entire_mesh(const float&, const float&, const bool, const bool, const bool);
59
   void probe_entire_mesh(const float&, const float&, const bool, const bool, const bool);
48
-  void debug_current_and_destination(const char * const title);
49
-  void ubl_line_to_destination(const float&, uint8_t);
50
   void manually_probe_remaining_mesh(const float&, const float&, const float&, const float&, const bool);
60
   void manually_probe_remaining_mesh(const float&, const float&, const float&, const float&, const bool);
51
   float measure_business_card_thickness(const float&);
61
   float measure_business_card_thickness(const float&);
52
   mesh_index_pair find_closest_mesh_point_of_type(const MeshPointType, const float&, const float&, const bool, unsigned int[16], bool);
62
   mesh_index_pair find_closest_mesh_point_of_type(const MeshPointType, const float&, const float&, const bool, unsigned int[16], bool);
53
   void shift_mesh_height();
63
   void shift_mesh_height();
64
+  void fine_tune_mesh(const float&, const float&, const bool);
54
   bool g29_parameter_parsing();
65
   bool g29_parameter_parsing();
55
   void g29_what_command();
66
   void g29_what_command();
56
   void g29_eeprom_dump();
67
   void g29_eeprom_dump();
57
   void g29_compare_current_mesh_to_stored_mesh();
68
   void g29_compare_current_mesh_to_stored_mesh();
58
-  void fine_tune_mesh(const float&, const float&, const bool);
59
-  void bit_clear(uint16_t bits[16], uint8_t x, uint8_t y);
60
-  void bit_set(uint16_t bits[16], uint8_t x, uint8_t y);
61
-  bool is_bit_set(uint16_t bits[16], uint8_t x, uint8_t y);
62
-  char *ftostr43sign(const float&, char);
63
 
69
 
64
-  void home_all_axes();
70
+  // External references
65
 
71
 
72
+  char *ftostr43sign(const float&, char);
73
+  bool ubl_lcd_clicked();
74
+  void home_all_axes();
66
   void gcode_G26();
75
   void gcode_G26();
67
   void gcode_G29();
76
   void gcode_G29();
68
 
77
 
75
     void lcd_quick_feedback();
84
     void lcd_quick_feedback();
76
   #endif
85
   #endif
77
 
86
 
78
-
79
   #define MESH_X_DIST (float(UBL_MESH_MAX_X - (UBL_MESH_MIN_X)) / float(GRID_MAX_POINTS_X - 1))
87
   #define MESH_X_DIST (float(UBL_MESH_MAX_X - (UBL_MESH_MIN_X)) / float(GRID_MAX_POINTS_X - 1))
80
   #define MESH_Y_DIST (float(UBL_MESH_MAX_Y - (UBL_MESH_MIN_Y)) / float(GRID_MAX_POINTS_Y - 1))
88
   #define MESH_Y_DIST (float(UBL_MESH_MAX_Y - (UBL_MESH_MIN_Y)) / float(GRID_MAX_POINTS_Y - 1))
81
 
89
 

Laden…
Annuleren
Opslaan