Browse Source

Miscellaneous tweaks to serial outputs, code cleanups

Scott Lahteine 6 years ago
parent
commit
e337df2e98
4 changed files with 10 additions and 6 deletions
  1. 3
    2
      Marlin/Marlin_main.cpp
  2. 2
    2
      Marlin/configuration_store.cpp
  3. 4
    1
      Marlin/pinsDebug.h
  4. 1
    1
      Marlin/temperature.cpp

+ 3
- 2
Marlin/Marlin_main.cpp View File

13324
     SERIAL_ECHOPGM(MSG_CONFIGURATION_VER);
13324
     SERIAL_ECHOPGM(MSG_CONFIGURATION_VER);
13325
     SERIAL_ECHOPGM(STRING_DISTRIBUTION_DATE);
13325
     SERIAL_ECHOPGM(STRING_DISTRIBUTION_DATE);
13326
     SERIAL_ECHOLNPGM(MSG_AUTHOR STRING_CONFIG_H_AUTHOR);
13326
     SERIAL_ECHOLNPGM(MSG_AUTHOR STRING_CONFIG_H_AUTHOR);
13327
+    SERIAL_ECHO_START();
13327
     SERIAL_ECHOLNPGM("Compiled: " __DATE__);
13328
     SERIAL_ECHOLNPGM("Compiled: " __DATE__);
13328
   #endif
13329
   #endif
13329
 
13330
 
13491
   #if ENABLED(SWITCHING_NOZZLE)
13492
   #if ENABLED(SWITCHING_NOZZLE)
13492
     move_nozzle_servo(0);  // Initialize nozzle servo
13493
     move_nozzle_servo(0);  // Initialize nozzle servo
13493
   #endif
13494
   #endif
13494
-  
13495
+
13495
   #if ENABLED(PARKING_EXTRUDER)
13496
   #if ENABLED(PARKING_EXTRUDER)
13496
     #if ENABLED(PARKING_EXTRUDER_SOLENOIDS_INVERT)
13497
     #if ENABLED(PARKING_EXTRUDER_SOLENOIDS_INVERT)
13497
       pe_activate_magnet(0);
13498
       pe_activate_magnet(0);
13498
       pe_activate_magnet(1);
13499
       pe_activate_magnet(1);
13499
-    #else 
13500
+    #else
13500
       pe_deactivate_magnet(0);
13501
       pe_deactivate_magnet(0);
13501
       pe_deactivate_magnet(1);
13502
       pe_deactivate_magnet(1);
13502
     #endif
13503
     #endif

+ 2
- 2
Marlin/configuration_store.cpp View File

659
       #if ENABLED(EEPROM_CHITCHAT)
659
       #if ENABLED(EEPROM_CHITCHAT)
660
         SERIAL_ECHO_START();
660
         SERIAL_ECHO_START();
661
         SERIAL_ECHOPAIR("Settings Stored (", eeprom_size - (EEPROM_OFFSET));
661
         SERIAL_ECHOPAIR("Settings Stored (", eeprom_size - (EEPROM_OFFSET));
662
-        SERIAL_ECHOPAIR(" bytes; crc ", final_crc);
662
+        SERIAL_ECHOPAIR(" bytes; crc ", (uint32_t)final_crc);
663
         SERIAL_ECHOLNPGM(")");
663
         SERIAL_ECHOLNPGM(")");
664
       #endif
664
       #endif
665
     }
665
     }
1010
           SERIAL_ECHO_START();
1010
           SERIAL_ECHO_START();
1011
           SERIAL_ECHO(version);
1011
           SERIAL_ECHO(version);
1012
           SERIAL_ECHOPAIR(" stored settings retrieved (", eeprom_index - (EEPROM_OFFSET));
1012
           SERIAL_ECHOPAIR(" stored settings retrieved (", eeprom_index - (EEPROM_OFFSET));
1013
-          SERIAL_ECHOPAIR(" bytes; crc ", working_crc);
1013
+          SERIAL_ECHOPAIR(" bytes; crc ", (uint32_t)working_crc);
1014
           SERIAL_ECHOLNPGM(")");
1014
           SERIAL_ECHOLNPGM(")");
1015
         #endif
1015
         #endif
1016
       }
1016
       }

+ 4
- 1
Marlin/pinsDebug.h View File

272
 static void err_is_counter()     { SERIAL_PROTOCOLPGM("   non-standard PWM mode"); }
272
 static void err_is_counter()     { SERIAL_PROTOCOLPGM("   non-standard PWM mode"); }
273
 static void err_is_interrupt()   { SERIAL_PROTOCOLPGM("   compare interrupt enabled"); }
273
 static void err_is_interrupt()   { SERIAL_PROTOCOLPGM("   compare interrupt enabled"); }
274
 static void err_prob_interrupt() { SERIAL_PROTOCOLPGM("   overflow interrupt enabled"); }
274
 static void err_prob_interrupt() { SERIAL_PROTOCOLPGM("   overflow interrupt enabled"); }
275
-static void print_is_also_tied() { SERIAL_PROTOCOLPGM(" is also tied to this pin"); SERIAL_PROTOCOL_SP(14); }
275
+
276
+#if AVR_ATmega2560_FAMILY || AVR_AT90USB1286_FAMILY
277
+  static void print_is_also_tied() { SERIAL_PROTOCOLPGM(" is also tied to this pin"); SERIAL_PROTOCOL_SP(14); }
278
+#endif
276
 
279
 
277
 void com_print(uint8_t N, uint8_t Z) {
280
 void com_print(uint8_t N, uint8_t Z) {
278
   const uint8_t *TCCRA = (uint8_t*)TCCR_A(N);
281
   const uint8_t *TCCRA = (uint8_t*)TCCR_A(N);

+ 1
- 1
Marlin/temperature.cpp View File

1559
 
1559
 
1560
     if (endstop_change) {
1560
     if (endstop_change) {
1561
       #if HAS_X_MIN
1561
       #if HAS_X_MIN
1562
-        if (TEST(endstop_change, X_MIN)) SERIAL_PROTOCOLPAIR("X_MIN:", !!TEST(current_endstop_bits_local, X_MIN));
1562
+        if (TEST(endstop_change, X_MIN)) SERIAL_PROTOCOLPAIR("  X_MIN:", !!TEST(current_endstop_bits_local, X_MIN));
1563
       #endif
1563
       #endif
1564
       #if HAS_X_MAX
1564
       #if HAS_X_MAX
1565
         if (TEST(endstop_change, X_MAX)) SERIAL_PROTOCOLPAIR("  X_MAX:", !!TEST(current_endstop_bits_local, X_MAX));
1565
         if (TEST(endstop_change, X_MAX)) SERIAL_PROTOCOLPAIR("  X_MAX:", !!TEST(current_endstop_bits_local, X_MAX));

Loading…
Cancel
Save