浏览代码

Fix ECHOPAIR ambiguity

- Also patch up some warnings
Scott Lahteine 9 年前
父节点
当前提交
460f73056b
共有 4 个文件被更改,包括 6 次插入6 次删除
  1. 1
    1
      Marlin/ConfigurationStore.cpp
  2. 1
    1
      Marlin/Marlin_main.cpp
  3. 2
    2
      Marlin/vector_3.cpp
  4. 2
    2
      Marlin/vector_3.h

+ 1
- 1
Marlin/ConfigurationStore.cpp 查看文件

@@ -754,7 +754,7 @@ void Config_PrintSettings(bool forReplay) {
754 754
         SERIAL_ECHOLNPGM("Z-Probe Offset (mm):");
755 755
         SERIAL_ECHO_START;
756 756
       }
757
-      SERIAL_ECHOPAIR("   M", CUSTOM_M_CODE_SET_Z_PROBE_OFFSET);
757
+      SERIAL_ECHOPAIR("   M", (unsigned long)CUSTOM_M_CODE_SET_Z_PROBE_OFFSET);
758 758
       SERIAL_ECHOPAIR(" Z", -zprobe_zoffset);
759 759
     #else
760 760
       if (!forReplay) {

+ 1
- 1
Marlin/Marlin_main.cpp 查看文件

@@ -2922,7 +2922,7 @@ inline void gcode_M42() {
2922 2922
       do_blocking_move_to( X_probe_location, Y_probe_location, Z_start_location); // Make sure we are at the probe location
2923 2923
 
2924 2924
       if (n_legs) {
2925
-        double radius=0.0, theta=0.0, x_sweep, y_sweep;
2925
+        double radius=0.0, theta=0.0;
2926 2926
         int l;
2927 2927
         int rotational_direction = (unsigned long) millis() & 0x0001;     // clockwise or counter clockwise
2928 2928
         radius = (unsigned long)millis() % (long)(X_MAX_LENGTH / 4);      // limit how far out to go

+ 2
- 2
Marlin/vector_3.cpp 查看文件

@@ -59,7 +59,7 @@ void vector_3::apply_rotation(matrix_3x3 matrix) {
59 59
 	z = resultZ;
60 60
 }
61 61
 
62
-void vector_3::debug(char* title) {
62
+void vector_3::debug(const char title[]) {
63 63
 	SERIAL_PROTOCOL(title);
64 64
 	SERIAL_PROTOCOLPGM(" x: ");
65 65
 	SERIAL_PROTOCOL_F(x, 6);
@@ -120,7 +120,7 @@ matrix_3x3 matrix_3x3::transpose(matrix_3x3 original) {
120 120
   return new_matrix;
121 121
 }
122 122
 
123
-void matrix_3x3::debug(char* title) {
123
+void matrix_3x3::debug(const char title[]) {
124 124
   SERIAL_PROTOCOLLN(title);
125 125
   int count = 0;
126 126
   for(int i=0; i<3; i++) {

+ 2
- 2
Marlin/vector_3.h 查看文件

@@ -37,7 +37,7 @@ struct vector_3
37 37
 	float get_length();
38 38
 	vector_3 get_normal();
39 39
 
40
-	void debug(char* title);
40
+	void debug(const char title[]);
41 41
 	
42 42
 	void apply_rotation(matrix_3x3 matrix);
43 43
 };
@@ -52,7 +52,7 @@ struct matrix_3x3
52 52
 
53 53
 	void set_to_identity();
54 54
 
55
-	void debug(char* title);
55
+	void debug(const char title[]);
56 56
 };
57 57
 
58 58
 

正在加载...
取消
保存