Ver código fonte

Merge pull request #5188 from thinkyhead/rc_extended_host_support

Extended host support: M155 Auto temp report, M115 capabilities
Scott Lahteine 8 anos atrás
pai
commit
60cc9342a4

+ 6
- 5
.travis.yml Ver arquivo

@@ -106,7 +106,7 @@ script:
106 106
   - opt_enable FIX_MOUNTED_PROBE Z_SAFE_HOMING
107 107
   - build_marlin
108 108
   #
109
-  # ...with AUTO_BED_LEVELING_LINEAR, Z_MIN_PROBE_REPEATABILITY_TEST, & DEBUG_LEVELING_FEATURE
109
+  # ...with AUTO_BED_LEVELING_LINEAR, Z_MIN_PROBE_REPEATABILITY_TEST, and DEBUG_LEVELING_FEATURE
110 110
   #
111 111
   - opt_enable AUTO_BED_LEVELING_LINEAR Z_MIN_PROBE_REPEATABILITY_TEST DEBUG_LEVELING_FEATURE
112 112
   - opt_set ABL_GRID_POINTS_X 16
@@ -119,9 +119,9 @@ script:
119 119
   - opt_enable Z_PROBE_SLED
120 120
   - build_marlin
121 121
   #
122
-  # ...with AUTO_BED_LEVELING_LINEAR & DEBUG_LEVELING_FEATURE
122
+  # ...with AUTO_BED_LEVELING_LINEAR, DEBUG_LEVELING_FEATURE, EEPROM_SETTINGS, and EEPROM_CHITCHAT
123 123
   #
124
-  - opt_enable AUTO_BED_LEVELING_LINEAR DEBUG_LEVELING_FEATURE
124
+  - opt_enable AUTO_BED_LEVELING_LINEAR DEBUG_LEVELING_FEATURE EEPROM_SETTINGS EEPROM_CHITCHAT
125 125
   - build_marlin
126 126
   #
127 127
   # Test a Servo Probe
@@ -130,9 +130,10 @@ script:
130 130
   - opt_enable NUM_SERVOS Z_ENDSTOP_SERVO_NR Z_SERVO_ANGLES DEACTIVATE_SERVOS_AFTER_MOVE
131 131
   - build_marlin
132 132
   #
133
-  # ...with AUTO_BED_LEVELING_3POINT & DEBUG_LEVELING_FEATURE
133
+  # ...with AUTO_BED_LEVELING_3POINT, DEBUG_LEVELING_FEATURE, EEPROM_SETTINGS, EEPROM_CHITCHAT, EXTENDED_CAPABILITIES_REPORT, and AUTO_REPORT_TEMPERATURES
134 134
   #
135
-  - opt_enable AUTO_BED_LEVELING_3POINT DEBUG_LEVELING_FEATURE
135
+  - opt_enable AUTO_BED_LEVELING_3POINT DEBUG_LEVELING_FEATURE EEPROM_SETTINGS EEPROM_CHITCHAT
136
+  - opt_enable_adv EXTENDED_CAPABILITIES_REPORT AUTO_REPORT_TEMPERATURES
136 137
   - build_marlin
137 138
   #
138 139
   # Test MESH_BED_LEVELING feature, with LCD

+ 0
- 6
Marlin/Conditionals_post.h Ver arquivo

@@ -28,12 +28,6 @@
28 28
 #ifndef CONDITIONALS_POST_H
29 29
 #define CONDITIONALS_POST_H
30 30
 
31
-  #if ENABLED(EMERGENCY_PARSER)
32
-    #define EMERGENCY_PARSER_CAPABILITIES " EMERGENCY_CODES:M108,M112,M410"
33
-  #else
34
-    #define EMERGENCY_PARSER_CAPABILITIES ""
35
-  #endif
36
-
37 31
   /**
38 32
    * Axis lengths and center
39 33
    */

+ 21
- 11
Marlin/Configuration_adv.h Ver arquivo

@@ -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
 
@@ -837,4 +837,14 @@
837 837
  */
838 838
 //#define PINS_DEBUGGING
839 839
 
840
+/**
841
+ * Auto-report temperatures with M155 S<seconds>
842
+ */
843
+//#define AUTO_REPORT_TEMPERATURES
844
+
845
+/**
846
+ * Include capabilities in M115 output
847
+ */
848
+//#define EXTENDED_CAPABILITIES_REPORT
849
+
840 850
 #endif // CONFIGURATION_ADV_H

+ 203
- 93
Marlin/Marlin_main.cpp Ver arquivo

