Browse Source

M155=>M260, M156=>M261

Scott Lahteine 7 years ago
parent
commit
75bfde9945

+ 11
- 11
Marlin/Configuration_adv.h View File

@@ -808,22 +808,22 @@
808 808
  *
809 809
  * ; Example #1
810 810
  * ; This macro send the string "Marlin" to the slave device with address 0x63 (99)
811
- * ; It uses multiple M155 commands with one B<base 10> arg
812
- * M155 A99  ; Target slave address
813
- * M155 B77  ; M
814
- * M155 B97  ; a
815
- * M155 B114 ; r
816
- * M155 B108 ; l
817
- * M155 B105 ; i
818
- * M155 B110 ; n
819
- * M155 S1   ; Send the current buffer
811
+ * ; It uses multiple M260 commands with one B<base 10> arg
812
+ * M260 A99  ; Target slave address
813
+ * M260 B77  ; M
814
+ * M260 B97  ; a
815
+ * M260 B114 ; r
816
+ * M260 B108 ; l
817
+ * M260 B105 ; i
818
+ * M260 B110 ; n
819
+ * M260 S1   ; Send the current buffer
820 820
  *
821 821
  * ; Example #2
822 822
  * ; Request 6 bytes from slave device with address 0x63 (99)
823
- * M156 A99 B5
823
+ * M261 A99 B5
824 824
  *
825 825
  * ; Example #3
826
- * ; Example serial output of a M156 request
826
+ * ; Example serial output of a M261 request
827 827
  * echo:i2c-reply: from:99 bytes:5 data:hello
828 828
  */
829 829
 

+ 67
- 65
Marlin/Marlin_main.cpp View File

@@ -214,6 +214,8 @@
214 214
  * M226 - Wait until a pin is in a given state: "M226 P<pin> S<state>"
215 215
  * M240 - Trigger a camera to take a photograph. (Requires CHDK or PHOTOGRAPH_PIN)
216 216
  * M250 - Set LCD contrast: "M250 C<contrast>" (0-63). (Requires LCD support)
217
+ * M260 - i2c Send Data (Requires EXPERIMENTAL_I2CBUS)
218
+ * M261 - i2c Request Data (Requires EXPERIMENTAL_I2CBUS)
217 219
  * M280 - Set servo position absolute: "M280 P<index> S<angle|µs>". (Requires servos)
218 220
  * M300 - Play beep sound S<frequency Hz> P<duration ms>
219 221
  * M301 - Set PID parameters P I and D. (Requires PIDTEMP)
@@ -5783,59 +5785,6 @@ inline void gcode_M121() { endstops.enable_globally(false); }
5783 5785
 
5784 5786
 #endif // BLINKM
5785 5787
 
