Skip to content

Added codec plugin implementation #671

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

Open
wants to merge 16 commits into
base: master
Choose a base branch
from
Open

Added codec plugin implementation #671

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
368dcf1
added codec plugin implementation
nicolas-juteau Mar 18, 2025
86286b6
fix: forgot ListDeviceProfileCodecPluginsResponse definition in chir…
nicolas-juteau Mar 24, 2025
bc231d9
changed encode/decode processing
nicolas-juteau Mar 25, 2025
ce4c20a
added unit tests
nicolas-juteau Mar 25, 2025
23c8384
unit tests: removed unused imports
nicolas-juteau Mar 25, 2025
6c35819
fix formatting (cargo fmt)
nicolas-juteau Mar 25, 2025
d152e2b
fix formatting (cargo fmt)
nicolas-juteau Mar 25, 2025
de8d3a1
fix: required imports for test + test expected value
nicolas-juteau Mar 25, 2025
75eb38d
codec plugin decode fix: fetch and return data field instead of whole…
nicolas-juteau Mar 25, 2025
48d2518
added 'plugin' keyword to error throwing to distinguish between js fu…
nicolas-juteau Mar 27, 2025
e170b59
Merge branch 'master' into test
nicolas-juteau Mar 27, 2025
ab282c8
Merge remote-tracking branch 'upstream/master' into test_codec_plugin…
nicolas-juteau Apr 24, 2025
c88fc57
Remove lazy_static dependency
nicolas-juteau Apr 24, 2025
4eb4279
added list_codec_plugins device_profile test
nicolas-juteau Apr 24, 2025
c74d959
fix: cargo fmt
nicolas-juteau Apr 24, 2025
1e5f98a
add codec js_plugin setup in tests
nicolas-juteau Apr 24, 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
Prev Previous commit
Next Next commit
Merge branch 'master' into test
  • Loading branch information
@nicolas-juteau
nicolas-juteau committed Mar 27, 2025
commit e170b5970ca50e7ba264178c37d48d4f5a659aed
5 changes: 4 additions & 1 deletion api/proto/api/device_profile.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,8 +466,11 @@ message DeviceProfile {
// Valid options are 1 - 15 (0 = always use system RX1 Delay).
uint32 rx1_delay = 53;

// Application Layer parameters.
AppLayerParams app_layer_params = 54;

// Payload codec plugin ID.
string codec_plugin_id = 54;
string codec_plugin_id = 55;
}

message Measurement {
Expand Down
5 changes: 4 additions & 1 deletion api/rust/proto/chirpstack/api/device_profile.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,8 +466,11 @@ message DeviceProfile {
// Valid options are 1 - 15 (0 = always use system RX1 Delay).
uint32 rx1_delay = 53;

// Application Layer parameters.
AppLayerParams app_layer_params = 54;

// Payload codec plugin ID.
string codec_plugin_id = 54;
string codec_plugin_id = 55;
}

message Measurement {
Expand Down
13 changes: 11 additions & 2 deletions chirpstack/src/api/device_profile.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -630,7 +630,15 @@ pub mod test {
mac_version: common::MacVersion::Lorawan103.into(),
reg_params_revision: common::RegParamsRevision::A.into(),
adr_algorithm_id: "default".into(),
codec_plugin_id: "passthrough".into(),
app_layer_params: Some(api::AppLayerParams {
ts003_version: api::Ts003Version::Ts003NotImplemented.into(),
ts003_f_port: 202,
ts004_version: api::Ts004Version::Ts004NotImplemented.into(),
ts004_f_port: 201,
ts005_version: api::Ts005Version::Ts005NotImplemented.into(),
ts005_f_port: 200,
}),
codec_plugin_id: "passthrough".into(),
..Default::default()
}),
get_resp.get_ref().device_profile
Expand Down Expand Up @@ -672,7 +680,8 @@ pub mod test {
mac_version: common::MacVersion::Lorawan103.into(),
reg_params_revision: common::RegParamsRevision::A.into(),
adr_algorithm_id: "default".into(),
codec_plugin_id: "passthrough".into(),
app_layer_params: Some(api::AppLayerParams::default()),
codec_plugin_id: "passthrough".into(),
..Default::default()
}),
get_resp.get_ref().device_profile
Expand Down
2 changes: 1 addition & 1 deletion chirpstack/src/cmd/root.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use signal_hook_tokio::Signals;
use tracing::{info, warn};

use crate::gateway;
use crate::{adr, api, backend, codec, downlink, integration, region, storage};
use crate::{adr, api, applayer::fuota, codec, backend, downlink, integration, region, storage};

pub async fn run() -> Result<()> {
info!(
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.