Skip to content

Commit 8a52429

Browse files
author
Angel
committed
Some changes in CarSens
1 parent e11aa5b commit 8a52429

File tree

1 file changed

+8
-38
lines changed

1 file changed

+8
-38
lines changed

MID/lib/CarSens.h

+8-38
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
#define ECU_CORRECTION 376 // <sens:200> 168 || <sens:150> 224 || <sens:100> 336 || <sens:50> 648
4242
#define VSS_CORRECTION 3.767 // <sens:200> 3.835232 || <sens:150> 5 || <sens:100> 7.670464 || <sens:50> 15.340928
4343
#define RPM_CORRECTION 33.767 // <sens:200> 33.767 || <sens:150> 50 || <sens:100> 67.534 || <sens:50> 135.068
44-
#define DST_CORRECTION 15300.11 // <sens:200> 15260.11 || <sens:150> 20266.66 || <sens:100> 30400 || <sens:50> 60791.24
44+
#define DST_CORRECTION 15400.11 // <sens:200> 15260.11 || <sens:150> 20266.66 || <sens:100> 30400 || <sens:50> 60791.24
4545
// DST
4646
// ===============
4747
// cur test +40 = 15240.11
@@ -161,9 +161,6 @@ class CarSens {
161161

162162
private:
163163

164-
165-
166-
167164
//
168165
// bool for read sensor at first loop
169166
bool isInitTemperature = 1;
@@ -793,15 +790,15 @@ void CarSens::speedingAlarms() {
793790
}
794791

795792
if (_amp->isSec() && CUR_VSS > VSS_ALARM_CITY_SPEED && speedAlarmCursor == ENABLE_SPEED_CT) {
796-
tone(ADT_ALR_PIN, 4000, 500);
793+
tone(ADT_ALR_PIN, 4000, 200);
797794
}
798795

799796
if (_amp->isSec() && CUR_VSS > VSS_ALARM_VWAY_SPEED && speedAlarmCursor == ENABLE_SPEED_VW) {
800-
tone(ADT_ALR_PIN, 4000, 500);
797+
tone(ADT_ALR_PIN, 4000, 200);
801798
}
802799

803800
if (_amp->isSec() && CUR_VSS > VSS_ALARM_HWAY_SPEED && speedAlarmCursor == ENABLE_SPEED_HW) {
804-
tone(ADT_ALR_PIN, 4000, 500);
801+
tone(ADT_ALR_PIN, 4000, 200);
805802
}
806803

807804
if (speedAlarmCursor > ENABLE_SPEED_HW) {
@@ -892,10 +889,10 @@ void CarSens::sensTnk() {
892889

893890
}
894891
}
895-
// if (_amp->isMinute()) {
896-
containerLpgTank = 3;
897-
indexLpgTank = CUR_LTK * 3;
898-
// }
892+
if (_amp->isMinute()) {
893+
containerLpgTank = 3;
894+
indexLpgTank = CUR_LTK * 3;
895+
}
899896
}
900897

901898
/**
@@ -1040,33 +1037,6 @@ void CarSens::sensTmp() {
10401037
TX = (1 / ((ln / EXT_TMP_MVL) + (1 / T0))); // Temperature from thermistor
10411038
temperatureC = TX * 0.01;
10421039

1043-
/*
1044-
*
1045-
* float reading = 310;
1046-
1047-
reading = ( 5 / 1023.00) * reading;
1048-
reading = 5 - reading;
1049-
//
1050-
// Read new data
1051-
float reading = analogRead(TMP_PIN_OUT);
1052-
1053-
reading = ( 5 / 1023.00) * reading;
1054-
reading = EXT_TMP_VSS - reading;
1055-
1056-
1057-
float cofVolt = 5;
1058-
1059-
// not correct
1060-
/// new type id: (147 / 2.666666 - 76) *1
1061-
// min -40 max 215 °C {formula A-40}
1062-
// separate reading
1063-
// 273.15
1064-
temperatureC = ((reading / cofVolt) - (340 / cofVolt)) * -1;
1065-
*/
1066-
1067-
//
1068-
//
1069-
// temperatureC = temperatureC;
10701040

10711041
#if defined(DEBUG_TEMPERATURE_OU)
10721042
if (_amp->isMid()) {

0 commit comments

Comments
 (0)