auto-sync

firmware/config/engines/dodge_ram.cpp

@@ -24,7 +24,7 @@ void setDodgeRam1996(DECLARE_ENGINE_PARAMETER_F) {
 	engineConfiguration->specs.firingOrder = FO_1_8_4_3_6_5_7_2;
 
 	boardConfiguration->triggerInputPins[0] = GPIOC_6;
-	boardConfiguration->triggerInputPins[1] = GPIOA_8;
+	boardConfiguration->triggerInputPins[1] = GPIOA_5;
 
 	engineConfiguration->vbattAdcChannel = EFI_ADC_NONE; // todo: conflict with what?
 }

firmware/controllers/engine_controller.cpp

@@ -311,7 +311,7 @@ static void printAnalogChannelInfoExt(const char *name, adc_channel_e hwChannel,
 static void printAnalogChannelInfo(const char *name, adc_channel_e hwChannel) {
 #if HAL_USE_ADC || defined(__DOXYGEN__)
 	if (hwChannel != EFI_ADC_NONE) {
-		printAnalogChannelInfoExt(name, hwChannel, getVoltage(hwChannel));
+		printAnalogChannelInfoExt(name, hwChannel, getVoltage("print", hwChannel));
 	}
 #endif
 }

firmware/controllers/sensors/allsensors.cpp

@@ -24,5 +24,5 @@ bool getAcToggle(Engine *engine) {
 	 * for now we are looking for a pull-up. High level means input switch is floating (which is OFF position)
 	 * low value means input is ground - which means ON.
 	 */
-	return getVoltageDivided(engine->engineConfiguration->acSwitchAdc) < 2.5;
+	return getVoltageDivided("A/C", engine->engineConfiguration->acSwitchAdc) < 2.5;
 }

firmware/controllers/sensors/ego.cpp

@@ -9,7 +9,7 @@ EXTERN_ENGINE;
 float getAfr(DECLARE_ENGINE_PARAMETER_F) {
 	afr_sensor_s * sensor = &engineConfiguration->afr;
 
-	float volts = getVoltageDivided(sensor->hwChannel);
+	float volts = getVoltageDivided("ego", sensor->hwChannel);
 
 	return interpolate(sensor->v1, sensor->value1, sensor->v2, sensor->value2, volts);
 }

firmware/controllers/sensors/maf.cpp

@@ -17,7 +17,7 @@ float getMaf(DECLARE_ENGINE_PARAMETER_F) {
  * @return kg/hour value
  */
 float getRealMaf(DECLARE_ENGINE_PARAMETER_F) {
-	int mafAdc = getAdcValue(engineConfiguration->mafAdcChannel);
+	int mafAdc = getAdcValue("maf", engineConfiguration->mafAdcChannel);
 	/**
 	 * here we drop from 12 bit ADC to 8 bit index
 	 */

firmware/controllers/sensors/maf.h

@@ -14,7 +14,7 @@
 
 #include "main.h"
 
-#define getMafT(ec) (getVoltageDivided(ec->mafAdcChannel))
+#define getMafT(ec) (getVoltageDivided("maf", ec->mafAdcChannel))
 float getMaf(void);
 float getRealMaf(DECLARE_ENGINE_PARAMETER_F);
 

firmware/controllers/sensors/map.cpp

@@ -76,12 +76,12 @@ float getMapByVoltage(float voltage DECLARE_ENGINE_PARAMETER_S) {
  * @return Manifold Absolute Pressure, in kPa
  */
 float getRawMap(DECLARE_ENGINE_PARAMETER_F) {
-	float voltage = getVoltageDivided(engineConfiguration->map.sensor.hwChannel);
+	float voltage = getVoltageDivided("map", engineConfiguration->map.sensor.hwChannel);
 	return getMapByVoltage(voltage PASS_ENGINE_PARAMETER);
 }
 
 float getBaroPressure(DECLARE_ENGINE_PARAMETER_F) {
-	float voltage = getVoltageDivided(engineConfiguration->baroSensor.hwChannel);
+	float voltage = getVoltageDivided("map", engineConfiguration->baroSensor.hwChannel);
 	return decodePressure(voltage, &engineConfiguration->baroSensor);
 }
 

firmware/controllers/sensors/thermistors.cpp

@@ -78,7 +78,7 @@ float getKelvinTemperature(float resistance, ThermistorConf *thermistor) {
 }
 
 float getResistance(Thermistor *thermistor) {
-	float voltage = getVoltageDivided(thermistor->channel);
+	float voltage = getVoltageDivided("term", thermistor->channel);
 	efiAssert(thermistor->config != NULL, "thermistor config is null", NAN);
 	float resistance = getR2InVoltageDividor(voltage, _5_VOLTS, thermistor->config->bias_resistor);
 	return resistance;

firmware/controllers/sensors/tps.cpp

@@ -72,7 +72,7 @@ static float getTpsValue(int adc DECLARE_ENGINE_PARAMETER_S) {
  * Return voltage on TPS AND channel
  * */
 float getTPSVoltage(DECLARE_ENGINE_PARAMETER_F) {
-	return getVoltageDivided(engineConfiguration->tpsAdcChannel);
+	return getVoltageDivided("tps", engineConfiguration->tpsAdcChannel);
 }
 
 /*

firmware/controllers/sensors/voltage.cpp

@@ -13,9 +13,9 @@
 #include "voltage.h"
 
 float getVRef(engine_configuration_s *engineConfiguration) {
-	return getVoltageDivided(engineConfiguration->vRefAdcChannel);
+	return getVoltageDivided("vref", engineConfiguration->vRefAdcChannel);
 }
 
 float getVBatt(engine_configuration_s *engineConfiguration) {
-	return getVoltage(engineConfiguration->vbattAdcChannel) * engineConfiguration->vbattDividerCoeff;
+	return getVoltage("vbatt", engineConfiguration->vbattAdcChannel) * engineConfiguration->vbattDividerCoeff;
 }

firmware/controllers/settings.cpp

@@ -368,7 +368,7 @@ static char pinNameBuffer[16];
 
 static void printThermistor(const char *msg, Thermistor *thermistor) {
 	adc_channel_e adcChannel = thermistor->channel;
-	float voltage = getVoltageDivided(adcChannel);
+	float voltage = getVoltageDivided("term", adcChannel);
 	float r = getResistance(thermistor);
 
 	float t = getTemperatureC(thermistor);

firmware/controllers/trigger/main_trigger_callback.cpp

@@ -353,7 +353,7 @@ void mainTriggerCallback(trigger_event_e ckpSignalType, uint32_t eventIndex DECL
 
 	if (eventIndex == engineConfiguration->ignMathCalculateAtIndex) {
 		if (engineConfiguration->externalKnockSenseAdc != EFI_ADC_NONE) {
-			float externalKnockValue = getVoltageDivided(engineConfiguration->externalKnockSenseAdc);
+			float externalKnockValue = getVoltageDivided("knock", engineConfiguration->externalKnockSenseAdc);
 			engine->knockNow = externalKnockValue > 2.5;
 			engine->knockEver |= engine->knockNow;
 		}

firmware/hw_layer/HIP9011.cpp

@@ -119,7 +119,7 @@ static void showHipInfo(void) {
 			nonZeroResponse);
 	scheduleMsg(logger, "CS=%s updateCount=%d", hwPortname(boardConfiguration->hip9011CsPin), settingUpdateCount);
 
-	scheduleMsg(logger, "value=%f@#%d", getVoltageDivided(engineConfiguration->hipOutputChannel),
+	scheduleMsg(logger, "value=%f@#%d", getVoltageDivided("hip", engineConfiguration->hipOutputChannel),
 			engineConfiguration->hipOutputChannel);
 }
 

firmware/hw_layer/adc_external.h

@@ -13,6 +13,6 @@
 
 #define getAdcValue(channel) getMcp3208adc(channel)
 #define adcToVoltsDivided(adc) (5.0f / 4095 * adc)
-#define getVoltageDivided(channel) (channel == EFI_ADC_NONE ? 66.66 : adcToVoltsDivided(getAdcValue(channel)))
+#define getVoltageDivided(msg, channel) (channel == EFI_ADC_NONE ? 66.66 : adcToVoltsDivided(getAdcValue(msg, channel)))
 
 #endif /* ADC_EXTERNAL_H_ */

firmware/hw_layer/adc_inputs.cpp

@@ -18,6 +18,7 @@
 #include "pin_repository.h"
 #include "engine_math.h"
 #include "board_test.h"
+#include "engine_controller.h"
 
 static adc_channel_mode_e adcHwChannelEnabled[HW_MAX_ADC_INDEX];
 
@@ -187,9 +188,9 @@ static void pwmpcb_fast(PWMDriver *pwmp) {
 #endif
 }
 
-int getInternalAdcValue(adc_channel_e hwChannel) {
+int getInternalAdcValue(const char *msg, adc_channel_e hwChannel) {
 	if (hwChannel == EFI_ADC_NONE) {
-		warning(OBD_PCM_Processor_Fault, "ADC: should not be asking for NONE");
+		warning(OBD_PCM_Processor_Fault, "ADC: should not be asking for NONE %s", msg);
 		return -1;
 	}
 
@@ -404,7 +405,7 @@ void AdcDevice::addChannel(adc_channel_e hwChannel) {
 }
 
 static void printAdcValue(adc_channel_e channel) {
-	int value = getAdcValue(channel);
+	int value = getAdcValue("print", channel);
 	float volts = adcToVoltsDivided(value);
 	scheduleMsg(&logger, "adc voltage : %f", volts);
 }
@@ -465,12 +466,15 @@ static void adc_callback_slow(ADCDriver *adcp, adcsample_t *buffer, size_t n) {
 	}
 }
 
+static char errorMsgBuff[10];
+
 static void addChannel(const char *name, adc_channel_e setting, adc_channel_mode_e mode) {
 	if (setting == EFI_ADC_NONE) {
 		return;
 	}
 	if (adcHwChannelEnabled[setting] != ADC_OFF) {
-		firmwareError("ADC mapping error: input for %s already used?", name);
+		getPinNameByAdcChannel(setting, errorMsgBuff);
+		firmwareError("ADC mapping error: input %s for %s already used?", errorMsgBuff, name);
 	}
 
 	adcHwChannelEnabled[setting] = mode;

firmware/hw_layer/adc_inputs.h

@@ -24,7 +24,7 @@ adc_channel_e getAdcChannel(brain_pin_e pin);
 int getAdcHardwareIndexByInternalIndex(int index);
 
 void pokeAdcInputs(void);
-int getInternalAdcValue(adc_channel_e index);
+int getInternalAdcValue(const char *msg, adc_channel_e index);
 
 /* Depth of the conversion buffer, channels are sampled X times each.*/
 #define ADC_BUF_DEPTH_SLOW      1
@@ -43,7 +43,7 @@ typedef struct {
 //	time_t time;
 } adc_state;
 
-#define getAdcValue(hwChannel) getInternalAdcValue(hwChannel)
+#define getAdcValue(msg, hwChannel) getInternalAdcValue(msg, hwChannel)
 
 // todo: migrate to adcToVoltageInputDividerCoefficient
 #define adcToVoltsDivided(adc) (adcToVolts(adc) * engineConfiguration->analogInputDividerCoefficient)

firmware/hw_layer/algo/adc_math.h

@@ -16,8 +16,8 @@
 
 #define voltsToAdc(volts) ((volts) * (ADC_MAX_VALUE / ADC_VCC))
 
-#define getVoltage(hwChannel) (adcToVolts(getAdcValue(hwChannel)))
+#define getVoltage(msg, hwChannel) (adcToVolts(getAdcValue(msg, hwChannel)))
 
-#define getVoltageDivided(hwChannel) (getVoltage(hwChannel) * engineConfiguration->analogInputDividerCoefficient)
+#define getVoltageDivided(msg, hwChannel) (getVoltage(msg, hwChannel) * engineConfiguration->analogInputDividerCoefficient)
 
 #endif /* ADC_MATH_H_ */

hardware/frankenso/DD_HIP9011.sch

@@ -58,7 +58,7 @@ $Descr A4 11693 8268
 encoding utf-8
 Sheet 5 15
 Title "Frankenso"
-Date "25 apr 2015"
+Date "2 may 2015"
 Rev ".02"
 Comp "rusEFI.com"
 Comment1 ""

hardware/frankenso/Misc_Vias.sch

@@ -58,7 +58,7 @@ $Descr B 17000 11000
 encoding utf-8
 Sheet 15 15
 Title "Frankenso"
-Date "25 apr 2015"
+Date "2 may 2015"
 Rev ".04"
 Comp "rusEFI.com"
 Comment1 ""

hardware/frankenso/PWR_buck_12V_switcher.sch

@@ -58,7 +58,7 @@ $Descr A 11000 8500
 encoding utf-8
 Sheet 9 15
 Title "Frankenso"
-Date "25 apr 2015"
+Date "2 may 2015"
 Rev ".02"
 Comp "rusEFI.com"
 Comment1 ""

hardware/frankenso/can_brd_1.sch

@@ -58,7 +58,7 @@ $Descr A4 11693 8268
 encoding utf-8
 Sheet 4 15
 Title "Frankenso"
-Date "25 apr 2015"
+Date "2 may 2015"
 Rev ".02"
 Comp "rusEFI.com"
 Comment1 ""

hardware/frankenso/cps_vrs_io_1.sch

@@ -58,7 +58,7 @@ $Descr B 17000 11000
 encoding utf-8
 Sheet 8 15
 Title "Frankenso"
-Date "25 apr 2015"
+Date "2 may 2015"
 Rev ".02"
 Comp "rusEFI.com"
 Comment1 ""

hardware/frankenso/frankenso.csv

@@ -86,20 +86,21 @@ MOS_PRO,1,"Q1001",vishay,SI2323DS-T1-E3,DIGI,SI2323DS-T1-E3CT-ND,sky-macau.com,4
 330R,1,"R5",ECG,ERA6AEB331V,DIGI,P330DADKR-ND
 680R,4,"R6 R7 R8 R9",ECG,ERA6AEB681V,DIGI,P680DACT-ND
 820R,1,"R177",vishay,CRCW0805820RJNEA,DIGI,541-820ACT-ND
-1k,9,"R11 R12 R13 R352 R701 R702 R703 R1001 R1002",VISHAY,CRCW0805100KFKEA,DIGI,CRCW0805100KFKEA
+1k,11,"R11 R12 R13 R290 R310 R352 R701 R702 R703 R1001 R1002",VISHAY,CRCW0805100KFKEA,DIGI,CRCW0805100KFKEA
 1k,1,"R99",VISHAY,CRCW0805100KFKEA,DIGI,CRCW0805100KFKEA
 1K,30,"R137 R141 R170 R172 R173 R174 R404 R405 R408 R409 R412 R413 R416 R417 R420 R421 R424 R425 R427 R428 R429 R430 R431 R432 R433 R434 R435 R436 R437 R438",VISHAY,CRCW0805100KFKEA,DIGI,CRCW0805100KFKEA
 1500,24,"R214 R215 R224 R225 R234 R235 R244 R245 R254 R255 R264 R265 R274 R275 R284 R285 R294 R295 R304 R305 R314 R315 R324 R325",ECG,ERA6AEB152V,DIGI,P1.5KDADKR-ND
-2700,17,"R210 R220 R230 R240 R250 R260 R270 R280 R290 R300 R310 R602 R603 R606 R607 R610 R611",PANASONIC,ERJ-6ENF2701V,DIGI,P2.70KCCT-ND
+2700,8,"R210 R220 R602 R603 R606 R607 R610 R611",PANASONIC,ERJ-6ENF2701V,DIGI,P2.70KCCT-ND
 5k,10,"R102 R103 R104 R106 R107 R108 R109 R110 R111 R112",STACKPOLE,RNCP0805FTD4K99,DIGI,RNCP0805FTD4K99CT-ND
-10k,23,"R1 R3 R4 R113 R114 R163 R164 R175 R176 R212 R222 R232 R242 R252 R262 R272 R282 R292 R302 R312 R321 R322 R472",BOURNS,CR0805-FX-1002ELF,DIGI,CR0805-FX-1002ELFCT-ND
+10k,26,"R1 R3 R4 R113 R114 R163 R164 R175 R176 R212 R222 R232 R242 R252 R260 R262 R272 R280 R282 R292 R300 R302 R312 R321 R322 R472",BOURNS,CR0805-FX-1002ELF,DIGI,CR0805-FX-1002ELFCT-ND
 39k,1,"R320",ECG,ERA6AEB393V,DIGI,P39KDACT-ND
 68k,2,"R167 R168",ECG,ERJ-8GEYJ680V,DIGI,P68ECT-ND
 100k,1,"R14",ECG,ERA6AEB104V,DIGI,P100KDACT-ND
-500K,11,"R211 R221 R231 R241 R251 R261 R271 R281 R291 R301 R311",ECG,ERA6AEB4993V,DIGI,P499KDACT-ND
+500K,4,"R231 R241 R251 R271",ECG,ERA6AEB4993V,DIGI,P499KDACT-ND
 1M,3,"R161 R162 R351",ECG,ERA-6AEB105V,DIGI,P1MDACT-ND
 2M,1,"R166",vishay,CRCW08052M00FKEA,DIGI,541-2.00MCCT-ND
 OPT,1,"R401",DNP,DNP,DNP,DNP
+dnp,11,"R211 R221 R230 R240 R250 R261 R270 R281 R291 R301 R311",dnp,dnp,dnp,dnp
 1kpot,1,"RV101",Bourns,TC33X-2-102E,DIGI,TC33X-102ECT-ND
 DISPLAY_BL,1,"S1"
 SW_PUSH,2,"SW1 SW2",E-SWITCH,TL1105F160Q,DIGI,EG1827-ND

hardware/frankenso/frankenso.pro

@@ -1,4 +1,4 @@
-update=4/25/2015 10:07:45 AM
+update=5/2/2015 5:17:55 PM
 version=1
 last_client=eeschema
 [cvpcb]

hardware/frankenso/frankenso.sch

@@ -58,7 +58,7 @@ $Descr B 17000 11000
 encoding utf-8
 Sheet 1 15
 Title "Frankenso"
-Date "25 apr 2015"
+Date "2 may 2015"
 Rev ".04"
 Comp "rusEFI.com"
 Comment1 ""
@@ -506,35 +506,35 @@ F 3 "DOCUMENTATION" H 10400 1350 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 Text Label 5050 2150 3    60   ~ 0
-START-SIG
+1C
 Text Label 5150 2150 3    60   ~ 0
-DIAG
+1D
 Text Label 4850 2150 3    60   ~ 0
-12V-CONST
+1A
 Text Label 5250 2150 3    60   ~ 0
-MUL
+1E
 Text Label 5850 2150 3    60   ~ 0
-DIAG-1K
+1K
 Text Label 5750 2150 3    60   ~ 0
-AC-RELAY
+1J
 Text Label 6250 2150 3    60   ~ 0
-STOP-LIGHT
+1O
 Text Label 6350 2150 3    60   ~ 0
-STEERING-SW
+1P
 Text Label 6150 2150 3    60   ~ 0
-TPS-IDL-SW
+1N
 Text Label 6450 2150 3    60   ~ 0
-AC-SW
+1Q
 Text Label 6550 2150 3    60   ~ 0
-COOL-FAN
+1R
 Text Label 6850 2150 3    60   ~ 0
-HEADLIGHT-SW
+1U
 Text Label 6950 2150 3    60   ~ 0
-NEUTRAL-CLUTCH-SW
+1V
 Text Label 6650 2150 3    60   ~ 0
-BLOWER-SW
+1S
 Text Label 6750 2150 3    60   ~ 0
-REAR-DEFROSTER-SW
+1T
 $Comp
 L TEST W27
 U 1 1 5398DD62
@@ -979,23 +979,23 @@ F 3 "~" H 12100 8550 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 Text Label 11400 2150 3    60   ~ 0
-INJ-05
+LOW-1A-05
 Text Label 11500 2150 3    60   ~ 0
-INJ-06
+LOW-1A-06
 Text Label 11600 2150 3    60   ~ 0
-INJ-07
+LOW-1A-07
 Text Label 10600 2150 3    60   ~ 0
 5V
 Text Label 11700 2150 3    60   ~ 0
-INJ-08
+LOW-1A-08
 Text Label 11800 2150 3    60   ~ 0
-INJ-09
+LOW-1A-09
 Text Label 11900 2150 3    60   ~ 0
-INJ-10
+LOW-1A-10
 Text Label 12000 2150 3    60   ~ 0
-INJ-11
+LOW-1A-11
 Text Label 12100 2150 3    60   ~ 0
-INJ-12
+LOW-1A-12
 Text Label 11000 2150 3    60   ~ 0
 AN3-HARN
 Text Label 10700 2150 3    60   ~ 0
@@ -1094,7 +1094,7 @@ HL5
 Text Label 5950 2150 3    60   ~ 0
 HL6
 Text Label 8900 2150 3    60   ~ 0
-INJ-03
+LOW-1A-03
 Text Label 10900 2150 3    60   ~ 0
 AN4-HARN
 Text Label 10800 2150 3    60   ~ 0
@@ -1104,11 +1104,11 @@ AN8-HARN
 Text Label 10400 2150 3    60   ~ 0
 AN7-HARN
 Text Label 8800 2150 3    60   ~ 0
-INJ-04
+LOW-1A-04
 Text Label 9000 2150 3    60   ~ 0
-INJ-02
+LOW-1A-02
 Text Label 9100 2150 3    60   ~ 0
-INJ-01_2
+LOW-1A-01_2
 Text Label 8600 2150 3    60   ~ 0
 CANH
 Text Label 8700 2150 3    60   ~ 0
@@ -1173,23 +1173,23 @@ GND
 Text Label 5700 6000 2    60   ~ 0
 3.3V
 Text Label 11100 3850 0    60   ~ 0
-INJ-01_2
+LOW-1A-01_2
 Text Label 11100 3950 0    60   ~ 0
-INJ-02
+LOW-1A-02
 Text Label 11100 4050 0    60   ~ 0
-INJ-03
+LOW-1A-03
 Text Label 11100 4150 0    60   ~ 0
-INJ-04
+LOW-1A-04
 Text Label 11100 4250 0    60   ~ 0
-INJ-05
+LOW-1A-05
 Text Label 11100 4350 0    60   ~ 0
-INJ-06
+LOW-1A-06
 Text Label 11100 4450 0    60   ~ 0
-INJ-07
+LOW-1A-07
 Text Label 11100 4550 0    60   ~ 0
-INJ-08
+LOW-1A-08
 Text Label 11100 4650 0    60   ~ 0
-INJ-09
+LOW-1A-09
 Text Label 5700 3850 2    60   ~ 0
 AN1-HARN
 Text Label 5700 3950 2    60   ~ 0
@@ -1211,11 +1211,11 @@ AN9-HARN
 Text Label 5700 4750 2    60   ~ 0
 AN10-HARN
 Text Label 11100 4750 0    60   ~ 0
-INJ-10
+LOW-1A-10
 Text Label 11100 4850 0    60   ~ 0
-INJ-11
+LOW-1A-11
 Text Label 11100 4950 0    60   ~ 0
-INJ-12
+LOW-1A-12
 Text Label 5700 4250 2    60   ~ 0
 AN5-HARN
 Text Label 5700 4550 2    60   ~ 0

hardware/frankenso/frankenso_by-ref.csv

@@ -322,67 +322,67 @@ R175,10k,BOURNS,CR0805-FX-1002ELF,DIGI,CR0805-FX-1002ELFCT-ND,,,,,,
 R176,10k,BOURNS,CR0805-FX-1002ELF,DIGI,CR0805-FX-1002ELFCT-ND,,,,,,
 R177,820R,vishay,CRCW0805820RJNEA,DIGI,541-820ACT-ND,,,,,,
 R210,2700,PANASONIC,ERJ-6ENF2701V,DIGI,P2.70KCCT-ND,,,,,,
-R211,500K,ECG,ERA6AEB4993V,DIGI,P499KDACT-ND,,,,,,
+R211,dnp,dnp,dnp,dnp,dnp,,,,,,
 R212,10k,BOURNS,CR0805-FX-1002ELF,DIGI,CR0805-FX-1002ELFCT-ND,,,,,,
 R213,100,PANASONIC,ERJ-6ENF1000V,DIGI,P100CTR-ND,,,,,,
 R214,1500,ECG,ERA6AEB152V,DIGI,P1.5KDADKR-ND,,,,,,
 R215,1500,ECG,ERA6AEB152V,DIGI,P1.5KDADKR-ND,,,,,,
 R220,2700,PANASONIC,ERJ-6ENF2701V,DIGI,P2.70KCCT-ND,,,,,,
-R221,500K,ECG,ERA6AEB4993V,DIGI,P499KDACT-ND,,,,,,
+R221,dnp,dnp,dnp,dnp,dnp,,,,,,
 R222,10k,BOURNS,CR0805-FX-1002ELF,DIGI,CR0805-FX-1002ELFCT-ND,,,,,,
 R223,100,PANASONIC,ERJ-6ENF1000V,DIGI,P100CTR-ND,,,,,,
 R224,1500,ECG,ERA6AEB152V,DIGI,P1.5KDADKR-ND,,,,,,
 R225,1500,ECG,ERA6AEB152V,DIGI,P1.5KDADKR-ND,,,,,,
-R230,2700,PANASONIC,ERJ-6ENF2701V,DIGI,P2.70KCCT-ND,,,,,,
+R230,dnp,dnp,dnp,dnp,dnp,,,,,,
 R231,500K,ECG,ERA6AEB4993V,DIGI,P499KDACT-ND,,,,,,
 R232,10k,BOURNS,CR0805-FX-1002ELF,DIGI,CR0805-FX-1002ELFCT-ND,,,,,,
 R233,100,PANASONIC,ERJ-6ENF1000V,DIGI,P100CTR-ND,,,,,,
 R234,1500,ECG,ERA6AEB152V,DIGI,P1.5KDADKR-ND,,,,,,
 R235,1500,ECG,ERA6AEB152V,DIGI,P1.5KDADKR-ND,,,,,,
-R240,2700,PANASONIC,ERJ-6ENF2701V,DIGI,P2.70KCCT-ND,,,,,,
+R240,dnp,dnp,dnp,dnp,dnp,,,,,,
 R241,500K,ECG,ERA6AEB4993V,DIGI,P499KDACT-ND,,,,,,
 R242,10k,BOURNS,CR0805-FX-1002ELF,DIGI,CR0805-FX-1002ELFCT-ND,,,,,,
 R243,100,PANASONIC,ERJ-6ENF1000V,DIGI,P100CTR-ND,,,,,,
 R244,1500,ECG,ERA6AEB152V,DIGI,P1.5KDADKR-ND,,,,,,
 R245,1500,ECG,ERA6AEB152V,DIGI,P1.5KDADKR-ND,,,,,,
-R250,2700,PANASONIC,ERJ-6ENF2701V,DIGI,P2.70KCCT-ND,,,,,,
+R250,dnp,dnp,dnp,dnp,dnp,,,,,,
 R251,500K,ECG,ERA6AEB4993V,DIGI,P499KDACT-ND,,,,,,
 R252,10k,BOURNS,CR0805-FX-1002ELF,DIGI,CR0805-FX-1002ELFCT-ND,,,,,,
 R253,100,PANASONIC,ERJ-6ENF1000V,DIGI,P100CTR-ND,,,,,,
 R254,1500,ECG,ERA6AEB152V,DIGI,P1.5KDADKR-ND,,,,,,
 R255,1500,ECG,ERA6AEB152V,DIGI,P1.5KDADKR-ND,,,,,,
-R260,2700,PANASONIC,ERJ-6ENF2701V,DIGI,P2.70KCCT-ND,,,,,,
-R261,500K,ECG,ERA6AEB4993V,DIGI,P499KDACT-ND,,,,,,
+R260,10k,BOURNS,CR0805-FX-1002ELF,DIGI,CR0805-FX-1002ELFCT-ND,,,,,,
+R261,dnp,dnp,dnp,dnp,dnp,,,,,,
 R262,10k,BOURNS,CR0805-FX-1002ELF,DIGI,CR0805-FX-1002ELFCT-ND,,,,,,
 R263,100,PANASONIC,ERJ-6ENF1000V,DIGI,P100CTR-ND,,,,,,
 R264,1500,ECG,ERA6AEB152V,DIGI,P1.5KDADKR-ND,,,,,,
 R265,1500,ECG,ERA6AEB152V,DIGI,P1.5KDADKR-ND,,,,,,
-R270,2700,PANASONIC,ERJ-6ENF2701V,DIGI,P2.70KCCT-ND,,,,,,
+R270,dnp,dnp,dnp,dnp,dnp,,,,,,
 R271,500K,ECG,ERA6AEB4993V,DIGI,P499KDACT-ND,,,,,,
 R272,10k,BOURNS,CR0805-FX-1002ELF,DIGI,CR0805-FX-1002ELFCT-ND,,,,,,
 R273,100,PANASONIC,ERJ-6ENF1000V,DIGI,P100CTR-ND,,,,,,
 R274,1500,ECG,ERA6AEB152V,DIGI,P1.5KDADKR-ND,,,,,,
 R275,1500,ECG,ERA6AEB152V,DIGI,P1.5KDADKR-ND,,,,,,
-R280,2700,PANASONIC,ERJ-6ENF2701V,DIGI,P2.70KCCT-ND,,,,,,
-R281,500K,ECG,ERA6AEB4993V,DIGI,P499KDACT-ND,,,,,,
+R280,10k,BOURNS,CR0805-FX-1002ELF,DIGI,CR0805-FX-1002ELFCT-ND,,,,,,
+R281,dnp,dnp,dnp,dnp,dnp,,,,,,
 R282,10k,BOURNS,CR0805-FX-1002ELF,DIGI,CR0805-FX-1002ELFCT-ND,,,,,,
 R283,100,PANASONIC,ERJ-6ENF1000V,DIGI,P100CTR-ND,,,,,,
 R284,1500,ECG,ERA6AEB152V,DIGI,P1.5KDADKR-ND,,,,,,
 R285,1500,ECG,ERA6AEB152V,DIGI,P1.5KDADKR-ND,,,,,,
-R290,2700,PANASONIC,ERJ-6ENF2701V,DIGI,P2.70KCCT-ND,,,,,,
-R291,500K,ECG,ERA6AEB4993V,DIGI,P499KDACT-ND,,,,,,
+R290,1k,VISHAY,CRCW0805100KFKEA,DIGI,CRCW0805100KFKEA,,,,,,
+R291,dnp,dnp,dnp,dnp,dnp,,,,,,
 R292,10k,BOURNS,CR0805-FX-1002ELF,DIGI,CR0805-FX-1002ELFCT-ND,,,,,,
 R293,100,PANASONIC,ERJ-6ENF1000V,DIGI,P100CTR-ND,,,,,,
 R294,1500,ECG,ERA6AEB152V,DIGI,P1.5KDADKR-ND,,,,,,
 R295,1500,ECG,ERA6AEB152V,DIGI,P1.5KDADKR-ND,,,,,,
-R300,2700,PANASONIC,ERJ-6ENF2701V,DIGI,P2.70KCCT-ND,,,,,,
-R301,500K,ECG,ERA6AEB4993V,DIGI,P499KDACT-ND,,,,,,
+R300,10k,BOURNS,CR0805-FX-1002ELF,DIGI,CR0805-FX-1002ELFCT-ND,,,,,,
+R301,dnp,dnp,dnp,dnp,dnp,,,,,,
 R302,10k,BOURNS,CR0805-FX-1002ELF,DIGI,CR0805-FX-1002ELFCT-ND,,,,,,
 R303,100,PANASONIC,ERJ-6ENF1000V,DIGI,P100CTR-ND,,,,,,
 R304,1500,ECG,ERA6AEB152V,DIGI,P1.5KDADKR-ND,,,,,,
 R305,1500,ECG,ERA6AEB152V,DIGI,P1.5KDADKR-ND,,,,,,
-R310,2700,PANASONIC,ERJ-6ENF2701V,DIGI,P2.70KCCT-ND,,,,,,
-R311,500K,ECG,ERA6AEB4993V,DIGI,P499KDACT-ND,,,,,,
+R310,1k,VISHAY,CRCW0805100KFKEA,DIGI,CRCW0805100KFKEA,,,,,,
+R311,dnp,dnp,dnp,dnp,dnp,,,,,,
 R312,10k,BOURNS,CR0805-FX-1002ELF,DIGI,CR0805-FX-1002ELFCT-ND,,,,,,
 R313,100,PANASONIC,ERJ-6ENF1000V,DIGI,P100CTR-ND,,,,,,
 R314,1500,ECG,ERA6AEB152V,DIGI,P1.5KDADKR-ND,,,,,,

hardware/frankenso/hi-lo.sch

@@ -58,7 +58,7 @@ $Descr B 17000 11000
 encoding utf-8
 Sheet 2 15
 Title "Frankenso"
-Date "25 apr 2015"
+Date "2 may 2015"
 Rev ".02"
 Comp "rusEFI.com"
 Comment1 ""

hardware/frankenso/inj_12ch.sch

@@ -58,7 +58,7 @@ $Descr B 17000 11000
 encoding utf-8
 Sheet 6 15
 Title "Frankenso"
-Date "25 apr 2015"
+Date "2 may 2015"
 Rev ".02"
 Comp "rusEFI.com"
 Comment1 ""

hardware/frankenso/known_issues.txt

@@ -58,7 +58,7 @@
 57) RESOLVED IN R0.4 Change C166 and C167 to 27pF instead of 20/18pF, to match XTAL specified 20CL. (30*30)/(30+30)+5= 20pF with 5pF stray capacitance.
 58) RESOLVED IN R0.4 add pF cap to HIP9011 / TPIC8101 knock chip to help fast transients and XTAL starting.
 59) RESOLVED IN R0.4 FIX CLAIMED ERRORS IN SCHEMATIC ERC power flags added to resolve 
-60)                  remove AC RELAY ect from harness connector net names.
+60) RESOLVED IN R0.4 remove AC RELAY ect from harness connector net names.
 61) RESOLVED IN R0.4 add 0R jumper between 5V and 5V plane to allow power supply verification before powering the 5V devices. 
 62)                  add resistor divider or some mechanism for identifying via firmware sensing PCB revision. Perhaps to PB1 AN input 
 63) RESOLVED IN R0.4 better test pads silkscreen: 5V, GND, 12V
