8000 feat: Add grinding feature by jniebuhr · Pull Request #32 · jniebuhr/gaggimate · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

feat: Add grinding feature #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 23, 2024
Merged

feat: Add grinding feature #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions lib/NimBLEComm/src/NimBLEClientController.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ NimBLEClientController::NimBLEClientController() :
tempControlChar(nullptr),
pumpControlChar(nullptr),
valveControlChar(nullptr),
altControlChar(nullptr),
tempReadChar(nullptr),
pingChar(nullptr),
errorChar(nullptr),
Expand Down Expand Up @@ -78,6 +79,7 @@ bool NimBLEClientController::connectToServer() {
tempControlChar = pRemoteService->getCharacteristic(NimBLEUUID(TEMP_CONTROL_CHAR_UUID));
pumpControlChar = pRemoteService->getCharacteristic(NimBLEUUID(PUMP_CONTROL_CHAR_UUID));
valveControlChar = pRemoteService->getCharacteristic(NimBLEUUID(VALVE_CONTROL_CHAR_UUID));
altControlChar = pRemoteService->getCharacteristic(NimBLEUUID(ALT_CONTROL_CHAR_UUID));
autotuneChar = pRemoteService->getCharacteristic(NimBLEUUID(AUTOTUNE_CHAR_UUID));
pingChar = pRemoteService->getCharacteristic(NimBLEUUID(PING_CHAR_UUID));
pidControlChar = pRemoteService->getCharacteristic(NimBLEUUID(PID_CONTROL_CHAR_UUID));
Expand Down Expand Up @@ -127,6 +129,12 @@ void NimBLEClientController::sendValveControl(bool pinState) {
}
}

void NimBLEClientController::sendAltControl(bool pinState) {
if (altControlChar != nullptr && client->isConnected()) {
altControlChar->writeValue(pinState ? "1" : "0");
}
}

