Merge remote-tracking branch 'refs/remotes/origin/master' into dev

MarlinKimbra/Configuration_Basic.h

@@ -41,7 +41,8 @@
 #define MACHINE_UUID "00000000-0000-0000-0000-000000000000"
 
 // If you want test the firmware uncomment below. Use Serial arduino monitor...
-//#define FIRMWARE_TEST // ONLY BAUDRATE 115200
+// ONLY BAUDRATE 115200
+//#define FIRMWARE_TEST
 
 // Some particular clients re-start sending commands only after receiving a 'wait' when there is a bed serial-connection.
 //#define NO_TIMEOUTS 1000  // Milliseconds

MarlinKimbra/Configuration_Cartesian.h

@@ -253,24 +253,24 @@
 
 // Enable this to sample the bed in a grid (least squares solution)
 // Note: this feature generates 10KB extra code size
-#define AUTO_BED_LEVELING_GRID
+//#define AUTO_BED_LEVELING_GRID
 
 // yes AUTO_BED_LEVELING_GRID
-#define MIN_PROBE_EDGE 10 // The probe square sides can be no smaller than this
+//#define MIN_PROBE_EDGE 10 // The probe square sides can be no smaller than this
 // Set the number of grid points per dimension
 // You probably don't need more than 3 (squared=9)
-#define AUTO_BED_LEVELING_GRID_POINTS 2
+//#define AUTO_BED_LEVELING_GRID_POINTS 2
 // yes AUTO_BED_LEVELING_GRID
 
 // no AUTO_BED_LEVELING_GRID
 // Arbitrary points to probe. A simple cross-product
 // is used to estimate the plane of the bed.
-#define ABL_PROBE_PT_1_X 15
-#define ABL_PROBE_PT_1_Y 180
-#define ABL_PROBE_PT_2_X 15
-#define ABL_PROBE_PT_2_Y 20
-#define ABL_PROBE_PT_3_X 170
-#define ABL_PROBE_PT_3_Y 20
+//#define ABL_PROBE_PT_1_X 15
+//#define ABL_PROBE_PT_1_Y 180
+//#define ABL_PROBE_PT_2_X 15
+//#define ABL_PROBE_PT_2_Y 20
+//#define ABL_PROBE_PT_3_X 170
+//#define ABL_PROBE_PT_3_Y 20
 // no AUTO_BED_LEVELING_GRID
 
 // Offsets to the probe relative to the extruder tip (Hotend - Probe)

MarlinKimbra/MarlinKimbra.ino

 /**
  * MarlinKimbra Firmware
  *
- * Based on Sprinter and grbl.
+ * Based on Marlin, Sprinter and grbl
+ * Copyright (C) 2013 MagoKimbra
  * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
  *
  * This program is free software: you can redistribute it and/or modify
@@ -16,20 +17,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * About Marlin
- *
- * This firmware is a mashup between Sprinter and grbl.
- *  - https://github.com/kliment/Sprinter
- *  - https://github.com/simen/grbl/tree
- *
- * It has preliminary support for Matthew Roberts advance algorithm
- *  - http://reprap.org/pipermail/reprap-dev/2011-May/003323.html
  */
 
-/* All the implementation is done in *.cpp files to get better compatibility with avr-gcc without the Arduino IDE */
-/* Use this file to help the Arduino IDE find which Arduino libraries are needed and to keep documentation on GCode */
-
 #include "base.h"
 
 #if ENABLED(DIGIPOT_I2C) || ENABLED(BLINKM)

MarlinKimbra/Marlin_main.cpp

@@ -31,7 +31,7 @@
 
 #include "Marlin_main.h"
 #include "ultralcd.h"
-#include "nextion/nextion_lcd.h"
+#include "module/nextion_lcd.h"
 #include "base.h"
 #if ENABLED(AUTO_BED_LEVELING_FEATURE)
   #include "vector_3.h"
@@ -54,16 +54,15 @@
 #endif
 
 #if HAS(BUZZER)
-  #include "buzzer.h"
+  #include "module/buzzer.h"
 #endif
 
 #if ENABLED(BLINKM)
-  #include "blinkm.h"
-  #include "Wire.h"
+  #include "module/blinkm.h"
 #endif
 
 #if HAS(SERVOS)
-  #include "servo.h"
+  #include "module/servo.h"
 #endif
 
 #if HAS(DIGIPOTSS)
@@ -71,7 +70,7 @@
 #endif
 
 #if ENABLED(FIRMWARE_TEST)
