Mikrokontrollersystemer-gruppe-4/mikrokontrollersystemer-prosjekt
1
0
Fork 0
Code Issues 3 Pull Requests 1 Packages Projects 1 Releases Wiki Activity

Fix merge issues

Browse Source
This commit is contained in:
Inamr 2024-03-12 13:13:06 +01:00
parent d8bd6917f6
commit 9a38ea8911
3 changed files with 181 additions and 179 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
prosjekt.X/header.h
View File

@ -54,8 +54,9 @@ extern "C" {
#endif /* XC_HEADER_TEMPLATE_H */ #endif /* XC_HEADER_TEMPLATE_H */
void led_init(void); void sensor_init(void);
void ADC0_init(void); void ADC0_init(void);
void ADC0_start(void); void ADC0_start(void);
bool ADC0_conversationDone(void); bool ADC0_conversationDone(void);
uint16_t ADC0_read(void);
uint16_t adcVal; uint16_t adcVal;

9
prosjekt.X/main.c
View File

@ -20,9 +20,6 @@
#include "uart.h" #include "uart.h"
#include <util/delay.h> #include <util/delay.h>
int main() {
init_uart((uint16_t)9600);
stdout = &USART_stream;
void sensor_init(void) { void sensor_init(void) {
/* Disable digital input buffer */ /* Disable digital input buffer */
@ -68,9 +65,11 @@ bool ADC0_conversationDone(void) {
} }
int main(void) { int main() {
sensor_init(); sensor_init();
ADC0_init(); ADC0_init();
init_uart((uint16_t)9600);
stdout = &USART_stream;
while (1) { while (1) {
//printf("loop\n"); //printf("loop\n");
@ -79,6 +78,8 @@ int main(void) {
VREF.ADC0REF = VREF_REFSEL_VDD_gc; VREF.ADC0REF = VREF_REFSEL_VDD_gc;
printf("The values: \n"); printf("The values: \n");
printf("%u , %u",VREF_REFSEL_VDD_gc , adcVal); printf("%u , %u",VREF_REFSEL_VDD_gc , adcVal);
} else {
printf("Not done\n");
} }
} }
} }