5786
-#if ENABLED(EXPERIMENTAL_I2CBUS)
5787
-
5788
-  /**
5789
-   * M155: Send data to a I2C slave device
5790
-   *
5791
-   * This is a PoC, the formating and arguments for the GCODE will
5792
-   * change to be more compatible, the current proposal is:
5793
-   *
5794
-   *  M155 A<slave device address base 10> ; Sets the I2C slave address the data will be sent to
5795
-   *
5796
-   *  M155 B<byte-1 value in base 10>
5797
-   *  M155 B<byte-2 value in base 10>
5798
-   *  M155 B<byte-3 value in base 10>
5799
-   *
5800
-   *  M155 S1 ; Send the buffered data and reset the buffer
5801
-   *  M155 R1 ; Reset the buffer without sending data
5802
-   *
5803
-   */
5804
-  inline void gcode_M155() {
5805
-    // Set the target address
5806
-    if (code_seen('A')) i2c.address(code_value_byte());
5807
-
5808
-    // Add a new byte to the buffer
5809
-    if (code_seen('B')) i2c.addbyte(code_value_byte());
5810
-
5811
-    // Flush the buffer to the bus
5812
-    if (code_seen('S')) i2c.send();
5813
-
5814
-    // Reset and rewind the buffer
5815
-    else if (code_seen('R')) i2c.reset();
5816
-  }
5817
-
5818
-  /**
5819
-   * M156: Request X bytes from I2C slave device
5820
-   *
5821
-   * Usage: M156 A<slave device address base 10> B<number of bytes>
5822
-   */
5823
-  inline void gcode_M156() {
5824
-    if (code_seen('A')) i2c.address(code_value_byte());
5825
-
5826
-    uint8_t bytes = code_seen('B') ? code_value_byte() : 1;
5827
-
5828
-    if (i2c.addr && bytes && bytes <= TWIBUS_BUFFER_SIZE) {
5829
-      i2c.relay(bytes);
5830
-    }
5831
-    else {
5832
-      SERIAL_ERROR_START;
5833
-      SERIAL_ERRORLN("Bad i2c request");
5834
-    }
5835
-  }
5836
-
5837
-#endif // EXPERIMENTAL_I2CBUS
5838
-
5839 5788
 /**
5840 5789
  * M200: Set filament diameter and set E axis units to cubic units
5841 5790
  *
@@ -6182,6 +6131,59 @@ inline void gcode_M226() {
6182 6131
   } // code_seen('P')
6183 6132
 }
6184 6133
 
6134
+#if ENABLED(EXPERIMENTAL_I2CBUS)
6135
+
6136
+  /**
6137
+   * M260: Send data to a I2C slave device
6138
+   *
6139
+   * This is a PoC, the formating and arguments for the GCODE will
6140
+   * change to be more compatible, the current proposal is:
6141
+   *
6142
+   *  M260 A<slave device address base 10> ; Sets the I2C slave address the data will be sent to
6143
+   *
6144
+   *  M260 B<byte-1 value in base 10>
6145
+   *  M260 B<byte-2 value in base 10>
6146
+   *  M260 B<byte-3 value in base 10>
6147
+   *
6148
+   *  M260 S1 ; Send the buffered data and reset the buffer
6149
+   *  M260 R1 ; Reset the buffer without sending data
6150
+   *
6151
+   */
6152
+  inline void gcode_M260() {
6153
+    // Set the target address
6154
+    if (code_seen('A')) i2c.address(code_value_byte());
6155
+
6156
+    // Add a new byte to the buffer
6157
+    if (code_seen('B')) i2c.addbyte(code_value_byte());
6158
+
6159
+    // Flush the buffer to the bus
6160
+    if (code_seen('S')) i2c.send();
6161
+
6162
+    // Reset and rewind the buffer
6163
+    else if (code_seen('R')) i2c.reset();
6164
+  }
6165
+
6166
+  /**
6167
+   * M261: Request X bytes from I2C slave device
6168
+   *
6169
+   * Usage: M261 A<slave device address base 10> B<number of bytes>
6170
+   */
6171
+  inline void gcode_M261() {
6172
+    if (code_seen('A')) i2c.address(code_value_byte());
6173
+
6174
+    uint8_t bytes = code_seen('B') ? code_value_byte() : 1;
6175
+
6176
+    if (i2c.addr && bytes && bytes <= TWIBUS_BUFFER_SIZE) {
6177
+      i2c.relay(bytes);
6178
+    }
6179
+    else {
6180
+      SERIAL_ERROR_START;
6181
+      SERIAL_ERRORLN("Bad i2c request");
6182
+    }
6183
+  }
6184
+
6185
+#endif // EXPERIMENTAL_I2CBUS
6186
+
6185 6187
 #if HAS_SERVOS
6186 6188
 
