Skip to content

Commit

Permalink
master 2.9.0
Browse files Browse the repository at this point in the history
  • Loading branch information
murmeltier08 committed Apr 2, 2021
1 parent 2b4f625 commit 34554f9
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 12 deletions.
6 changes: 2 additions & 4 deletions rancilio-pid/rancilio-pid.ino
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
/********************************************************
Version 2.9.0 (29.03.2021)
* Port for ESP32
* Scale weight
Version 2.9.0 (02.04.2021)
******************************************************/

/********************************************************
Expand Down Expand Up @@ -140,7 +138,7 @@ int relayON, relayOFF; // used for relay trigger type. Do not change!
boolean kaltstart = true; // true = Rancilio started for first time
boolean emergencyStop = false; // Notstop bei zu hoher Temperatur
double EmergencyStopTemp = 120; // Temp EmergencyStopTemp
const char* sysVersion PROGMEM = "Version 2.9.0 SCALE"; //System version
const char* sysVersion PROGMEM = "Version 2.9.0 MASTER"; //System version
int inX = 0, inY = 0, inOld = 0, inSum = 0; //used for filter()
int bars = 0; //used for getSignalStrength()
boolean brewDetected = 0;
Expand Down
16 changes: 8 additions & 8 deletions rancilio-pid/userConfig.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/********************************************************
Version 2.1 (14.02.2021)
Version 2.2 (04.02.2021)
Last Change: code cleanup
Values must be configured by the user
******************************************************/
Expand All @@ -12,7 +12,7 @@
******************************************************/
// Display
#define DISPLAY 2 // 0 = deactivated, 1 = SH1106 (e.g. 1.3 "128x64), 2 = SSD1306 (e.g. 0.96" 128x64)
#define OLED_I2C 0x3C // I2C address for OLED, 0x3C by default
#define OLED_I2C 0x3C // I2C address for OLED, 0x3C by default
#define DISPLAYTEMPLATE 3 // 1 = Standard Display Template, 2 = Minimal Template, 3 = only Temperatur, 4 = Scale Template, 20 = vertical Display see git Handbook for further information
#define MACHINELOGO 1 // 1 = Rancilio, 2 = Gaggia
#define DISPALYROTATE U8G2_R0 // rotate display clockwise: U8G2_R0 = no rotation; U8G2_R1 = 90°; U8G2_R2 = 180°; U8G2_R3 = 270°
Expand All @@ -37,18 +37,18 @@

// TOF sensor for water level
#define TOF 0 // 0 = no TOF sensor connected; 1 = water level by TOF sensor
#define TOF_I2C 0x29 // I2C address of TOF sensor; 0x29 by default
#define CALIBRATION_MODE 0 // 1 = enable to obtain water level calibration values; 0 = disable for normal PID operation; can also be done in Blynk
#define WATER_FULL 102 // value for full water tank (=100%) obtained in calibration procedure (in mm); can also be set in Blynk
#define WATER_EMPTY 205 // value for empty water tank (=0%) obtained in calibration procedure (in mm); can also be set in Blynk
#define TOF_I2C 0x29 // I2C address of TOF sensor; 0x29 by default
#define CALIBRATION_MODE 0 // 1 = enable to obtain water level calibration values; 0 = disable for normal PID operation; can also be done in Blynk
#define WATER_FULL 102 // value for full water tank (=100%) obtained in calibration procedure (in mm); can also be set in Blynk
#define WATER_EMPTY 205 // value for empty water tank (=0%) obtained in calibration procedure (in mm); can also be set in Blynk

// E-Trigger
#define ETRIGGER 0 // 0 = no trigger (for Rancilio except Rancilio E), 1 = trigger for CPU of Rancilio E
#define ETRIGGERTIME 60 // seconds, time between trigger signal
#define TRIGGERRELAYTYPE HIGH // LOW = low trigger, HIGH = high trigger relay for E-Trigger

//Weight SCALE
#define WEIGHTSETPOINT 30 // Gramm ?
#define WEIGHTSETPOINT 30 // Gramm

/// Wifi
#define HOSTNAME "Rancilio"
Expand Down Expand Up @@ -77,7 +77,7 @@

// PID - offline values
#define SETPOINT 95 // Temperatur setpoint
#define STEAMSETPOINT 120 // Temperatur setpoint
#define STEAMSETPOINT 120 // Temperatur setpoint
#define AGGKP 69 // Kp normal
#define AGGTN 399 // Tn
#define AGGTV 0 // Tv
Expand Down

0 comments on commit 34554f9

Please sign in to comment.