Skip to content

Commit 00d5305

Browse files
lubiel-nordiclubiel-nordic
authored
Release v3.3.0
Preview
2 parents de600a6 + 58191d5 commit 00d5305

28 files changed

Lines changed: 26 additions & 1588 deletions

File tree

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ The course covers a wide range of topics, including thread management, data pass
77

88
This repository contains the exercise code base and solutions. Make sure to select the branch that corresponds with the nRF Connect SDK version of your choosing:
99
<ul>
10-
<li><code>main</code>: For nRF Connect SDK version v3.2.0 </li>
10+
<li><code>main</code>: For nRF Connect SDK version v3.3.0 </li>
1111
</ul>
1212

1313
The course supports the following hardware:

‎l5/l5_e1_sol/src/main.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ const struct gpio_dt_spec ledspec = GPIO_DT_SPEC_GET(DT_NODELABEL(led0), gpios);
3939

4040
/* STEP 3 - Retrieve the API-device structure */
4141
#define SPIOP SPI_WORD_SET(8) | SPI_TRANSFER_MSB
42-
struct spi_dt_spec spispec = SPI_DT_SPEC_GET(DT_NODELABEL(bme280), SPIOP, 0);
42+
struct spi_dt_spec spispec = SPI_DT_SPEC_GET(DT_NODELABEL(bme280), SPIOP);
4343