6187 6189
   /**
@@ -7948,18 +7950,6 @@ void process_next_command() {
7948 7950
 
7949 7951
       #endif // BLINKM
7950 7952
 
7951
-      #if ENABLED(EXPERIMENTAL_I2CBUS)
7952
-
7953
-        case 155: // M155: Send data to an i2c slave
7954
-          gcode_M155();
7955
-          break;
7956
-
7957
-        case 156: // M156: Request data from an i2c slave
7958
-          gcode_M156();
7959
-          break;
7960
-
7961
-      #endif //EXPERIMENTAL_I2CBUS
7962
-
7963 7953
       #if ENABLED(MIXING_EXTRUDER)
7964 7954
         case 163: // M163: Set a component weight for mixing extruder
7965 7955
           gcode_M163();
@@ -8082,6 +8072,18 @@ void process_next_command() {
8082 8072
           break;
8083 8073
       #endif // HAS_LCD_CONTRAST
8084 8074
 
8075
+      #if ENABLED(EXPERIMENTAL_I2CBUS)
8076
+
8077
+        case 260: // M260: Send data to an i2c slave
8078
+          gcode_M260();
8079
+          break;
8080
+
8081
+        case 261: // M261: Request data from an i2c slave
8082
+          gcode_M261();
8083
+          break;
8084
+
8085
+      #endif // EXPERIMENTAL_I2CBUS
8086
+
8085 8087
       #if ENABLED(PREVENT_COLD_EXTRUSION)
8086 8088
         case 302: // M302: Allow cold extrudes (set the minimum extrude temperature)
8087 8089
           gcode_M302();

+ 11
- 11
Marlin/example_configurations/Cartesio/Configuration_adv.h View File

@@ -808,22 +808,22 @@
808 808
  *
809 809
  * ; Example #1
810 810
  * ; This macro send the string "Marlin" to the slave device with address 0x63 (99)
811
- * ; It uses multiple M155 commands with one B<base 10> arg
812
- * M155 A99  ; Target slave address
813
- * M155 B77  ; M
814
- * M155 B97  ; a
815
- * M155 B114 ; r
816
- * M155 B108 ; l
817
- * M155 B105 ; i
818
- * M155 B110 ; n
819
- * M155 S1   ; Send the current buffer
811
+ * ; It uses multiple M260 commands with one B<base 10> arg
812
+ * M260 A99  ; Target slave address
813
+ * M260 B77  ; M
814
+ * M260 B97  ; a
815
+ * M260 B114 ; r
816
+ * M260 B108 ; l
817
+ * M260 B105 ; i
818
+ * M260 B110 ; n
819
+ * M260 S1   ; Send the current buffer
820 820
  *
821 821
  * ; Example #2
822 822
  * ; Request 6 bytes from slave device with address 0x63 (99)
823
- * M156 A99 B5
823
+ * M261 A99 B5
824 824
  *
825 825
  * ; Example #3
826
- * ; Example serial output of a M156 request
826
+ * ; Example serial output of a M261 request
827 827
  * echo:i2c-reply: from:99 bytes:5 data:hello
828 828
  */
829 829
 

+ 11
- 11
Marlin/example_configurations/Felix/Configuration_adv.h View File

@@ -808,22 +808,22 @@
808 808
  *
809 809
  * ; Example #1
810 810
  * ; This macro send the string "Marlin" to the slave device with address 0x63 (99)
811
- * ; It uses multiple M155 commands with one B<base 10> arg
812
- * M155 A99  ; Target slave address
813
- * M155 B77  ; M
814
- * M155 B97  ; a
815
- * M155 B114 ; r
816
- * M155 B108 ; l
817
- * M155 B105 ; i
818
- * M155 B110 ; n
819
- * M155 S1   ; Send the current buffer
811
+ * ; It uses multiple M260 commands with one B<base 10> arg
812
+ * M260 A99  ; Target slave address
813
+ * M260 B77  ; M
814
+ * M260 B97  ; a
815
+ * M260 B114 ; r
816
+ * M260 B108 ; l
817
+ * M260 B105 ; i
818
+ * M260 B110 ; n
819
+ * M260 S1   ; Send the current buffer
820 820
  *
821 821
  * ; Example #2
822 822
  * ; Request 6 bytes from slave device with address 0x63 (99)
823
- * M156 A99 B5
823
+ * M261 A99 B5
824 824
  *
825 825
  * ; Example #3
826
- * ; Example serial output of a M156 request
826
+ * ; Example serial output of a M261 request
827 827
  * echo:i2c-reply: from:99 bytes:5 data:hello
828 828
  */
829 829
 

+ 11
- 11
Marlin/example_configurations/Hephestos/Configuration_adv.h View File

@@ -808,22 +808,22 @@
808 808
  *
809 809
  * ; Example #1
810 810
  * ; This macro send the string "Marlin" to the slave device with address 0x63 (99)
811
- * ; It uses multiple M155 commands with one B<base 10> arg
812
- * M155 A99  ; Target slave address
813
- * M155 B77  ; M
814
- * M155 B97  ; a
815
- * M155 B114 ; r
816
- * M155 B108 ; l
817
- * M155 B105 ; i
818
- * M155 B110 ; n
819
- * M155 S1   ; Send the current buffer
811
+ * ; It uses multiple M260 commands with one B<base 10> arg
812
+ * M260 A99  ; Target slave address
813
+ * M260 B77  ; M
814
+ * M260 B97  ; a
815
+ * M260 B114 ; r
816
+ * M260 B108 ; l
817
+ * M260 B105 ; i
818
+ * M260 B110 ; n
819
+ * M260 S1   ; Send the current buffer
820 820
  *
821 821
  * ; Example #2
822 822
  * ; Request 6 bytes from slave device with address 0x63 (99)
