jens/arduino_ph_controller
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aufgeräumt

Browse Source
This commit is contained in:
jens 2025-07-09 22:48:52 +02:00
parent 45d4f7e090
commit 05236edd70
2 changed files with 12 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gui/main.py
View File

@ -244,11 +244,11 @@ class PHControllerGUI(QMainWindow):
if ph == 4:
self.send_command("<15>") # Start pH4 calibration
QMessageBox.information(self, "Kalibrierung",
"pH4 Kalibrierung gestartet. Sensor in pH4-Lösung tauchen und warten bis der Wert stabil ist.")
"pH4 Kalibrierung gestartet. Sensor in pH4.01-Lösung tauchen und warten bis der Wert stabil ist.")
else:
self.send_command("<16>") # Start pH7 calibration
QMessageBox.information(self, "Kalibrierung",
"pH7 Kalibrierung gestartet. Sensor in pH7-Lösung tauchen und warten bis der Wert stabil ist.")
"pH7 Kalibrierung gestartet. Sensor in pH6.86-Lösung tauchen und warten bis der Wert stabil ist.")
def start_auto_dose(self):
volume = self.volume_spin.value()

122
ph_controller/ph_controller.ino
View File

@ -213,24 +213,7 @@ void loop(){
for (int i = 0 ; i < 4 ; i++) {
RxCmd[i] = 0;
}
/*
if (Serial.available()) {
delay(2);
RxCmd[0] = Serial.read();
if (RxCmd[0] == STX) {
int i =1;
while(Serial.available()) {
delay(1);
RxCmd[i] = Serial.read();
//if (RxCmd[i]>127 || i>7) break; //Communication error
if (RxCmd[i]==ETX) {
break; //Read all data
}
i++;
}
}
}
*/
if (Serial.available()) {
delay(2);
RxCmd[0] = Serial.read();
@ -264,16 +247,6 @@ if ( RxCmd[1] == '1' ){
Pumpe=1;
break;
}
//case '3':{ // Schlauchdaten anfordern
//Serial.print('<');
//Serial.print('#');
//double mlpersec =( ml[tubid]*korrf*2)/6; // tube * 20 Um/min * korecturfaktor durch 60 sec
//mlpersec = mlpersec*100000;
//Serial.print(mlpersec); //
//Serial.println('>');
//break;
// }
case '3': {
Serial.print("<T");
Serial.print(tubid); // Return current Tubid
@ -320,7 +293,15 @@ if ( RxCmd[1] == '1' ){
}
break;
}
case '8':{ // Schlauchdaten anfordern
Serial.print('<');
Serial.print('#');
double mlpersec =( ml[tubid]*korrf*2)/6; // tube * 20 Um/min * korecturfaktor durch 60 sec
mlpersec = mlpersec*100000;
Serial.print(mlpersec); //
Serial.println('>');
break;
}
}
@ -572,89 +553,6 @@ if (CurrentMode == 12) { // Auto modus stopped
}
}
}
// if (adc_key_prev != lcd_key)
// {
// //Serial.println("Key Press Change Detected");
// switch (lcd_key){ // depending on which button was pushed, we perform an action
// case btnRIGHT:{ // push button "RIGHT" and show the word on the screen
// //lcd.print("RIGHT");
// if ( CurrentMode == 0 ){
// lcd.clear();
// CurrentMode = 2;
// }
// if ( CurrentMode == 3){
// lcd.clear();
// if ( CalSelect == 0 ){
// CurrentMode = 4;
// }
// if ( CalSelect == 1){
// CurrentMode = 5;
// }
// }
// break;
// }
// case btnLEFT:{
// //lcd.print("LEFT "); // push button "LEFT" and show the word on the screen
// if ( CurrentMode == 2 ){
// lcd.clear();
// CurrentMode = 0;
// }
// if ( CurrentMode == 3 ){
// lcd.clear();
// CurrentMode = 0;
// }
// if ( CurrentMode == 4 || CurrentMode == 5 ){
// lcd.clear();
// CurrentMode = 3;
// }
//
// break;
// }
// case btnUP:{
// //lcd.print("UP "); // push button "UP" and show the word on the screen
// if ( CurrentMode == 0 ){
// lcd.clear();
// CurrentMode = 1;
// }
// if ( CurrentMode == 3 ){
// lcd.clear();
// CalSelect = 0;
// }
// break;
// }
// case btnDOWN:{
// //lcd.print("DOWN "); // push button "DOWN" and show the word on the screen
// if ( CurrentMode == 1){
// lcd.clear();
// CurrentMode = 0;
// }
// if ( CurrentMode == 3 ){
// lcd.clear();
// CalSelect = 1;
// }
// break;
// }
// case btnSELECT:{
// //lcd.print("SEL. "); // push button "SELECT" and show the word on the screen
// if ( CurrentMode == 0 ){
// lcd.clear();
// CurrentMode = 3;
// break;
// }
// if ( CurrentMode == 3 ){
// lcd.clear();
// CurrentMode = 0;
// break;
// }
// break;
//
// }
// case btnNONE:{
// //lcd.print("NONE "); // No action will show "None" on the screen
// break;
// }
// }
// }
}