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;

11
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,10 +65,12 @@ 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");
if (ADC0_conversationDone()) { if (ADC0_conversationDone()) {
@ -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");
} }
} }
} }

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

@ -1,173 +1,173 @@
<?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>header.h</itemPath> <itemPath>header.h</itemPath>
</logicalFolder> </logicalFolder>
<logicalFolder name="ExternalFiles" <logicalFolder name="ExternalFiles"
displayName="Important Files" displayName="Important Files"
projectFiles="true"> projectFiles="true">
<itemPath>Makefile</itemPath> <itemPath>Makefile</itemPath>
</logicalFolder> </logicalFolder>
<logicalFolder name="LinkerScript" <logicalFolder name="LinkerScript"
displayName="Linker Files" displayName="Linker Files"
projectFiles="true"> projectFiles="true">
</logicalFolder> </logicalFolder>
<logicalFolder name="SourceFiles" <logicalFolder name="SourceFiles"
displayName="Source Files" displayName="Source Files"
projectFiles="true"> projectFiles="true">
<itemPath>main.c</itemPath> <itemPath>main.c</itemPath>
<itemPath>uart.c</itemPath> <itemPath>uart.c</itemPath>
</logicalFolder> </logicalFolder>
</logicalFolder> </logicalFolder>
<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.46</languageToolchainVersion> <languageToolchainVersion>2.46</languageToolchainVersion>
<platform>3</platform> <platform>3</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>
<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>
</conf> </conf>
</confs> </confs>
</configurationDescriptor> </configurationDescriptor>