Browse Source

Mixer patch, etc.

Scott Lahteine 6 years ago
parent
commit
842466f4d9
2 changed files with 3 additions and 9 deletions
  1. 0
    1
      Marlin/src/feature/I2CPositionEncoder.cpp
  2. 3
    8
      Marlin/src/lcd/menu/menu_mixer.cpp

+ 0
- 1
Marlin/src/feature/I2CPositionEncoder.cpp View File

424
     travelledDistance = mm_from_count(ABS(stopCount - startCount));
424
     travelledDistance = mm_from_count(ABS(stopCount - startCount));
425
 
425
 
426
     SERIAL_ECHOLNPAIR("Attempted travel: ", travelDistance, "mm");
426
     SERIAL_ECHOLNPAIR("Attempted travel: ", travelDistance, "mm");
427
-
428
     SERIAL_ECHOLNPAIR("   Actual travel:  ", travelledDistance, "mm");
427
     SERIAL_ECHOLNPAIR("   Actual travel:  ", travelledDistance, "mm");
429
 
428
 
430
     //Calculate new axis steps per unit
429
     //Calculate new axis steps per unit

+ 3
- 8
Marlin/src/lcd/menu/menu_mixer.cpp View File

272
     #endif
272
     #endif
273
   );
273
   );
274
 
274
 
275
-  MENU_ITEM(submenu, MSG_MIX,
276
-    #if CHANNEL_MIX_EDITING
277
-      _lcd_goto_mix_edit
278
-    #elif DUAL_MIXING_EXTRUDER
279
-      lcd_mixer_mix_edit
280
-    #endif
281
-  );
282
-
283
   #if DUAL_MIXING_EXTRUDER
275
   #if DUAL_MIXING_EXTRUDER
284
   {
276
   {
285
     char tmp[10];
277
     char tmp[10];
278
+    MENU_ITEM(submenu, MSG_MIX, lcd_mixer_mix_edit);
286
     MENU_ITEM_ADDON_START(10);
279
     MENU_ITEM_ADDON_START(10);
287
       mixer.update_mix_from_vtool();
280
       mixer.update_mix_from_vtool();
288
       sprintf_P(tmp, PSTR("%3d;%3d%%"), int(mixer.mix[0]), int(mixer.mix[1]));
281
       sprintf_P(tmp, PSTR("%3d;%3d%%"), int(mixer.mix[0]), int(mixer.mix[1]));
290
     MENU_ITEM_ADDON_END();
283
     MENU_ITEM_ADDON_END();
291
     MENU_ITEM(function, MSG_TOGGLE_MIX, _lcd_mixer_toggle_mix);
284
     MENU_ITEM(function, MSG_TOGGLE_MIX, _lcd_mixer_toggle_mix);
292
   }
285
   }
286
+  #else
287
+    MENU_ITEM(submenu, MSG_MIX, _lcd_goto_mix_edit);
293
   #endif
288
   #endif
294
 
289
 
295
   MENU_ITEM(submenu, MSG_RESET_VTOOLS, menu_mixer_vtools_reset_confirm);
290
   MENU_ITEM(submenu, MSG_RESET_VTOOLS, menu_mixer_vtools_reset_confirm);

Loading…
Cancel
Save