From 6a85e7616ec9dddc446bf0232f9a1434d246b4c4 Mon Sep 17 00:00:00 2001 From: loudnl Date: Thu, 17 Oct 2024 16:34:25 +0200 Subject: [PATCH] Version update --- CMakeLists.txt | 4 ++-- src/config.c | 1 - src/config.h | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4ce6a54..fcdb1c4 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,8 +27,8 @@ cmake_minimum_required(VERSION 3.17) ### Project set(PROJECT_NAME usbsidpico) -set(PROJECT_VERSION "0.2.0-BETA.20241016") # Must be the same as in config.h -set(MAGIC_SMOKE "20241016") # DATEOFRELEASE +set(PROJECT_VERSION "0.2.0-BETA.20241017") # Must be the same as in config.h +set(MAGIC_SMOKE "20241017") # DATEOFRELEASE ### Optimization and debugging SET(DEBUG_SYMBOLS 0) diff --git a/src/config.c b/src/config.c index 7923689..bb5d3ea 100644 --- a/src/config.c +++ b/src/config.c @@ -149,7 +149,6 @@ void load_config(Config* config) __builtin_memcpy(config, (void *)(XIP_BASE + FLASH_TARGET_OFFSET), sizeof(Config)); stdio_flush(); if (config->magic != MAGIC_SMOKE) { - default_config(config); return; } diff --git a/src/config.h b/src/config.h index 1176879..439c62b 100644 --- a/src/config.h +++ b/src/config.h @@ -51,7 +51,7 @@ /* Config constants */ #define FLASH_TARGET_OFFSET (PICO_FLASH_SIZE_BYTES - FLASH_SECTOR_SIZE) #define CONFIG_SIZE (FLASH_SECTOR_SIZE / 4) /* 1024 Bytes */ -#define PROJECT_VERSION "0.2.0-BETA.20241016" +#define PROJECT_VERSION "0.2.0-BETA.20241017" /* Compile time variable settings */ #ifndef MAGIC_SMOKE #define MAGIC_SMOKE 19700101 /* DATEOFRELEASE */