From 4a8b6137d140fee8638b974935649dee05830b58 Mon Sep 17 00:00:00 2001 From: Elp03 Date: Wed, 13 Mar 2024 11:48:58 +0100 Subject: [PATCH] Change namingsheme --- prosjekt.X/eeprom.c | 68 ++++++++++++------------- prosjekt.X/eeprom.h | 10 ++-- prosjekt.X/nbproject/configurations.xml | 2 +- 3 files changed, 39 insertions(+), 41 deletions(-) diff --git a/prosjekt.X/eeprom.c b/prosjekt.X/eeprom.c index 2cc7d24..4eea0c2 100644 --- a/prosjekt.X/eeprom.c +++ b/prosjekt.X/eeprom.c @@ -1,25 +1,23 @@ #include "eeprom.h" // The start address for the controller data -uint8_t EEMEM startAddressController = 0x00; +uint8_t EEMEM start_address_controller = 0x00; // Where the writing of the fans points start -uint8_t EEMEM startAddressFan1 = 0x30; -uint8_t EEMEM startAddressFan2 = 0x60; +uint8_t EEMEM start_address_fan1 = 0x30; +uint8_t EEMEM start_address_fan2 = 0x60; // The placement for the next datapoint form the fans. -uint8_t EEMEM currentAddressFan1 = 0x30; -uint8_t EEMEM currentAddressFan2 = 0x60; +uint8_t EEMEM current_address_fan1 = 0x30; +uint8_t EEMEM current_address_fan2 = 0x60; // Checks if the EEPROM memory is ready to be written in. -void checkEEpromIsReady(){ +void check_eeprom_is_ready(){ while(1){ if (eeprom_is_ready()){ break; - printf("it is"); }else{ ; - printf("its not"); } } } @@ -30,42 +28,42 @@ void checkEEpromIsReady(){ // Checks if it has been written information at the address // If true, the infromation is replaced with the intaken struct // else the intaken struct is written at the address. -void WriteStructInEEPROM(config_t writeStruct){ - uint8_t structSize; - structSize = sizeof(writeStruct); +void write_struct_in_EEPROM(config_t write_struct){ + uint8_t struct_size; + struct_size = sizeof(write_struct); - checkEEpromIsReady(); + check_eeprom_is_ready(); - eeprom_update_block((void*) &writeStruct,(void*) &startAddressController, structSize); + eeprom_update_block((void*) &write_struct,(void*) &start_address_controller, struct_size); } // Reads the memory block at the address 0x00 // returns a struct in form of config_t -config_t ReadStructInEEPROM(){ +config_t read_struct_from_EEPROM(){ //is eeprom ready?? - config_t readStruct; - uint8_t structsize = sizeof(readStruct); + config_t read_struct; + uint8_t struct_size = sizeof(read_struct); - checkEEpromIsReady(); + check_eeprom_is_ready(); - eeprom_read_block((void *) &readStruct,(void*) &startAddressController, structsize); - return readStruct; + eeprom_read_block((void *) &read_struct,(void*) &start_address_controller, struct_size); + return read_struct; } // Takes inn a dataPoint and what data set it belongs to // checks if EEPROM is ready // If the dataset is 1, the datapoint is written at the address. // If the dataset is 2 its written at another point. -void WriteDataPointInEEPROM(uint8_t dataPoint, uint8_t data){ +void write_data_point_in_EEPROM(uint8_t data_point, uint8_t data){ - checkEEpromIsReady(); + check_eeprom_is_ready(); if (data == 1){ - eeprom_update_byte(currentAddressFan1, dataPoint); - currentAddressFan1++; + eeprom_update_byte(current_address_fan1, data_point); + current_address_fan1++; } else if (data == 2){ - eeprom_update_byte(currentAddressFan2, dataPoint); - currentAddressFan2++; + eeprom_update_byte(current_address_fan2, data_point); + current_address_fan2++; } else{ // error??? ; @@ -74,25 +72,25 @@ void WriteDataPointInEEPROM(uint8_t dataPoint, uint8_t data){ // Reads all the datapoints to the choosen data. // it writes the data points in the USART stream. -void ReadDataPointSpeedInfo(uint8_t data){ - uint8_t dataPoint = 0; +void read_data_point_speed_info(uint8_t data){ + uint8_t data_point = 0; if (data == 1){ - uint8_t len = currentAddressFan1 - startAddressFan1; + uint8_t len = current_address_fan1 - start_address_fan1; - checkEEpromIsReady(); + check_eeprom_is_ready(); for (uint8_t i = 0; i + eeprom.h main.c - eeprom.h eeprom.c