From 58686a426e0fa75b877c993a43c35c44643129f1 Mon Sep 17 00:00:00 2001 From: Lasse Rosenow Date: Mon, 10 Feb 2025 14:13:00 +0100 Subject: [PATCH 1/3] Remove platform from generated NETWORK_CHANNEL_X CFLAG --- examples/riot/coap_federated_lf/CoapFederatedLF/r1/run_lfc.sh | 3 ++- examples/riot/coap_federated_lf/CoapFederatedLF/r2/run_lfc.sh | 3 ++- .../main/kotlin/org/lflang/generator/uc/UcMakeGenerator.kt | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/examples/riot/coap_federated_lf/CoapFederatedLF/r1/run_lfc.sh b/examples/riot/coap_federated_lf/CoapFederatedLF/r1/run_lfc.sh index c2c0502c..2ab0edc4 100755 --- a/examples/riot/coap_federated_lf/CoapFederatedLF/r1/run_lfc.sh +++ b/examples/riot/coap_federated_lf/CoapFederatedLF/r1/run_lfc.sh @@ -1,4 +1,5 @@ -#!/bin/bash +#!/usr/bin/env bash + LF_MAIN=CoapFederatedLF $REACTOR_UC_PATH/lfc/bin/lfc-dev ../../src/$LF_MAIN.lf -n -o . \ No newline at end of file diff --git a/examples/riot/coap_federated_lf/CoapFederatedLF/r2/run_lfc.sh b/examples/riot/coap_federated_lf/CoapFederatedLF/r2/run_lfc.sh index c2c0502c..2ab0edc4 100755 --- a/examples/riot/coap_federated_lf/CoapFederatedLF/r2/run_lfc.sh +++ b/examples/riot/coap_federated_lf/CoapFederatedLF/r2/run_lfc.sh @@ -1,4 +1,5 @@ -#!/bin/bash +#!/usr/bin/env bash + LF_MAIN=CoapFederatedLF $REACTOR_UC_PATH/lfc/bin/lfc-dev ../../src/$LF_MAIN.lf -n -o . \ No newline at end of file diff --git a/lfc/core/src/main/kotlin/org/lflang/generator/uc/UcMakeGenerator.kt b/lfc/core/src/main/kotlin/org/lflang/generator/uc/UcMakeGenerator.kt index 152297f9..16b2ce99 100644 --- a/lfc/core/src/main/kotlin/org/lflang/generator/uc/UcMakeGenerator.kt +++ b/lfc/core/src/main/kotlin/org/lflang/generator/uc/UcMakeGenerator.kt @@ -60,9 +60,9 @@ class UcMakeGeneratorFederated( val channelTypesCompileDefs = channelTypes.joinWithLn { when (it) { - NetworkChannelType.TCP_IP -> "CFLAGS += -DNETWORK_CHANNEL_TCP_RIOT" + NetworkChannelType.TCP_IP -> "CFLAGS += -DNETWORK_CHANNEL_TCP" NetworkChannelType.COAP_UDP_IP -> - "CFLAGS += -DNETWORK_CHANNEL_COAP_RIOT" // TODO: Abstract RIOT away! + "CFLAGS += -DNETWORK_CHANNEL_COAP" NetworkChannelType.NONE -> "" NetworkChannelType.CUSTOM -> "" } From 86bfcc112c8481d0d120ab60a68f90166af950bd Mon Sep 17 00:00:00 2001 From: Lasse Rosenow Date: Mon, 10 Feb 2025 14:20:42 +0100 Subject: [PATCH 2/3] Fix --- .../main/kotlin/org/lflang/generator/uc/UcMakeGenerator.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lfc/core/src/main/kotlin/org/lflang/generator/uc/UcMakeGenerator.kt b/lfc/core/src/main/kotlin/org/lflang/generator/uc/UcMakeGenerator.kt index 16b2ce99..a8f6e97c 100644 --- a/lfc/core/src/main/kotlin/org/lflang/generator/uc/UcMakeGenerator.kt +++ b/lfc/core/src/main/kotlin/org/lflang/generator/uc/UcMakeGenerator.kt @@ -61,8 +61,8 @@ class UcMakeGeneratorFederated( channelTypes.joinWithLn { when (it) { NetworkChannelType.TCP_IP -> "CFLAGS += -DNETWORK_CHANNEL_TCP" - NetworkChannelType.COAP_UDP_IP -> - "CFLAGS += -DNETWORK_CHANNEL_COAP" + NetworkChannelType.COAP_UDP_IP -> "CFLAGS += -DNETWORK_CHANNEL_COAP" + NetworkChannelType.UART -> "CFLAGS += -DNETWORK_CHANNEL_UART" NetworkChannelType.NONE -> "" NetworkChannelType.CUSTOM -> "" } From 27850072592ef956f382d706105773f067fd2768 Mon Sep 17 00:00:00 2001 From: Lasse Rosenow Date: Mon, 10 Feb 2025 14:24:57 +0100 Subject: [PATCH 3/3] Fix --- .../src/main/kotlin/org/lflang/generator/uc/UcMakeGenerator.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/lfc/core/src/main/kotlin/org/lflang/generator/uc/UcMakeGenerator.kt b/lfc/core/src/main/kotlin/org/lflang/generator/uc/UcMakeGenerator.kt index a8f6e97c..7be0e968 100644 --- a/lfc/core/src/main/kotlin/org/lflang/generator/uc/UcMakeGenerator.kt +++ b/lfc/core/src/main/kotlin/org/lflang/generator/uc/UcMakeGenerator.kt @@ -62,7 +62,6 @@ class UcMakeGeneratorFederated( when (it) { NetworkChannelType.TCP_IP -> "CFLAGS += -DNETWORK_CHANNEL_TCP" NetworkChannelType.COAP_UDP_IP -> "CFLAGS += -DNETWORK_CHANNEL_COAP" - NetworkChannelType.UART -> "CFLAGS += -DNETWORK_CHANNEL_UART" NetworkChannelType.NONE -> "" NetworkChannelType.CUSTOM -> "" }