@@ -175,7 +175,7 @@
175 175
  * M112 - Emergency stop.
176 176
  * M113 - Get or set the timeout interval for Host Keepalive "busy" messages. (Requires HOST_KEEPALIVE_FEATURE)
177 177
  * M114 - Report current position.
178
- * M115 - Report capabilities.
178
+ * M115 - Report capabilities. (Extended capabilities requires EXTENDED_CAPABILITIES_REPORT)
179 179
  * M117 - Display a message on the controller screen. (Requires an LCD)
180 180
  * M119 - Report endstops status.
181 181
  * M120 - Enable endstops detection.
@@ -188,6 +188,7 @@
188 188
  * M145 - Set heatup values for materials on the LCD. H<hotend> B<bed> F<fan speed> for S<material> (0=PLA, 1=ABS)
189 189
  * M149 - Set temperature units. (Requires TEMPERATURE_UNITS_SUPPORT)
190 190
  * M150 - Set BlinkM Color R<red> U<green> B<blue>. Values 0-255. (Requires BLINKM)
191
+ * M155 - Auto-report temperatures with interval of S<seconds>. (Requires AUTO_REPORT_TEMPERATURES)
191 192
  * M163 - Set a single proportion for a mixing extruder. (Requires MIXING_EXTRUDER)
192 193
  * M164 - Save the mix as a virtual extruder. (Requires MIXING_EXTRUDER and MIXING_VIRTUAL_TOOLS)
193 194
  * M165 - Set the proportions for a mixing extruder. Use parameters ABCDHI to set the mixing factors. (Requires MIXING_EXTRUDER)
@@ -214,6 +215,8 @@
214 215
  * M226 - Wait until a pin is in a given state: "M226 P<pin> S<state>"
215 216
  * M240 - Trigger a camera to take a photograph. (Requires CHDK or PHOTOGRAPH_PIN)
216 217
  * M250 - Set LCD contrast: "M250 C<contrast>" (0-63). (Requires LCD support)
218
+ * M260 - i2c Send Data (Requires EXPERIMENTAL_I2CBUS)
219
+ * M261 - i2c Request Data (Requires EXPERIMENTAL_I2CBUS)
217 220
  * M280 - Set servo position absolute: "M280 P<index> S<angle|µs>". (Requires servos)
218 221
  * M300 - Play beep sound S<frequency Hz> P<duration ms>
219 222
  * M301 - Set PID parameters P I and D. (Requires PIDTEMP)
