diff --git a/prosjekt.X/fan_speeeed.c b/prosjekt.X/fan_speeeed.c index ea66791..f60d65b 100644 --- a/prosjekt.X/fan_speeeed.c +++ b/prosjekt.X/fan_speeeed.c @@ -1,4 +1,5 @@ #include "fan_speeeed.h" +#include "uart.h" void TCA0_init() { TCA0.SINGLE.INTCTRL = TCA_SINGLE_OVF_bm ; diff --git a/prosjekt.X/main.c b/prosjekt.X/main.c index 2135b9f..ab8146f 100644 --- a/prosjekt.X/main.c +++ b/prosjekt.X/main.c @@ -15,7 +15,7 @@ #include -#define F_CPU 4E6 +//#define F_CPU 4E6 #include #include @@ -27,9 +27,6 @@ int main() { - - - read_input_get_RPM(); sei(); init_uart((uint16_t)9600); diff --git a/prosjekt.X/nbproject/configurations.xml b/prosjekt.X/nbproject/configurations.xml index c5d79cd..534a367 100644 --- a/prosjekt.X/nbproject/configurations.xml +++ b/prosjekt.X/nbproject/configurations.xml @@ -1,185 +1,184 @@ - - - - - uart.h - voltage.h - fan_speeeed.h - - - Makefile - - - - - main.c - uart.c - voltage.c - fan_speeeed.c - - - - . - - Makefile - - - - localhost - AVR128DB48 - - - nEdbgTool - XC8 - 2.46 - 2 - - - - - - - - - - - - - - - false - false - - - - - - - false - false - - false - - false - false - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + uart.h + voltage.h + fan_speeeed.h + themistor-temp.h + + + + + main.c + uart.c + voltage.c + fan_speeeed.c + thermistor-temp.c + + + Makefile + + + Makefile + + + + localhost + AVR128DB48 + + + nEdbgTool + XC8 + 2.45 + 2 + + + + + + + + + + + + + + + false + false + + + + + + + false + false + + false + + false + false + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/prosjekt.X/nbproject/project.xml b/prosjekt.X/nbproject/project.xml index 9ac6a37..cd4eb8b 100644 --- a/prosjekt.X/nbproject/project.xml +++ b/prosjekt.X/nbproject/project.xml @@ -8,9 +8,7 @@ 0 ISO-8859-1 - - . - + default diff --git a/prosjekt.X/voltage.c b/prosjekt.X/voltage.c index 8c43dfd..2e4b60a 100644 --- a/prosjekt.X/voltage.c +++ b/prosjekt.X/voltage.c @@ -39,15 +39,3 @@ uint16_t internal_voltage_read() { VREF.ADC0REF = VREF_REFSEL_VDD_gc; } - -uint16_t diode_voltage_read(){ - /* Gets value for the diode */ - uint8_t adcVal = ADC0_read(); - return adcVal; -} -uint16_t internal_voltage_read() { - /* Gets value for the internal voltage reffreance*/ - - VREF.ADC0REF = VREF_REFSEL_VDD_gc; - return VREF_REFSEL_VDD_gc; -} \ No newline at end of file