-  #include "firmware_test.h"
+  #include "module/firmware_test.h"
 #endif
 
 /**

MarlinKimbra/cardreader.cpp

@@ -11,7 +11,7 @@
 #include "stepper.h"
 #include "temperature.h"
 #include "ultralcd.h"
-#include "nextion/nextion_lcd.h"
+#include "module/nextion_lcd.h"
 #include "cardreader.h"
 
 CardReader::CardReader() {

MarlinKimbra/conditionals.h

@@ -708,6 +708,18 @@
  * Servos
  */
 #if HAS(SERVOS)
+  #ifndef X_ENDSTOP_SERVO_NR
+    #define X_ENDSTOP_SERVO_NR -1
+  #endif
+  #ifndef Y_ENDSTOP_SERVO_NR
+    #define Y_ENDSTOP_SERVO_NR -1
+  #endif
+  #ifndef Z_ENDSTOP_SERVO_NR
+    #define Z_ENDSTOP_SERVO_NR -1
+  #endif
+  #ifndef SERVO_DEACTIVATION_DELAY
+    #define SERVO_DEACTIVATION_DELAY 300
+  #endif
   #if X_ENDSTOP_SERVO_NR >= 0 || Y_ENDSTOP_SERVO_NR >= 0 || Z_ENDSTOP_SERVO_NR >= 0
     #define HAS_SERVO_ENDSTOPS true
     #define SERVO_ENDSTOP_IDS { X_ENDSTOP_SERVO_NR, Y_ENDSTOP_SERVO_NR, Z_ENDSTOP_SERVO_NR }

MarlinKimbra/blinkm.cpp → MarlinKimbra/module/blinkm.cpp

@@ -2,11 +2,12 @@
   blinkm.cpp - Library for controlling a BlinkM over i2c
   Created by Tim Koster, August 21 2013.
 */
-#include "base.h"
+#include "../base.h"
 
 #if ENABLED(BLINKM)
 
 #include "blinkm.h"
