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

resets array and puts diode readings in array

Browse Source
This commit is contained in:
Inamr 2024-03-20 15:25:59 +01:00
parent 8b5b4e186a
commit dc8a858204
5 changed files with 258 additions and 231 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
prosjekt.X/fan speeeed.h
View File

@ -23,6 +23,8 @@ extern "C" {
#include <avr/interrupt.h> #include <avr/interrupt.h>
#include <avr/io.h> #include <avr/io.h>
#include <avr/cpufunc.h> #include <avr/cpufunc.h>
#include "voltage.h"
int RTC_init(); int RTC_init();
int read_array_get_RPM(int voltage_value); int read_array_get_RPM(int voltage_value);
inline void put_in_array(); inline void put_in_array();

44
prosjekt.X/fan speeeeeeeed.c
View File

@ -1,5 +1,13 @@
#include "fan speeeed.h" #include "fan speeeed.h"
int voltage_value_counter = 0;
int voltage_value [30];
RTC.PITCTRLA = RTC_PERIOD_CYC32768_gc | RTC_PITEN_bm; RTC.PITCTRLA = RTC_PERIOD_CYC32768_gc | RTC_PITEN_bm;
int RTC_init() { int RTC_init() {
@ -42,31 +50,35 @@ int RTC_init() {
} }
// skal lage en som finner data hvert ... sekund. Datane skal samles inn i en array. Når arrayen er full skal jeg regne ut rpm. Vet t det er ... mange sek mellom så blir enklere. så noe signalbehandling shit. // skal lage en som finner data hvert ... sekund. Datane skal samles inn i en array. Når arrayen er full skal jeg regne ut rpm. Vet t det er ... mange sek mellom så blir enklere. så noe signalbehandling shit.
int read_array_get_RPM(int voltage_value) { int read_array_get_RPM() {
f = ((1 / t)*1000); f = ((1 / t)*1000);
fan_speed = (f * 60) / 2; fan_speed = (f * 60) / 2;
return fan_speed; return fan_speed;
} }
inline void put_in_array() { inline void put_in_array() {
int voltage_value [30] = {}; voltage_values[voltage_value_counter] = read_photodiode_voltage();
for(int i = 0; i <30; i++) voltage_value_counter++;
scanf("%d", &voltage_value[i]);
} }
void reset_voltage_array(){
for(int i = 0; i < voltage_values_counter; i++){
voltage_values[i]= 0;
}
voltage_value_counter = 0;
}
ISR(RTC_PIT_vect) { ISR(RTC_PIT_vect) {
RTC.PITINTFLAGS = RTC_PI_bm; RTC.PITINTFLAGS = RTC_PI_bm;
if(voltage_value_counter < sizeof(voltage_values)/sizeof(voltage_value[0])){
put_in_array(); put_in_array();
}
int main(void) {
sei();
read_array_get_RPM();
RTC_init();
while (1) {
} }
} else{
read_array_get_RPM();
reset_voltage_array();
}
}

73
prosjekt.X/main.c
View File

@ -1,36 +1,39 @@
/* /*
* File: main.c * File: main.c
* Author: Sebastian H. Gabrielli * Author: Sebastian H. Gabrielli
* *
* Created on March 6, 2024, 12:34 PM * Created on March 6, 2024, 12:34 PM
*/ */
#include "voltage.h" #include "voltage.h"
#include "uart.h" #include "uart.h"
#define RTC_PERIOD (511) #define RTC_PERIOD (511)
#define DELAY_TIME 1000 #define DELAY_TIME 1000
#include <avr/io.h> #include <avr/io.h>
#include <avr/interrupt.h> #include <avr/interrupt.h>
#include <util/delay.h> #include <util/delay.h>
#include <string.h> #include <string.h>
#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>
#include "uart.h" #include "uart.h"
#include <util/delay.h> #include <util/delay.h>
#include <stdint.h> #include <stdint.h>
#include "themistor-temp.h" #include "themistor-temp.h"
#include "fan speeeed.h"
int main() {
sensor_init();
ADC0_init(); int main() {
init_uart((uint16_t)9600); sensor_init();
stdout = &USART_stream; ADC0_init();
RTC_init();
while (1) { sei();
uint16_t adcVal = voltage_values(); init_uart((uint16_t)9600);
printf("The values: \n%u , %u\n",VREF_REFSEL_VDD_gc , adcVal); stdout = &USART_stream;
}
while (1) {
;
}
} }

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

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

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

@ -8,7 +8,9 @@
<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>