823
- * M156 A99 B5
823
+ * M261 A99 B5
824 824
  *
825 825
  * ; Example #3
826
- * ; Example serial output of a M156 request
826
+ * ; Example serial output of a M261 request
827 827
  * echo:i2c-reply: from:99 bytes:5 data:hello
828 828
  */
829 829
 

+ 11
- 11
Marlin/example_configurations/Hephestos_2/Configuration_adv.h View File

@@ -808,22 +808,22 @@
808 808
  *
809 809
  * ; Example #1
810 810
  * ; This macro send the string "Marlin" to the slave device with address 0x63 (99)
811
- * ; It uses multiple M155 commands with one B<base 10> arg
812
- * M155 A99  ; Target slave address
813
- * M155 B77  ; M
814
- * M155 B97  ; a
815
- * M155 B114 ; r
816
- * M155 B108 ; l
817
- * M155 B105 ; i
818
- * M155 B110 ; n
819
- * M155 S1   ; Send the current buffer
811
+ * ; It uses multiple M260 commands with one B<base 10> arg
812
+ * M260 A99  ; Target slave address
813
+ * M260 B77  ; M
814
+ * M260 B97  ; a
815
+ * M260 B114 ; r
816
+ * M260 B108 ; l
817
+ * M260 B105 ; i
818
+ * M260 B110 ; n
819
+ * M260 S1   ; Send the current buffer
820 820
  *
821 821
  * ; Example #2
822 822
  * ; Request 6 bytes from slave device with address 0x63 (99)
823
- * M156 A99 B5
823
+ * M261 A99 B5
824 824
  *
825 825
  * ; Example #3
826
- * ; Example serial output of a M156 request
826
+ * ; Example serial output of a M261 request
827 827
  * echo:i2c-reply: from:99 bytes:5 data:hello
828 828
  */
829 829
 

+ 11
- 11
Marlin/example_configurations/K8200/Configuration_adv.h View File

@@ -814,22 +814,22 @@
814 814
  *
815 815
  * ; Example #1
816 816
  * ; This macro send the string "Marlin" to the slave device with address 0x63 (99)
817
- * ; It uses multiple M155 commands with one B<base 10> arg
818
- * M155 A99  ; Target slave address
819
- * M155 B77  ; M
820
- * M155 B97  ; a
821
- * M155 B114 ; r
822
- * M155 B108 ; l
823
- * M155 B105 ; i
824
- * M155 B110 ; n
825
- * M155 S1   ; Send the current buffer
817
+ * ; It uses multiple M260 commands with one B<base 10> arg
818
+ * M260 A99  ; Target slave address
819
+ * M260 B77  ; M
820
+ * M260 B97  ; a
821
+ * M260 B114 ; r
822
+ * M260 B108 ; l
823
+ * M260 B105 ; i
824
+ * M260 B110 ; n
825
+ * M260 S1   ; Send the current buffer
826 826
  *
827 827
  * ; Example #2
828 828
  * ; Request 6 bytes from slave device with address 0x63 (99)
829
- * M156 A99 B5
829
+ * M261 A99 B5
830 830
  *
831 831
  * ; Example #3
832
- * ; Example serial output of a M156 request
832
+ * ; Example serial output of a M261 request
833 833
  * echo:i2c-reply: from:99 bytes:5 data:hello
834 834
  */
835 835
 

+ 11
- 11
Marlin/example_configurations/K8400/Configuration_adv.h View File

@@ -808,22 +808,22 @@
808 808
  *
809 809
  * ; Example #1
810 810
  * ; This macro send the string "Marlin" to the slave device with address 0x63 (99)
811
- * ; It uses multiple M155 commands with one B<base 10> arg
812
- * M155 A99  ; Target slave address
813
- * M155 B77  ; M
814
- * M155 B97  ; a
815
- * M155 B114 ; r
816
- * M155 B108 ; l
817
- * M155 B105 ; i
818
- * M155 B110 ; n
819
- * M155 S1   ; Send the current buffer
811
+ * ; It uses multiple M260 commands with one B<base 10> arg
812
+ * M260 A99  ; Target slave address
813
+ * M260 B77  ; M
814
+ * M260 B97  ; a
815
+ * M260 B114 ; r
816
+ * M260 B108 ; l
817
+ * M260 B105 ; i
818
+ * M260 B110 ; n
819
+ * M260 S1   ; Send the current buffer
820 820
  *
821 821
  * ; Example #2
