-
-
Notifications
You must be signed in to change notification settings - Fork 63
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into spotbugs-fixes
- Loading branch information
Showing
49 changed files
with
386 additions
and
14 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule reactor-c
updated
9 files
+5 −3 | core/CMakeLists.txt | |
+18 −9 | core/federated/RTI/enclave.c | |
+5 −2 | core/federated/federate.c | |
+1 −1 | core/platform/lf_zephyr_support.c | |
+4 −2 | core/reactor.c | |
+11 −1 | core/tag.c | |
+4 −2 | core/threaded/reactor_threaded.c | |
+28 −9 | include/core/tag.h | |
+6 −3 | util/tracing/visualization/fedsd.py |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
# Zephyr platform files | ||
These are files needed to compile LF programs for the Zephyr target. | ||
All of the files in the `boards` directory are for enabling a Timer peripheral for different devices so that we can use a Counter device for time-keeping. These device tree config overlays are copied from the `alarm` example found in the zephyr source tree under `samples/drivers/counter/alarm`. |
4 changes: 4 additions & 0 deletions
4
core/src/main/resources/lib/platform/zephyr/boards/arduino_due.overlay
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
&tc0 { | ||
clk = <4>; | ||
status = "okay"; | ||
}; |
5 changes: 5 additions & 0 deletions
5
core/src/main/resources/lib/platform/zephyr/boards/bl5340_dvk_cpuapp.conf
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
# Enable RTC | ||
CONFIG_I2C=y | ||
CONFIG_COUNTER=y | ||
CONFIG_COUNTER_MICROCHIP_MCP7940N=y | ||
CONFIG_COUNTER_INIT_PRIORITY=65 |
12 changes: 12 additions & 0 deletions
12
core/src/main/resources/lib/platform/zephyr/boards/bl5340_dvk_cpuapp.overlay
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
/* | ||
* Copyright (c) 2021 Laird Connectivity | ||
* | ||
* SPDX-License-Identifier: Apache-2.0 | ||
*/ | ||
|
||
&i2c1 { | ||
/* Connect MCP7940N MFP pin TP9 to P0.04 */ | ||
extrtc0: mcp7940n@6f { | ||
int-gpios = <&gpio0 4 GPIO_ACTIVE_HIGH>; | ||
}; | ||
}; |
3 changes: 3 additions & 0 deletions
3
core/src/main/resources/lib/platform/zephyr/boards/esp32c3_devkitm.overlay
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
&timer0 { | ||
status = "okay"; | ||
}; |
3 changes: 3 additions & 0 deletions
3
core/src/main/resources/lib/platform/zephyr/boards/esp32s2_saola.overlay
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
&timer0 { | ||
status = "okay"; | ||
}; |
3 changes: 3 additions & 0 deletions
3
core/src/main/resources/lib/platform/zephyr/boards/esp32s3_devkitm.overlay
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
&timer0 { | ||
status = "okay"; | ||
}; |
10 changes: 10 additions & 0 deletions
10
core/src/main/resources/lib/platform/zephyr/boards/gd32e103v_eval.overlay
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
/* | ||
* SPDX-License-Identifier: Apache-2.0 | ||
* | ||
* Copyright (c) 2022 TOKITA Hiroshi <tokita.hiroshi@gmail.com> | ||
*/ | ||
|
||
&timer0 { | ||
status = "okay"; | ||
prescaler = <29999>; | ||
}; |
10 changes: 10 additions & 0 deletions
10
core/src/main/resources/lib/platform/zephyr/boards/gd32e507v_start.overlay
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
/* | ||
* SPDX-License-Identifier: Apache-2.0 | ||
* | ||
* Copyright (c) 2022 TOKITA Hiroshi <tokita.hiroshi@gmail.com> | ||
*/ | ||
|
||
&timer0 { | ||
status = "okay"; | ||
prescaler = <44999>; | ||
}; |
10 changes: 10 additions & 0 deletions
10
core/src/main/resources/lib/platform/zephyr/boards/gd32e507z_eval.overlay
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
/* | ||
* SPDX-License-Identifier: Apache-2.0 | ||
* | ||
* Copyright (c) 2022 TOKITA Hiroshi <tokita.hiroshi@gmail.com> | ||
*/ | ||
|
||
&timer0 { | ||
status = "okay"; | ||
prescaler = <44999>; | ||
}; |
10 changes: 10 additions & 0 deletions
10
core/src/main/resources/lib/platform/zephyr/boards/gd32f350r_eval.overlay
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
/* | ||
* SPDX-License-Identifier: Apache-2.0 | ||
* | ||
* Copyright (c) 2022 TOKITA Hiroshi <tokita.hiroshi@gmail.com> | ||
*/ | ||
|
||
&timer0 { | ||
status = "okay"; | ||
prescaler = <26999>; | ||
}; |
10 changes: 10 additions & 0 deletions
10
core/src/main/resources/lib/platform/zephyr/boards/gd32f403z_eval.overlay
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
/* | ||
* SPDX-License-Identifier: Apache-2.0 | ||
* | ||
* Copyright (c) 2022 TOKITA Hiroshi <tokita.hiroshi@gmail.com> | ||
*/ | ||
|
||
&timer0 { | ||
status = "okay"; | ||
prescaler = <41999>; | ||
}; |
10 changes: 10 additions & 0 deletions
10
core/src/main/resources/lib/platform/zephyr/boards/gd32f407v_start.overlay
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
/* | ||
* SPDX-License-Identifier: Apache-2.0 | ||
* | ||
* Copyright (c) 2022 TOKITA Hiroshi <tokita.hiroshi@gmail.com> | ||
*/ | ||
|
||
&timer0 { | ||
status = "okay"; | ||
prescaler = <41999>; | ||
}; |
10 changes: 10 additions & 0 deletions
10
core/src/main/resources/lib/platform/zephyr/boards/gd32f450i_eval.overlay
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
/* | ||
* SPDX-License-Identifier: Apache-2.0 | ||
* | ||
* Copyright (c) 2022 TOKITA Hiroshi <tokita.hiroshi@gmail.com> | ||
*/ | ||
|
||
&timer0 { | ||
status = "okay"; | ||
prescaler = <49999>; | ||
}; |
10 changes: 10 additions & 0 deletions
10
core/src/main/resources/lib/platform/zephyr/boards/gd32f450v_start.overlay
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
/* | ||
* SPDX-License-Identifier: Apache-2.0 | ||
* | ||
* Copyright (c) 2022 TOKITA Hiroshi <tokita.hiroshi@gmail.com> | ||
*/ | ||
|
||
&timer0 { | ||
status = "okay"; | ||
prescaler = <49999>; | ||
}; |
10 changes: 10 additions & 0 deletions
10
core/src/main/resources/lib/platform/zephyr/boards/gd32f450z_eval.overlay
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
/* | ||
* SPDX-License-Identifier: Apache-2.0 | ||
* | ||
* Copyright (c) 2022 TOKITA Hiroshi <tokita.hiroshi@gmail.com> | ||
*/ | ||
|
||
&timer0 { | ||
status = "okay"; | ||
prescaler = <49999>; | ||
}; |
10 changes: 10 additions & 0 deletions
10
core/src/main/resources/lib/platform/zephyr/boards/gd32f470i_eval.overlay
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
/* | ||
* SPDX-License-Identifier: Apache-2.0 | ||
* | ||
* Copyright (c) 2022 TOKITA Hiroshi <tokita.hiroshi@gmail.com> | ||
*/ | ||
|
||
&timer0 { | ||
status = "okay"; | ||
prescaler = <59999>; | ||
}; |
3 changes: 3 additions & 0 deletions
3
core/src/main/resources/lib/platform/zephyr/boards/nrf51dk_nrf51422.overlay
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
&timer1 { | ||
status = "okay"; | ||
}; |
3 changes: 3 additions & 0 deletions
3
core/src/main/resources/lib/platform/zephyr/boards/nrf52840dk_nrf52840.overlay
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
&rtc0 { | ||
status = "okay"; | ||
}; |
3 changes: 3 additions & 0 deletions
3
core/src/main/resources/lib/platform/zephyr/boards/nrf52dk_nrf52832.overlay
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
&timer1 { | ||
status = "okay"; | ||
}; |
1 change: 0 additions & 1 deletion
1
core/src/main/resources/lib/platform/zephyr/boards/nrf52dk_nrf52832_lf.conf
This file was deleted.
Oops, something went wrong.
3 changes: 3 additions & 0 deletions
3
core/src/main/resources/lib/platform/zephyr/boards/nrf9160dk_nrf9160.overlay
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
&rtc0 { | ||
status = "okay"; | ||
}; |
10 changes: 10 additions & 0 deletions
10
core/src/main/resources/lib/platform/zephyr/boards/s32z270dc2_rtu0_r52.overlay
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
/* | ||
* Copyright 2022 NXP | ||
* | ||
* SPDX-License-Identifier: Apache-2.0 | ||
*/ | ||
|
||
&stm0 { | ||
prescaler = <1>; | ||
status = "okay"; | ||
}; |
10 changes: 10 additions & 0 deletions
10
core/src/main/resources/lib/platform/zephyr/boards/s32z270dc2_rtu1_r52.overlay
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
/* | ||
* Copyright 2022 NXP | ||
* | ||
* SPDX-License-Identifier: Apache-2.0 | ||
*/ | ||
|
||
&stm0 { | ||
prescaler = <1>; | ||
status = "okay"; | ||
}; |
4 changes: 4 additions & 0 deletions
4
core/src/main/resources/lib/platform/zephyr/boards/sam4e_xpro.overlay
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
&tc0 { | ||
clk = <4>; | ||
status = "okay"; | ||
}; |
4 changes: 4 additions & 0 deletions
4
core/src/main/resources/lib/platform/zephyr/boards/sam4s_xplained.overlay
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
&tc0 { | ||
clk = <4>; | ||
status = "okay"; | ||
}; |
4 changes: 4 additions & 0 deletions
4
core/src/main/resources/lib/platform/zephyr/boards/sam_e70_xplained.overlay
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
&tc0 { | ||
clk = <4>; | ||
status = "okay"; | ||
}; |
4 changes: 4 additions & 0 deletions
4
core/src/main/resources/lib/platform/zephyr/boards/sam_e70b_xplained.overlay
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
&tc0 { | ||
clk = <4>; | ||
status = "okay"; | ||
}; |
4 changes: 4 additions & 0 deletions
4
core/src/main/resources/lib/platform/zephyr/boards/sam_v71_xult.overlay
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
&tc0 { | ||
clk = <4>; | ||
status = "okay"; | ||
}; |
4 changes: 4 additions & 0 deletions
4
core/src/main/resources/lib/platform/zephyr/boards/sam_v71b_xult.overlay
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
&tc0 { | ||
clk = <4>; | ||
status = "okay"; | ||
}; |
6 changes: 6 additions & 0 deletions
6
core/src/main/resources/lib/platform/zephyr/boards/stm32h735g_disco.overlay
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
&timers2 { | ||
st,prescaler = <83>; | ||
counter { | ||
status = "okay"; | ||
}; | ||
}; |
7 changes: 7 additions & 0 deletions
7
core/src/main/resources/lib/platform/zephyr/boards/stm32l562e_dk_ns.conf
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
# | ||
# Copyright (c) 2022 O.S.Systems | ||
# | ||
# SPDX-License-Identifier: Apache-2.0 | ||
# | ||
CONFIG_BUILD_WITH_TFM=y | ||
CONFIG_TFM_PROFILE_TYPE_MEDIUM=y |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
// Success here is not segfaulting. | ||
target C { | ||
timeout: 10 ms | ||
} | ||
|
||
reactor B(bank_index: int = 0) { | ||
input in: int | ||
output out_problem: int | ||
|
||
reaction(in) -> out_problem {= | ||
lf_set(out_problem, self->bank_index); | ||
=} | ||
} | ||
|
||
reactor A { | ||
input in: int | ||
output out1: int | ||
output out2: int | ||
output out3: int | ||
|
||
b = new[3] B() | ||
(in)+ -> b.in | ||
b.out_problem -> out1, out2, out3 | ||
} | ||
|
||
main reactor { | ||
m = new A() | ||
timer t(0, 10 ms) | ||
|
||
reaction(t) -> m.in {= | ||
lf_set(m.in, 42); | ||
=} | ||
|
||
reaction(m.out3) {= | ||
lf_print("out3 = %d", m.out3->value); | ||
if (m.out3->value != 2) { | ||
lf_print_error_and_exit("Expected 2."); | ||
} | ||
=} | ||
} |
Oops, something went wrong.