stm-firmware/include/fatfs/ffconf.h

@@ -150,7 +150,7 @@
 */
 
 
-#define FF_FS_RPATH		2
+#define FF_FS_RPATH		0
 /* This option configures support for relative path.
 /
 /   0: Disable relative path and remove related functions.

stm-firmware/include/reflow-controller/settings/settings-sd-card.h

@@ -21,8 +21,4 @@
 #ifndef __SETTINGS_SETTINGS_SD_CARD_H__
 #define __SETTINGS_SETTINGS_SD_CARD_H__
 
-#define CALIBRATION_FILE_NAME "cal.toml"
-
-int sd_card_settings_save_calibration(float sens_deviation, float offset);
-
 #endif /* __SETTINGS_SETTINGS_SD_CARD_H__ */

stm-firmware/include/reflow-controller/settings/settings.h

@@ -22,12 +22,6 @@
 #ifndef __SETTINGS_SETTINGS_H__
 #define __SETTINGS_SETTINGS_H__
 
-/**
+int settings_save_calibration();
- * @brief Save the calibration
- * @param sens_deviation
- * @param offset
- * @return 0 if successful, -1 if generic error, -2 if medium unavailable
- */
-int settings_save_calibration(float sens_deviation, float offset);
 
 #endif /* __SETTINGS_SETTINGS_H__ */

stm-firmware/settings/settings-sd-card.c

@@ -19,90 +19,3 @@
 */
 
 #include <reflow-controller/settings/settings-sd-card.h>
-#include <stm-periph/unique-id.h>
-#include <toml/toml.h>
-#include <fatfs/ff.h>
-
-static void get_controller_folder_path(char *path, size_t size)
-{
-	uint32_t high;
-	uint32_t mid;
-	uint32_t low;
-
-	if (!path)
-		return;
-
-	unique_id_get(&high, &mid, &low);
-
-	snprintf(path, size, "/%08X-%08X-%08X",
-		 (unsigned int)high, (unsigned int)mid, (unsigned int)low);
-}
-
-/**
- * @brief Open or create the controller folder on the SD Card.
- * @param[in,out] controller_folder
- * @return 0 if opened, 1 if created and opened, -1 if error.
- */
-static int open_or_create_controller_folder(DIR *controller_folder)
-{
-	char foldername[48];
-	int ret = -1;
-	FRESULT filesystem_result;
-
-	if (!controller_folder)
-		return -1001;
-
-	get_controller_folder_path(foldername, sizeof(foldername));
-
-	/* Check if folder is present */
-	filesystem_result = f_opendir(controller_folder, foldername);
-	if (filesystem_result == FR_OK) {
-		ret = 0;
-	} else {
-		filesystem_result = f_mkdir(foldername);
-		if (filesystem_result == FR_OK) {
-			filesystem_result = f_opendir(controller_folder, foldername);
-			if (filesystem_result == FR_OK)
-				ret = 1;
-			else
-				ret = -1;
-		} else {
-			ret = -1;
-		}
-	}
-
-	if (ret >= 0)
-		f_chdir(foldername);
-
-	return ret;
-}
-
-int sd_card_settings_save_calibration(float sens_deviation, float offset)
-{
-	DIR folder;
-	FIL cal_file;
-	int status;
-	FRESULT res;
-	UINT bw;
-	int ret = 0;
-
-	status = open_or_create_controller_folder(&folder);
-	f_closedir(&folder);
-
-	if (status < 0)
-		return -2;
-
-	/* Create new calibration file */
-	res = f_open(&cal_file, CALIBRATION_FILE_NAME, FA_CREATE_ALWAYS | FA_WRITE);
-	if (res == FR_OK) {
-		f_write(&cal_file, "Test", 4U, &bw);
-		f_close(&cal_file);
-		ret = 0;
-	} else {
-		ret = -1;
-	}
-
-	f_chdir("/");
-
-	return ret;
-}

stm-firmware/settings/settings.c

@@ -19,10 +19,8 @@
 */
 
 #include <reflow-controller/settings/settings.h>
-#include <reflow-controller/settings/settings-sd-card.h>
 
-settings_save_calibration(float sens_deviation, float offset)
+int settings_save_calibration()
 {
-	/* There is no other configuration location besides the SD card (yet) */
+	return 0;
-	return sd_card_settings_save_calibration(sens_deviation, offset);
 }

stm-firmware/shell.c

@@ -36,7 +36,6 @@
 #include <reflow-controller/stack-check.h>
 #include <reflow-controller/rotary-encoder.h>
 #include <reflow-controller/safety/safety-controller.h>
-#include <reflow-controller/settings/settings.h>
 
 #ifndef GIT_VER
 #define GIT_VER "VERSION NOT SET"
@@ -408,24 +407,6 @@ static shellmatta_retCode_t shell_cmd_read_flags(const shellmatta_handle_t handl
 	return SHELLMATTA_OK;
 }
 
-static shellmatta_retCode_t shell_cmd_save_cal(const shellmatta_handle_t handle, const char *arguments,
-					  uint32_t length)
-
-{
-	(void)length;
-	(void)arguments;
-	int res;
-
-	/* TODO: Change this */
-	res = settings_save_calibration(0.0f, 0.0f);
-	if (res) {
-		shellmatta_printf(handle, "Error saving %d\r\n", res);
-	} else {
-		shellmatta_printf(handle, "Saved!\r\n");
-	}
-
-	return SHELLMATTA_OK;
-}
 //typedef struct shellmatta_cmd
 //{
 //    char                    *cmd;       /**< command name                           */
@@ -436,7 +417,7 @@ static shellmatta_retCode_t shell_cmd_save_cal(const shellmatta_handle_t handle,
 //    struct shellmatta_cmd   *next;      /**< pointer to next command or NULL        */
 //} shellmatta_cmd_t;
 
-static shellmatta_cmd_t cmd[14] = {
+static shellmatta_cmd_t cmd[13] = {
 	{
 		.cmd = "version",
 		.cmdAlias = "ver",
@@ -539,16 +520,8 @@ static shellmatta_cmd_t cmd[14] = {
 		.helpText = "",
 		.usageText = "",
 		.cmdFct = shell_cmd_read_flags,
-		.next = &cmd[13],
-	},
-	{
-		.cmd = "save-calibration",
-		.cmdAlias = "save-cal",
-		.helpText = "",
-		.usageText = "",
-		.cmdFct = shell_cmd_save_cal,
 		.next = NULL,
-	},
+	}
 };
 
 shellmatta_handle_t shell_init(shellmatta_write_t write_func)