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

Fix xml file (maybe)

Browse Source
This commit is contained in:
Elp03 2024-04-09 15:39:11 +02:00
parent a6d1afb0bf
commit cd97face0f
5 changed files with 187 additions and 204 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
prosjekt.X/fan_speeeed.c
View File

@ -1,4 +1,5 @@
#include "fan_speeeed.h" #include "fan_speeeed.h"
#include "uart.h"
void TCA0_init() { void TCA0_init() {
TCA0.SINGLE.INTCTRL = TCA_SINGLE_OVF_bm ; TCA0.SINGLE.INTCTRL = TCA_SINGLE_OVF_bm ;

5
prosjekt.X/main.c
View File

@ -15,7 +15,7 @@
#include <stdbool.h> #include <stdbool.h>
#define F_CPU 4E6 //#define F_CPU 4E6
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -27,9 +27,6 @@
int main() { int main() {
read_input_get_RPM(); read_input_get_RPM();
sei(); sei();
init_uart((uint16_t)9600); init_uart((uint16_t)9600);

17
prosjekt.X/nbproject/configurations.xml
View File

@ -7,11 +7,7 @@
<itemPath>uart.h</itemPath> <itemPath>uart.h</itemPath>
<itemPath>voltage.h</itemPath> <itemPath>voltage.h</itemPath>
<itemPath>fan_speeeed.h</itemPath> <itemPath>fan_speeeed.h</itemPath>
</logicalFolder> <itemPath>themistor-temp.h</itemPath>
<logicalFolder name="ExternalFiles"
displayName="Important Files"
projectFiles="true">
<itemPath>Makefile</itemPath>
</logicalFolder> </logicalFolder>
<logicalFolder name="LinkerScript" <logicalFolder name="LinkerScript"
displayName="Linker Files" displayName="Linker Files"
@ -24,11 +20,14 @@
<itemPath>uart.c</itemPath> <itemPath>uart.c</itemPath>
<itemPath>voltage.c</itemPath> <itemPath>voltage.c</itemPath>
<itemPath>fan_speeeed.c</itemPath> <itemPath>fan_speeeed.c</itemPath>
<itemPath>thermistor-temp.c</itemPath>
</logicalFolder>
<logicalFolder name="ExternalFiles"
displayName="Important Files"
projectFiles="false">
<itemPath>Makefile</itemPath>
</logicalFolder> </logicalFolder>
</logicalFolder> </logicalFolder>
<sourceRootList>
<Elem>.</Elem>
</sourceRootList>
<projectmakefile>Makefile</projectmakefile> <projectmakefile>Makefile</projectmakefile>
<confs> <confs>
<conf name="default" type="2"> <conf name="default" type="2">
@ -39,7 +38,7 @@
<targetPluginBoard></targetPluginBoard> <targetPluginBoard></targetPluginBoard>
<platformTool>nEdbgTool</platformTool> <platformTool>nEdbgTool</platformTool>
<languageToolchain>XC8</languageToolchain> <languageToolchain>XC8</languageToolchain>
<languageToolchainVersion>2.46</languageToolchainVersion> <languageToolchainVersion>2.45</languageToolchainVersion>
<platform>2</platform> <platform>2</platform>
</toolsSet> </toolsSet>
<packs> <packs>

4
prosjekt.X/nbproject/project.xml
View File

@ -8,9 +8,7 @@
<make-project-type>0</make-project-type> <make-project-type>0</make-project-type>
<sourceEncoding>ISO-8859-1</sourceEncoding> <sourceEncoding>ISO-8859-1</sourceEncoding>
<make-dep-projects/> <make-dep-projects/>
<sourceRootList> <sourceRootList/>
<sourceRootElem>.</sourceRootElem>
</sourceRootList>
<confList> <confList>
<confElem> <confElem>
<name>default</name> <name>default</name>

12
prosjekt.X/voltage.c
View File

@ -39,15 +39,3 @@ uint16_t internal_voltage_read() {
VREF.ADC0REF = VREF_REFSEL_VDD_gc; 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;
}