Commit 33839b8c authored by MagoKimbra's avatar MagoKimbra

Merge pull request #20 from simone97/patch-16

Added support for see the Power Consumption
parents 8b413c82 595d5a11
...@@ -907,6 +907,9 @@ ...@@ -907,6 +907,9 @@
//Use the RAMPS 1.4 Analog input 5 on the AUX2 connector //Use the RAMPS 1.4 Analog input 5 on the AUX2 connector
#define FILWIDTH_PIN 5 // ANALOG NUMBERING #define FILWIDTH_PIN 5 // ANALOG NUMBERING
#endif #endif
#ifdef POWER_CONSUMPTION
#define POWER_CONSUMPTION_PIN 4 // ANALOG NUMBERING
#endif
#if defined(REPRAP_DISCOUNT_SMART_CONTROLLER) || defined(G3D_PANEL) #if defined(REPRAP_DISCOUNT_SMART_CONTROLLER) || defined(G3D_PANEL)
#define KILL_PIN 41 #define KILL_PIN 41
...@@ -1112,6 +1115,9 @@ ...@@ -1112,6 +1115,9 @@
//Use the RAMPS 1.4 Analog input 5 on the AUX2 connector //Use the RAMPS 1.4 Analog input 5 on the AUX2 connector
#define FILWIDTH_PIN 5 // ANALOG NUMBERING #define FILWIDTH_PIN 5 // ANALOG NUMBERING
#endif #endif
#ifdef POWER_CONSUMPTION
#define POWER_CONSUMPTION_PIN 4 // ANALOG NUMBERING
#endif
#if NUM_SERVOS > 0 #if NUM_SERVOS > 0
#define SERVO0_PIN 11 #define SERVO0_PIN 11
...@@ -1311,6 +1317,9 @@ ...@@ -1311,6 +1317,9 @@
//Use the RAMPS 1.4 Analog input 5 on the AUX2 connector //Use the RAMPS 1.4 Analog input 5 on the AUX2 connector
#define FILWIDTH_PIN 5 // ANALOG NUMBERING #define FILWIDTH_PIN 5 // ANALOG NUMBERING
#endif #endif
#ifdef POWER_CONSUMPTION
#define POWER_CONSUMPTION_PIN 4 // ANALOG NUMBERING
#endif
#if NUM_SERVOS > 0 #if NUM_SERVOS > 0
#define SERVO0_PIN 11 #define SERVO0_PIN 11
...@@ -1510,6 +1519,9 @@ ...@@ -1510,6 +1519,9 @@
//Use the RAMPS 1.4 Analog input 5 on the AUX2 connector //Use the RAMPS 1.4 Analog input 5 on the AUX2 connector
#define FILWIDTH_PIN 5 // ANALOG NUMBERING #define FILWIDTH_PIN 5 // ANALOG NUMBERING
#endif #endif
#ifdef POWER_CONSUMPTION
#define POWER_CONSUMPTION_PIN 4 // ANALOG NUMBERING
#endif
#if NUM_SERVOS > 0 #if NUM_SERVOS > 0
#define SERVO0_PIN 11 #define SERVO0_PIN 11
...@@ -1764,6 +1776,9 @@ ...@@ -1764,6 +1776,9 @@
//Filip added pin for Filament sensor analog input //Filip added pin for Filament sensor analog input
#define FILWIDTH_PIN 3 #define FILWIDTH_PIN 3
#endif //FILAMENT_SENSOR #endif //FILAMENT_SENSOR
#ifdef POWER_CONSUMPTION
#define POWER_CONSUMPTION_PIN -1 // ANALOG NUMBERING
#endif //POWER_CONSUMPTION
#endif // RAMBO #endif // RAMBO
/****************************************************************************************/ /****************************************************************************************/
...@@ -2038,7 +2053,7 @@ ...@@ -2038,7 +2053,7 @@
// Pins for DOGM SPI LCD Support // Pins for DOGM SPI LCD Support
#define DOGLCD_A0 30 #define DOGLCD_A0 30
#define DOGLCD_CS 29 #define DOGLCD_CS 29
#define LCD_CONTRAST 1 #define LCD_CONTRAST 1
#endif #endif
// Uncomment screen orientation // Uncomment screen orientation
#define LCD_SCREEN_ROT_0 #define LCD_SCREEN_ROT_0
...@@ -3511,6 +3526,9 @@ ...@@ -3511,6 +3526,9 @@
#ifdef FILAMENT_SENSOR #ifdef FILAMENT_SENSOR
#define FILWIDTH_PIN 2 #define FILWIDTH_PIN 2
#endif //FILAMENT_SENSOR #endif //FILAMENT_SENSOR
#ifdef POWER_CONSUMPTION
#define POWER_CONSUMPTION_PIN -1 // ANALOG NUMBERING
#endif //POWER_CONSUMPTION
#endif #endif
#define TEMP_1_PIN -1 #define TEMP_1_PIN -1
...@@ -4374,6 +4392,7 @@ DaveX plan for Teensylu/printrboard-type pinouts (ref teensylu & sprinter) for a ...@@ -4374,6 +4392,7 @@ DaveX plan for Teensylu/printrboard-type pinouts (ref teensylu & sprinter) for a
#error Unknown MOTHERBOARD value in configuration.h #error Unknown MOTHERBOARD value in configuration.h
#endif #endif
#ifndef HEATER_1_PIN #ifndef HEATER_1_PIN
#define HEATER_1_PIN -1 #define HEATER_1_PIN -1
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment