Fixed indentation

lab_3/data/diode.dat

@@ -0,0 +1,11 @@
+# Temperature (C) Diode Value
+68  364
+67  367
+58  382
+52  390
+49  396
+43  405
+42  408
+37  415
+33  422
+25  438

lab_3/data/diode.gplot

@@ -0,0 +1,13 @@
+set key off
+set xlabel 'Temperature (°C)'
+set ylabel 'ADC Value'
+
+f(x) = a*x +b
+
+fit f(x) 'diode.dat' using 1:2 via a, b
+
+set term pngcairo
+set output 'diode.png'
+
+p f(x) lt rgb "black" dt 2, \
+    'diode.dat' using 1:2 lc rgb "black"

lab_3/data/fit.log

@@ -0,0 +1,288 @@
+
+
+*******************************************************************************
+Mon Nov  4 15:58:15 2019
+
+
+FIT:    data read from 'diode.dat' using 1:2
+        format = x:z
+        #datapoints = 10
+        residuals are weighted equally (unit weight)
+
+function used for fitting: f(x)
+	f(x) = a*x +b
+fitted parameters initialized with current variable values
+
+iter      chisq       delta/lim  lambda   a             b            
+   0 1.2400030000e+06   0.00e+00  3.48e+01    1.000000e+00   1.000000e+00
+   6 9.6489173663e+00  -2.10e-08  3.48e-05   -1.668582e+00   4.777908e+02
+
+After 6 iterations the fit converged.
+final sum of squares of residuals : 9.64892
+rel. change during last iteration : -2.10241e-13
+
+degrees of freedom    (FIT_NDF)                        : 8
+rms of residuals      (FIT_STDFIT) = sqrt(WSSR/ndf)    : 1.09823
+variance of residuals (reduced chisquare) = WSSR/ndf   : 1.20611
+
+Final set of parameters            Asymptotic Standard Error
+=======================            ==========================
+a               = -1.66858         +/- 0.02581      (1.547%)
+b               = 477.791          +/- 1.272        (0.2662%)
+
+correlation matrix of the fit parameters:
+                a      b      
+a               1.000 
+b              -0.962  1.000 
+
+
+*******************************************************************************
+Mon Nov  4 15:58:43 2019
+
+
+FIT:    data read from 'diode.dat' using 1:2
+        format = x:z
+        #datapoints = 10
+        residuals are weighted equally (unit weight)
+
+function used for fitting: f(x)
+	f(x) = a*x +b
+fitted parameters initialized with current variable values
+
+iter      chisq       delta/lim  lambda   a             b            
+   0 1.2400030000e+06   0.00e+00  3.48e+01    1.000000e+00   1.000000e+00
+   6 9.6489173663e+00  -2.10e-08  3.48e-05   -1.668582e+00   4.777908e+02
+
+After 6 iterations the fit converged.
+final sum of squares of residuals : 9.64892
+rel. change during last iteration : -2.10241e-13
+
+degrees of freedom    (FIT_NDF)                        : 8
+rms of residuals      (FIT_STDFIT) = sqrt(WSSR/ndf)    : 1.09823
+variance of residuals (reduced chisquare) = WSSR/ndf   : 1.20611
+
+Final set of parameters            Asymptotic Standard Error
+=======================            ==========================
+a               = -1.66858         +/- 0.02581      (1.547%)
+b               = 477.791          +/- 1.272        (0.2662%)
+
+correlation matrix of the fit parameters:
+                a      b      
+a               1.000 
+b              -0.962  1.000 
+
+
+*******************************************************************************
+Mon Nov  4 15:59:43 2019
+
+
+FIT:    data read from 'diode.dat' using 1:2
+        format = x:z
+        #datapoints = 10
+        residuals are weighted equally (unit weight)
+
+function used for fitting: f(x)
+	f(x) = a*x +b
+fitted parameters initialized with current variable values
+
+iter      chisq       delta/lim  lambda   a             b            
+   0 1.2400030000e+06   0.00e+00  3.48e+01    1.000000e+00   1.000000e+00
+   6 9.6489173663e+00  -2.10e-08  3.48e-05   -1.668582e+00   4.777908e+02
+
+After 6 iterations the fit converged.
+final sum of squares of residuals : 9.64892
+rel. change during last iteration : -2.10241e-13
+
+degrees of freedom    (FIT_NDF)                        : 8
+rms of residuals      (FIT_STDFIT) = sqrt(WSSR/ndf)    : 1.09823
+variance of residuals (reduced chisquare) = WSSR/ndf   : 1.20611
+
+Final set of parameters            Asymptotic Standard Error
+=======================            ==========================
+a               = -1.66858         +/- 0.02581      (1.547%)
+b               = 477.791          +/- 1.272        (0.2662%)
+
+correlation matrix of the fit parameters:
+                a      b      
+a               1.000 
+b              -0.962  1.000 
+
+
+*******************************************************************************
+Mon Nov  4 16:00:07 2019
+
+
+FIT:    data read from 'diode.dat' using 1:2
+        format = x:z
+        #datapoints = 10
+        residuals are weighted equally (unit weight)
+
+function used for fitting: f(x)
+	f(x) = a*x +b
+fitted parameters initialized with current variable values
+
+iter      chisq       delta/lim  lambda   a             b            
+   0 1.2400030000e+06   0.00e+00  3.48e+01    1.000000e+00   1.000000e+00
+   6 9.6489173663e+00  -2.10e-08  3.48e-05   -1.668582e+00   4.777908e+02
+
+After 6 iterations the fit converged.
+final sum of squares of residuals : 9.64892
+rel. change during last iteration : -2.10241e-13
+
+degrees of freedom    (FIT_NDF)                        : 8
+rms of residuals      (FIT_STDFIT) = sqrt(WSSR/ndf)    : 1.09823
+variance of residuals (reduced chisquare) = WSSR/ndf   : 1.20611
+
+Final set of parameters            Asymptotic Standard Error
+=======================            ==========================
+a               = -1.66858         +/- 0.02581      (1.547%)
+b               = 477.791          +/- 1.272        (0.2662%)
+
+correlation matrix of the fit parameters:
+                a      b      
+a               1.000 
+b              -0.962  1.000 
+
+
+*******************************************************************************
+Mon Nov  4 16:00:31 2019
+
+
+FIT:    data read from 'diode.dat' using 1:2
+        format = x:z
+        #datapoints = 10
+        residuals are weighted equally (unit weight)
+
+function used for fitting: f(x)
+	f(x) = a*x +b
+fitted parameters initialized with current variable values
+
+iter      chisq       delta/lim  lambda   a             b            
+   0 1.2400030000e+06   0.00e+00  3.48e+01    1.000000e+00   1.000000e+00
+   6 9.6489173663e+00  -2.10e-08  3.48e-05   -1.668582e+00   4.777908e+02
+
+After 6 iterations the fit converged.
+final sum of squares of residuals : 9.64892
+rel. change during last iteration : -2.10241e-13
+
+degrees of freedom    (FIT_NDF)                        : 8
+rms of residuals      (FIT_STDFIT) = sqrt(WSSR/ndf)    : 1.09823
+variance of residuals (reduced chisquare) = WSSR/ndf   : 1.20611
+
+Final set of parameters            Asymptotic Standard Error
+=======================            ==========================
+a               = -1.66858         +/- 0.02581      (1.547%)
+b               = 477.791          +/- 1.272        (0.2662%)
+
+correlation matrix of the fit parameters:
+                a      b      
+a               1.000 
+b              -0.962  1.000 
+
+
+*******************************************************************************
+Mon Nov  4 16:01:04 2019
+
+
+FIT:    data read from 'diode.dat' using 1:2
+        format = x:z
+        #datapoints = 10
+        residuals are weighted equally (unit weight)
+
+function used for fitting: f(x)
+	f(x) = a*x +b
+fitted parameters initialized with current variable values
+
+iter      chisq       delta/lim  lambda   a             b            
+   0 1.2400030000e+06   0.00e+00  3.48e+01    1.000000e+00   1.000000e+00
+   6 9.6489173663e+00  -2.10e-08  3.48e-05   -1.668582e+00   4.777908e+02
+
+After 6 iterations the fit converged.
+final sum of squares of residuals : 9.64892
+rel. change during last iteration : -2.10241e-13
+
+degrees of freedom    (FIT_NDF)                        : 8
+rms of residuals      (FIT_STDFIT) = sqrt(WSSR/ndf)    : 1.09823
+variance of residuals (reduced chisquare) = WSSR/ndf   : 1.20611
+
+Final set of parameters            Asymptotic Standard Error
+=======================            ==========================
+a               = -1.66858         +/- 0.02581      (1.547%)
+b               = 477.791          +/- 1.272        (0.2662%)
+
+correlation matrix of the fit parameters:
+                a      b      
+a               1.000 
+b              -0.962  1.000 
+
+
+*******************************************************************************
+Mon Nov  4 16:01:25 2019
+
+
+FIT:    data read from 'diode.dat' using 1:2
+        format = x:z
+        #datapoints = 10
+        residuals are weighted equally (unit weight)
+
+function used for fitting: f(x)
+	f(x) = a*x +b
+fitted parameters initialized with current variable values
+
+iter      chisq       delta/lim  lambda   a             b            
+   0 1.2400030000e+06   0.00e+00  3.48e+01    1.000000e+00   1.000000e+00
+   6 9.6489173663e+00  -2.10e-08  3.48e-05   -1.668582e+00   4.777908e+02
+
+After 6 iterations the fit converged.
+final sum of squares of residuals : 9.64892
+rel. change during last iteration : -2.10241e-13
+
+degrees of freedom    (FIT_NDF)                        : 8
+rms of residuals      (FIT_STDFIT) = sqrt(WSSR/ndf)    : 1.09823
+variance of residuals (reduced chisquare) = WSSR/ndf   : 1.20611
+
+Final set of parameters            Asymptotic Standard Error
+=======================            ==========================
+a               = -1.66858         +/- 0.02581      (1.547%)
+b               = 477.791          +/- 1.272        (0.2662%)
+
+correlation matrix of the fit parameters:
+                a      b      
+a               1.000 
+b              -0.962  1.000 
+
+
+*******************************************************************************
+Mon Nov  4 16:33:45 2019
+
+
+FIT:    data read from 'diode.dat' using 1:2
+        format = x:z
+        #datapoints = 10
+        residuals are weighted equally (unit weight)
+
+function used for fitting: f(x)
+	f(x) = a*x +b
+fitted parameters initialized with current variable values
+
+iter      chisq       delta/lim  lambda   a             b            
+   0 1.2400030000e+06   0.00e+00  3.48e+01    1.000000e+00   1.000000e+00
+   6 9.6489173663e+00  -2.10e-08  3.48e-05   -1.668582e+00   4.777908e+02
+
+After 6 iterations the fit converged.
+final sum of squares of residuals : 9.64892
+rel. change during last iteration : -2.10241e-13
+
+degrees of freedom    (FIT_NDF)                        : 8
+rms of residuals      (FIT_STDFIT) = sqrt(WSSR/ndf)    : 1.09823
+variance of residuals (reduced chisquare) = WSSR/ndf   : 1.20611
+
+Final set of parameters            Asymptotic Standard Error
+=======================            ==========================
+a               = -1.66858         +/- 0.02581      (1.547%)
+b               = 477.791          +/- 1.272        (0.2662%)
+
+correlation matrix of the fit parameters:
+                a      b      
+a               1.000 
+b              -0.962  1.000 