@@ -77,16 +77,16 @@
 76) RESOLVED IN R0.4 AN inputs are limited to operation between 0V and 4V.RESOLVED BY CHANGING OP-AMP TO A BETTER RAIL TO RAIL THAT IS MUCH CLOSER TO THE RAIL.
 77)                  W1002 - silksceen on the wrong place? remove these jumpers anyway?
 78)                  1K and 0R on the MAX9926 input: need to put a comment on the schematics page explaining that none or just one of them should be installed depending on the use-case
+79) RESOLVED IN R0.4 on schematics, rename INJ_xx to LOW_xx? "inj" is a bit confusing, it implies that PE6 is injector #1 while it is usually not the case
+80) RESOLVED IN R0.4 set analog input values to match https://docs.google.com/spreadsheets/d/1LTvS7I-128Hft9uXHG1JrBxetVjGJDSBkySgVDQ6MGk/edit#gid=0
+81) RESOLVED IN R0.4 remove 'REAR-DEFROSTER-SW' and etc from schematics
 
 
   )                  route unused stm32 pins (D3 PC13 etc) to unused connector pins
   )                  cheaper battery holder - through-hole (need to find out footprint)
-  )                  remove some/all EGT - expand prototyping area?
+  )                  remove some/all EGT?
   )                  idle valve SMD diode?
