Fix merge issues
This commit is contained in:
parent
d8bd6917f6
commit
9a38ea8911
@ -54,8 +54,9 @@ extern "C" {
|
||||
|
||||
#endif /* XC_HEADER_TEMPLATE_H */
|
||||
|
||||
void led_init(void);
|
||||
void sensor_init(void);
|
||||
void ADC0_init(void);
|
||||
void ADC0_start(void);
|
||||
bool ADC0_conversationDone(void);
|
||||
uint16_t ADC0_read(void);
|
||||
uint16_t adcVal;
|
||||
@ -20,9 +20,6 @@
|
||||
#include "uart.h"
|
||||
#include <util/delay.h>
|
||||
|
||||
int main() {
|
||||
init_uart((uint16_t)9600);
|
||||
stdout = &USART_stream;
|
||||
|
||||
void sensor_init(void) {
|
||||
/* Disable digital input buffer */
|
||||
@ -68,9 +65,11 @@ bool ADC0_conversationDone(void) {
|
||||
|
||||
}
|
||||
|
||||
int main(void) {
|
||||
int main() {
|
||||
sensor_init();
|
||||
ADC0_init();
|
||||
init_uart((uint16_t)9600);
|
||||
stdout = &USART_stream;
|
||||
|
||||
while (1) {
|
||||
//printf("loop\n");
|
||||
@ -79,6 +78,8 @@ int main(void) {
|
||||
VREF.ADC0REF = VREF_REFSEL_VDD_gc;
|
||||
printf("The values: \n");
|
||||
printf("%u , %u",VREF_REFSEL_VDD_gc , adcVal);
|
||||
} else {
|
||||
printf("Not done\n");
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user