You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by ja...@apache.org on 2026/10/07 12:43:39 UTC
(mynewt-core) branch master updated (fa92b9dc4 -> ddab58cde)
This is an automated email from the ASF dual-hosted git repository.
sjanc pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-core.git
from fa92b9dc4 encoding/nanopb: Upgrade to 0.4.9.2
new 65ab0852f net/osdp: Update to 3.2.7
new ddab58cde apps/osdp_sample: Add CP mode support
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
apps/osdp_sample/pkg.yml | 2 +-
apps/osdp_sample/src/main.c | 93 ++++++++++++++++++++++++++++++++++++++++++++-
apps/osdp_sample/syscfg.yml | 2 +-
net/osdp/pkg.yml | 6 +--
4 files changed, 96 insertions(+), 7 deletions(-)
(mynewt-core) 01/02: net/osdp: Update to 3.2.7
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sjanc pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-core.git
commit 65ab0852f7c39794b08f50ab13aaa3900c000bc9
Author: Szymon Janc <sz...@codecoup.pl>
AuthorDate: Mon Oct 5 18:22:44 2026 +0200
net/osdp: Update to 3.2.7
This updates libosdp to the latest upstream release. Upstream has
moved from goToMain to the osdp-dev GitHub organization, so the
repository and homepage are updated as well.
Notable upstream fixes since 3.2.2:
- cp: Fix OOB write in cp_decode_response REPLY_KEYPAD/RAW
- file: Fix OOB read due to critical check placed as assert
- phy: Guard packet length subtraction against underflow
- phy: Fix framer wedge on fragmented packet header
- phy: Skip packets that don't belong to current context
- PD: Fix bug in pd_cap check path which always ACKs
- CP: Don't update sequence number on command retry probes
Assisted-by: Claude:claude-opus-5-5
---
net/osdp/pkg.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/net/osdp/pkg.yml b/net/osdp/pkg.yml
index b00c47080..d8c69a7ec 100644
--- a/net/osdp/pkg.yml
+++ b/net/osdp/pkg.yml
@@ -19,7 +19,7 @@
pkg.name: net/osdp
pkg.description: OSDP (Open Supervised Device Protocol) library
pkg.author: "Apache Mynewt <de...@mynewt.apache.org>"
-pkg.homepage: "https://github.com/goToMain/libosdp"
+pkg.homepage: "https://github.com/osdp-dev/libosdp"
pkg.keywords:
- osdp
@@ -63,6 +63,6 @@ pkg.subpriority: 1
repository.osdp:
type: github
- vers: v3.2.2-commit
- user: goToMain
+ vers: v3.2.7-commit
+ user: osdp-dev
repo: libosdp
(mynewt-core) 02/02: apps/osdp_sample: Add CP mode support
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sjanc pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-core.git
commit ddab58cde10f3fe3cec3bb86d3f37fee7b290f71
Author: Szymon Janc <sz...@codecoup.pl>
AuthorDate: Mon Oct 5 18:24:11 2026 +0200
apps/osdp_sample: Add CP mode support
The sample was calling PD-only APIs unconditionally, so building it
with OSDP_MODE_CP failed at link time with undefined references to
osdp_pd_submit_event() and osdp_pd_set_command_callback().
PD-specific code is now built only in PD mode. In CP mode the app
registers an event callback that logs events reported by the PD and,
once secure channel is up, periodically sends LED and buzzer commands
to it. OSDP_PD_ADDRESS is now set for both modes so that a CP build
addresses a PD built from this sample.
Assisted-by: Claude:claude-opus-5-5
---
apps/osdp_sample/pkg.yml | 2 +-
apps/osdp_sample/src/main.c | 93 ++++++++++++++++++++++++++++++++++++++++++++-
apps/osdp_sample/syscfg.yml | 2 +-
3 files changed, 93 insertions(+), 4 deletions(-)
diff --git a/apps/osdp_sample/pkg.yml b/apps/osdp_sample/pkg.yml
index 05ad12f89..33c91b34e 100644
--- a/apps/osdp_sample/pkg.yml
+++ b/apps/osdp_sample/pkg.yml
@@ -19,7 +19,7 @@
pkg.name: apps/osdp_sample
pkg.type: app
-pkg.description: Sample app for OSDP in PD mode
+pkg.description: Sample app for OSDP in PD or CP mode
pkg.author: ""
pkg.homepage: ""
pkg.keywords:
diff --git a/apps/osdp_sample/src/main.c b/apps/osdp_sample/src/main.c
index d5288eed7..29cfe178a 100644
--- a/apps/osdp_sample/src/main.c
+++ b/apps/osdp_sample/src/main.c
@@ -49,13 +49,14 @@ struct log g_logger;
static struct os_callout cmd_timer;
+static struct osdp_t *ctx;
+
+#if MYNEWT_VAL(OSDP_MODE_PD)
static int create_keypress_event(struct osdp_event *event);
static int create_cardreader_event(struct osdp_event *event);
static int create_mfgreply_event(struct osdp_cmd *oc);
static int pd_command_handler(void *arg, struct osdp_cmd *cmd);
-static struct osdp_t *ctx;
-
/* From osdp.h */
static const char *const osdp_cmd_str[] = {
"OSDP_CMD_OUTPUT",
@@ -195,6 +196,66 @@ create_keypress_event(struct osdp_event *event)
return 0;
}
+#else
+/*
+ * Callback function registered with the library
+ * Events received from PD will be reflected here
+ */
+static int
+cp_event_handler(void *arg, int pd, struct osdp_event *ev)
+{
+ (void)(arg);
+
+ switch (ev->type) {
+ case OSDP_EVENT_CARDREAD:
+ LOG(INFO, "PD %d: card read, rdr: %d, fmt: %d, len: %d\n", pd,
+ ev->cardread.reader_no, ev->cardread.format, ev->cardread.length);
+ break;
+ case OSDP_EVENT_KEYPRESS:
+ LOG(INFO, "PD %d: key press, rdr: %d, len: %d\n", pd,
+ ev->keypress.reader_no, ev->keypress.length);
+ break;
+ case OSDP_EVENT_MFGREP:
+ LOG(INFO, "PD %d: manufacturer reply, v_code: 0x%06x, len: %d\n", pd,
+ (unsigned int)ev->mfgrep.vendor_code, ev->mfgrep.length);
+ break;
+ default:
+ LOG(INFO, "PD %d: event %d\n", pd, ev->type);
+ break;
+ }
+
+ return 0;
+}
+
+static void
+create_led_command(struct osdp_cmd *cmd)
+{
+ memset(cmd, 0, sizeof(*cmd));
+ cmd->id = OSDP_CMD_LED;
+ cmd->led.reader = 0;
+ cmd->led.led_number = 0;
+ /* Blink green 3 times (100ms on, 100ms off) */
+ cmd->led.temporary.control_code = 2;
+ cmd->led.temporary.on_count = 1;
+ cmd->led.temporary.off_count = 1;
+ cmd->led.temporary.on_color = OSDP_LED_COLOR_GREEN;
+ cmd->led.temporary.off_color = OSDP_LED_COLOR_NONE;
+ cmd->led.temporary.timer_count = 6;
+}
+
+static void
+create_buzzer_command(struct osdp_cmd *cmd)
+{
+ memset(cmd, 0, sizeof(*cmd));
+ cmd->id = OSDP_CMD_BUZZER;
+ cmd->buzzer.reader = 0;
+ /* Default tone, beep twice (200ms on, 200ms off) */
+ cmd->buzzer.control_code = 2;
+ cmd->buzzer.on_count = 2;
+ cmd->buzzer.off_count = 2;
+ cmd->buzzer.rep_count = 2;
+}
+#endif
/*
* Handler called after cmd_handler timer timeout
@@ -208,6 +269,7 @@ cmd_handler(struct os_event *ev)
osdp_get_sc_status_mask(ctx, &sc_active);
+#if MYNEWT_VAL(OSDP_MODE_PD)
if (sc_active) {
struct osdp_event event;
if (cmd == 0) {
@@ -223,6 +285,24 @@ cmd_handler(struct os_event *ev)
cmd = 0;
}
}
+#else
+ /* Send commands to the first (and only) PD once secure channel is up */
+ if (sc_active & 0x01) {
+ struct osdp_cmd osdp_cmd;
+ if (cmd == 0) {
+ LOG(INFO, "Sending LED command\n");
+ create_led_command(&osdp_cmd);
+ } else if (cmd == 1) {
+ LOG(INFO, "Sending Buzzer command\n");
+ create_buzzer_command(&osdp_cmd);
+ }
+ osdp_cp_submit_command(ctx, 0, &osdp_cmd);
+ cmd++;
+ if (cmd > 1) {
+ cmd = 0;
+ }
+ }
+#endif
/* Heartbeat blink */
hal_gpio_toggle(LED_BLINK_PIN);
@@ -309,6 +389,7 @@ mynewt_main(int argc, char **argv)
hal_gpio_init_out(LED_BLINK_PIN, 1);
+#if MYNEWT_VAL(OSDP_MODE_PD)
/* List capabilities of this PD */
struct osdp_pd_cap cap[] = {
{
@@ -333,6 +414,10 @@ mynewt_main(int argc, char **argv)
},
{ -1, 0, 0 }
};
+#else
+ /* Capabilities are reported by the PD, not needed in CP mode */
+ struct osdp_pd_cap *cap = NULL;
+#endif
/* Validate and assign key */
if (MYNEWT_VAL(OSDP_SC_ENABLED) && strcmp(OSDP_KEY_STRING, "NONE") != 0) {
@@ -369,7 +454,11 @@ mynewt_main(int argc, char **argv)
ctx = osdp_init(&info_pd);
assert(ctx);
+#if MYNEWT_VAL(OSDP_MODE_PD)
osdp_pd_set_command_callback(ctx, pd_command_handler, NULL);
+#else
+ osdp_cp_set_event_callback(ctx, cp_event_handler, NULL);
+#endif
timers_init();
diff --git a/apps/osdp_sample/syscfg.yml b/apps/osdp_sample/syscfg.yml
index 150033e7d..90e4be7e2 100644
--- a/apps/osdp_sample/syscfg.yml
+++ b/apps/osdp_sample/syscfg.yml
@@ -24,10 +24,10 @@ syscfg.vals:
OSDP_MODE_PD: 1 # set in peripheral device mode
OSDP_SC_ENABLED: 1 # enable secure channel
OSDP_UART_DEV_NAME: '"uart0"' # set uart device for OSDP communication
+ OSDP_PD_ADDRESS: 101 # PD own address or address of PD connected to CP
# PD mode config
syscfg.vals.OSDP_MODE_PD:
- OSDP_PD_ADDRESS: 101
OSDP_PD_ID_VENDOR_CODE: 0xCAFEBABE
OSDP_PD_ID_MODEL: 1
OSDP_PD_ID_VERSION: 1