-  )                  on schematics, rename INJ_xx to LOW_xx? "inj" is a bit confusing, it implies that PE6 is injector #1 while it is usually not the case
-  )                  set analog input values to match https://docs.google.com/spreadsheets/d/1LTvS7I-128Hft9uXHG1JrBxetVjGJDSBkySgVDQ6MGk/edit#gid=0
   )                  silkscreen for analog inputs - PA1/PC1/etc?
-
 For honda add-on / rewiring board
 -- Add 2A high side solinoid drive for VTec sol
 -- Add 3rd VR chip for 3rd signal

hardware/frankenso/mmc_usb_1.sch

@@ -58,7 +58,7 @@ $Descr A4 11693 8268
 encoding utf-8
 Sheet 7 15
 Title "Frankenso"
-Date "25 apr 2015"
+Date "2 may 2015"
 Rev ".02"
 Comp "rusEFI.com"
 Comment1 ""

hardware/frankenso/stm32f407_board.sch

@@ -58,7 +58,7 @@ $Descr A3 16535 11693
 encoding utf-8
 Sheet 10 15
 Title "Frankenso"
-Date "25 apr 2015"
+Date "2 may 2015"
 Rev ".02"
 Comp "rusEFI.com"
 Comment1 ""

hardware/frankenso/thermocouple_module.sch