822 822
  * ; Request 6 bytes from slave device with address 0x63 (99)
823
- * M156 A99 B5
823
+ * M261 A99 B5
824 824
  *
825 825
  * ; Example #3
826
- * ; Example serial output of a M156 request
826
+ * ; Example serial output of a M261 request
827 827
  * echo:i2c-reply: from:99 bytes:5 data:hello
828 828
  */
829 829
 

+ 11
- 11
Marlin/example_configurations/RigidBot/Configuration_adv.h View File

@@ -808,22 +808,22 @@
808 808
  *
809 809
  * ; Example #1
810 810
  * ; This macro send the string "Marlin" to the slave device with address 0x63 (99)
811
- * ; It uses multiple M155 commands with one B<base 10> arg
812
- * M155 A99  ; Target slave address
813
- * M155 B77  ; M
814
- * M155 B97  ; a
815
- * M155 B114 ; r
816
- * M155 B108 ; l
817
- * M155 B105 ; i
818
- * M155 B110 ; n
819
- * M155 S1   ; Send the current buffer
811
+ * ; It uses multiple M260 commands with one B<base 10> arg
812
+ * M260 A99  ; Target slave address
813
+ * M260 B77  ; M
814
+ * M260 B97  ; a
815
+ * M260 B114 ; r
816
+ * M260 B108 ; l
817
+ * M260 B105 ; i
818
+ * M260 B110 ; n
819
+ * M260 S1   ; Send the current buffer
820 820
  *
821 821
  * ; Example #2
822 822
  * ; Request 6 bytes from slave device with address 0x63 (99)
823
- * M156 A99 B5
823
+ * M261 A99 B5
824 824
  *
825 825
  * ; Example #3
826
- * ; Example serial output of a M156 request
826
+ * ; Example serial output of a M261 request
827 827
  * echo:i2c-reply: from:99 bytes:5 data:hello
828 828
  */
829 829
 

+ 11
- 11
Marlin/example_configurations/SCARA/Configuration_adv.h View File

@@ -808,22 +808,22 @@
808 808
  *
809 809
  * ; Example #1
810 810
  * ; This macro send the string "Marlin" to the slave device with address 0x63 (99)
811
- * ; It uses multiple M155 commands with one B<base 10> arg
812
- * M155 A99  ; Target slave address
813
- * M155 B77  ; M
814
- * M155 B97  ; a
815
- * M155 B114 ; r
816
- * M155 B108 ; l
817
- * M155 B105 ; i
818
- * M155 B110 ; n
819
- * M155 S1   ; Send the current buffer
811
+ * ; It uses multiple M260 commands with one B<base 10> arg
812
+ * M260 A99  ; Target slave address
813
+ * M260 B77  ; M
814
+ * M260 B97  ; a
815
+ * M260 B114 ; r
816
+ * M260 B108 ; l
817
+ * M260 B105 ; i
818
+ * M260 B110 ; n
819
+ * M260 S1   ; Send the current buffer
820 820
  *
821 821
  * ; Example #2
822 822
  * ; Request 6 bytes from slave device with address 0x63 (99)
823
- * M156 A99 B5
823
+ * M261 A99 B5
824 824
  *
825 825
  * ; Example #3
826
- * ; Example serial output of a M156 request
826
+ * ; Example serial output of a M261 request
827 827
  * echo:i2c-reply: from:99 bytes:5 data:hello
828 828
  */
829 829
 

+ 11
- 11
Marlin/example_configurations/TAZ4/Configuration_adv.h View File

@@ -816,22 +816,22 @@
816 816
  *
817 817
  * ; Example #1
818 818
  * ; This macro send the string "Marlin" to the slave device with address 0x63 (99)
819
- * ; It uses multiple M155 commands with one B<base 10> arg
820
- * M155 A99  ; Target slave address
821
- * M155 B77  ; M
822
- * M155 B97  ; a
823
- * M155 B114 ; r
824
- * M155 B108 ; l
825
- * M155 B105 ; i
826
- * M155 B110 ; n
827
- * M155 S1   ; Send the current buffer
819
+ * ; It uses multiple M260 commands with one B<base 10> arg
820
+ * M260 A99  ; Target slave address
821
+ * M260 B77  ; M
822
+ * M260 B97  ; a
823
+ * M260 B114 ; r
824
+ * M260 B108 ; l
825
+ * M260 B105 ; i
826
+ * M260 B110 ; n
827
+ * M260 S1   ; Send the current buffer
828 828
  *