+#include <Wire.h>
 
 void SendColors(byte red, byte grn, byte blu) {
   Wire.begin();

MarlinKimbra/buzzer.cpp → MarlinKimbra/module/buzzer.cpp

-#include "base.h"
+#include "../base.h"
+
 #if HAS(BUZZER)
   #include "buzzer.h"
-  #include "ultralcd.h"
+  #include "../ultralcd.h"
 
   void buzz(long duration, uint16_t freq) {
     if (freq > 0) {

MarlinKimbra/firmware_test.cpp → MarlinKimbra/module/firmware_test.cpp

-/*
-  Test.h
-  Tools for firmware test
-  By MagoKimbra
+/**
+ * Tools for firmware test
+ * By MagoKimbra
  */
 
-#include "base.h"
+#include "../base.h"
+
 #if ENABLED(FIRMWARE_TEST)
-#include "Marlin_main.h"
+
+#include "firmware_test.h"
+
+#include "../Marlin_main.h"
+#include "../planner.h"
+#include "../stepper_indirection.h"
+#include "../stepper.h"
+#include "../temperature.h"
+
 #if ENABLED(AUTO_BED_LEVELING_FEATURE)
-  #include "vector_3.h"
+  #include "../vector_3.h"
 #endif
-#include "planner.h"
-#include "stepper_indirection.h"
-#include "stepper.h"
-#include "temperature.h"
-#include "firmware_test.h"
+
 static char serial_answer;
 
 void FirmwareTest() {

MarlinKimbra/firmware_test.h → MarlinKimbra/module/firmware_test.h

 #ifndef FIRMWARE_TEST_H
-#define FIRMWARE_TEST_H
-
-void FirmwareTest();
+  #define FIRMWARE_TEST_H
+  void FirmwareTest();
 #endif

MarlinKimbra/nextion/nextion_lcd.cpp → MarlinKimbra/module/nextion_lcd.cpp

@@ -17,16 +17,18 @@
   #include "nextion_gfx.h"
   #include <Nextion.h>
 
+  const float MaxWave   = 0.2;
   bool NextionON        = false;
   bool PageInfo         = false;
+  bool gfxON            = false;
   char buffer[100]      = {0};
   uint32_t slidermaxval = 20;
-  char lcd_status_message[30] = WELCOME_MSG; // worst case is kana with up to 3*LCD_WIDTH+1
+  char lcd_status_message[30] = WELCOME_MSG;
   uint8_t lcd_status_message_level = 0;
   static millis_t next_lcd_update_ms;
 
   #if ENABLED(NEXTION_GFX)
-    GFX gfx = GFX(200, 190);
+    GFX gfx = GFX(196, 194);
   #endif
 
   // Page
@@ -39,10 +41,10 @@
   NexPage Pmove         = NexPage(6, 0, "move");
 
   // Text
-  NexText Hotend0       = NexText(1,  2,  "t0");
+  NexText Hotend0       = NexText(1,  1,  "t0");
   NexText Hotend1       = NexText(1,  4,  "t1");
-  NexText Hotend21      = NexText(1,  5,  "h2");
-  NexText Hotend2       = NexText(1,  6,  "t2");
+  NexText Hotend2       = NexText(1,  5,  "t2");
+  NexText Hotend21      = NexText(1,  6,  "h2");
   NexText LedStatus     = NexText(1,  7,  "t4");
   NexText LedCoord      = NexText(1,  8,  "t5");
   NexText set0          = NexText(2,  2,  "set0");
@@ -55,15 +57,15 @@
   NexText sdfolder      = NexText(4, 23,  "sdfolder");
 
   // Picture
-  NexPicture Menu       = NexPicture(1,  9, "p0");
-  NexPicture MSD        = NexPicture(1, 10, "p1");
-  NexPicture MSetup     = NexPicture(1, 11, "p2");
-  NexPicture Hend0      = NexPicture(1, 12, "p3");
+  NexPicture Menu       = NexPicture(1, 10, "p0");
+  NexPicture MSD        = NexPicture(1, 11, "p1");
+  NexPicture MSetup     = NexPicture(1, 12, "p2");
+  NexPicture Hend0      = NexPicture(1, 13, "p3");
   NexPicture Hend1      = NexPicture(1, 14, "p4");
-  NexPicture Hend2      = NexPicture(1, 16, "p5");
-  NexPicture Fanpic     = NexPicture(1, 18, "p6");
-  NexPicture NPlay      = NexPicture(1, 24, "p7");
-  NexPicture NStop      = NexPicture(1, 25, "p8");
+  NexPicture Hend2      = NexPicture(1, 15, "p5");
+  NexPicture Fanpic     = NexPicture(1, 19, "p6");
+  NexPicture NPlay      = NexPicture(1, 27, "p7");
+  NexPicture NStop      = NexPicture(1, 28, "p8");
   NexPicture Exit1      = NexPicture(3,  4, "p3");
   NexPicture Folder0    = NexPicture(4,  9, "p0");
   NexPicture Folder1    = NexPicture(4, 10, "p1");
@@ -84,29 +86,32 @@
   NexPicture ZDown      = NexPicture(6, 12, "p11");
 
   // Progress Bar
-  NexProgressBar sdbar  = NexProgressBar(1, 23, "j0");
+  NexProgressBar sdbar  = NexProgressBar(1, 26, "j0");
 
   // Slider
   NexSlider sdlist      = NexSlider(4, 1,   "h0");
 
   // Wafeform
+  NexWaveform Graph0    = NexWaveform(1,  9, "s0");
+  NexWaveform Graph1    = NexWaveform(1, 24, "s1");
+  NexWaveform Graph2    = NexWaveform(1, 25, "s2");
 
   // Touch area
-  NexHotspot hot0       = NexHotspot(1, 13, "hot0");
-  NexHotspot hot1       = NexHotspot(1, 15, "hot1");
-  NexHotspot hot2       = NexHotspot(1, 17, "hot2");
+  NexHotspot hot0       = NexHotspot(1, 14, "hot0");
+  NexHotspot hot1       = NexHotspot(1, 16, "hot1");
+  NexHotspot hot2       = NexHotspot(1, 18, "hot2");
   NexHotspot m11        = NexHotspot(2, 14, "m11");
   NexHotspot tup        = NexHotspot(2, 16, "tup");
   NexHotspot tdown      = NexHotspot(2, 17, "tdown");
 
   // Timer
   NexTimer startimer    = NexTimer(0,  1, "tm0");
-  NexTimer fantimer     = NexTimer(1, 22, "tm0");
+  NexTimer fantimer     = NexTimer(1, 23, "tm0");
 
   // Variable
-  NexVar Hotend         = NexVar(1, 19, "he");
-  NexVar Bed            = NexVar(1, 20, "bed");
+  NexVar Hotend         = NexVar(1, 20, "he");
   NexVar set1           = NexVar(2, 17, "set1");
+  NexVar Bed            = NexVar(1, 21, "bed");
   NexVar filename0      = NexVar(4, 19, "va0");
   NexVar filename1      = NexVar(4, 20, "va1");
   NexVar filename2      = NexVar(4, 21, "va2");
@@ -160,6 +165,14 @@
     NULL
   };
 
+  NexWaveform *graph_list[] =
+  {
+    &Graph0,
+    &Graph1,
+    &Graph2,
+    NULL
+  };
+
   NexText *row_list[] =
   {
     &sdrow0,
@@ -198,10 +211,6 @@
 
     PageInfo = true;
 
-    #if ENABLED(NEXTION_GFX)
-      gfx_clear(X_MAX_POS, Y_MAX_POS, Z_MAX_POS);
-    #endif
-
     #if HAS_TEMP_0
       Hotend.setValue(1);
     #endif
@@ -269,6 +278,7 @@
 
     static void setpagesdcard() {
       PageInfo = false;
+      gfxON    = false;
       Psdcard.show();
       uint16_t fileCnt = card.getnrfilenames();
 
@@ -426,10 +436,12 @@
   void setpagePopCallback(void *ptr) {
     if (ptr == &Menu) {
       PageInfo = false;
+      gfxON    = false;
       Pmenu.show();
     }
     else if (ptr == &MSetup) {
       PageInfo = false;
+      gfxON    = false;
       Psetup.show();
     }
 
@@ -549,6 +561,11 @@
 
     hotend_list[h]->setText(buffer);
     hotend_list[h]->setColor(color);
+
+    if (!gfxON) {
+      graph_list[h]->addValue(0, (int)(T1 * MaxWave));
+      graph_list[h]->addValue(1, (int)(T2 * MaxWave));
+    }
   }
 
   static void coordtoLCD() {
@@ -661,17 +678,19 @@
 
   #if ENABLED(NEXTION_GFX)
     void gfx_clear(float x, float y, float z) {
-      if (PageInfo)
+      if (PageInfo) {
         gfx.clear(x, y, z);
+        gfxON = true;
+      }
     }
 
     void gfx_cursor_to(float x, float y, float z) {
-      if (PageInfo)
+      if (PageInfo && gfxON)
         gfx.cursor_to(x, y, z);
     }
 
     void gfx_line_to(float x, float y, float z){
-      if (PageInfo)
+      if (PageInfo && gfxON)
         gfx.line_to(VC_TOOL, x, y, z);
     }
   #endif

MarlinKimbra/servo.cpp → MarlinKimbra/module/servo.cpp

@@ -44,7 +44,7 @@
 
 */
 
-#include "base.h"
+#include "../base.h"
 
 #if HAS(SERVOS)
 #include "servo.h"

MarlinKimbra/sanitycheck.h

@@ -472,15 +472,21 @@
       #if DISABLED(Z_ENDSTOP_SERVO_NR)
         #error DEPENDENCY ERROR: Missing setting Z_ENDSTOP_SERVO_NR
       #endif
+      #if ENABLED(X_ENDSTOP_SERVO_NR) && X_ENDSTOP_SERVO_NR > -1
         #if DISABLED(X_ENDSTOP_SERVO_ANGLES)
           #error DEPENDENCY ERROR: Missing setting X_ENDSTOP_SERVO_ANGLES
         #endif
+      #endif
+      #if ENABLED(Y_ENDSTOP_SERVO_NR) && Y_ENDSTOP_SERVO_NR > -1
         #if DISABLED(Y_ENDSTOP_SERVO_ANGLES)
           #error DEPENDENCY ERROR: Missing setting Y_ENDSTOP_SERVO_ANGLES
         #endif
+      #endif
+      #if ENABLED(Z_ENDSTOP_SERVO_NR) && Z_ENDSTOP_SERVO_NR > -1
         #if DISABLED(Z_ENDSTOP_SERVO_ANGLES)
           #error DEPENDENCY ERROR: Missing setting Z_ENDSTOP_SERVO_ANGLES
         #endif
+      #endif
       #if DISABLED(SERVO_DEACTIVATION_DELAY)
         #error DEPENDENCY ERROR: Missing setting SERVO_DEACTIVATION_DELAY
       #endif

MarlinKimbra/stepper.cpp

@@ -36,7 +36,7 @@
 #include "stepper.h"
 #include "temperature.h"
 #include "ultralcd.h"
-#include "nextion/nextion_lcd.h"
+#include "module/nextion_lcd.h"
 
 #if ENABLED(SDSUPPORT)
   #include "cardreader.h"

MarlinKimbra/temperature.cpp

@@ -24,7 +24,7 @@
   #include "vector_3.h"
 #endif
 #include "ultralcd.h"
-#include "nextion/nextion_lcd.h"
+#include "module/nextion_lcd.h"
 #include "planner.h"
 #include "stepper_indirection.h"
 #if MB(ALLIGATOR)

MarlinKimbra/ultralcd.cpp

@@ -17,7 +17,7 @@
 #include "ultralcd.h"
 
 #if HAS(BUZZER)
-  #include "buzzer.h"
+  #include "module/buzzer.h"
 #endif
 
 int8_t encoderDiff; // updated from interrupt context and added to encoderPosition every LCD update

MarlinKimbra/ultralcd.h

@@ -3,7 +3,9 @@
 
 #include "Marlin_main.h"
 #if ENABLED(ULTRA_LCD)
-  #include "buzzer.h"
+  #if HAS(BUZZER)
+    #include "module/buzzer.h"
+  #endif
 
   int lcd_strlen(char* s);
   int lcd_strlen_P(const char* s);