@@ -58,7 +58,7 @@ $Descr A4 11693 8268
 encoding utf-8
 Sheet 14 15
 Title "Electronic Industrial Temperature Interface (EITI)"
-Date "25 apr 2015"
+Date "2 may 2015"
 Rev ".02"
 Comp "Mrk Industries"
 Comment1 ""

unit_tests/boards.cpp

@@ -9,7 +9,7 @@
 
 float testMafValue = 0;
 
-float getVoltageDivided(int channel) {
+float getVoltageDivided(const char *msg, int channel) {
 	switch(channel) {
 	case TEST_MAF_CHANNEL:
 		return testMafValue;
@@ -17,11 +17,11 @@ float getVoltageDivided(int channel) {
 	return 0;
 }
 
-float getVoltage(int channel) {
+float getVoltage(const char *msg, int channel) {
 	return 0;
 }
 
-int getAdcValue(int channel) {
+int getAdcValue(const char *msg, int channel) {
 	return 0;
 }
 

unit_tests/boards.h

@@ -12,8 +12,8 @@
 
 #define TEST_MAF_CHANNEL 10000013
 
-float getVoltageDivided(int);
-float getVoltage(int channel);
-int getAdcValue(int channel);
+float getVoltageDivided(const char *msg, int);
+float getVoltage(const char *msg, int channel);
+int getAdcValue(const char *msg, int channel);
 
 #endif /* BOARDS_H_ */

win32_functional_tests/simulator/boards.cpp

@@ -15,7 +15,7 @@ extern engine_configuration_s *engineConfiguration;
 
 static float fakeAdcValues[16];
 
-int getAdcValue(int hwChannel) {
+int getAdcValue(const char *msg, int hwChannel) {
 	return fakeAdcValues[hwChannel];
 }
 

win32_functional_tests/simulator/boards.h

@@ -19,13 +19,15 @@
  */
 #define EFI_CONSOLE_UART_DEVICE (&testStream)
 
+int getAdcValue(const char *msg, int channel);
+void initFakeBoard(void);
+
+
 #ifdef __cplusplus
 extern "C"
 {
 #endif /* __cplusplus */
 
-int getAdcValue(int channel);
-void initFakeBoard(void);
 
 #ifdef __cplusplus
 }