4444
/* Data structure to store BME280 data */
4545
struct bme280_data {

‎l6/l6_e2_sol/src/main.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ void battery_sample_timer_handler(struct k_timer *timer)
3939
{
4040

4141
/* STEP 7.2 - Trigger the sampling */
42-
nrfx_err_t err = nrfx_saadc_mode_trigger();
42+
int err = nrfx_saadc_mode_trigger();
4343
if (err != 0) {
4444
printk("nrfx_saadc_mode_trigger error: %08x", err);
4545
return;
@@ -66,7 +66,7 @@ static void configure_saadc(void)
6666
nrfx_isr, nrfx_saadc_irq_handler, 0);
6767

6868
/* STEP 5.2 - Initialize the nrfx_SAADC driver */
69-
nrfx_err_t err = nrfx_saadc_init(DT_IRQ(DT_NODELABEL(adc), priority));
69+
int err = nrfx_saadc_init(DT_IRQ(DT_NODELABEL(adc), priority));
7070
if (err != 0)
7171
{
7272
printk("nrfx_saadc_mode_trigger error: %08x", err);

‎l6/l6_e3/src/main.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ LOG_MODULE_REGISTER(Lesson6_Exercise3, LOG_LEVEL_DBG);
3232

3333
static void configure_timer(void)
3434
{
35-
nrfx_err_t err;
35+
int err;
3636

3737
/* STEP 3.3 - Declaring timer config and intialize nrfx_timer instance. */
3838

@@ -44,7 +44,7 @@ static void configure_timer(void)
4444

4545
static void saadc_event_handler(nrfx_saadc_evt_t const * p_event)
4646
{
47-
nrfx_err_t err;
47+
int err;
4848
switch (p_event->type)
4949
{
5050
case NRFX_SAADC_EVT_READY:
@@ -76,7 +76,7 @@ static void saadc_event_handler(nrfx_saadc_evt_t const * p_event)
7676

7777
static void configure_saadc(void)
7878
{
79-
nrfx_err_t err;
79+
int err;
8080

8181
/* STEP 4.4 - Connect ADC interrupt to nrfx interrupt handler */
8282

@@ -100,7 +100,7 @@ static void configure_saadc(void)
100100

101101
static void configure_ppi(void)
102102
{
103-
nrfx_err_t err;
103+
int err;
104104
/* STEP 6.1 - Declare variables used to hold the (D)PPI channel number */
105105

106106

‎l6/l6_e3_sol/src/main.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ static uint32_t saadc_current_buffer = 0;
5050

5151
static void configure_timer(void)
5252
{
53-
nrfx_err_t err;
53+
int err;
5454

5555
/* STEP 3.3 - Declaring timer config and intialize nrfx_timer instance. */
5656
nrfx_timer_config_t timer_config = NRFX_TIMER_DEFAULT_CONFIG(1000000);
@@ -68,7 +68,7 @@ static void configure_timer(void)
6868

6969
static void saadc_event_handler(nrfx_saadc_evt_t const * p_event)
7070
{
71-
nrfx_err_t err;
71+
int err;
7272
switch (p_event->type)
7373
{
7474
case NRFX_SAADC_EVT_READY:
@@ -117,7 +117,7 @@ static void saadc_event_handler(nrfx_saadc_evt_t const * p_event)
117117

118118
static void configure_saadc(void)
119119
{
120-
nrfx_err_t err;
120+
int err;
121121

122122
/* STEP 4.4 - Connect ADC interrupt to nrfx interrupt handler */
123123
IRQ_CONNECT(DT_IRQN(DT_NODELABEL(adc)),
@@ -178,7 +178,7 @@ static void configure_saadc(void)
178178

179179
static void configure_ppi(void)
180180
{
181-
nrfx_err_t err;
181+
int err;
182182
/* STEP 6.1 - Declare variables used to hold the (D)PPI channel number */
183183
nrfx_gppi_handle_t gppi_handle_sample;
184184
nrfx_gppi_handle_t gppi_handle_start;

‎l7/l7_e1_sol/custom_driver_module/drivers/sensor/custom_bme280/custom_bme280.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,7 @@ static int custom_bme280_init(const struct device *dev)
406406
#define CUSTOM_BME280_DEFINE(inst) \
407407
static struct custom_bme280_data custom_bme280_data_##inst; \
408408
static const struct custom_bme280_config custom_bme280_config_##inst = { \
409-
.spi = SPI_DT_SPEC_INST_GET(inst, SPIOP, 0), \
409+
.spi = SPI_DT_SPEC_INST_GET(inst, SPIOP), \
410410
}; \
411411
/* STEP 5.2 - Define a macro for the device driver instance */ \
412412
DEVICE_DT_INST_DEFINE(inst, \

‎l7/l7_e2/custom_driver_module/drivers/sensor/custom_bme280/custom_bme280.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,7 @@ static int custom_bme280_init(const struct device *dev)
409409
#define CUSTOM_BME280_DEFINE(inst) \
410410
static struct custom_bme280_data custom_bme280_data_##inst; \
411411
static const struct custom_bme280_config custom_bme280_config_##inst = { \
412-
.spi = SPI_DT_SPEC_INST_GET(inst, SPIOP, 0), \
412+
.spi = SPI_DT_SPEC_INST_GET(inst, SPIOP), \
413413
}; \
414414
/* STEP 3.1 - Attach power management fuction */ \
415415

‎l7/l7_e2_sol/custom_driver_module/drivers/sensor/custom_bme280/custom_bme280.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -495,7 +495,7 @@ static int custom_bme280_pm_action(const struct device *dev,
495495
#define CUSTOM_BME280_DEFINE(inst) \
496496
static struct custom_bme280_data custom_bme280_data_##inst; \
497497
static const struct custom_bme280_config custom_bme280_config_##inst = { \
498-
.spi = SPI_DT_SPEC_INST_GET(inst, SPIOP, 0), \
498+
.spi = SPI_DT_SPEC_INST_GET(inst, SPIOP), \
499499
}; \
500500
/* STEP 3.1 - Attach power management fuction */ \
501501
PM_DEVICE_DT_INST_DEFINE(inst, custom_bme280_pm_action); \

‎l9/l9_e4/sample.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,13 @@ common:
1111
- nrf52840dk/nrf52840
1212
- nrf5340dk/nrf5340/cpuapp
1313
- nrf5340dk/nrf5340/cpuapp/ns
14+
- nrf54lm20dk/nrf54lm20a/cpuapp
1415
platform_allow:
1516
- nrf52833dk/nrf52833
1617
- nrf52840dk/nrf52840
1718
- nrf5340dk/nrf5340/cpuapp
1819
- nrf5340dk/nrf5340/cpuapp/ns
20+
- nrf54lm20dk/nrf54lm20a/cpuapp
1921

2022
tests:
2123
ncs_inter.l9.e4: {}

‎l9/l9_e4_sol/sysbuild/mcuboot.conf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ CONFIG_MCUBOOT_INDICATION_LED=y
1818
CONFIG_BOOT_SERIAL_CDC_ACM=y
1919

2020
# Step 3.1 - Increase flash space for MCUboot image to fit USB drivers
21-
CONFIG_PM_PARTITION_SIZE_MCUBOOT=0x11000
21+
CONFIG_PM_PARTITION_SIZE_MCUBOOT=0x16000
2222

2323
# Step 3.2 - Increase the maximum number of image sectors MCUboot can handle (nRF54LM20DK)
24-
CONFIG_BOOT_MAX_IMG_SECTORS=512
24+
CONFIG_BOOT_MAX_IMG_SECTORS=512

0 commit comments

Comments
 (0)