829 829
  * ; Example #2
830 830
  * ; Request 6 bytes from slave device with address 0x63 (99)
831
- * M156 A99 B5
831
+ * M261 A99 B5
832 832
  *
833 833
  * ; Example #3
834
- * ; Example serial output of a M156 request
834
+ * ; Example serial output of a M261 request
835 835
  * echo:i2c-reply: from:99 bytes:5 data:hello
836 836
  */
837 837
 

+ 11
- 11
Marlin/example_configurations/WITBOX/Configuration_adv.h View File

@@ -808,22 +808,22 @@
808 808
  *
809 809
  * ; Example #1
810 810
  * ; This macro send the string "Marlin" to the slave device with address 0x63 (99)
811
- * ; It uses multiple M155 commands with one B<base 10> arg
812
- * M155 A99  ; Target slave address
813
- * M155 B77  ; M
814
- * M155 B97  ; a
815
- * M155 B114 ; r
816
- * M155 B108 ; l
817
- * M155 B105 ; i
818
- * M155 B110 ; n
819
- * M155 S1   ; Send the current buffer
811
+ * ; It uses multiple M260 commands with one B<base 10> arg
812
+ * M260 A99  ; Target slave address
813
+ * M260 B77  ; M
814
+ * M260 B97  ; a
815
+ * M260 B114 ; r
816
+ * M260 B108 ; l
817
+ * M260 B105 ; i
818
+ * M260 B110 ; n
819
+ * M260 S1   ; Send the current buffer
820 820
  *
821 821
  * ; Example #2
822 822
  * ; Request 6 bytes from slave device with address 0x63 (99)
823
- * M156 A99 B5
823
+ * M261 A99 B5
824 824
  *
825 825
  * ; Example #3
826
- * ; Example serial output of a M156 request
826
+ * ; Example serial output of a M261 request
827 827
  * echo:i2c-reply: from:99 bytes:5 data:hello
828 828
  */
829 829
 

+ 11
- 11
Marlin/example_configurations/delta/biv2.5/Configuration_adv.h View File

@@ -810,22 +810,22 @@
810 810
  *
811 811
  * ; Example #1
812 812
  * ; This macro send the string "Marlin" to the slave device with address 0x63 (99)
813
- * ; It uses multiple M155 commands with one B<base 10> arg
814
- * M155 A99  ; Target slave address
815
- * M155 B77  ; M
816
- * M155 B97  ; a
817
- * M155 B114 ; r
818
- * M155 B108 ; l
819
- * M155 B105 ; i
820
- * M155 B110 ; n
821
- * M155 S1   ; Send the current buffer
813
+ * ; It uses multiple M260 commands with one B<base 10> arg
814
+ * M260 A99  ; Target slave address
815
+ * M260 B77  ; M
816
+ * M260 B97  ; a
817
+ * M260 B114 ; r
818
+ * M260 B108 ; l
819
+ * M260 B105 ; i
820
+ * M260 B110 ; n
821
+ * M260 S1   ; Send the current buffer
822 822
  *
823 823
  * ; Example #2
824 824
  * ; Request 6 bytes from slave device with address 0x63 (99)
825
- * M156 A99 B5
825
+ * M261 A99 B5
826 826
  *
827 827
  * ; Example #3
828
- * ; Example serial output of a M156 request
828
+ * ; Example serial output of a M261 request
829 829
  * echo:i2c-reply: from:99 bytes:5 data:hello
830 830
  */
831 831
 

+ 11
- 11
Marlin/example_configurations/delta/generic/Configuration_adv.h View File

@@ -810,22 +810,22 @@
810 810
  *
811 811
  * ; Example #1
812 812
  * ; This macro send the string "Marlin" to the slave device with address 0x63 (99)
813
- * ; It uses multiple M155 commands with one B<base 10> arg
814
- * M155 A99  ; Target slave address
815
- * M155 B77  ; M
816
- * M155 B97  ; a
817
- * M155 B114 ; r
818
- * M155 B108 ; l
819
- * M155 B105 ; i
820
- * M155 B110 ; n
821
- * M155 S1   ; Send the current buffer
813
+ * ; It uses multiple M260 commands with one B<base 10> arg
814
+ * M260 A99  ; Target slave address
815
+ * M260 B77  ; M
816
+ * M260 B97  ; a
817
+ * M260 B114 ; r
818
+ * M260 B108 ; l
819
+ * M260 B105 ; i
820
+ * M260 B110 ; n
821
+ * M260 S1   ; Send the current buffer
822 822
  *