@@ -865,11 +868,20 @@ void setup_homepin(void) {
865 868
 #if HAS_CASE_LIGHT
866 869
 
867 870
   void setup_case_light() {
868
-    #if ENABLED(CASE_LIGHT_DEFAULT_ON)
869
-      OUT_WRITE(CASE_LIGHT_PIN, HIGH);
870
-    #else
871
-      OUT_WRITE(CASE_LIGHT_PIN, LOW);
872
-    #endif
871
+    digitalWrite(CASE_LIGHT_PIN,
872
+      #if ENABLED(CASE_LIGHT_DEFAULT_ON)
873
+        255
874
+      #else
875
+        0
876
+      #endif
877
+    );
878
+    analogWrite(CASE_LIGHT_PIN,
879
+      #if ENABLED(CASE_LIGHT_DEFAULT_ON)
880
+        255
881
+      #else
882
+        0
883
+      #endif
884
+    );
873 885
   }
874 886
 
875 887
 #endif
@@ -5141,6 +5153,31 @@ inline void gcode_M105() {
5141 5153
   SERIAL_EOL;
5142 5154
 }
5143 5155
 
5156
+#if ENABLED(AUTO_REPORT_TEMPERATURES) && (HAS_TEMP_HOTEND || HAS_TEMP_BED)
5157
+
5158
+  static uint8_t auto_report_temp_interval;
5159
+  static millis_t next_temp_report_ms;
5160
+
5161
+  /**
5162
+   * M155: Set temperature auto-report interval. M155 S<seconds>
5163
+   */
5164
+  inline void gcode_M155() {
5165
+    if (code_seen('S')) {
5166
+      auto_report_temp_interval = code_value_byte();
5167
+      NOMORE(auto_report_temp_interval, 60);
5168
+      next_temp_report_ms = millis() + 1000UL * auto_report_temp_interval;
5169
+    }
5170
+  }
5171
+
5172
+  inline void auto_report_temperatures() {
5173
+    if (auto_report_temp_interval && ELAPSED(millis(), next_temp_report_ms)) {
5174
+      next_temp_report_ms = millis() + 1000UL * auto_report_temp_interval;
5175
+      print_heaterstates();
5176
+    }
5177
+  }
5178
+
5179
+#endif // AUTO_REPORT_TEMPERATURES
5180
+
5144 5181
 #if FAN_COUNT > 0
5145 5182
 
5146 5183
   /**
@@ -5751,7 +5788,71 @@ inline void gcode_M114() { report_current_position(); }
5751 5788
  * M115: Capabilities string
5752 5789
  */
5753 5790
 inline void gcode_M115() {
5754
-  SERIAL_PROTOCOLPGM(MSG_M115_REPORT);
5791
+  SERIAL_PROTOCOLLNPGM(MSG_M115_REPORT);
5792
+
5793
+  #if ENABLED(EXTENDED_CAPABILITIES_REPORT)
5794
+
5795
+    // EEPROM (M500, M501)
5796
+    SERIAL_PROTOCOLPGM("Cap:");
5797
+    #if ENABLED(EEPROM_SETTINGS)
5798
+      SERIAL_PROTOCOLLNPGM("EEPROM:1");
5799
+    #else
5800
+      SERIAL_PROTOCOLLNPGM("EEPROM:0");
5801
+    #endif
5802
+
5803
+    // AUTOREPORT_TEMP (M155)
5804
+    SERIAL_PROTOCOLPGM("Cap:");
5805
+    #if ENABLED(AUTO_REPORT_TEMPERATURES)
5806
+      SERIAL_PROTOCOLLNPGM("AUTOREPORT_TEMP:1");
5807
+    #else
5808
+      SERIAL_PROTOCOLLNPGM("AUTOREPORT_TEMP:0");
5809
+    #endif
5810
+
5811
+    // PROGRESS (M530 S L, M531 <file>, M532 X L)
5812
+    SERIAL_PROTOCOLPGM("Cap:");
5813
+    SERIAL_PROTOCOLPGM("PROGRESS:0");
5814
+
5815
+    // AUTOLEVEL (G29)
5816
+    SERIAL_PROTOCOLPGM("Cap:");
5817
+    #if HAS_ABL
5818
+      SERIAL_PROTOCOLLNPGM("AUTOLEVEL:1");
5819
+    #else
5820
+      SERIAL_PROTOCOLLNPGM("AUTOLEVEL:0");
5821
+    #endif
5822
+
5823
+    // Z_PROBE (G30)
5824
+    SERIAL_PROTOCOLPGM("Cap:");
5825
+    #if HAS_BED_PROBE
5826
+      SERIAL_PROTOCOLLNPGM("Z_PROBE:1");
5827
+    #else
5828
+      SERIAL_PROTOCOLLNPGM("Z_PROBE:0");
5829
+    #endif
5830
+
5831
+    // SOFTWARE_POWER (G30)
5832
+    SERIAL_PROTOCOLPGM("Cap:");
5833
+    #if HAS_POWER_SWITCH
5834
+      SERIAL_PROTOCOLLNPGM("SOFTWARE_POWER:1");
5835
+    #else
5836
+      SERIAL_PROTOCOLLNPGM("SOFTWARE_POWER:0");
5837
+    #endif
5838
+
5839
+    // TOGGLE_LIGHTS (M355)
5840
+    SERIAL_PROTOCOLPGM("Cap:");
5841
+    #if HAS_CASE_LIGHT
5842
+      SERIAL_PROTOCOLLNPGM("TOGGLE_LIGHTS:1");
5843
+    #else
5844
+      SERIAL_PROTOCOLLNPGM("TOGGLE_LIGHTS:0");
5845
+    #endif
5846
+
5847
+    // EMERGENCY_PARSER (M108, M112, M410)
5848
+    SERIAL_PROTOCOLPGM("Cap:");
5849
+    #if ENABLED(EMERGENCY_PARSER)
5850
+      SERIAL_PROTOCOLLNPGM("EMERGENCY_PARSER:1");
5851
+    #else
5852
+      SERIAL_PROTOCOLLNPGM("EMERGENCY_PARSER:0");
5853
+    #endif
5854
+
5855
+  #endif // EXTENDED_CAPABILITIES_REPORT
5755 5856
 }
5756 5857
 
5757 5858
 /**
@@ -5791,59 +5892,6 @@ inline void gcode_M121() { endstops.enable_globally(false); }
5791 5892
 
5792 5893
 #endif // BLINKM
5793 5894
 
5794
-#if ENABLED(EXPERIMENTAL_I2CBUS)
5795
-
5796
-  /**
5797
-   * M155: Send data to a I2C slave device
5798
-   *
5799
-   * This is a PoC, the formating and arguments for the GCODE will
5800
-   * change to be more compatible, the current proposal is:
5801
-   *
5802
-   *  M155 A<slave device address base 10> ; Sets the I2C slave address the data will be sent to
5803
-   *
5804
-   *  M155 B<byte-1 value in base 10>
5805
-   *  M155 B<byte-2 value in base 10>
5806
-   *  M155 B<byte-3 value in base 10>
5807
-   *
5808
-   *  M155 S1 ; Send the buffered data and reset the buffer
5809
-   *  M155 R1 ; Reset the buffer without sending data
5810
-   *
5811
-   */
5812
-  inline void gcode_M155() {
5813
-    // Set the target address
5814
-    if (code_seen('A')) i2c.address(code_value_byte());
5815
-
5816
-    // Add a new byte to the buffer
5817
-    if (code_seen('B')) i2c.addbyte(code_value_byte());
5818
-
5819
-    // Flush the buffer to the bus
5820
-    if (code_seen('S')) i2c.send();
5821
-
5822
-    // Reset and rewind the buffer
5823
-    else if (code_seen('R')) i2c.reset();
5824
-  }
5825
-
5826
-  /**
5827
-   * M156: Request X bytes from I2C slave device
5828
-   *
5829
-   * Usage: M156 A<slave device address base 10> B<number of bytes>
5830
-   */
5831
-  inline void gcode_M156() {
5832
-    if (code_seen('A')) i2c.address(code_value_byte());
5833
-
5834
-    uint8_t bytes = code_seen('B') ? code_value_byte() : 1;
5835
-
5836
-    if (i2c.addr && bytes && bytes <= TWIBUS_BUFFER_SIZE) {
5837
-      i2c.relay(bytes);
5838
-    }
5839
-    else {
5840
-      SERIAL_ERROR_START;
5841
-      SERIAL_ERRORLN("Bad i2c request");
5842
-    }
5843
-  }
5844
-
5845
-#endif // EXPERIMENTAL_I2CBUS
5846
-
5847 5895
 /**
5848 5896
  * M200: Set filament diameter and set E axis units to cubic units
5849 5897
  *
@@ -6190,6 +6238,59 @@ inline void gcode_M226() {
6190 6238
   } // code_seen('P')
6191 6239
 }
6192 6240
 
6241
+#if ENABLED(EXPERIMENTAL_I2CBUS)
6242
+
6243
+  /**
6244
+   * M260: Send data to a I2C slave device
6245
+   *
6246
+   * This is a PoC, the formating and arguments for the GCODE will
6247
+   * change to be more compatible, the current proposal is:
6248
+   *
6249
+   *  M260 A<slave device address base 10> ; Sets the I2C slave address the data will be sent to
6250
+   *
6251
+   *  M260 B<byte-1 value in base 10>
6252
+   *  M260 B<byte-2 value in base 10>
6253
+   *  M260 B<byte-3 value in base 10>
6254
+   *
6255
+   *  M260 S1 ; Send the buffered data and reset the buffer
6256
+   *  M260 R1 ; Reset the buffer without sending data
6257
+   *
6258
+   */
6259
+  inline void gcode_M260() {
6260
+    // Set the target address
6261
+    if (code_seen('A')) i2c.address(code_value_byte());
6262
+
6263
+    // Add a new byte to the buffer
6264
+    if (code_seen('B')) i2c.addbyte(code_value_byte());
6265
+
6266
+    // Flush the buffer to the bus
6267
+    if (code_seen('S')) i2c.send();
6268
+
6269
+    // Reset and rewind the buffer
6270
+    else if (code_seen('R')) i2c.reset();
6271
+  }
6272
+
6273
+  /**
6274
+   * M261: Request X bytes from I2C slave device
6275
+   *
6276
+   * Usage: M261 A<slave device address base 10> B<number of bytes>
6277
+   */
6278
+  inline void gcode_M261() {
6279
+    if (code_seen('A')) i2c.address(code_value_byte());
6280
+
6281
+    uint8_t bytes = code_seen('B') ? code_value_byte() : 1;
6282
+
6283
+    if (i2c.addr && bytes && bytes <= TWIBUS_BUFFER_SIZE) {
6284
+      i2c.relay(bytes);
6285
+    }
6286
+    else {
6287
+      SERIAL_ERROR_START;
6288
+      SERIAL_ERRORLN("Bad i2c request");
6289
+    }
6290
+  }
6291
+
6292
+#endif // EXPERIMENTAL_I2CBUS
6293
+
6193 6294
 #if HAS_SERVOS
6194 6295
 
6195 6296
   /**
@@ -7099,33 +7200,30 @@ inline void gcode_M907() {
7099 7200
 #endif // HAS_MICROSTEPS
7100 7201
 
7101 7202
 #if HAS_CASE_LIGHT
7203
+
7102 7204
   /**
7103
-   * M355: Turn case lights on/off
7104
-   *
7105
-   *   S<int>   change state on/off or sets PWM
7205
+   * M355: Turn case lights on/off and set brightness
7106 7206
    *
7207
+   *   S<bool>  Turn case light on or off
7208
+   *   P<byte>  Set case light brightness (PWM pin required)
7107 7209
    */
7108 7210
   inline void gcode_M355() {
7211
+    static bool case_light_on
7212
+      #if ENABLED(CASE_LIGHT_DEFAULT_ON)
7213
+        = true
7214
+      #else
7215
+    ;
7216
+    #endif
7217
+    static uint8_t case_light_brightness = 255;
7218
+    if (code_seen('P')) case_light_brightness = code_value_byte();
7109 7219
     if (code_seen('S')) {
7110
-      SERIAL_ECHO_START;
7111
-      SERIAL_ECHOPGM("Case lights ");
7112
-      byte light_pwm = code_value_byte();
7113
-      switch (light_pwm) {
7114
-        case 0: // Disable lights
7115
-          SERIAL_ECHOPGM("off");
7116
-          break;
7117
-        case 1: // Enable lights
7118
-          light_pwm = 255;
7119
-          SERIAL_ECHOPGM("on");
7120
-          break;
7121
-        default: // Enable lights PWM
7122
-          SERIAL_ECHOPAIR("set to: ", (int)map(light_pwm, 0, 255, 0, 100));
7123
-          SERIAL_CHAR('%');
7124
-          break;
7125
-      }
7126
-      analogWrite(CASE_LIGHT_PIN, light_pwm);
7127
-      SERIAL_EOL;
7220
+      case_light_on = code_value_bool();
7221
+      digitalWrite(CASE_LIGHT_PIN, case_light_on ? HIGH : LOW);
7222
+      analogWrite(CASE_LIGHT_PIN, case_light_on ? case_light_brightness : 0);
7128 7223
     }
7224
+    SERIAL_ECHO_START;
7225
+    SERIAL_ECHOPGM("Case lights ");
7226
+    case_light_on ? SERIAL_ECHOLNPGM("on") : SERIAL_ECHOLNPGM("off");
7129 7227
   }
7130 7228
 
7131 7229
 #endif // HAS_CASE_LIGHT
@@ -7846,6 +7944,12 @@ void process_next_command() {
7846 7944
         KEEPALIVE_STATE(NOT_BUSY);
7847 7945
         return; // "ok" already printed
7848 7946
 
7947
+      #if ENABLED(AUTO_REPORT_TEMPERATURES) && (HAS_TEMP_HOTEND || HAS_TEMP_BED)
7948
+        case 155: // M155: Set temperature auto-report interval
7949
+          gcode_M155();
7950
+          break;
7951
+      #endif
7952
+
7849 7953
       case 109: // M109: Wait for hotend temperature to reach target
7850 7954
         gcode_M109();
7851 7955
         break;
@@ -7956,18 +8060,6 @@ void process_next_command() {
7956 8060
 
7957 8061
       #endif // BLINKM
7958 8062
 
7959
-      #if ENABLED(EXPERIMENTAL_I2CBUS)
7960
-
7961
-        case 155: // M155: Send data to an i2c slave
7962
-          gcode_M155();
7963
-          break;
7964
-
7965
-        case 156: // M156: Request data from an i2c slave
7966
-          gcode_M156();
7967
-          break;
7968
-
7969
-      #endif //EXPERIMENTAL_I2CBUS
7970
-
7971 8063
       #if ENABLED(MIXING_EXTRUDER)
7972 8064
         case 163: // M163: Set a component weight for mixing extruder
7973 8065
           gcode_M163();
@@ -8090,6 +8182,18 @@ void process_next_command() {
8090 8182
           break;
8091 8183
       #endif // HAS_LCD_CONTRAST
8092 8184
 
8185
+      #if ENABLED(EXPERIMENTAL_I2CBUS)
8186
+
8187
+        case 260: // M260: Send data to an i2c slave
8188
+          gcode_M260();
8189
+          break;
8190
+
8191
+        case 261: // M261: Request data from an i2c slave
8192
+          gcode_M261();
8193
+          break;
8194
+
8195
+      #endif // EXPERIMENTAL_I2CBUS
8196
+
8093 8197
       #if ENABLED(PREVENT_COLD_EXTRUSION)
8094 8198
         case 302: // M302: Allow cold extrudes (set the minimum extrude temperature)
8095 8199
           gcode_M302();
@@ -9669,7 +9773,13 @@ void idle(
9669 9773
   #endif
9670 9774
 ) {
9671 9775
   lcd_update();
9776
+
9672 9777
   host_keepalive();
9778
+
9779
+  #if ENABLED(AUTO_REPORT_TEMPERATURES) && (HAS_TEMP_HOTEND || HAS_TEMP_BED)
9780
+    auto_report_temperatures();
9781
+  #endif
9782
+
9673 9783
   manage_inactivity(
9674 9784
     #if ENABLED(FILAMENT_CHANGE_FEATURE)
9675 9785
       no_stepper_sleep

+ 21
- 11
Marlin/example_configurations/Cartesio/Configuration_adv.h Ver arquivo

@@ -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
 
@@ -837,4 +837,14 @@
837 837
  */
838 838
 //#define PINS_DEBUGGING
839 839
 
840
+/**
841
+ * Auto-report temperatures with M155 S<seconds>
842
+ */
843
+//#define AUTO_REPORT_TEMPERATURES
844
+
845
+/**
846
+ * Include capabilities in M115 output
847
+ */
848
+//#define EXTENDED_CAPABILITIES_REPORT
849
+
840 850
 #endif // CONFIGURATION_ADV_H

+ 21
- 11
Marlin/example_configurations/Felix/Configuration_adv.h Ver arquivo

@@ -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
 
@@ -837,4 +837,14 @@
837 837
  */
838 838
 //#define PINS_DEBUGGING
839 839
 
840
+/**
841
+ * Auto-report temperatures with M155 S<seconds>
842
+ */
843
+//#define AUTO_REPORT_TEMPERATURES
844
+
845
+/**
846
+ * Include capabilities in M115 output
847
+ */
848
+//#define EXTENDED_CAPABILITIES_REPORT
849
+
840 850
 #endif // CONFIGURATION_ADV_H

+ 21
- 11
Marlin/example_configurations/Hephestos/Configuration_adv.h Ver arquivo

@@ -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
 
@@ -837,4 +837,14 @@
837 837
  */
838 838
 //#define PINS_DEBUGGING
839 839
 
840
+/**
841
+ * Auto-report temperatures with M155 S<seconds>
842
+ */
843
+//#define AUTO_REPORT_TEMPERATURES
844
+
845
+/**
846
+ * Include capabilities in M115 output
847
+ */
848
+//#define EXTENDED_CAPABILITIES_REPORT
849
+
840 850
 #endif // CONFIGURATION_ADV_H

+ 21
- 11
Marlin/example_configurations/Hephestos_2/Configuration_adv.h Ver arquivo

@@ -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
 
@@ -837,4 +837,14 @@
837 837
  */
838 838
 //#define PINS_DEBUGGING
839 839
 
840
+/**
841
+ * Auto-report temperatures with M155 S<seconds>
842
+ */
843
+//#define AUTO_REPORT_TEMPERATURES
844
+
845
+/**
846
+ * Include capabilities in M115 output
847
+ */
848
+//#define EXTENDED_CAPABILITIES_REPORT
849
+
840 850
 #endif // CONFIGURATION_ADV_H

+ 21
- 11
Marlin/example_configurations/K8200/Configuration_adv.h Ver arquivo

@@ -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
 
@@ -843,4 +843,14 @@
843 843
  */
844 844
 //#define PINS_DEBUGGING
845 845
 
846
+/**
847
+ * Auto-report temperatures with M155 S<seconds>
848
+ */
849
+//#define AUTO_REPORT_TEMPERATURES
850
+
851
+/**
852
+ * Include capabilities in M115 output
853
+ */
854
+//#define EXTENDED_CAPABILITIES_REPORT
855
+
846 856
 #endif // CONFIGURATION_ADV_H

+ 21
- 11
Marlin/example_configurations/K8400/Configuration_adv.h Ver arquivo

@@ -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
 
@@ -837,4 +837,14 @@
837 837
  */
838 838
 //#define PINS_DEBUGGING
839 839
 
840
+/**
841
+ * Auto-report temperatures with M155 S<seconds>
842
+ */
843
+//#define AUTO_REPORT_TEMPERATURES
844
+
845
+/**
846
+ * Include capabilities in M115 output
847
+ */
848
+//#define EXTENDED_CAPABILITIES_REPORT
849
+
840 850
 #endif // CONFIGURATION_ADV_H

+ 21
- 11
Marlin/example_configurations/RigidBot/Configuration_adv.h Ver arquivo

@@ -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
 
@@ -837,4 +837,14 @@
837 837
  */
838 838
 //#define PINS_DEBUGGING
839 839
 
840
+/**
841
+ * Auto-report temperatures with M155 S<seconds>
842
+ */
843
+//#define AUTO_REPORT_TEMPERATURES
844
+
845
+/**
846
+ * Include capabilities in M115 output
847
+ */
848
+//#define EXTENDED_CAPABILITIES_REPORT
849
+
840 850
 #endif // CONFIGURATION_ADV_H

+ 21
- 11
Marlin/example_configurations/SCARA/Configuration_adv.h Ver arquivo

@@ -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
 
@@ -837,4 +837,14 @@
837 837
  */
838 838
 //#define PINS_DEBUGGING
839 839
 
840
+/**
841
+ * Auto-report temperatures with M155 S<seconds>
842
+ */
843
+//#define AUTO_REPORT_TEMPERATURES
844
+
845
+/**
846
+ * Include capabilities in M115 output
847
+ */
848
+//#define EXTENDED_CAPABILITIES_REPORT
849
+
840 850
 #endif // CONFIGURATION_ADV_H

+ 21
- 11
Marlin/example_configurations/TAZ4/Configuration_adv.h Ver arquivo

@@ -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
 
@@ -845,4 +845,14 @@
845 845
  */
846 846
 //#define PINS_DEBUGGING
847 847
 
848
+/**
849
+ * Auto-report temperatures with M155 S<seconds>
850
+ */
851
+//#define AUTO_REPORT_TEMPERATURES
852
+
853
+/**
854
+ * Include capabilities in M115 output
855
+ */
856
+//#define EXTENDED_CAPABILITIES_REPORT
857
+
848 858
 #endif // CONFIGURATION_ADV_H

+ 21
- 11
Marlin/example_configurations/WITBOX/Configuration_adv.h Ver arquivo

@@ -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
 
@@ -837,4 +837,14 @@
837 837
  */
838 838
 //#define PINS_DEBUGGING
839 839
 
840
+/**
841
+ * Auto-report temperatures with M155 S<seconds>
842
+ */
843
+//#define AUTO_REPORT_TEMPERATURES
844
+
845
+/**
846
+ * Include capabilities in M115 output
847
+ */
848
+//#define EXTENDED_CAPABILITIES_REPORT
849
+
840 850
 #endif // CONFIGURATION_ADV_H

+ 21
- 11
Marlin/example_configurations/delta/biv2.5/Configuration_adv.h Ver arquivo

@@ -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
 
@@ -839,4 +839,14 @@
839 839
  */
840 840
 //#define PINS_DEBUGGING
841 841
 
842
+/**
843
+ * Auto-report temperatures with M155 S<seconds>
844
+ */
845
+//#define AUTO_REPORT_TEMPERATURES
846
+
847
+/**
848
+ * Include capabilities in M115 output
849
+ */
850
+//#define EXTENDED_CAPABILITIES_REPORT
851
+
842 852
 #endif // CONFIGURATION_ADV_H

+ 21
- 11
Marlin/example_configurations/delta/generic/Configuration_adv.h Ver arquivo

@@ -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
 
@@ -839,4 +839,14 @@
839 839
  */
840 840
 //#define PINS_DEBUGGING
841 841
 
842
+/**
843
+ * Auto-report temperatures with M155 S<seconds>
844
+ */
845
+//#define AUTO_REPORT_TEMPERATURES
846
+
847
+/**
848
+ * Include capabilities in M115 output
849
+ */
850
+//#define EXTENDED_CAPABILITIES_REPORT
851
+
842 852
 #endif // CONFIGURATION_ADV_H

+ 21
- 11
Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h Ver arquivo

@@ -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
 
@@ -839,4 +839,14 @@
839 839
  */
840 840
 //#define PINS_DEBUGGING
841 841
 
842
+/**
843
+ * Auto-report temperatures with M155 S<seconds>
844
+ */
845
+//#define AUTO_REPORT_TEMPERATURES
846
+
847
+/**
848
+ * Include capabilities in M115 output
849
+ */
850
+//#define EXTENDED_CAPABILITIES_REPORT
851
+
842 852
 #endif // CONFIGURATION_ADV_H

+ 21
- 11
Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h Ver arquivo

@@ -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
 
@@ -844,4 +844,14 @@
844 844
  */
845 845
 //#define PINS_DEBUGGING
846 846
 
847
+/**
848
+ * Auto-report temperatures with M155 S<seconds>
849
+ */
850
+//#define AUTO_REPORT_TEMPERATURES
851
+
852
+/**
853
+ * Include capabilities in M115 output
854
+ */
855
+//#define EXTENDED_CAPABILITIES_REPORT
856
+
847 857
 #endif // CONFIGURATION_ADV_H

+ 21
- 11
Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h Ver arquivo

@@ -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
 
@@ -839,4 +839,14 @@
839 839
  */
840 840
 //#define PINS_DEBUGGING
841 841
 
842
+/**
843
+ * Auto-report temperatures with M155 S<seconds>
844
+ */
845
+//#define AUTO_REPORT_TEMPERATURES
846
+
847
+/**
848
+ * Include capabilities in M115 output
849
+ */
850
+//#define EXTENDED_CAPABILITIES_REPORT
851
+
842 852
 #endif // CONFIGURATION_ADV_H

+ 21
- 11
Marlin/example_configurations/makibox/Configuration_adv.h Ver arquivo

@@ -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
 
@@ -837,4 +837,14 @@
837 837
  */
838 838
 //#define PINS_DEBUGGING
839 839
 
840
+/**
841
+ * Auto-report temperatures with M155 S<seconds>
842
+ */
843
+//#define AUTO_REPORT_TEMPERATURES
844
+
845
+/**
846
+ * Include capabilities in M115 output
847
+ */
848
+//#define EXTENDED_CAPABILITIES_REPORT
849
+
840 850
 #endif // CONFIGURATION_ADV_H

+ 21
- 11
Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h Ver arquivo

@@ -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
 
@@ -837,4 +837,14 @@
837 837
  */
838 838
 //#define PINS_DEBUGGING
839 839
 
840
+/**
841
+ * Auto-report temperatures with M155 S<seconds>
842
+ */
843
+//#define AUTO_REPORT_TEMPERATURES
844
+
845
+/**
846
+ * Include capabilities in M115 output
847
+ */
848
+//#define EXTENDED_CAPABILITIES_REPORT
849
+
840 850
 #endif // CONFIGURATION_ADV_H

+ 1
- 1
Marlin/language.h Ver arquivo

@@ -129,7 +129,7 @@
129 129
 #define MSG_INVALID_EXTRUDER                "Invalid extruder"
130 130
 #define MSG_INVALID_SOLENOID                "Invalid solenoid"
131 131
 #define MSG_ERR_NO_THERMISTORS              "No thermistors - no temperature"
132
-#define MSG_M115_REPORT                     "FIRMWARE_NAME:Marlin " DETAILED_BUILD_VERSION " SOURCE_CODE_URL:" SOURCE_CODE_URL " PROTOCOL_VERSION:" PROTOCOL_VERSION " MACHINE_TYPE:" MACHINE_NAME " EXTRUDER_COUNT:" STRINGIFY(EXTRUDERS) " UUID:" MACHINE_UUID EMERGENCY_PARSER_CAPABILITIES "\n"
132
+#define MSG_M115_REPORT                     "FIRMWARE_NAME:Marlin " DETAILED_BUILD_VERSION " SOURCE_CODE_URL:" SOURCE_CODE_URL " PROTOCOL_VERSION:" PROTOCOL_VERSION " MACHINE_TYPE:" MACHINE_NAME " EXTRUDER_COUNT:" STRINGIFY(EXTRUDERS) " UUID:" MACHINE_UUID
133 133
 #define MSG_COUNT_X                         " Count X: "
134 134
 #define MSG_COUNT_A                         " Count A: "
135 135
 #define MSG_ERR_KILLED                      "Printer halted. kill() called!"

+ 0
- 2
Marlin/twibus.cpp Ver arquivo

@@ -77,8 +77,6 @@ void TWIBus::addstring(char str[]) {
77 77
 }
78 78
 
79 79
 void TWIBus::send() {
80
-  if (!this->addr) return;
81
-
82 80
   #if ENABLED(DEBUG_TWIBUS)
83 81
     debug(PSTR("send"), this->addr);
84 82
   #endif

+ 3
- 3
Marlin/twibus.h Ver arquivo

@@ -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
  *

Carregando…
Cancelar
Salvar