void NimBLEClientController::sendPing() {
if (pingChar != nullptr && client->isConnected()) {
pingChar->writeValue("1");
Expand Down
2 changes: 2 additions & 0 deletions lib/NimBLEComm/src/NimBLEClientController.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ class NimBLEClientController : public NimBLEAdvertisedDeviceCallbacks, NimBLECli
void sendTemperatureControl(float setpoint);
void sendPumpControl(float setpoint);
void sendValveControl(bool pinState);
void sendAltControl(bool pinState);
void sendPing();
void sendAutotune();
void sendPidSettings(const String& pid);
Expand All @@ -26,6 +27,7 @@ class NimBLEClientController : public NimBLEAdvertisedDeviceCallbacks, NimBLECli
NimBLERemoteCharacteristic* tempControlChar;
NimBLERemoteCharacteristic* pumpControlChar;
NimBLERemoteCharacteristic* valveControlChar;
NimBLERemoteCharacteristic* altControlChar;
NimBLERemoteCharacteristic* tempReadChar;
NimBLERemoteCharacteristic* pingChar;
NimBLERemoteCharacteristic* pidControlChar;
Expand Down
1 change: 1 addition & 0 deletions lib/NimBLEComm/src/NimBLEComm.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#define TEMP_CONTROL_CHAR_UUID "fd668d9a-15d1-4968-aa29-deda8bb0e73a"
#define PUMP_CONTROL_CHAR_UUID "1f0739ac-9638-4c4b-9665-5d7684d30249"
#define VALVE_CONTROL_CHAR_UUID "485ea9f8-3e3f-4811-a299-c8ba6d1f4b78"
#define ALT_CONTROL_CHAR_UUID "cca5a577-ec67-4499-8ccb-654f1312db1d"
#define TEMP_READ_CHAR_UUID "56887a3f-23fe-4181-afa5-8dad4d92721b"
#define PING_CHAR_UUID "9731755e-29ce-41a8-91d9-7a244f49859b"
#define ERROR_CHAR_UUID "d6676ec7-820c-41de-820d-95620749003b"
Expand Down
36 changes: 28 additions & 8 deletions lib/NimBLEComm/src/NimBLEServerController.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,15 @@ NimBLEServerController::NimBLEServerController() :
tempControlChar(nullptr),
pumpControlChar(nullptr),
valveControlChar(nullptr),
altControlChar(nullptr),
tempReadChar(nullptr),
pingChar(nullptr),
errorChar(nullptr),
autotuneChar(nullptr),
tempControlCallback(nullptr),
pumpControlCallback(nullptr),
valveControlCallback(nullptr),
altControlCallback(nullptr),
pidControlChar(nullptr),
pidControlCallback(nullptr),
pingCallback(nullptr),
Expand Down Expand Up @@ -50,6 +52,13 @@ void NimBLEServerController::initServer() {
);
valveControlChar->setCallbacks(this); // Use this class as the callback handler

// Valve Control Characteristic (Client writes pin state)
altControlChar = pService->createCharacteristic(
ALT_CONTROL_CHAR_UUID,
NIMBLE_PROPERTY::WRITE
);
altControlChar->setCallbacks(this); // Use this class as the callback handler

// Temperature Read Characteristic (Server notifies client of temperature)
tempReadChar = pService->createCharacteristic(
TEMP_READ_CHAR_UUID,
Expand Down Expand Up @@ -88,7 +97,7 @@ void NimBLEServerController::initServer() {
pAdvertising->addServiceUUID(SERVICE_UUID);
pAdvertising->setScanResponse(true);
NimBLEDevice::startAdvertising();
Serial.println("BLE Server started, advertising...");
printf("BLE Server started, advertising...\n");
}

void NimBLEServerController::sendTemperature(float temperature) {
Expand Down Expand Up @@ -123,6 +132,10 @@ void NimBLEServerController::registerValveControlCallback(pin_control_callback_t
valveControlCallback = callback;
}

void NimBLEServerController::registerAltControlCallback(pin_control_callback_t callback) {
altControlCallback = callback;
}

void NimBLEServerController::registerPingCallback(ping_callback_t callback) {
pingCallback = callback;
}
Expand Down Expand Up @@ -175,37 +188,44 @@ String get_token(String &from, uint8_t index, char separator)

// BLECharacteristicCallbacks override
void NimBLEServerController::onWrite(NimBLECharacteristic* pCharacteristic) {
Serial.println("Write received!");
printf("Write received!\n");

if (pCharacteristic->getUUID().equals(NimBLEUUID(TEMP_CONTROL_CHAR_UUID))) {
float setpoint = atof(pCharacteristic->getValue().c_str());
Serial.printf("Received temperature setpoint: %.2f\n", setpoint);
printf("Received temperature setpoint: %.2f\n", setpoint);
if (tempControlCallback != nullptr) {
tempControlCallback(setpoint);
}
}
else if (pCharacteristic->getUUID().equals(NimBLEUUID(PUMP_CONTROL_CHAR_UUID))) {
float setpoint = atof(pCharacteristic->getValue().c_str());
Serial.printf("Received pump control: %.2f\n", setpoint);
printf("Received pump control: %.2f\n", setpoint);
if (pumpControlCallback != nullptr) {
pumpControlCallback(setpoint);
}
}
else if (pCharacteristic->getUUID().equals(NimBLEUUID(VALVE_CONTROL_CHAR_UUID))) {
bool pinState = (pCharacteristic->getValue()[0] == '1');
Serial.printf("Received valve control: %s\n", pinState ? "ON" : "OFF");
printf("Received valve control: %s\n", pinState ? "ON" : "OFF");
if (valveControlCallback != nullptr) {
valveControlCallback(pinState);
}
}
else if (pCharacteristic->getUUID().equals(NimBLEUUID(ALT_CONTROL_CHAR_UUID))) {
bool pinState = (pCharacteristic->getValue()[0] == '1');
printf("Received ALT control: %s\n", pinState ? "ON" : "OFF");
if (altControlCallback != nullptr) {
altControlCallback(pinState);
}
}
else if (pCharacteristic->getUUID().equals(NimBLEUUID(PING_CHAR_UUID))) {
Serial.printf("Received ping\n");
printf("Received ping\n");
if (pingCallback != nullptr) {
pingCallback();
}
}
else if (pCharacteristic->getUUID().equals(NimBLEUUID(AUTOTUNE_CHAR_UUID))) {
Serial.printf("Received autotune\n");
printf("Received autotune\n");
if (autotuneCallback != nullptr) {
autotuneCallback();
}
Expand All @@ -215,7 +235,7 @@ void NimBLEServerController::onWrite(NimBLECharacteristic* pCharacteristic) {
float Kp = get_token(pid, 0, ',').toFloat();
float Ki = get_token(pid, 1, ',').toFloat();
float Kd = get_token(pid, 2, ',').toFloat();
Serial.printf("Received PID settings: %.2f, %.2f, %.2f\n", Kp, Ki, Kd);
printf("Received PID settings: %.2f, %.2f, %.2f\n", Kp, Ki, Kd);
if (pidControlCallback != nullptr) {
pidControlCallback(Kp, Ki, Kd);
}
Expand Down
3 changes: 3 additions & 0 deletions lib/NimBLEComm/src/NimBLEServerController.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ class NimBLEServerController : public NimBLEServerCallbacks, public NimBLECharac
void registerTempControlCallback(temp_control_callback_t callback);
void registerPumpControlCallback(pump_control_callback_t callback);
void registerValveControlCallback(pin_control_callback_t callback);
void registerAltControlCallback(pin_control_callback_t callback);
void registerPidControlCallback(pid_control_callback_t callback);
void registerPingCallback(ping_callback_t callback);
void registerAutotuneCallback(autotune_callback_t callback);
Expand All @@ -21,6 +22,7 @@ class NimBLEServerController : public NimBLEServerCallbacks, public NimBLECharac
NimBLECharacteristic* tempControlChar;
NimBLECharacteristic* pumpControlChar;
NimBLECharacteristic* valveControlChar;
NimBLECharacteristic* altControlChar;
NimBLECharacteristic* tempReadChar;
NimBLECharacteristic* pingChar;
NimBLECharacteristic* pidControlChar;
Expand All @@ -30,6 +32,7 @@ class NimBLEServerController : public NimBLEServerCallbacks, public NimBLECharac
temp_control_callback_t tempControlCallback;
pump_control_callback_t pumpControlCallback;
pin_control_callback_t valveControlCallback;
pin_control_callback_t altControlCallback;
pid_control_callback_t pidControlCallback;
ping_callback_t pingCallback;
autotune_callback_t autotuneCallback;
Expand Down
21 changes: 21 additions & 0 deletions src/controller/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,10 @@ void setup() {
pinMode(HEATER_PIN, OUTPUT);
pinMode(PUMP_PIN, OUTPUT);
pinMode(VALVE_PIN, OUTPUT);
pinMode(ALT_PIN, OUTPUT);
control_heater(0);
control_pump();
control_alt(false);
control_valve(false);

aTune.SetOutputStep(10); // Set the output step size for autotuning
Expand All @@ -62,6 +64,7 @@ void setup() {
serverController.registerTempControlCallback(on_temperature_control);
serverController.registerPumpControlCallback(on_pump_control);
serverController.registerValveControlCallback(on_valve_control);
serverController.registerAltControlCallback(on_alt_control);
serverController.registerPidControlCallback(on_pid_control);
serverController.registerPingCallback(on_ping);
serverController.registerAutotuneCallback(on_autotune);
Expand Down Expand Up @@ -126,6 +129,8 @@ void on_pump_control(float setpoint) {

void on_valve_control(bool state) { control_valve(state); }

void on_alt_control(bool state) { control_alt(state); }

void on_pid_control(float Kp, float Ki, float Kd) {
myPID.SetTunings(Kp, Ki, Kd);
}
Expand All @@ -144,6 +149,8 @@ void handle_ping_timeout() {
// Turn off the heater and pump as a safety measure
control_heater(0);
on_pump_control(0);
control_valve(false);
control_alt(false);
setpoint = 0;
serverController.sendError(ERROR_CODE_TIMEOUT);
}
Expand All @@ -153,6 +160,8 @@ void thermal_runaway_shutdown() {
// Turn off the heater and pump immediately
control_heater(0);
on_pump_control(0);
control_valve(false);
control_alt(false);
setpoint = 0;
serverController.sendError(ERROR_CODE_RUNAWAY);
}
Expand Down Expand Up @@ -196,6 +205,18 @@ void control_valve(bool state) {
}
}

void control_alt(bool state) {
if (state) {
// Turn on the valve
digitalWrite(ALT_PIN, RELAY_ON);
printf("Setting ALT relay to ON\n");
} else {
// Turn off the valve
digitalWrite(ALT_PIN, !RELAY_ON);
printf("Setting ALT relay to OFF\n");
}
}

float read_temperature(void) {
int status = thermoCouple.read();
if (status == STATUS_OK) {
Expand Down
3 changes: 3 additions & 0 deletions src/controller/main.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
#define HEATER_PIN 14
#define PUMP_PIN 9
#define VALVE_PIN 10
#define ALT_PIN 11
#define MAX6675_SCK_PIN 6
#define MAX6675_CS_PIN 7
#define MAX6675_MISO_PIN 4
Expand All @@ -34,9 +35,11 @@ void loop(void);
void control_heater(int signal);
void control_pump();
void control_valve(bool state);
void control_alt(bool state);
float read_temperature(void);
void on_temperature_control(float temperature);
void on_pump_control(float setpoint);
void on_alt_control(bool state);
void on_valve_control(bool state);
void on_pid_control(float Kp, float Ki, float Kd);
void on_ping();
Expand Down
Loading
Loading
0