823 823
  * ; Example #2
824 824
  * ; Request 6 bytes from slave device with address 0x63 (99)
825
- * M156 A99 B5
825
+ * M261 A99 B5
826 826
  *
827 827
  * ; Example #3
828
- * ; Example serial output of a M156 request
828
+ * ; Example serial output of a M261 request
829 829
  * echo:i2c-reply: from:99 bytes:5 data:hello
830 830
  */
831 831
 

+ 11
- 11
Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h View File

@@ -810,22 +810,22 @@
810 810
  *
811 811
  * ; Example #1
812 812
  * ; This macro send the string "Marlin" to the slave device with address 0x63 (99)
813
- * ; It uses multiple M155 commands with one B<base 10> arg
814
- * M155 A99  ; Target slave address
815
- * M155 B77  ; M
816
- * M155 B97  ; a
817
- * M155 B114 ; r
818
- * M155 B108 ; l
819
- * M155 B105 ; i
820
- * M155 B110 ; n
821
- * M155 S1   ; Send the current buffer
813
+ * ; It uses multiple M260 commands with one B<base 10> arg
814
+ * M260 A99  ; Target slave address
815
+ * M260 B77  ; M
816
+ * M260 B97  ; a
817
+ * M260 B114 ; r
818
+ * M260 B108 ; l
819
+ * M260 B105 ; i
820
+ * M260 B110 ; n
821
+ * M260 S1   ; Send the current buffer
822 822
  *
823 823
  * ; Example #2
824 824
  * ; Request 6 bytes from slave device with address 0x63 (99)
825
- * M156 A99 B5
825
+ * M261 A99 B5
826 826
  *
827 827
  * ; Example #3
828
- * ; Example serial output of a M156 request
828
+ * ; Example serial output of a M261 request
829 829
  * echo:i2c-reply: from:99 bytes:5 data:hello
830 830
  */
831 831
 

+ 11
- 11
Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h View File

@@ -815,22 +815,22 @@
815 815
  *
816 816
  * ; Example #1
817 817
  * ; This macro send the string "Marlin" to the slave device with address 0x63 (99)
818
- * ; It uses multiple M155 commands with one B<base 10> arg
819
- * M155 A99  ; Target slave address
820
- * M155 B77  ; M
821
- * M155 B97  ; a
822
- * M155 B114 ; r
823
- * M155 B108 ; l
824
- * M155 B105 ; i
825
- * M155 B110 ; n
826
- * M155 S1   ; Send the current buffer
818
+ * ; It uses multiple M260 commands with one B<base 10> arg
819
+ * M260 A99  ; Target slave address
820
+ * M260 B77  ; M
821
+ * M260 B97  ; a
822
+ * M260 B114 ; r
823
+ * M260 B108 ; l
824
+ * M260 B105 ; i
825
+ * M260 B110 ; n
826
+ * M260 S1   ; Send the current buffer
827 827
  *
828 828
  * ; Example #2
829 829
  * ; Request 6 bytes from slave device with address 0x63 (99)
830
- * M156 A99 B5
830
+ * M261 A99 B5
831 831
  *
832 832
  * ; Example #3
833
- * ; Example serial output of a M156 request
833
+ * ; Example serial output of a M261 request
834 834
  * echo:i2c-reply: from:99 bytes:5 data:hello
835 835
  */
836 836
 

+ 11
- 11
Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h View File

@@ -810,22 +810,22 @@
810 810
  *
811 811
  * ; Example #1
812 812
  * ; This macro send the string "Marlin" to the slave device with address 0x63 (99)
813
- * ; It uses multiple M155 commands with one B<base 10> arg
814
- * M155 A99  ; Target slave address
815
- * M155 B77  ; M
816
- * M155 B97  ; a
817
- * M155 B114 ; r
818
- * M155 B108 ; l
819
- * M155 B105 ; i
820
- * M155 B110 ; n
821
- * M155 S1   ; Send the current buffer
813
+ * ; It uses multiple M260 commands with one B<base 10> arg
814
+ * M260 A99  ; Target slave address
815
+ * M260 B77  ; M
816
+ * M260 B97  ; a
817
+ * M260 B114 ; r
818
+ * M260 B108 ; l
819
+ * M260 B105 ; i
820
+ * M260 B110 ; n
821
+ * M260 S1   ; Send the current buffer
822 822
  *
