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);

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

@ -1,185 +1,184 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<configurationDescriptor version="65"> <configurationDescriptor version="65">
<logicalFolder name="root" displayName="root" projectFiles="true"> <logicalFolder name="root" displayName="root" projectFiles="true">
<logicalFolder name="HeaderFiles" <logicalFolder name="HeaderFiles"
displayName="Header Files" displayName="Header Files"
projectFiles="true"> projectFiles="true">
<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" </logicalFolder>
displayName="Important Files" <logicalFolder name="LinkerScript"
projectFiles="true"> displayName="Linker Files"
<itemPath>Makefile</itemPath> projectFiles="true">
</logicalFolder> </logicalFolder>
<logicalFolder name="LinkerScript" <logicalFolder name="SourceFiles"
displayName="Linker Files" displayName="Source Files"
projectFiles="true"> projectFiles="true">
</logicalFolder> <itemPath>main.c</itemPath>
<logicalFolder name="SourceFiles" <itemPath>uart.c</itemPath>
displayName="Source Files" <itemPath>voltage.c</itemPath>
projectFiles="true"> <itemPath>fan_speeeed.c</itemPath>
<itemPath>main.c</itemPath> <itemPath>thermistor-temp.c</itemPath>
<itemPath>uart.c</itemPath> </logicalFolder>
<itemPath>voltage.c</itemPath> <logicalFolder name="ExternalFiles"
<itemPath>fan_speeeed.c</itemPath> displayName="Important Files"
</logicalFolder> projectFiles="false">
</logicalFolder> <itemPath>Makefile</itemPath>
<sourceRootList> </logicalFolder>
<Elem>.</Elem> </logicalFolder>
</sourceRootList> <projectmakefile>Makefile</projectmakefile>
<projectmakefile>Makefile</projectmakefile> <confs>
<confs> <conf name="default" type="2">
<conf name="default" type="2"> <toolsSet>
<toolsSet> <developmentServer>localhost</developmentServer>
<developmentServer>localhost</developmentServer> <targetDevice>AVR128DB48</targetDevice>
<targetDevice>AVR128DB48</targetDevice> <targetHeader></targetHeader>
<targetHeader></targetHeader> <targetPluginBoard></targetPluginBoard>
<targetPluginBoard></targetPluginBoard> <platformTool>nEdbgTool</platformTool>
<platformTool>nEdbgTool</platformTool> <languageToolchain>XC8</languageToolchain>
<languageToolchain>XC8</languageToolchain> <languageToolchainVersion>2.45</languageToolchainVersion>
<languageToolchainVersion>2.46</languageToolchainVersion> <platform>2</platform>
<platform>2</platform> </toolsSet>
</toolsSet> <packs>
<packs> <pack name="AVR-Dx_DFP" vendor="Microchip" version="2.3.272"/>
<pack name="AVR-Dx_DFP" vendor="Microchip" version="2.3.272"/> </packs>
</packs> <ScriptingSettings>
<ScriptingSettings> </ScriptingSettings>
</ScriptingSettings> <compileType>
<compileType> <linkerTool>
<linkerTool> <linkerLibItems>
<linkerLibItems> </linkerLibItems>
</linkerLibItems> </linkerTool>
</linkerTool> <archiverTool>
<archiverTool> </archiverTool>
</archiverTool> <loading>
<loading> <useAlternateLoadableFile>false</useAlternateLoadableFile>
<useAlternateLoadableFile>false</useAlternateLoadableFile> <parseOnProdLoad>false</parseOnProdLoad>
<parseOnProdLoad>false</parseOnProdLoad> <alternateLoadableFile></alternateLoadableFile>
<alternateLoadableFile></alternateLoadableFile> </loading>
</loading> <subordinates>
<subordinates> </subordinates>
</subordinates> </compileType>
</compileType> <makeCustomizationType>
<makeCustomizationType> <makeCustomizationPreStepEnabled>false</makeCustomizationPreStepEnabled>
<makeCustomizationPreStepEnabled>false</makeCustomizationPreStepEnabled> <makeUseCleanTarget>false</makeUseCleanTarget>
<makeUseCleanTarget>false</makeUseCleanTarget> <makeCustomizationPreStep></makeCustomizationPreStep>
<makeCustomizationPreStep></makeCustomizationPreStep> <makeCustomizationPostStepEnabled>false</makeCustomizationPostStepEnabled>
<makeCustomizationPostStepEnabled>false</makeCustomizationPostStepEnabled> <makeCustomizationPostStep></makeCustomizationPostStep>
<makeCustomizationPostStep></makeCustomizationPostStep> <makeCustomizationPutChecksumInUserID>false</makeCustomizationPutChecksumInUserID>
<makeCustomizationPutChecksumInUserID>false</makeCustomizationPutChecksumInUserID> <makeCustomizationEnableLongLines>false</makeCustomizationEnableLongLines>
<makeCustomizationEnableLongLines>false</makeCustomizationEnableLongLines> <makeCustomizationNormalizeHexFile>false</makeCustomizationNormalizeHexFile>
<makeCustomizationNormalizeHexFile>false</makeCustomizationNormalizeHexFile> </makeCustomizationType>
</makeCustomizationType> <HI-TECH-COMP>
<HI-TECH-COMP> <property key="additional-warnings" value="true"/>
<property key="additional-warnings" value="true"/> <property key="asmlist" value="true"/>
<property key="asmlist" value="true"/> <property key="call-prologues" value="false"/>
<property key="call-prologues" value="false"/> <property key="default-bitfield-type" value="true"/>
<property key="default-bitfield-type" value="true"/> <property key="default-char-type" value="true"/>
<property key="default-char-type" value="true"/> <property key="define-macros" value=""/>
<property key="define-macros" value=""/> <property key="disable-optimizations" value="false"/>
<property key="disable-optimizations" value="false"/> <property key="extra-include-directories" value=""/>
<property key="extra-include-directories" value=""/> <property key="favor-optimization-for" value="-speed,+space"/>
<property key="favor-optimization-for" value="-speed,+space"/> <property key="garbage-collect-data" value="true"/>
<property key="garbage-collect-data" value="true"/> <property key="garbage-collect-functions" value="true"/>
<property key="garbage-collect-functions" value="true"/> <property key="identifier-length" value="255"/>
<property key="identifier-length" value="255"/> <property key="local-generation" value="false"/>
<property key="local-generation" value="false"/> <property key="operation-mode" value="free"/>
<property key="operation-mode" value="free"/> <property key="opt-xc8-compiler-strict_ansi" value="false"/>
<property key="opt-xc8-compiler-strict_ansi" value="false"/> <property key="optimization-assembler" value="true"/>
<property key="optimization-assembler" value="true"/> <property key="optimization-assembler-files" value="true"/>
<property key="optimization-assembler-files" value="true"/> <property key="optimization-debug" value="false"/>
<property key="optimization-debug" value="false"/> <property key="optimization-invariant-enable" value="false"/>
<property key="optimization-invariant-enable" value="false"/> <property key="optimization-invariant-value" value="16"/>
<property key="optimization-invariant-value" value="16"/> <property key="optimization-level" value="-O1"/>
<property key="optimization-level" value="-O1"/> <property key="optimization-speed" value="false"/>
<property key="optimization-speed" value="false"/> <property key="optimization-stable-enable" value="false"/>
<property key="optimization-stable-enable" value="false"/> <property key="preprocess-assembler" value="true"/>
<property key="preprocess-assembler" value="true"/> <property key="short-enums" value="true"/>
<property key="short-enums" value="true"/> <property key="tentative-definitions" value="-fno-common"/>
<property key="tentative-definitions" value="-fno-common"/> <property key="undefine-macros" value=""/>
<property key="undefine-macros" value=""/> <property key="use-cci" value="false"/>
<property key="use-cci" value="false"/> <property key="use-iar" value="false"/>
<property key="use-iar" value="false"/> <property key="verbose" value="false"/>
<property key="verbose" value="false"/> <property key="warning-level" value="-3"/>
<property key="warning-level" value="-3"/> <property key="what-to-do" value="ignore"/>
<property key="what-to-do" value="ignore"/> </HI-TECH-COMP>
</HI-TECH-COMP> <HI-TECH-LINK>
<HI-TECH-LINK> <property key="additional-options-checksum" value=""/>
<property key="additional-options-checksum" value=""/> <property key="additional-options-code-offset" value=""/>
<property key="additional-options-code-offset" value=""/> <property key="additional-options-command-line" value=""/>
<property key="additional-options-command-line" value=""/> <property key="additional-options-errata" value=""/>
<property key="additional-options-errata" value=""/> <property key="additional-options-extend-address" value="false"/>
<property key="additional-options-extend-address" value="false"/> <property key="additional-options-trace-type" value=""/>
<property key="additional-options-trace-type" value=""/> <property key="additional-options-use-response-files" value="false"/>
<property key="additional-options-use-response-files" value="false"/> <property key="backup-reset-condition-flags" value="false"/>
<property key="backup-reset-condition-flags" value="false"/> <property key="calibrate-oscillator" value="false"/>
<property key="calibrate-oscillator" value="false"/> <property key="calibrate-oscillator-value" value="0x3400"/>
<property key="calibrate-oscillator-value" value="0x3400"/> <property key="clear-bss" value="true"/>
<property key="clear-bss" value="true"/> <property key="code-model-external" value="wordwrite"/>
<property key="code-model-external" value="wordwrite"/> <property key="code-model-rom" value=""/>
<property key="code-model-rom" value=""/> <property key="create-html-files" value="false"/>
<property key="create-html-files" value="false"/> <property key="data-model-ram" value=""/>
<property key="data-model-ram" value=""/> <property key="data-model-size-of-double" value="24"/>
<property key="data-model-size-of-double" value="24"/> <property key="data-model-size-of-double-gcc" value="no-short-double"/>
<property key="data-model-size-of-double-gcc" value="no-short-double"/> <property key="data-model-size-of-float" value="24"/>
<property key="data-model-size-of-float" value="24"/> <property key="data-model-size-of-float-gcc" value="no-short-float"/>
<property key="data-model-size-of-float-gcc" value="no-short-float"/> <property key="display-class-usage" value="false"/>
<property key="display-class-usage" value="false"/> <property key="display-hex-usage" value="false"/>
<property key="display-hex-usage" value="false"/> <property key="display-overall-usage" value="true"/>
<property key="display-overall-usage" value="true"/> <property key="display-psect-usage" value="false"/>
<property key="display-psect-usage" value="false"/> <property key="extra-lib-directories" value=""/>
<property key="extra-lib-directories" value=""/> <property key="fill-flash-options-addr" value=""/>
<property key="fill-flash-options-addr" value=""/> <property key="fill-flash-options-const" value=""/>
<property key="fill-flash-options-const" value=""/> <property key="fill-flash-options-how" value="0"/>
<property key="fill-flash-options-how" value="0"/> <property key="fill-flash-options-inc-const" value="1"/>
<property key="fill-flash-options-inc-const" value="1"/> <property key="fill-flash-options-increment" value=""/>
<property key="fill-flash-options-increment" value=""/> <property key="fill-flash-options-seq" value=""/>
<property key="fill-flash-options-seq" value=""/> <property key="fill-flash-options-what" value="0"/>
<property key="fill-flash-options-what" value="0"/> <property key="format-hex-file-for-download" value="false"/>
<property key="format-hex-file-for-download" value="false"/> <property key="initialize-data" value="true"/>
<property key="initialize-data" value="true"/> <property key="input-libraries" value="libm"/>
<property key="input-libraries" value="libm"/> <property key="keep-generated-startup.as" value="false"/>
<property key="keep-generated-startup.as" value="false"/> <property key="link-in-c-library" value="true"/>
<property key="link-in-c-library" value="true"/> <property key="link-in-c-library-gcc" value=""/>
<property key="link-in-c-library-gcc" value=""/> <property key="link-in-peripheral-library" value="false"/>
<property key="link-in-peripheral-library" value="false"/> <property key="managed-stack" value="false"/>
<property key="managed-stack" value="false"/> <property key="opt-xc8-linker-file" value="false"/>
<property key="opt-xc8-linker-file" value="false"/> <property key="opt-xc8-linker-link_startup" value="false"/>
<property key="opt-xc8-linker-link_startup" value="false"/> <property key="opt-xc8-linker-serial" value=""/>
<property key="opt-xc8-linker-serial" value=""/> <property key="program-the-device-with-default-config-words" value="false"/>
<property key="program-the-device-with-default-config-words" value="false"/> <property key="remove-unused-sections" value="true"/>
<property key="remove-unused-sections" value="true"/> </HI-TECH-LINK>
</HI-TECH-LINK> <Tool>
<Tool> <property key="debugoptions.useswbreakpoints" value="true"/>
<property key="debugoptions.useswbreakpoints" value="true"/> </Tool>
</Tool> <XC8-CO>
<XC8-CO> <property key="coverage-enable" value=""/>
<property key="coverage-enable" value=""/> <property key="stack-guidance" value="false"/>
<property key="stack-guidance" value="false"/> </XC8-CO>
</XC8-CO> <XC8-config-global>
<XC8-config-global> <property key="advanced-elf" value="true"/>
<property key="advanced-elf" value="true"/> <property key="constdata-progmem" value="true"/>
<property key="constdata-progmem" value="true"/> <property key="gcc-opt-driver-new" value="true"/>
<property key="gcc-opt-driver-new" value="true"/> <property key="gcc-opt-std" value="-std=c99"/>
<property key="gcc-opt-std" value="-std=c99"/> <property key="gcc-output-file-format" value="dwarf-3"/>
<property key="gcc-output-file-format" value="dwarf-3"/> <property key="mapped-progmem" value="false"/>
<property key="mapped-progmem" value="false"/> <property key="omit-pack-options" value="false"/>
<property key="omit-pack-options" value="false"/> <property key="omit-pack-options-new" value="1"/>
<property key="omit-pack-options-new" value="1"/> <property key="output-file-format" value="-mcof,+elf"/>
<property key="output-file-format" value="-mcof,+elf"/> <property key="smart-io-format" value=""/>
<property key="smart-io-format" value=""/> <property key="stack-size-high" value="auto"/>
<property key="stack-size-high" value="auto"/> <property key="stack-size-low" value="auto"/>
<property key="stack-size-low" value="auto"/> <property key="stack-size-main" value="auto"/>
<property key="stack-size-main" value="auto"/> <property key="stack-type" value="compiled"/>
<property key="stack-type" value="compiled"/> <property key="user-pack-device-support" value=""/>
<property key="user-pack-device-support" value=""/> <property key="wpo-lto" value="false"/>
<property key="wpo-lto" value="false"/> </XC8-config-global>
</XC8-config-global> <nEdbgTool>
<nEdbgTool> <property key="debugoptions.useswbreakpoints" value="true"/>
<property key="debugoptions.useswbreakpoints" value="true"/> </nEdbgTool>
</nEdbgTool> </conf>
</conf> </confs>
</confs> </configurationDescriptor>
</configurationDescriptor>

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;
}