Nur in /home/andy/Electronic/Soldering/T962/T-962-improvements-master_original: COMPILING.md.
Nur in /home/andy/Electronic/Soldering/T962/T-962-improvements-master_original: .cproject.
Nur in /home/andy/Electronic/Soldering/T962/T-962-improvements-master_original: .gitignore.
Nur in /home/andy/Electronic/Soldering/T962/T-962-improvements-master_original: LICENSE.
Nur in /home/andy/Electronic/Soldering/T962/T-962-improvements-master_original: logs.
Nur in /home/andy/Electronic/Soldering/T962/T-962-improvements-master_original: .project.
Nur in /home/andy/Electronic/Soldering/T962/T-962-improvements-master_original: schematic-T962.pdf.
Nur in /home/andy/Electronic/Soldering/T962/T-962-improvements-master_original: serial-control.py.
Nur in /home/andy/Electronic/Soldering/T962/T-962-improvements-master_original: .settings.
Nur in /home/andy/Electronic/Soldering/T962/T-962-improvements-master_original/src: images.
diff -r /home/andy/Electronic/Soldering/T962/T-962-improvements-master_original/src/main.c /home/andy/workspace/LPC/T-962-improvements-master/src/main.c
53c53
< 	return "no version info";
---
> 	return "abr 08/13/2019";
76a77,78
> " sensors                 Show which sensors are present\n" \
> " scan1w                  New scan of the 1-wire bus\n" \
238a241,255
> 				printf("\n");
> 
> 			} else if (strcmp(serial_cmd, "scan1w") == 0) {
> 				OneWire_Init() ;
> 				printf("\n");
> 
> 			} else if (strcmp(serial_cmd, "sensors") == 0) {
> 				printf("\nActual sensors:\n");
> 				for (int i = 0; i < 16; i++) {
>                     if (OneWire_IsTCPresent(i)) {
>                       printf("\npresent %d: ", i);
>                     } else {
>                       printf("\nnot present %d: ", i);
>                     }
>                 }
diff -r /home/andy/Electronic/Soldering/T962/T-962-improvements-master_original/src/nvstorage.h /home/andy/workspace/LPC/T-962-improvements-master/src/nvstorage.h
16a17
>     TC_CONTROL_TOP,
diff -r /home/andy/Electronic/Soldering/T962/T-962-improvements-master_original/src/onewire.c /home/andy/workspace/LPC/T-962-improvements-master/src/onewire.c
381c381
< 				printf(" [Thermocouple interface, ID %x]",tcid);
---
> 				printf(" [Thermocouple interface, ID %x %x]",tcid, iter);
421,423c421,424
< 			if (devreadout[idx] & 0x01) { // Fault detected
< 				retval = 999.0f; // Invalid
< 			} else {
---
>  			if (devreadout[idx] & 0x01) { // Fault detected
>  				retval = 999.0f; // Invalid
>  			} else 
>             {
diff -r /home/andy/Electronic/Soldering/T962/T-962-improvements-master_original/src/reflow.c /home/andy/workspace/LPC/T-962-improvements-master/src/reflow.c
94c94
< 		printf("\n# Time,  Temp0, Temp1, Temp2, Temp3,  Set,Actual, Heat, Fan,  ColdJ, Mode");
---
> 		printf("\n# Time,  TempL, TempR, Xtra1, Xtra2,  Set,Actual, Heat, Fan, ColdJ, Mode");
diff -r /home/andy/Electronic/Soldering/T962/T-962-improvements-master_original/src/sensor.c /home/andy/workspace/LPC/T-962-improvements-master/src/sensor.c
24c24
< static float adcgainadj[2];
---
> static float sensorGainAdj[2];
26c26
< static float adcoffsetadj[2];
---
> static float sensorOffsetAdj[2];
44c44
< 	adcgainadj[0] = ((float)temp) * 0.01f;
---
> 	sensorGainAdj[0] = ((float)temp) * 0.01f;
51,52c51,52
< 	adcgainadj[1] = ((float)temp) * 0.01f;
< 
---
> 	sensorGainAdj[1] = ((float)temp) * 0.01f;
>     
58c58
< 	adcoffsetadj[0] = ((float)(temp - 100)) * 0.25f;
---
> 	sensorOffsetAdj[0] = ((float)(temp - 100)) * 0.25f;
65,66c65
< 	adcoffsetadj[1] = ((float)(temp - 100)) * 0.25f;
< }
---
> 	sensorOffsetAdj[1] = ((float)(temp - 100)) * 0.25f;
67a67,73
> 	temp = NV_GetConfig(TC_CONTROL_TOP);
> 	if (temp == 255) {
> 		temp = 1;
> 		NV_SetConfig(TC_CONTROL_TOP, temp); // Default top 
> 	}
> 
> }
77c83
< 	uint8_t tcpresent[4];
---
> 	uint8_t j, tcpresent[4];
79,80c85,87
< 	for (int i = 0; i < 4; i++) { // Get 4 TC channels
< 		tcpresent[i] = OneWire_IsTCPresent(i);
---
> 	for (int i = 0; i < 4; i++) { // Get 4 TC channels, channel no is 0,1,3,7 by HW, abr!
>         j= (i==2) ? 7 : i;        // channel 2 convert to 7
> 		tcpresent[i] = OneWire_IsTCPresent(j);
82,83c89,94
< 			tctemp[i] = OneWire_GetTCReading(i);
< 			tccj[i] = OneWire_GetTCColdReading(i);
---
>             if (i<2) {
>                 tctemp[i] = (OneWire_GetTCReading(j) * sensorGainAdj[i]) + sensorOffsetAdj[i];
>             } else {
>                 tctemp[i] = OneWire_GetTCReading(j);
>             }    
> 			tccj[i] = OneWire_GetTCColdReading(j);
91c102,106
< 				tctemp[i] = SPI_GetTCReading(i);
---
>                 if (i<2) {
>                     tctemp[i] = (SPI_GetTCReading(i) * sensorGainAdj[i]) + sensorOffsetAdj[i];
>                 } else {
>                     tctemp[i] = SPI_GetTCReading(i);
>                 }    
135,136c150,151
< 		temperature[0] *= adcgainadj[0];
< 		temperature[1] *= adcgainadj[1];
---
> 		temperature[0] *= sensorGainAdj[0];
> 		temperature[1] *= sensorGainAdj[1];
139,140c154,155
< 		temperature[0] += coldjunction + adcoffsetadj[0];
< 		temperature[1] += coldjunction + adcoffsetadj[1];
---
> 		temperature[0] += coldjunction + sensorOffsetAdj[0];
> 		temperature[1] += coldjunction + sensorOffsetAdj[1];
143,144c158
< 
< 		avgtemp = (temperature[0] + temperature[1]) / 2.0f;
---
>         avgtemp = (temperature[0] + temperature[1]) / 2.0f;
146a161,166
> 	if (TC_CONTROL_TOP==1) {
>         avgtemp = (temperature[0] + temperature[1]) / 2.0f;
>     } else {
>         avgtemp = (temperature[2] + temperature[3]) / 2.0f;
>     }
>     
diff -r /home/andy/Electronic/Soldering/T962/T-962-improvements-master_original/src/setup.c /home/andy/workspace/LPC/T-962-improvements-master/src/setup.c
32a33
> 	{"T control top    %2.0f", TC_CONTROL_TOP, 0, 1, 0, 1.0f},
52a54
> 	Sensor_ValidateNV();// Need to update gain and offset arrays etc
Nur in /home/andy/Electronic/Soldering/T962/T-962-improvements-master_original: T-962-controller.ld.
Nur in /home/andy/Electronic/Soldering/T962/T-962-improvements-master_original: .travis.yml.