823 823
  * ; Example #2
824 824
  * ; Request 6 bytes from slave device with address 0x63 (99)
825
- * M156 A99 B5
825
+ * M261 A99 B5
826 826
  *
827 827
  * ; Example #3
828
- * ; Example serial output of a M156 request
828
+ * ; Example serial output of a M261 request
829 829
  * echo:i2c-reply: from:99 bytes:5 data:hello
830 830
  */
831 831
 

+ 11
- 11
Marlin/example_configurations/makibox/Configuration_adv.h View File

@@ -808,22 +808,22 @@
808 808
  *
809 809
  * ; Example #1
810 810
  * ; This macro send the string "Marlin" to the slave device with address 0x63 (99)
811
- * ; It uses multiple M155 commands with one B<base 10> arg
812
- * M155 A99  ; Target slave address
813
- * M155 B77  ; M
814
- * M155 B97  ; a
815
- * M155 B114 ; r
816
- * M155 B108 ; l
817
- * M155 B105 ; i
818
- * M155 B110 ; n
819
- * M155 S1   ; Send the current buffer
811
+ * ; It uses multiple M260 commands with one B<base 10> arg
812
+ * M260 A99  ; Target slave address
813
+ * M260 B77  ; M
814
+ * M260 B97  ; a
815
+ * M260 B114 ; r
816
+ * M260 B108 ; l
817
+ * M260 B105 ; i
818
+ * M260 B110 ; n
819
+ * M260 S1   ; Send the current buffer
820 820
  *
821 821
  * ; Example #2
822 822
  * ; Request 6 bytes from slave device with address 0x63 (99)
823
- * M156 A99 B5
823
+ * M261 A99 B5
824 824
  *
825 825
  * ; Example #3
826
- * ; Example serial output of a M156 request
826
+ * ; Example serial output of a M261 request
827 827
  * echo:i2c-reply: from:99 bytes:5 data:hello
828 828
  */
829 829
 

+ 11
- 11
Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h View File

@@ -808,22 +808,22 @@
808 808
  *
809 809
  * ; Example #1
810 810
  * ; This macro send the string "Marlin" to the slave device with address 0x63 (99)
811
- * ; It uses multiple M155 commands with one B<base 10> arg
812
- * M155 A99  ; Target slave address
813
- * M155 B77  ; M
814
- * M155 B97  ; a
815
- * M155 B114 ; r
816
- * M155 B108 ; l
817
- * M155 B105 ; i
818
- * M155 B110 ; n
819
- * M155 S1   ; Send the current buffer
811
+ * ; It uses multiple M260 commands with one B<base 10> arg
812
+ * M260 A99  ; Target slave address
813
+ * M260 B77  ; M
814
+ * M260 B97  ; a
815
+ * M260 B114 ; r
816
+ * M260 B108 ; l
817
+ * M260 B105 ; i
818
+ * M260 B110 ; n
819
+ * M260 S1   ; Send the current buffer
820 820
  *
821 821
  * ; Example #2
822 822
  * ; Request 6 bytes from slave device with address 0x63 (99)
823
- * M156 A99 B5
823
+ * M261 A99 B5
824 824
  *
825 825
  * ; Example #3
826
- * ; Example serial output of a M156 request
826
+ * ; Example serial output of a M261 request
827 827
  * echo:i2c-reply: from:99 bytes:5 data:hello
828 828
  */
829 829
 

+ 3
- 3
Marlin/twibus.h View File

@@ -43,11 +43,11 @@ typedef void (*twiRequestFunc_t)();
43 43
  * an experimental feature and it's inner workings as well as public facing
44 44
  * interface are prune to change in the future.
45 45
  *
46
- * The two main consumers of this class are M155 and M156, where M155 allows
46
+ * The two main consumers of this class are M260 and M261, where M260 allows
47 47
  * Marlin to send a I2C packet to a device (please be aware that no repeated
48 48
  * starts are possible), this can be done in caching method by calling multiple
49
- * times M155 B<byte-1 value in base 10> or a one liner M155, have a look at
50
- * the gcode_M155() function for more information. M156 allows Marlin to
49
+ * times M260 B<byte-1 value in base 10> or a one liner M260, have a look at
50
+ * the gcode_M260() function for more information. M261 allows Marlin to
51 51
  * request data from a device, the received data is then relayed into the serial
52 52
  * line for host interpretation.
53 53
  *

Loading…
Cancel
Save