Browse Source

Fix ECHOPAIR ambiguity

- Also patch up some warnings
Scott Lahteine 9 years ago
parent
commit
460f73056b
4 changed files with 6 additions and 6 deletions
  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 View File

754
         SERIAL_ECHOLNPGM("Z-Probe Offset (mm):");
754
         SERIAL_ECHOLNPGM("Z-Probe Offset (mm):");
755
         SERIAL_ECHO_START;
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
       SERIAL_ECHOPAIR(" Z", -zprobe_zoffset);
758
       SERIAL_ECHOPAIR(" Z", -zprobe_zoffset);
759
     #else
759
     #else
760
       if (!forReplay) {
760
       if (!forReplay) {

+ 1
- 1
Marlin/Marlin_main.cpp View File

2922
       do_blocking_move_to( X_probe_location, Y_probe_location, Z_start_location); // Make sure we are at the probe location
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
       if (n_legs) {
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
         int l;
2926
         int l;
2927
         int rotational_direction = (unsigned long) millis() & 0x0001;     // clockwise or counter clockwise
2927
         int rotational_direction = (unsigned long) millis() & 0x0001;     // clockwise or counter clockwise
2928
         radius = (unsigned long)millis() % (long)(X_MAX_LENGTH / 4);      // limit how far out to go
2928
         radius = (unsigned long)millis() % (long)(X_MAX_LENGTH / 4);      // limit how far out to go

+ 2
- 2
Marlin/vector_3.cpp View File

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

+ 2
- 2
Marlin/vector_3.h View File

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

Loading…
Cancel
Save