Skip to content

Fix DEBUG mode, include in zephyr primitives and typo #289

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jan 17, 2025
Merged

Fix DEBUG mode, include in zephyr primitives and typo #289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9340a7b
Fix variable used in DEBUG mode being commented out to avoid warnings
MaartenS11 Jan 16, 2025
ad8dd77
Remove unnecessary include that causes issues
MaartenS11 Jan 16, 2025
380b19d
Fix pim_index typo
MaartenS11 Jan 16, 2025
be8a79c
Updated comment next to variable
MaartenS11 Jan 16, 2025
a4b88bb
Also fix typo on the Arduino platform
MaartenS11 Jan 16, 2025
893ed07
Fix formatting
MaartenS11 Jan 16, 2025
fd88a0e
Fix missing type uint32_t error
MaartenS11 Jan 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Primitives/arduino.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ int prim_index = 0;
p->f_reverse = nullptr; \
p->f_serialize_state = nullptr; \
} else { \
FATAL("pim_index out of bounds"); \
FATAL("prim_index out of bounds"); \
} \
}

Expand Down
7 changes: 4 additions & 3 deletions src/Primitives/emulated.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ double sensor_emu = 0;
p->f_reverse = nullptr; \
p->f_serialize_state = nullptr; \
} else { \
FATAL("pim_index out of bounds"); \
FATAL("prim_index out of bounds"); \
} \
}

Expand Down Expand Up @@ -394,7 +394,7 @@ def_prim(chip_pin_mode, twoToNoneU32) {
}

def_prim(chip_digital_write, twoToNoneU32) {
debug("EMU: chip_digital_write(%u,%u) \n", arg1.uint32, arg0.uint32);
printf("EMU: chip_digital_write(%u,%u) \n", arg1.uint32, arg0.uint32);
pop_args(2);
return true;
}
Expand Down Expand Up @@ -462,7 +462,8 @@ def_prim(write_spi_bytes_16, twoToNoneU32) {
def_prim(subscribe_interrupt, threeToNoneU32) {
uint8_t pin = arg2.uint32; // GPIOPin
uint8_t tidx = arg1.uint32; // Table Idx pointing to Callback function
// uint8_t mode = arg0.uint32; // never used in emulator
[[maybe_unused]] uint8_t mode =
arg0.uint32; // Not used by emulator only printed

debug("EMU: subscribe_interrupt(%u, %u, %u) \n", pin, tidx, mode);

Expand Down
2 changes: 1 addition & 1 deletion src/Primitives/idf.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ double sensor_emu = 0;
p->f_reverse = nullptr; \
p->f_serialize_state = nullptr; \
} else { \
FATAL("pim_index out of bounds"); \
FATAL("prim_index out of bounds"); \
} \
}

Expand Down
3 changes: 1 addition & 2 deletions src/Primitives/zephyr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#include <sys/_stdint.h>
#ifndef ARDUINO

/**
Expand Down Expand Up @@ -54,7 +53,7 @@ double sensor_emu = 0;
p->f_reverse = nullptr; \
p->f_serialize_state = nullptr; \
} else { \
FATAL("pim_index out of bounds"); \
FATAL("prim_index out of bounds"); \
} \
}

Expand Down
1 change: 1 addition & 0 deletions tests/unit/shared/serialisation.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#pragma once
#include <cstdint>
#include <iostream>

class Serialiser {
Expand Down
Loading