diff --git a/prosjekt.X/main.c b/prosjekt.X/main.c
index e13df82..4325f26 100644
--- a/prosjekt.X/main.c
+++ b/prosjekt.X/main.c
@@ -23,7 +23,7 @@ int main() {
stdout = &USART_stream;
while (1) {
- voltage_values();
- //printf("The values: \n%u , %u\n",VREF_REFSEL_VDD_gc , adcVal);
+ uint16_t adcVal = voltage_values();
+ printf("The values: \n%u , %u\n",VREF_REFSEL_VDD_gc , adcVal);
}
}
\ No newline at end of file
diff --git a/prosjekt.X/nbproject/configurations.xml b/prosjekt.X/nbproject/configurations.xml
index 0799e0f..6efab0a 100644
--- a/prosjekt.X/nbproject/configurations.xml
+++ b/prosjekt.X/nbproject/configurations.xml
@@ -1,174 +1,180 @@
-
-
-
-
- uart.h
- voltage.h
-
-
- Makefile
-
-
-
-
- main.c
- uart.c
- voltage.c
-
-
- Makefile
-
-
-
- localhost
- AVR128DB48
-
-
- nEdbgTool
- XC8
- 2.46
- 3
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- false
- false
-
-
-
-
-
-
- false
- false
-
- false
-
- false
- false
- false
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ uart.h
+ voltage.h
+
+
+ Makefile
+
+
+
+
+ main.c
+ uart.c
+ voltage.c
+
+
+ Makefile
+
+
+
+ localhost
+ AVR128DB48
+
+
+ nEdbgTool
+ XC8
+ 2.45
+ 2
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ false
+ false
+
+
+
+
+
+
+ false
+ false
+
+ false
+
+ false
+ false
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/prosjekt.X/voltage.c b/prosjekt.X/voltage.c
index 127ef13..2983dfb 100644
--- a/prosjekt.X/voltage.c
+++ b/prosjekt.X/voltage.c
@@ -3,6 +3,7 @@
void sensor_init(void) {
/* Disable digital input buffer */
+
}
void ADC0_init(void) {
@@ -26,14 +27,14 @@ uint16_t ADC0_read(void) {
while (!(ADC0.INTFLAGS & ADC_RESRDY_bm)) {
;
}
- /* Clear the interrupt flag by writing 1: */
- ADC0.INTFLAGS = ADC_RESRDY_bm;
+ // Clear the interrupt flag by writing 1:
+ ADC0.INTFLAGS = ADC_RESRDY_bm;
return ADC0.RES;
}
-uint8_t voltage_values(void) {
+uint16_t voltage_values(void) {
/* Gets values */
- uint8_t adcVal = ADC0_read();
+ uint16_t adcVal = ADC0_read();
VREF.ADC0REF = VREF_REFSEL_VDD_gc;
return adcVal;
}
\ No newline at end of file
diff --git a/prosjekt.X/voltage.h b/prosjekt.X/voltage.h
index a2fdecd..221b741 100644
--- a/prosjekt.X/voltage.h
+++ b/prosjekt.X/voltage.h
@@ -53,7 +53,7 @@ void ADC0_init(void);
//Start ADC conversion
uint16_t ADC0_read(void);
// Gets the value from sensor and internal voltage
-uint8_t voltage_values(void);
+uint16_t voltage_values(void);
#ifdef __cplusplus
}
#endif /* __cplusplus */