diff --git a/platform/dev-imxrt/Cargo.lock b/platform/dev-imxrt/Cargo.lock index 6a2e900..271c045 100644 --- a/platform/dev-imxrt/Cargo.lock +++ b/platform/dev-imxrt/Cargo.lock @@ -35,10 +35,11 @@ dependencies = [ [[package]] name = "battery-service" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#b2914600404371ba150093bec40d4e7e116b3369" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "battery-service-interface", "defmt 0.3.100", + "embassy-futures", "embassy-time", "embedded-batteries-async", "embedded-services", @@ -48,16 +49,17 @@ dependencies = [ [[package]] name = "battery-service-interface" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#b2914600404371ba150093bec40d4e7e116b3369" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "defmt 0.3.100", "embedded-batteries-async", + "power-policy-interface", ] [[package]] name = "battery-service-relay" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#b2914600404371ba150093bec40d4e7e116b3369" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "battery-service-interface", "defmt 0.3.100", @@ -695,7 +697,7 @@ dependencies = [ [[package]] name = "embedded-services" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#b2914600404371ba150093bec40d4e7e116b3369" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "bitfield 0.17.0", "cortex-m", @@ -902,7 +904,7 @@ dependencies = [ [[package]] name = "mctp-rs" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#b2914600404371ba150093bec40d4e7e116b3369" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "bit-register 0.1.0 (git+https://github.com/OpenDevicePartnership/odp-utilities)", "crc", @@ -1012,7 +1014,7 @@ dependencies = [ [[package]] name = "odp-service-common" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#b2914600404371ba150093bec40d4e7e116b3369" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "embedded-services", "static_cell", @@ -1087,7 +1089,7 @@ checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49" [[package]] name = "power-policy-interface" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#b2914600404371ba150093bec40d4e7e116b3369" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "defmt 0.3.100", "embassy-sync", @@ -1312,7 +1314,7 @@ dependencies = [ [[package]] name = "thermal-service" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#b2914600404371ba150093bec40d4e7e116b3369" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "defmt 0.3.100", "embassy-futures", @@ -1329,7 +1331,7 @@ dependencies = [ [[package]] name = "thermal-service-interface" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#b2914600404371ba150093bec40d4e7e116b3369" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "defmt 0.3.100", "embassy-time", @@ -1340,7 +1342,7 @@ dependencies = [ [[package]] name = "thermal-service-relay" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#b2914600404371ba150093bec40d4e7e116b3369" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "defmt 0.3.100", "embedded-services", @@ -1381,7 +1383,7 @@ dependencies = [ [[package]] name = "time-alarm-service" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#b2914600404371ba150093bec40d4e7e116b3369" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "defmt 0.3.100", "embassy-futures", @@ -1397,10 +1399,11 @@ dependencies = [ [[package]] name = "time-alarm-service-interface" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#b2914600404371ba150093bec40d4e7e116b3369" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "bitfield 0.17.0", "defmt 0.3.100", + "embassy-sync", "embedded-mcu-hal 0.3.0", "num_enum", "zerocopy", @@ -1409,7 +1412,7 @@ dependencies = [ [[package]] name = "time-alarm-service-relay" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#b2914600404371ba150093bec40d4e7e116b3369" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "bitfield 0.17.0", "defmt 0.3.100", @@ -1490,7 +1493,7 @@ checksum = "40ce102ab67701b8526c123c1bab5cbe42d7040ccfd0f64af1a385808d2f43de" [[package]] name = "uart-service" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#b2914600404371ba150093bec40d4e7e116b3369" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "defmt 0.3.100", "embassy-sync", diff --git a/platform/dev-mcxa/Cargo.lock b/platform/dev-mcxa/Cargo.lock index 3827d23..d0cfc26 100644 --- a/platform/dev-mcxa/Cargo.lock +++ b/platform/dev-mcxa/Cargo.lock @@ -29,10 +29,11 @@ dependencies = [ [[package]] name = "battery-service" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#b2914600404371ba150093bec40d4e7e116b3369" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "battery-service-interface", "defmt 0.3.100", + "embassy-futures", "embassy-time", "embedded-batteries-async", "embedded-services", @@ -42,16 +43,17 @@ dependencies = [ [[package]] name = "battery-service-interface" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#b2914600404371ba150093bec40d4e7e116b3369" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "defmt 0.3.100", "embedded-batteries-async", + "power-policy-interface", ] [[package]] name = "battery-service-relay" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#b2914600404371ba150093bec40d4e7e116b3369" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "battery-service-interface", "defmt 0.3.100", @@ -678,7 +680,7 @@ dependencies = [ [[package]] name = "embedded-services" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#b2914600404371ba150093bec40d4e7e116b3369" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "bitfield 0.17.0", "cortex-m", @@ -900,7 +902,7 @@ dependencies = [ [[package]] name = "mctp-rs" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#b2914600404371ba150093bec40d4e7e116b3369" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "bit-register 0.1.0 (git+https://github.com/OpenDevicePartnership/odp-utilities)", "crc", @@ -998,7 +1000,7 @@ dependencies = [ [[package]] name = "odp-service-common" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#b2914600404371ba150093bec40d4e7e116b3369" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "embedded-services", "static_cell", @@ -1096,7 +1098,7 @@ dependencies = [ [[package]] name = "power-policy-interface" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#b2914600404371ba150093bec40d4e7e116b3369" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "defmt 0.3.100", "embassy-sync", @@ -1340,7 +1342,7 @@ dependencies = [ [[package]] name = "thermal-service" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#b2914600404371ba150093bec40d4e7e116b3369" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "defmt 0.3.100", "embassy-futures", @@ -1357,7 +1359,7 @@ dependencies = [ [[package]] name = "thermal-service-interface" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#b2914600404371ba150093bec40d4e7e116b3369" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "defmt 0.3.100", "embassy-time", @@ -1368,7 +1370,7 @@ dependencies = [ [[package]] name = "thermal-service-relay" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#b2914600404371ba150093bec40d4e7e116b3369" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "defmt 0.3.100", "embedded-services", @@ -1409,7 +1411,7 @@ dependencies = [ [[package]] name = "time-alarm-service" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#b2914600404371ba150093bec40d4e7e116b3369" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "defmt 0.3.100", "embassy-futures", @@ -1425,10 +1427,11 @@ dependencies = [ [[package]] name = "time-alarm-service-interface" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#b2914600404371ba150093bec40d4e7e116b3369" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "bitfield 0.17.0", "defmt 0.3.100", + "embassy-sync", "embedded-mcu-hal 0.3.0", "num_enum", "zerocopy", @@ -1437,7 +1440,7 @@ dependencies = [ [[package]] name = "time-alarm-service-relay" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#b2914600404371ba150093bec40d4e7e116b3369" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "bitfield 0.17.0", "defmt 0.3.100", @@ -1518,7 +1521,7 @@ checksum = "b6f5e870be6c3b371b77fe0ee0bafb859fa4964b4404c27de1d380043c4dda20" [[package]] name = "uart-service" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#b2914600404371ba150093bec40d4e7e116b3369" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "defmt 0.3.100", "embassy-sync", diff --git a/platform/dev-mec/Cargo.lock b/platform/dev-mec/Cargo.lock index 92c1020..4f3c20b 100644 --- a/platform/dev-mec/Cargo.lock +++ b/platform/dev-mec/Cargo.lock @@ -35,10 +35,11 @@ dependencies = [ [[package]] name = "battery-service" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#b2914600404371ba150093bec40d4e7e116b3369" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "battery-service-interface", "defmt 0.3.100", + "embassy-futures", "embassy-time", "embedded-batteries-async", "embedded-services", @@ -48,16 +49,17 @@ dependencies = [ [[package]] name = "battery-service-interface" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#b2914600404371ba150093bec40d4e7e116b3369" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "defmt 0.3.100", "embedded-batteries-async", + "power-policy-interface", ] [[package]] name = "battery-service-relay" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#b2914600404371ba150093bec40d4e7e116b3369" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "battery-service-interface", "defmt 0.3.100", @@ -653,7 +655,7 @@ dependencies = [ [[package]] name = "embedded-services" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#b2914600404371ba150093bec40d4e7e116b3369" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "bitfield 0.17.0", "cortex-m", @@ -851,7 +853,7 @@ dependencies = [ [[package]] name = "mctp-rs" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#b2914600404371ba150093bec40d4e7e116b3369" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "bit-register 0.1.0 (git+https://github.com/OpenDevicePartnership/odp-utilities)", "crc", @@ -937,7 +939,7 @@ dependencies = [ [[package]] name = "odp-service-common" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#b2914600404371ba150093bec40d4e7e116b3369" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "embedded-services", "static_cell", @@ -1012,7 +1014,7 @@ checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49" [[package]] name = "power-policy-interface" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#b2914600404371ba150093bec40d4e7e116b3369" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "defmt 0.3.100", "embassy-sync", @@ -1226,7 +1228,7 @@ dependencies = [ [[package]] name = "thermal-service" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#b2914600404371ba150093bec40d4e7e116b3369" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "defmt 0.3.100", "embassy-futures", @@ -1243,7 +1245,7 @@ dependencies = [ [[package]] name = "thermal-service-interface" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#b2914600404371ba150093bec40d4e7e116b3369" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "defmt 0.3.100", "embassy-time", @@ -1254,7 +1256,7 @@ dependencies = [ [[package]] name = "thermal-service-relay" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#b2914600404371ba150093bec40d4e7e116b3369" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "defmt 0.3.100", "embedded-services", @@ -1295,7 +1297,7 @@ dependencies = [ [[package]] name = "time-alarm-service" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#b2914600404371ba150093bec40d4e7e116b3369" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "defmt 0.3.100", "embassy-futures", @@ -1311,10 +1313,11 @@ dependencies = [ [[package]] name = "time-alarm-service-interface" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#b2914600404371ba150093bec40d4e7e116b3369" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "bitfield 0.17.0", "defmt 0.3.100", + "embassy-sync", "embedded-mcu-hal 0.3.0", "num_enum", "zerocopy", @@ -1323,7 +1326,7 @@ dependencies = [ [[package]] name = "time-alarm-service-relay" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#b2914600404371ba150093bec40d4e7e116b3369" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "bitfield 0.17.0", "defmt 0.3.100", @@ -1404,7 +1407,7 @@ checksum = "40ce102ab67701b8526c123c1bab5cbe42d7040ccfd0f64af1a385808d2f43de" [[package]] name = "uart-service" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#b2914600404371ba150093bec40d4e7e116b3369" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "defmt 0.3.100", "embassy-sync", diff --git a/platform/dev-npcx/Cargo.lock b/platform/dev-npcx/Cargo.lock index 6386ba3..6d57456 100644 --- a/platform/dev-npcx/Cargo.lock +++ b/platform/dev-npcx/Cargo.lock @@ -29,10 +29,11 @@ dependencies = [ [[package]] name = "battery-service" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#b2914600404371ba150093bec40d4e7e116b3369" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "battery-service-interface", "defmt 0.3.100", + "embassy-futures", "embassy-time", "embedded-batteries-async", "embedded-services", @@ -42,16 +43,17 @@ dependencies = [ [[package]] name = "battery-service-interface" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#b2914600404371ba150093bec40d4e7e116b3369" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "defmt 0.3.100", "embedded-batteries-async", + "power-policy-interface", ] [[package]] name = "battery-service-relay" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#b2914600404371ba150093bec40d4e7e116b3369" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "battery-service-interface", "defmt 0.3.100", @@ -634,7 +636,7 @@ dependencies = [ [[package]] name = "embedded-services" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#b2914600404371ba150093bec40d4e7e116b3369" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "bitfield 0.17.0", "cortex-m", @@ -820,7 +822,7 @@ dependencies = [ [[package]] name = "mctp-rs" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#b2914600404371ba150093bec40d4e7e116b3369" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "bit-register 0.1.0 (git+https://github.com/OpenDevicePartnership/odp-utilities)", "crc", @@ -918,7 +920,7 @@ dependencies = [ [[package]] name = "odp-service-common" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#b2914600404371ba150093bec40d4e7e116b3369" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "embedded-services", "static_cell", @@ -1016,7 +1018,7 @@ dependencies = [ [[package]] name = "power-policy-interface" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#b2914600404371ba150093bec40d4e7e116b3369" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "defmt 0.3.100", "embassy-sync 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1230,7 +1232,7 @@ dependencies = [ [[package]] name = "thermal-service" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#b2914600404371ba150093bec40d4e7e116b3369" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "defmt 0.3.100", "embassy-futures", @@ -1247,7 +1249,7 @@ dependencies = [ [[package]] name = "thermal-service-interface" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#b2914600404371ba150093bec40d4e7e116b3369" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "defmt 0.3.100", "embassy-time", @@ -1258,7 +1260,7 @@ dependencies = [ [[package]] name = "thermal-service-relay" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#b2914600404371ba150093bec40d4e7e116b3369" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "defmt 0.3.100", "embedded-services", @@ -1299,7 +1301,7 @@ dependencies = [ [[package]] name = "time-alarm-service" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#b2914600404371ba150093bec40d4e7e116b3369" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "defmt 0.3.100", "embassy-futures", @@ -1315,10 +1317,11 @@ dependencies = [ [[package]] name = "time-alarm-service-interface" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#b2914600404371ba150093bec40d4e7e116b3369" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "bitfield 0.17.0", "defmt 0.3.100", + "embassy-sync 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "embedded-mcu-hal 0.3.0", "num_enum", "zerocopy", @@ -1327,7 +1330,7 @@ dependencies = [ [[package]] name = "time-alarm-service-relay" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#b2914600404371ba150093bec40d4e7e116b3369" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "bitfield 0.17.0", "defmt 0.3.100", @@ -1408,7 +1411,7 @@ checksum = "b6f5e870be6c3b371b77fe0ee0bafb859fa4964b4404c27de1d380043c4dda20" [[package]] name = "uart-service" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#b2914600404371ba150093bec40d4e7e116b3369" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "defmt 0.3.100", "embassy-sync 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/platform/dev-qemu/Cargo.lock b/platform/dev-qemu/Cargo.lock index 1827c29..a7256bc 100644 --- a/platform/dev-qemu/Cargo.lock +++ b/platform/dev-qemu/Cargo.lock @@ -29,10 +29,11 @@ dependencies = [ [[package]] name = "battery-service" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#baf1a1577c71375ec0ee33830b874f40e17b9423" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "battery-service-interface", "defmt 0.3.100", + "embassy-futures", "embassy-time", "embedded-batteries-async", "embedded-services", @@ -42,16 +43,17 @@ dependencies = [ [[package]] name = "battery-service-interface" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#baf1a1577c71375ec0ee33830b874f40e17b9423" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "defmt 0.3.100", "embedded-batteries-async", + "power-policy-interface", ] [[package]] name = "battery-service-relay" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#baf1a1577c71375ec0ee33830b874f40e17b9423" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "battery-service-interface", "defmt 0.3.100", @@ -631,7 +633,7 @@ dependencies = [ [[package]] name = "embedded-services" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#baf1a1577c71375ec0ee33830b874f40e17b9423" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "bitfield 0.17.0", "cortex-m", @@ -749,7 +751,7 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "hidi2c-target-service" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#baf1a1577c71375ec0ee33830b874f40e17b9423" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "defmt 0.3.100", "embassy-futures", @@ -820,7 +822,7 @@ dependencies = [ [[package]] name = "mctp-rs" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#baf1a1577c71375ec0ee33830b874f40e17b9423" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "bit-register 0.1.0 (git+https://github.com/OpenDevicePartnership/odp-utilities)", "crc", @@ -895,7 +897,7 @@ dependencies = [ [[package]] name = "odp-service-common" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#baf1a1577c71375ec0ee33830b874f40e17b9423" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "embedded-services", "static_cell", @@ -960,7 +962,7 @@ checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49" [[package]] name = "power-policy-interface" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#baf1a1577c71375ec0ee33830b874f40e17b9423" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "defmt 0.3.100", "embassy-sync 0.8.0", @@ -1262,7 +1264,7 @@ dependencies = [ [[package]] name = "thermal-service" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#baf1a1577c71375ec0ee33830b874f40e17b9423" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "defmt 0.3.100", "embassy-futures", @@ -1279,7 +1281,7 @@ dependencies = [ [[package]] name = "thermal-service-interface" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#baf1a1577c71375ec0ee33830b874f40e17b9423" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "defmt 0.3.100", "embassy-time", @@ -1290,7 +1292,7 @@ dependencies = [ [[package]] name = "thermal-service-relay" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#baf1a1577c71375ec0ee33830b874f40e17b9423" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "defmt 0.3.100", "embedded-services", @@ -1331,7 +1333,7 @@ dependencies = [ [[package]] name = "time-alarm-service" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#baf1a1577c71375ec0ee33830b874f40e17b9423" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "defmt 0.3.100", "embassy-futures", @@ -1347,10 +1349,11 @@ dependencies = [ [[package]] name = "time-alarm-service-interface" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#baf1a1577c71375ec0ee33830b874f40e17b9423" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "bitfield 0.17.0", "defmt 0.3.100", + "embassy-sync 0.8.0", "embedded-mcu-hal 0.3.0", "num_enum", "zerocopy", @@ -1359,7 +1362,7 @@ dependencies = [ [[package]] name = "time-alarm-service-relay" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#baf1a1577c71375ec0ee33830b874f40e17b9423" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "bitfield 0.17.0", "defmt 0.3.100", @@ -1440,7 +1443,7 @@ checksum = "b6f5e870be6c3b371b77fe0ee0bafb859fa4964b4404c27de1d380043c4dda20" [[package]] name = "uart-service" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#baf1a1577c71375ec0ee33830b874f40e17b9423" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "defmt 0.3.100", "embassy-sync 0.8.0", diff --git a/platform/dev-qemu/src/main.rs b/platform/dev-qemu/src/main.rs index a7beec9..d4ef64c 100644 --- a/platform/dev-qemu/src/main.rs +++ b/platform/dev-qemu/src/main.rs @@ -66,14 +66,19 @@ async fn time_alarm_wake( service: platform_common::mock::time_alarm::TimeAlarmService, mut gpio: embassy_qemu_riscv::gpio::Output<'static>, ) { + use time_alarm_service_interface::TimeAlarmService; + let mut wake_requested = service + .wake_requested_receiver() + .expect("TimeAlarm wake receiver unavailable"); + let mut requested = wake_requested.get().await; loop { - let requested = service.wait_for_wake_signal().await; if requested { gpio.set_high(); } else { gpio.set_low(); } info!("TimeAlarm wake requested: {}", requested); + requested = wake_requested.changed().await; } } @@ -95,7 +100,7 @@ async fn time_alarm_power_input( service: platform_common::mock::time_alarm::TimeAlarmService, mut input: embassy_qemu_riscv::gpio::Input<'static, embassy_qemu_riscv::gpio::Async>, ) { - use time_alarm_service_interface::AcpiTimerId; + use time_alarm_service_interface::{AcpiTimerId, TimeAlarmService}; loop { let source = power_source(&input); service.set_power_source(source); diff --git a/platform/platform-common/Cargo.lock b/platform/platform-common/Cargo.lock index c67630f..27e4ed2 100644 --- a/platform/platform-common/Cargo.lock +++ b/platform/platform-common/Cargo.lock @@ -90,10 +90,11 @@ dependencies = [ [[package]] name = "battery-service" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#b2914600404371ba150093bec40d4e7e116b3369" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "battery-service-interface", "defmt 0.3.100", + "embassy-futures", "embassy-time", "embedded-batteries-async", "embedded-services", @@ -103,16 +104,17 @@ dependencies = [ [[package]] name = "battery-service-interface" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#b2914600404371ba150093bec40d4e7e116b3369" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "defmt 0.3.100", "embedded-batteries-async", + "power-policy-interface", ] [[package]] name = "battery-service-relay" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#b2914600404371ba150093bec40d4e7e116b3369" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "battery-service-interface", "defmt 0.3.100", @@ -629,7 +631,7 @@ dependencies = [ [[package]] name = "embedded-services" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#b2914600404371ba150093bec40d4e7e116b3369" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "bitfield 0.17.0", "cortex-m", @@ -848,7 +850,7 @@ dependencies = [ [[package]] name = "mctp-rs" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#b2914600404371ba150093bec40d4e7e116b3369" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "bit-register 0.1.0 (git+https://github.com/OpenDevicePartnership/odp-utilities)", "defmt 0.3.100", @@ -996,7 +998,7 @@ dependencies = [ [[package]] name = "odp-service-common" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#b2914600404371ba150093bec40d4e7e116b3369" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "embedded-services", "static_cell", @@ -1067,7 +1069,7 @@ checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49" [[package]] name = "power-policy-interface" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#b2914600404371ba150093bec40d4e7e116b3369" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "defmt 0.3.100", "embassy-sync", @@ -1312,7 +1314,7 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "thermal-service" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#b2914600404371ba150093bec40d4e7e116b3369" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "defmt 0.3.100", "embassy-futures", @@ -1329,7 +1331,7 @@ dependencies = [ [[package]] name = "thermal-service-interface" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#b2914600404371ba150093bec40d4e7e116b3369" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "defmt 0.3.100", "embassy-time", @@ -1340,7 +1342,7 @@ dependencies = [ [[package]] name = "thermal-service-relay" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#b2914600404371ba150093bec40d4e7e116b3369" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "defmt 0.3.100", "embedded-services", @@ -1381,7 +1383,7 @@ dependencies = [ [[package]] name = "time-alarm-service" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#b2914600404371ba150093bec40d4e7e116b3369" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "defmt 0.3.100", "embassy-futures", @@ -1397,10 +1399,11 @@ dependencies = [ [[package]] name = "time-alarm-service-interface" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#b2914600404371ba150093bec40d4e7e116b3369" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "bitfield 0.17.0", "defmt 0.3.100", + "embassy-sync", "embedded-mcu-hal 0.3.0", "num_enum", "zerocopy", @@ -1409,7 +1412,7 @@ dependencies = [ [[package]] name = "time-alarm-service-relay" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#b2914600404371ba150093bec40d4e7e116b3369" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#3ff41f56a8d07754062e21e63495baf161302369" dependencies = [ "bitfield 0.17.0", "defmt 0.3.100", diff --git a/platform/platform-common/src/mock/battery.rs b/platform/platform-common/src/mock/battery.rs index ce92761..096ce9b 100644 --- a/platform/platform-common/src/mock/battery.rs +++ b/platform/platform-common/src/mock/battery.rs @@ -9,7 +9,7 @@ use static_cell::StaticCell; /// The fuel gauge, behind a mutex so the service and the driving task can share it. type FuelGauge = Mutex; /// Two registered fuel gauges: battery `0` is a 3S pack, battery `1` a 2S pack. -type Reg = bs::ArrayRegistration<'static, FuelGauge, 2>; +type Reg = bs::ArrayRegistration<'static, FuelGauge, 2, bs::DefaultPowerPolicyRouting>; pub type BatteryService = bs::Service<'static, Reg>; pub async fn init(spawner: embassy_executor::Spawner) -> BatteryService { @@ -23,6 +23,7 @@ pub async fn init(spawner: embassy_executor::Spawner) -> BatteryService { let service = bs::Service::new(bs::ArrayRegistration { fuel_gauges: [fuel_gauge_0, fuel_gauge_1], + routing: bs::DefaultPowerPolicyRouting, }); for (battery_id, fuel_gauge) in [fuel_gauge_0, fuel_gauge_1].into_iter().enumerate() {