mirror of
https://github.com/adrigongv23/G26---Telemetry-Software.git
synced 2026-08-25 19:43:16 +02:00
Ajustes de compilación y eliminación de erratas
This commit is contained in:
adrigongv23
parent
e826b0f25e
commit
ec5895f827
3 changed files with 9 additions and 216 deletions
|
|
@ -1,8 +1,8 @@
|
|||
#ifndef CAN_HPP
|
||||
#define CAN_HPP
|
||||
|
||||
#define RX_PIN 13
|
||||
#define TX_PIN 38
|
||||
#define RX_PIN 23
|
||||
#define TX_PIN 22
|
||||
#define POLLING_RATE_MS 1000
|
||||
#define TRANSMIT_RATE_MS 1000
|
||||
|
||||
|
|
|
|||
|
|
@ -17,11 +17,11 @@ public:
|
|||
|
||||
//Métodos de recepción de CAN
|
||||
|
||||
void send_serial_frame_0(int rpmh, int rpml, int tpsh, int tpsl, int ecth, int ectl, int gear);
|
||||
//void send_serial_frame_1(int lfws, int rfws, int lrws, int rrws, int maph, int mapl, int ect);
|
||||
//void send_serial_frame_2(int lambh, int lambl, int lamth, int lamtl, int bvolth, int bvoltl, int iat);
|
||||
//void send_serial_frame_3(int aux1, int aux2, int aux3, int aux4, int aux5, int aux6, int aux7);
|
||||
//void send_serial_frame_4(int aux1, int aux2, int aux3, int aux4, int aux5, int aux6, int aux7);
|
||||
void send_serial_frame_0(int rpmh, int rpml, int tpsh, int tpsl, int vbatth, int vbattl, int ect);
|
||||
void send_serial_frame_1(int lmbh, int lmbl, int lmbth, int lmbtl, int fuelh, int fuell, int gear);
|
||||
void send_serial_frame_2(int shut, int fan, int lmbch, int lmbcl, int brakeh, int brakel, int aux1);
|
||||
void send_serial_frame_3(int aux3, int aux4, int aux5, int aux6, int aux7, int aux8, int dig1);
|
||||
void send_serial_frame_4(int dig3, int dig4, int dig5, int dig6, int dig7, int dig8, int dig9);
|
||||
|
||||
|
||||
//Métodos extras
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ void DataProcessor::send_serial(byte type, unsigned int value) {
|
|||
void DataProcessor::send_serial_frame_0(int rpmh, int rpml, int tpsh, int tpsl, int vbatth, int vbattl, int ect){
|
||||
|
||||
//Calculos necesarios para obtener bien el formato de los valores necesarios
|
||||
int rpm = (rpmh * 256) + rpml
|
||||
int rpm = (rpmh * 256) + rpml;
|
||||
double vbatt = ((vbatth * 256) + vbattl) / 100.0;
|
||||
|
||||
Serial.println("send_serial_frame_0");
|
||||
|
|
@ -31,230 +31,23 @@ void DataProcessor::send_serial_frame_0(int rpmh, int rpml, int tpsh, int tpsl,
|
|||
Serial.printf("CAN RX -> ECT: %d | RPM: %d | BATT: %.1f \n", ect, rpm, vbatt);;
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
//LAMB + LAMBTRG + FUEL + GEAR
|
||||
void DataProcessor::send_serial_frame_1(int lmbh, int lmbl, int lmbth, int lmbtl, int fuelh, int fuell, int gear){
|
||||
Serial.println("send_serial_frame_1");
|
||||
int lmb = (lmbh * 256) + lmbl;
|
||||
int lmbtrg = (lmbth * 256) + lmbtl;
|
||||
int fuel = (fuelh * 256) + fuell;
|
||||
_crow_panel_controller->set_value_to_label(ui_lambda, lmb);
|
||||
_crow_panel_controller->set_value_to_label(ui_lambdatarget, lmbtrg);
|
||||
_crow_panel_controller->set_value_to_label(ui_fuel, fuel);
|
||||
// _crow_panel_controller->set_value_to_label(ui_gear, gear);
|
||||
|
||||
}
|
||||
|
||||
|
||||
void DataProcessor::send_serial_frame_2(int shut, int fan, int lmbch, int lmbcl, int brakeh, int brakel, int aux1){
|
||||
Serial.println("send_serial_frame_2");
|
||||
int lmbcorrect = (lmbch * 256) + lmbcl;
|
||||
int brake = (brakeh * 256) + brakel;
|
||||
|
||||
char shut_str[10];
|
||||
char fan_str[10];
|
||||
char aux1_str[10];
|
||||
|
||||
if (shut == 3){
|
||||
strcpy(shut_str, "ON");
|
||||
} else {
|
||||
strcpy(shut_str, "OFF");
|
||||
}
|
||||
|
||||
if (fan == 1){
|
||||
strcpy(fan_str, "ON");
|
||||
} else {
|
||||
strcpy(fan_str, "OFF");
|
||||
}
|
||||
|
||||
if (aux1 == 1){
|
||||
strcpy(aux1_str, "N");
|
||||
_crow_panel_controller->set_label_color(ui_PanelGear, CrowPanelController::COLOR_GOOD);
|
||||
} else {
|
||||
strcpy(aux1_str, "D");
|
||||
_crow_panel_controller->set_label_color(ui_PanelGear, CrowPanelController::COLOR_PANEL_DEFAULT);
|
||||
}
|
||||
|
||||
|
||||
|
||||
_crow_panel_controller->set_string_to_label(ui_shutdown, shut_str);
|
||||
_crow_panel_controller->set_string_to_label(ui_fan, fan_str);
|
||||
_crow_panel_controller->set_value_to_label(ui_correctionlambda, lmbcorrect);
|
||||
_crow_panel_controller->set_value_to_label(ui_auxstatus9, brake);
|
||||
_crow_panel_controller->set_string_to_label(ui_gear, aux1_str);
|
||||
|
||||
// Shutdown status color
|
||||
if (shut == 3) {
|
||||
_crow_panel_controller->set_label_color(ui_shutdown, CrowPanelController::COLOR_CRITICAL); // Red when shutdown is ON (emergency)
|
||||
} else {
|
||||
_crow_panel_controller->set_label_color(ui_shutdown, CrowPanelController::COLOR_GOOD); // Green when shutdown is OFF (normal)
|
||||
}
|
||||
|
||||
// Fan status color
|
||||
if (fan == 1) {
|
||||
_crow_panel_controller->set_label_color(ui_fan, CrowPanelController::COLOR_BLUE); // Blue when fan is ON (cooling)
|
||||
} else {
|
||||
_crow_panel_controller->set_label_color(ui_fan, CrowPanelController::COLOR_NORMAL); // White when fan is OFF
|
||||
}
|
||||
|
||||
// Brake pressure color (assuming brake > 0 means brakes applied)
|
||||
if (brake > 100) { // Adjust threshold as needed
|
||||
_crow_panel_controller->set_label_color(ui_auxstatus9, CrowPanelController::COLOR_WARNING); // Yellow for heavy braking
|
||||
} else if (brake > 0) {
|
||||
_crow_panel_controller->set_label_color(ui_auxstatus9, CrowPanelController::COLOR_NORMAL); // White for light braking
|
||||
} else {
|
||||
_crow_panel_controller->set_label_color(ui_auxstatus9, CrowPanelController::COLOR_GOOD); // Green for no braking
|
||||
}
|
||||
}
|
||||
|
||||
void DataProcessor::send_serial_frame_3(int aux3, int aux4, int aux5, int aux6, int aux7, int aux8, int dig1){
|
||||
Serial.println("send_serial_frame_3");
|
||||
|
||||
char aux3_str[10];
|
||||
char aux4_str[10];
|
||||
char aux5_str[10];
|
||||
char aux6_str[10];
|
||||
char aux7_str[10];
|
||||
char aux8_str[10];
|
||||
char dig1_str[10];
|
||||
|
||||
if (aux3 == 1){
|
||||
strcpy(aux3_str, "ON");
|
||||
} else {
|
||||
strcpy(aux3_str, "OFF");
|
||||
}
|
||||
|
||||
if (aux4 == 1){
|
||||
|
||||
strcpy(aux4_str, "ON");
|
||||
} else {
|
||||
strcpy(aux4_str, "OFF");
|
||||
}
|
||||
|
||||
if (aux5 == 1){
|
||||
strcpy(aux5_str, "ON");
|
||||
} else {
|
||||
strcpy(aux5_str, "OFF");
|
||||
}
|
||||
|
||||
if (aux6 == 1){
|
||||
strcpy(aux6_str, "ON");
|
||||
} else {
|
||||
strcpy(aux6_str, "OFF");
|
||||
}
|
||||
|
||||
if (aux7 == 1){
|
||||
strcpy(aux7_str, "ON");
|
||||
} else {
|
||||
strcpy(aux7_str, "OFF");
|
||||
}
|
||||
|
||||
if (aux8 == 1){
|
||||
strcpy(aux8_str, "ON");
|
||||
} else {
|
||||
strcpy(aux8_str, "OFF");
|
||||
}
|
||||
|
||||
if (dig1 == 1){
|
||||
strcpy(dig1_str, "ON");
|
||||
} else {
|
||||
strcpy(dig1_str, "OFF");
|
||||
}
|
||||
|
||||
_crow_panel_controller -> set_string_to_label(ui_auxstatus3, aux3_str);
|
||||
if(aux3 == 1 && change_screen_requested == false){
|
||||
switch(current_display){
|
||||
case 0:
|
||||
_crow_panel_controller->change_screen(ui_Screen1);
|
||||
break;
|
||||
case 1:
|
||||
_crow_panel_controller->change_screen(ui_Screen2);
|
||||
break;
|
||||
case 2:
|
||||
_crow_panel_controller->change_screen(ui_Screen3);
|
||||
break;
|
||||
case 3:
|
||||
_crow_panel_controller->change_screen(ui_Screen4);
|
||||
break;
|
||||
}
|
||||
current_display++;
|
||||
change_screen_requested = true;
|
||||
if(current_display > 3){
|
||||
current_display = 0;
|
||||
}
|
||||
}else if(aux3 == 0 && change_screen_requested == true){
|
||||
change_screen_requested = false;
|
||||
}
|
||||
|
||||
_crow_panel_controller -> set_string_to_label(ui_auxstatus4, aux4_str);
|
||||
_crow_panel_controller -> set_string_to_label(ui_auxstatus5, aux5_str);
|
||||
_crow_panel_controller -> set_string_to_label(ui_auxstatus6, aux6_str);
|
||||
_crow_panel_controller -> set_string_to_label(ui_auxstatus7, aux7_str);
|
||||
_crow_panel_controller -> set_string_to_label(ui_auxstatus8, aux8_str);
|
||||
_crow_panel_controller -> set_string_to_label(ui_digitalstatus1, dig1_str);
|
||||
}
|
||||
|
||||
void DataProcessor::send_serial_frame_4(int dig3, int dig4, int dig5, int dig6, int dig7, int dig8, int dig9){
|
||||
Serial.println("send_serial_frame_4");
|
||||
char dig3_str[10];
|
||||
char dig4_str[10];
|
||||
char dig5_str[10];
|
||||
char dig6_str[10];
|
||||
char dig7_str[10];
|
||||
char dig8_str[10];
|
||||
char dig9_str[10];
|
||||
|
||||
if (dig3 == 1){
|
||||
strcpy(dig3_str, "ON");
|
||||
} else {
|
||||
strcpy(dig3_str, "OFF");
|
||||
}
|
||||
|
||||
if (dig4 == 1){
|
||||
strcpy(dig4_str, "ON");
|
||||
} else {
|
||||
strcpy(dig4_str, "OFF");
|
||||
}
|
||||
|
||||
if (dig5 == 1){
|
||||
strcpy(dig5_str, "ON");
|
||||
} else {
|
||||
strcpy(dig5_str, "OFF");
|
||||
}
|
||||
|
||||
if (dig6 == 1){
|
||||
strcpy(dig6_str, "ON");
|
||||
} else {
|
||||
strcpy(dig6_str, "OFF");
|
||||
}
|
||||
|
||||
if (dig7 == 1){
|
||||
strcpy(dig7_str, "ON");
|
||||
} else {
|
||||
strcpy(dig7_str, "OFF");
|
||||
}
|
||||
|
||||
if (dig8 == 1){
|
||||
strcpy(dig8_str, "ON");
|
||||
} else {
|
||||
strcpy(dig8_str, "OFF");
|
||||
}
|
||||
|
||||
if (dig9 == 1){
|
||||
strcpy(dig9_str, "ON");
|
||||
} else {
|
||||
strcpy(dig9_str, "OFF");
|
||||
}
|
||||
|
||||
_crow_panel_controller -> set_string_to_label(ui_digitalstatus3, dig3_str);
|
||||
_crow_panel_controller -> set_string_to_label(ui_digitalstatus4, dig4_str);
|
||||
_crow_panel_controller -> set_string_to_label(ui_digitalstatus5, dig5_str);
|
||||
_crow_panel_controller -> set_string_to_label(ui_digitalstatus6, dig6_str);
|
||||
_crow_panel_controller -> set_string_to_label(ui_digitalstatus7, dig7_str);
|
||||
_crow_panel_controller -> set_string_to_label(ui_digitalstatus8, dig8_str);
|
||||
_crow_panel_controller -> set_string_to_label(ui_digitalstatus9, dig9_str);
|
||||
|
||||
}
|
||||
*/
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue