Make it compile with PICO SDK 2.0.0

This commit is contained in:
Martin Brodbeck 2024-08-13 14:38:24 +02:00
parent 972c6c49ff
commit 680dde14b8
4 changed files with 7 additions and 5 deletions

View file

@ -1,6 +1,6 @@
# Generated Cmake Pico project file # Generated Cmake Pico project file
cmake_minimum_required(VERSION 3.26) cmake_minimum_required(VERSION 3.28)
set(CMAKE_C_STANDARD 11) set(CMAKE_C_STANDARD 11)
set(CMAKE_CXX_STANDARD 23) set(CMAKE_CXX_STANDARD 23)
@ -14,8 +14,8 @@ set(PICO_BOARD pico CACHE STRING "Board type")
# Pull in Raspberry Pi Pico SDK (must be before project) # Pull in Raspberry Pi Pico SDK (must be before project)
include(pico_sdk_import.cmake) include(pico_sdk_import.cmake)
if (PICO_SDK_VERSION_STRING VERSION_LESS "1.5.0") if (PICO_SDK_VERSION_STRING VERSION_LESS "2.0.0")
message(FATAL_ERROR "Raspberry Pi Pico SDK version 1.5.0 (or later) required. Your version is ${PICO_SDK_VERSION_STRING}") message(FATAL_ERROR "Raspberry Pi Pico SDK version 2.0.0 (or later) required. Your version is ${PICO_SDK_VERSION_STRING}")
endif() endif()
project(raspikeyer VERSION "0.0.1" LANGUAGES C CXX ASM) project(raspikeyer VERSION "0.0.1" LANGUAGES C CXX ASM)

View file

@ -5,6 +5,7 @@
#include "bsp/board.h" #include "bsp/board.h"
#include "hardware/adc.h" #include "hardware/adc.h"
#include "pico/flash.h"
#include "pico/binary_info/code.h" #include "pico/binary_info/code.h"
#include "pico/multicore.h" #include "pico/multicore.h"
#include "pico/stdlib.h" #include "pico/stdlib.h"

View file

@ -1,6 +1,7 @@
#include <cstring> #include <cstring>
#include "pico/stdlib.h" #include "pico/stdlib.h"
#include "pico/flash.h"
#include "settings.h" #include "settings.h"
@ -66,4 +67,4 @@ Settings read_settings()
} }
return settings; return settings;
} }

View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "pico/flash.h" #include "hardware/flash.h"
const uint16_t MAGIC_NUMBER = 4; const uint16_t MAGIC_NUMBER = 4;