Merge branch 'master' of gitorious.ghostdub.de:avr/thermocouple

Conflicts:
	firmware/slavechip/main.c

firmware/masterchip/main.c

@@ -78,7 +78,7 @@ int __attribute__((noreturn)) main(void) {
     SOFTTIMER(2,800) {
 		uint16_t recv;
 		for(int i=0; i<4; i++) {
-			thermoData[i] = spi_master_transceive(7, i, 0);			
+			thermoData[i] = spi_master_transceive(7, i, 0);
 		}
 		newThermoData = 1;
     }

firmware/slavechip/main.c

@@ -60,6 +60,7 @@ int __attribute__((noreturn)) main(void) {
 
 		// measure temps 5*2 times
 		for(uint8_t i=0; i<5; i++) {
+            dbgLog("starting temp measuring");
 			for(uint8_t active_sensor=0; active_sensor<2; active_sensor++) { // only measuring two probes atm
 				muxer_set(active_sensor);
 				while(!mcpadc_has_new_data()) _delay_ms(10);
@@ -72,8 +73,10 @@ int __attribute__((noreturn)) main(void) {
             dbgLog("a");
 		}
 
+		dbgLog("now measuring offsets");
 		// measure 2 offsets
 		for(uint8_t active_sensor=0; active_sensor<2; active_sensor++) { // only measuring two offsets atm
+			dbgLog("active sensor: %i",active_sensor);
 			muxer_set(active_sensor);
 			offset_measure_start(active_sensor);
 			while(!mcpadc_has_new_data()) _delay_ms(10);
@@ -81,7 +84,7 @@ int __attribute__((noreturn)) main(void) {
 			while(!mcpadc_has_new_data()) _delay_ms(10);
 
 			data = mcpadc_get_data();
-            process_ambient_value(data);
+			dbgLog("retrieved offset data %i", data);
 			// TODO: what to do with the offset?
 			
 			offset_measure_stop();
@@ -97,60 +100,24 @@ int __attribute__((noreturn)) main(void) {
 
 
 /*		SOFTTIMER(1,8000) { // maybe measure coldjunction comp
-			muxer_set(23); // TODO: channel for ntc?!
 			
-			// first measure ntc offset?! maybe?
-			offset_measure_start(active_sensor);
-			while(!mcpadc_has_new_data()) _delay_ms(1);
-			mcpadc_get_data(); // first data after switch to trash
-			while(!mcpadc_has_new_data()) _delay_ms(1);
-
-			data = mcpadc_get_data();
-			offset_measure_stop();
-
-			// now measure temp-data
-			while(!mcpadc_has_new_data()) _delay_ms(1);
-			mcpadc_get_data(); // first data after switch to trash
-			while(!mcpadc_has_new_data()) _delay_ms(1);
-
-			data = mcpadc_get_data();			
-		}*/
-		
-
-    
-		/* SOFTTIMER(1,10) { */
-		/* 	if(mcpadc_has_new_data()) { */
-		/* 		int16_t data = mcpadc_get_data(); */
-		/* 		float f = filter_voltage_to_temp( */
-		/* 				((float)data) * 0.000625 ); */
-		/* 		// total gain is 100 (50 from INA, 2 from ADC) */
-		/* 		// full signed range on ADC is +-2.048V */
-		/* 		// with 16bit, 1LSB is worth 0.0625mV */
-		/* 		// with the gain added in that's 0.000625mV */
-
-		/* 		filter_average_input(active_sensor, f); */
-		/* 		if(filter_average_done(active_sensor,16)){ */
-		/* 			float noise = filter_average_noise(active_sensor); */
-		/* 			float temp = filter_average_result(active_sensor); */
-		/* 			dbgLog("temp: %3.3f°C (lastval %i), noise: %e\n",temp, data, noise); */
-		/* 		} */
-		/* 	} */
-		/* } */
-
-		/* SOFTTIMER(3,4000){ */
-		/* 	static uint8_t toggle; */
-		/* 	if(toggle){ */
-		/* 		offset_measure_start(1); */
-		/* 		toggle=0; */
-		/* 		dbgLog("measuring offset\n"); */
-		/* 	} else { */
-		/* 		offset_measure_stop(); */
-		/* 		toggle=1; */
-		/* 		dbgLog("stopping offset-measuring\n"); */
-		/* 	} */
-		/* } */
-
-    }
+			/* // first measure ntc offset?! maybe? */
+			/* offset_measure_start(active_sensor); */
+			/* while(!mcpadc_has_new_data()) _delay_ms(1); */
+			/* mcpadc_get_data(); // first data after switch to trash */
+			/* while(!mcpadc_has_new_data()) _delay_ms(1); */
+
+			/* data = mcpadc_get_data(); */
+			/* offset_measure_stop(); */
+
+			/* // now measure temp-data */
+			/* while(!mcpadc_has_new_data()) _delay_ms(1); */
+			/* mcpadc_get_data(); // first data after switch to trash */
+			/* while(!mcpadc_has_new_data()) _delay_ms(1); */
+
+			/* data = mcpadc_get_data();			 */
+	}
+	
 }