-
Notifications
You must be signed in to change notification settings - Fork 268
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'dev' into fix/pcb_not_building
- Loading branch information
Showing
207 changed files
with
14,534 additions
and
18,702 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Validating CODEOWNERS rules …
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
* @Zer0-bit @kstam | ||
* @Zer0-bit @kstam @matiasjrossi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,63 @@ | ||
#ifndef GAGGIA_SETTINGS_H | ||
#define GAGGIA_SETTINGS_H | ||
|
||
#include <Arduino.h> | ||
#include <vector> | ||
#include <string> | ||
|
||
struct BoilerSettings { | ||
uint16_t steamSetPoint; /* Desired steam temperature */ | ||
uint16_t offsetTemp; /* Temperature offset from what the thermocouple measures to the water temp */ | ||
uint16_t hpwr; | ||
uint16_t mainDivider; | ||
uint16_t brewDivider; | ||
}; | ||
struct SystemSettings { | ||
float pumpFlowAtZero; /* A PZ constant used for pump calibration */ | ||
uint16_t lcdSleep; /* Time (in minutes) after which the screen should go to sleep */ | ||
bool warmupState; /* Should gaggia wait to warmup */ | ||
}; | ||
|
||
struct ScalesSettings { | ||
bool forcePredictive; | ||
bool hwScalesEnabled; | ||
int hwScalesF1; | ||
int hwScalesF2; | ||
bool btScalesEnabled; | ||
bool btScalesAutoConnect; | ||
|
||
friend bool operator==(const ScalesSettings& lhs, const ScalesSettings& rhs) { | ||
return lhs.forcePredictive == rhs.forcePredictive && | ||
lhs.hwScalesEnabled == rhs.hwScalesEnabled && | ||
lhs.hwScalesF1 == rhs.hwScalesF1 && | ||
lhs.hwScalesF2 == rhs.hwScalesF2 && | ||
lhs.btScalesEnabled == rhs.btScalesEnabled && | ||
lhs.btScalesAutoConnect == rhs.btScalesAutoConnect; | ||
} | ||
}; | ||
|
||
struct BrewSettings { | ||
bool basketPrefill; /* Whether we should add a prefill phase at the beginning of the profile */ | ||
bool homeOnShotFinish; /* Should we exit the graph a few seconds after the shot has finished */ | ||
bool brewDeltaState; /* Should gaggia add more heating power during a shot to compensate for cold water entering */ | ||
}; | ||
|
||
struct LedSettings { | ||
bool state; /* Should the led be ON or OFF */ | ||
bool disco; /* Should we activate disco mode during brew */ | ||
struct Color { /* The led color */ | ||
uint8_t R; | ||
uint8_t G; | ||
uint8_t B; | ||
} color; | ||
}; | ||
|
||
struct GaggiaSettings { | ||
BoilerSettings boiler; | ||
SystemSettings system; | ||
BrewSettings brew; | ||
LedSettings led; | ||
ScalesSettings scales; | ||
}; | ||
|
||
#endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.