lab_3/main.c

@@ -25,27 +25,31 @@ void pin_init() {
 }
 
 /** @brief Initializes ADC with required settings
- */
+*/
 void adc_init() {
     /* ADC Settings
-     * Use AVcc as Vref
+     * Use 1v1 reference as Vref
      * Initially set input as GND
      * Data right-adjusted
      * No Interrupts
      */
-	// Set Vref
+    // Set Vref
-	ADMUX |= (1 << REFS1) | (1 << REFS0);
+    ADMUX |= (1 << REFS1) | (1 << REFS0);
     // Set the clock prescaler to 128 (slower ADC means more accurate measurements)
     ADCSRA |= (1 << ADPS2) | (1 << ADPS1) | (1 << ADPS0);
 
-	// Enable ADC
+    // Enable ADC
-	ADCSRA |= (1 << ADEN);
+    ADCSRA |= (1 << ADEN);
 }
 
 /** @brief Blocking function to read an ADC conversion from a selected ADC input.
  * 
  * @note Blocks until conversion finishes, so speed of this function is dependant
  *      on ADC prescaler.
+ * 
+ * @param adc_selection Value from 0-5, selects from ADC[0-5]
+ * 
+ * @return Raw value of ADC conversion
  */
 uint16_t adc_run_conversion(uint8_t adc_selection) {
     // Select ADC input, using 
@@ -58,30 +62,36 @@ uint16_t adc_run_conversion(uint8_t adc_selection) {
     while (!(ADCSRA & (1 << ADIF)));
 
     // Read out conversion value
-    // may not be correct
     return ADC;
 }
 
 
 /** @brief Converts an ADC value from a measurement on an LM35 into a temperature.
+ * 
+ * @param adc_reading Raw ADC measurement from LM35.
+ * 
+ * @return Measured temperature, configure parameters in main.h
  */
 int8_t lm35_convert(uint16_t adc_reading) {
     return (adc_reading * ADC_VREF / ADC_RESOLUTION) / LM35_SENSITIVITY;
 }
 
 /** @brief Converts and ADC value from a measurement on a diode into a temperature.
+ * 
+ * @param adc_reading Raw ADC measurement from diode.
+ * 
+ * @return Measured temperature, configure parameters in main.h
  */
 int8_t diode_convert(uint16_t adc_reading) {
-	// This could be collapsed but it doesn't really matter
+    int16_t value_diff = adc_reading - DIODE_VALUE_25C;
-	int16_t value_diff = adc_reading - DIODE_VALUE_25C;
+    int16_t temp_diff = value_diff / DIODE_SENSITIVITY;
-	int16_t temp_diff = value_diff / DIODE_SENSITIVITY;
     return temp_diff + 25;
 }
 
 int main() {
-	// Initialise display
+    // Initialise display
-	// NOTE: LCD uses PB0-PB6
+    // NOTE: LCD uses PB0-PB6
-	lcd_init(LCD_DISP_ON);
+    lcd_init(LCD_DISP_ON);
 
     // Initialise peripherals
     pin_init();
@@ -90,11 +100,11 @@ int main() {
 
 
     while (1) {
-		// Reset position
+        // Reset position
-		lcd_gotoxy(0, 0);
+        lcd_gotoxy(0, 0);
 
         // Read LM35 value, and write to LCD
-		uint16_t lm35_value = adc_run_conversion(1);
+        uint16_t lm35_value = adc_run_conversion(1);
         int8_t lm35_temp = lm35_convert(lm35_value);
         // Convert measured value to string
         sprintf(lm35_string, "LM35 : %4d %3dC", lm35_value, lm35_temp);
@@ -102,18 +112,19 @@ int main() {
         // Display temp on LCD
         lcd_puts((const char*) lm35_string);
 
-		lcd_gotoxy(0, 1);
+        lcd_gotoxy(0, 1);
 
 
         // Read diode value, and write to 
         uint16_t diode_value = adc_run_conversion(0);
-		int8_t diode_temp = diode_convert(diode_value);
+        int8_t diode_temp = diode_convert(diode_value);
         sprintf(diode_string, "Diode: %4d %3dC", diode_value, diode_temp);
 
         // Display diode info on LCD
         lcd_puts((const char*) diode_string);
 
-		_delay_ms(500);
+        // Refreshing too fast can make the data appear weird
+        _delay_ms(500);
     }
 
 }

lab_3/main.h

@@ -7,14 +7,11 @@
 #include <stdio.h>
 #include "lcd.h"
 
-// Comment out to run in "normal" mode
-#define CALIBRATION
-
 #define ADC_VREF            1.1
 #define ADC_RESOLUTION      1023 // (2^ 10 - 1, 10 bits resolution)
 
-#define DIODE_VALUE_25C		436 // ADC value for diode at 0C
+#define DIODE_VALUE_25C		440 // ADC value for diode at 0C
-#define DIODE_SENSITIVITY	-1.85 // ADC value / degree C, tuneable
+#define DIODE_SENSITIVITY	-1.66 // ADC value / degree C, tuneable
 
 #define LM35_SENSITIVITY    0.01 // V / degree C, see LM35 datasheet