Create sample main to present library capabilities

Author: majcoch

slim-fat-sln/slim-fat-lib/slim-fat-lib.cproj

@@ -132,6 +132,10 @@
       <SubType>compile</SubType>
       <Link>slimfat\fileio\fileio.h</Link>
     </Compile>
+    <Compile Include="..\..\src\slimfat\slimfat.h">
+      <SubType>compile</SubType>
+      <Link>slimfat\slimfat.h</Link>
+    </Compile>
     <Compile Include="..\..\src\slimfat\slimfaterr.h">
       <SubType>compile</SubType>
       <Link>slimfat\slimfaterr.h</Link>

slim-fat-sln/slim-fat-runner/main.c

@@ -7,12 +7,72 @@
 
 #include <avr/io.h>
 
+// Device SPI driver
+#include "spi/spi_master.h"
 
-int main(void)
-{
-    /* Replace with your application code */
-    while (1) 
-    {
-    }
+// Library supplied SD card driver
+#include "sd-driver/sd_driver.h"
+
+// SlimFAT file system driver
+#include "slimfat/slimfat.h"
+
+// Device buffer
+uint8_t buffer[SECTOR_SIZE] = { 0 };
+
+int main(void) {
+	spi_master_init();
+	
+	// Create handle for SD card connected to SPI
+	sd_card_t sd_card = GET_SD_HANDLE(spi_master_transfer, spi_slave_sd_select);
+	
+	// Create handle for generic storage device with sector buffer
+	fs_storage_device storage_dev = GET_DEV_HANDLE(buffer, &sd_card, sd_card_read, sd_card_write);
+	
+	// Create handle for partition to be mounted
+	fs_partition_t partition = GET_PART_HANDLE(storage_dev);
+	
+	// Initialize SD card
+	sd_card_err err = sd_card_init(&sd_card);
+	if(SD_SUCCESS == err) {
+		// Mount selected partition (0 - 3)
+		if (FS_SUCCESS == fs_mount(&partition, 0)) {
+			uint8_t line_buff[100] = { 0 };
+							
+			/* Read existing files on mounted partition */
+			fs_file_t read_file = GET_FILE_HANDLE(partition);
+			if (FS_SUCCESS == fs_fopen(&read_file, "read.txt", READ)) {
+				/* Access data stored in file */
+				fs_fgetc(&read_file);
+				fs_fgets(&read_file, line_buff, sizeof(line_buff));
+				fs_fread(&read_file, line_buff, 100);
+
+				/* Navigate file */
+				fs_fseek(&read_file, 300, FS_SEEK_SET);
+			}
+			
+			/* Write existing files or create new on mounted partition */
+			fs_file_t write_file = GET_FILE_HANDLE(partition);
+			if (FS_SUCCESS == fs_fopen(&write_file, "write.txt", WRITE)) {
+				/* Store data to file */
+				fs_fputc(&write_file, 'a');
+				fs_fputs(&write_file, "Hello, world!");
+				fs_fflush(&write_file);
+				fs_fwrite(&write_file, line_buff, 100);
+				
+				/* Close file to make sure data is flushed */
+				fs_fclose(&write_file);
+			}
+			
+			/* Append existing file on mounted partition */
+			fs_file_t append_file = GET_FILE_HANDLE(partition);
+			if (FS_SUCCESS == fs_fopen(&append_file, "append.txt", APPEND)) {
+				/* Store data to file */
+				fs_fputs(&append_file, "This is simple append.");
+				fs_fclose(&append_file);
+			}
+			
+		}
+	}
+    while (1);
 }
 

slim-fat-sln/slim-fat-runner/slim-fat-runner.cproj

@@ -86,6 +86,7 @@
   <avrgcc.compiler.directories.IncludePaths>
     <ListValues>
       <Value>%24(PackRepoDir)\atmel\ATmega_DFP\1.6.364\include\</Value>
+      <Value>../../../src</Value>
     </ListValues>
   </avrgcc.compiler.directories.IncludePaths>
   <avrgcc.compiler.optimization.level>Optimize debugging experience (-Og)</avrgcc.compiler.optimization.level>
@@ -111,13 +112,27 @@
     <Compile Include="main.c">
       <SubType>compile</SubType>
     </Compile>
+    <Compile Include="spi\spi_master.c">
+      <SubType>compile</SubType>
+    </Compile>
+    <Compile Include="spi\spi_master.h">
+      <SubType>compile</SubType>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\sd-card-driver\sd-card-driver.cproj">
       <Name>sd-card-driver</Name>
       <Project>{00eb8831-c401-4c63-a56d-ed2e89fd5742}</Project>
       <Private>True</Private>
     </ProjectReference>
+    <ProjectReference Include="..\slim-fat-lib\slim-fat-lib.cproj">
+      <Name>slim-fat-lib</Name>
+      <Project>{463e6b59-0cca-49b2-9e5d-773df16c2cd5}</Project>
+      <Private>True</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="spi" />
   </ItemGroup>
   <Import Project="$(AVRSTUDIO_EXE_PATH)\\Vs\\Compiler.targets" />
 </Project>

slim-fat-sln/slim-fat-runner/spi/spi_master.c

@@ -0,0 +1,24 @@
+#include "spi_master.h"
+
+void spi_master_init(void) {
+	// SPI hardware initialization
+	DDRB |= (1<<PORTB3)|(1<<PORTB5)|(1<<PORTB2);
+	PORTB |= (1<<PORTB2);	// set SS high
+	SPCR |= (1<<SPE)|(1<<MSTR);
+	SPSR |= (1<<SPI2X);
+	
+	// Slave Select lines initialization
+	DDRB |= (1<<PORTB1);
+	PORTB |= (1<<PORTB1);
+}
+
+uint8_t spi_master_transfer(uint8_t byte) {
+	SPDR = byte;
+	while(!(SPSR & (1<<SPIF)));
+	return SPDR;
+}
+
+void spi_slave_sd_select(uint8_t state) {
+	if(state) PORTB |= (1<<PORTB1);
+	else PORTB &= ~(1<<PORTB1);
+}

slim-fat-sln/slim-fat-runner/spi/spi_master.h

@@ -0,0 +1,24 @@
+/*
+ * spi_master.h
+ *
+ * Created: 02.03.2021 14:14:23
+ *  Author: Micha³ Granda
+ */ 
+
+
+#ifndef SPI_MASTER_H_
+#define SPI_MASTER_H_
+
+#include <avr/io.h>
+#include <inttypes.h>
+
+/* SPI master module setup */
+void spi_master_init(void);
+uint8_t spi_master_transfer(uint8_t byte);
+
+/* Slave select lines management*/
+void spi_slave_sd_select(uint8_t state);
+
+
+
+#endif /* SPI_MASTER_H_ */

src/sd-driver/sd_driver.h

@@ -50,6 +50,8 @@ typedef struct {
 	void (*spi_chip_select)(uint8_t);
 } sd_card_t;
 
+#define GET_SD_HANDLE(transfer_byte, chip_select) {.spi_transfer_byte = transfer_byte, .spi_chip_select = chip_select}
+
 sd_card_err	sd_card_init(sd_card_t* sd);
 sd_card_err	sd_card_read(sd_card_t* sd, const uint32_t sector, uint8_t* buffer);
 sd_card_err	sd_card_write(sd_card_t* sd, const uint32_t sector, const uint8_t* buffer);

src/slimfat/fat32/fat32.h

@@ -35,6 +35,8 @@ typedef struct fat32_entry {
 	uint16_t root_dir_offset;
 } fat_entry_t;
 
+#define GET_PART_HANDLE(dev) {.device = &dev}
+
 /* Partition operation */
 fs_error fat32_mount_partition(fs_partition_t* partition, const uint32_t start_sector);
 

src/slimfat/fileio/fileio.c

@@ -112,6 +112,26 @@ fs_error fs_fopen(fs_file_t* file, const char* file_name, const fs_mode mode) {
 	return err;
 }
 
+fs_error fs_fclose(fs_file_t* file) {
+	uint8_t err = FS_SUCCESS;
+
+	if (READ != file->mode) {
+		err = fat32_update_entry(file->partition, &file->entry);
+	}
+
+	return err;
+}
+
+fs_error fs_fflush(fs_file_t* file) {
+	uint8_t err = FS_SUCCESS;
+
+	if (READ != file->mode) {
+		err = fat32_update_entry(file->partition, &file->entry);
+	}
+
+	return err;
+}
+
 uint16_t fs_fread(fs_file_t* file, uint8_t* ptr, const uint16_t count) {
 	uint8_t err = FS_SUCCESS;
 

src/slimfat/fileio/fileio.h

@@ -43,6 +43,8 @@ typedef struct fs_generic_file {
 	uint32_t	current_offset;
 } fs_file_t;
 
+#define GET_FILE_HANDLE(part) {.partition = &part}
+
 /* Partition operations */
 fs_error fs_mount(fs_partition_t* partition, const uint8_t partition_number);
 

src/slimfat/slimfat.h

@@ -0,0 +1,17 @@
+/*
+ * slimfat.h
+ *
+ * Created: 24.09.2021 14:12:04
+ * Author : Micha³ Granda
+ */ 
+
+
+#ifndef SLIMFAT_H_
+#define SLIMFAT_H_
+
+#include "fileio/fileio.h"
+
+
+
+
+#endif /* SLIMFAT_H_ */

src/slimfat/storage/storage.h

@@ -28,6 +28,8 @@ typedef struct {
 	uint8_t(*write_sector)(void*, const uint32_t, const uint8_t*);
 } fs_storage_device;
 
+#define GET_DEV_HANDLE(buff, dev, read, write) {.disk = dev, .status = 0, .buffer = buff,  .read_sector = read, .write_sector = write }
+
 fs_error find_partition(fs_storage_device* device, const uint8_t partition_number, uint32_t* sector);
 fs_error read_buffered_sector(fs_storage_device* device, const uint32_t sector);
 fs_error write_buffered_sector(fs_storage_device* device, const uint32_t sector);