Bläddra i källkod

base-station/software: Update dependencies.

Mathias Gottschlag 4 år sedan
förälder
incheckning
e143d71077

+ 299
- 105
base-station/software/Cargo.lock Visa fil

1
 # This file is automatically @generated by Cargo.
1
 # This file is automatically @generated by Cargo.
2
 # It is not intended for manual editing.
2
 # It is not intended for manual editing.
3
+version = 3
4
+
3
 [[package]]
5
 [[package]]
4
 name = "CoreFoundation-sys"
6
 name = "CoreFoundation-sys"
5
 version = "0.1.4"
7
 version = "0.1.4"
200
  "linux-embedded-hal",
202
  "linux-embedded-hal",
201
  "log",
203
  "log",
202
  "mqtt-protocol",
204
  "mqtt-protocol",
203
- "nb",
204
  "nrf24l01-stick-driver",
205
  "nrf24l01-stick-driver",
205
  "protocol",
206
  "protocol",
206
- "rand",
207
+ "rand 0.8.4",
207
  "serde",
208
  "serde",
208
  "structopt",
209
  "structopt",
209
  "sysfs_gpio",
210
  "sysfs_gpio",
210
  "thiserror",
211
  "thiserror",
211
- "tokio",
212
+ "tokio 1.10.1",
212
  "toml",
213
  "toml",
213
 ]
214
 ]
214
 
215
 
323
 
324
 
324
 [[package]]
325
 [[package]]
325
 name = "chrono"
326
 name = "chrono"
326
-version = "0.4.11"
327
+version = "0.4.19"
327
 source = "registry+https://github.com/rust-lang/crates.io-index"
328
 source = "registry+https://github.com/rust-lang/crates.io-index"
328
-checksum = "80094f509cf8b5ae86a4966a39b3ff66cd7e2a3e594accec3743ff3fabeab5b2"
329
+checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73"
329
 dependencies = [
330
 dependencies = [
331
+ "libc",
330
  "num-integer",
332
  "num-integer",
331
  "num-traits",
333
  "num-traits",
332
  "serde",
334
  "serde",
333
  "time 0.1.43",
335
  "time 0.1.43",
336
+ "winapi 0.3.8",
334
 ]
337
 ]
335
 
338
 
336
 [[package]]
339
 [[package]]
383
  "hkdf",
386
  "hkdf",
384
  "hmac",
387
  "hmac",
385
  "percent-encoding",
388
  "percent-encoding",
386
- "rand",
389
+ "rand 0.7.3",
387
  "sha2",
390
  "sha2",
388
  "time 0.2.24",
391
  "time 0.2.24",
389
  "version_check",
392
  "version_check",
444
  "subtle",
447
  "subtle",
445
 ]
448
 ]
446
 
449
 
450
+[[package]]
451
+name = "ctor"
452
+version = "0.1.16"
453
+source = "registry+https://github.com/rust-lang/crates.io-index"
454
+checksum = "7fbaabec2c953050352311293be5c6aba8e141ba19d6811862b232d6fd020484"
455
+dependencies = [
456
+ "quote",
457
+ "syn",
458
+]
459
+
447
 [[package]]
460
 [[package]]
448
 name = "ctr"
461
 name = "ctr"
449
 version = "0.6.0"
462
 version = "0.6.0"
453
  "cipher",
466
  "cipher",
454
 ]
467
 ]
455
 
468
 
469
+[[package]]
470
+name = "dashmap"
471
+version = "4.0.2"
472
+source = "registry+https://github.com/rust-lang/crates.io-index"
473
+checksum = "e77a43b28d0668df09411cb0bc9a8c2adc40f9a048afe863e05fd43251e8e39c"
474
+dependencies = [
475
+ "cfg-if 1.0.0",
476
+ "num_cpus",
477
+]
478
+
456
 [[package]]
479
 [[package]]
457
 name = "data-encoding"
480
 name = "data-encoding"
458
 version = "2.3.1"
481
 version = "2.3.1"
496
 
519
 
497
 [[package]]
520
 [[package]]
498
 name = "env_logger"
521
 name = "env_logger"
499
-version = "0.7.1"
522
+version = "0.9.0"
500
 source = "registry+https://github.com/rust-lang/crates.io-index"
523
 source = "registry+https://github.com/rust-lang/crates.io-index"
501
-checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36"
524
+checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3"
502
 dependencies = [
525
 dependencies = [
503
  "atty",
526
  "atty",
504
  "humantime",
527
  "humantime",
571
 
594
 
572
 [[package]]
595
 [[package]]
573
 name = "futures"
596
 name = "futures"
574
-version = "0.3.5"
597
+version = "0.3.16"
575
 source = "registry+https://github.com/rust-lang/crates.io-index"
598
 source = "registry+https://github.com/rust-lang/crates.io-index"
576
-checksum = "1e05b85ec287aac0dc34db7d4a569323df697f9c55b99b15d6b4ef8cde49f613"
599
+checksum = "1adc00f486adfc9ce99f77d717836f0c5aa84965eb0b4f051f4e83f7cab53f8b"
577
 dependencies = [
600
 dependencies = [
578
  "futures-channel",
601
  "futures-channel",
579
  "futures-core",
602
  "futures-core",
586
 
609
 
587
 [[package]]
610
 [[package]]
588
 name = "futures-channel"
611
 name = "futures-channel"
589
-version = "0.3.5"
612
+version = "0.3.16"
590
 source = "registry+https://github.com/rust-lang/crates.io-index"
613
 source = "registry+https://github.com/rust-lang/crates.io-index"
591
-checksum = "f366ad74c28cca6ba456d95e6422883cfb4b252a83bed929c83abfdbbf2967d5"
614
+checksum = "74ed2411805f6e4e3d9bc904c95d5d423b89b3b25dc0250aa74729de20629ff9"
592
 dependencies = [
615
 dependencies = [
593
  "futures-core",
616
  "futures-core",
594
  "futures-sink",
617
  "futures-sink",
596
 
619
 
597
 [[package]]
620
 [[package]]
598
 name = "futures-core"
621
 name = "futures-core"
599
-version = "0.3.5"
622
+version = "0.3.16"
600
 source = "registry+https://github.com/rust-lang/crates.io-index"
623
 source = "registry+https://github.com/rust-lang/crates.io-index"
601
-checksum = "59f5fff90fd5d971f936ad674802482ba441b6f09ba5e15fd8b39145582ca399"
624
+checksum = "af51b1b4a7fdff033703db39de8802c673eb91855f2e0d47dcf3bf2c0ef01f99"
602
 
625
 
603
 [[package]]
626
 [[package]]
604
 name = "futures-executor"
627
 name = "futures-executor"
605
-version = "0.3.5"
628
+version = "0.3.16"
606
 source = "registry+https://github.com/rust-lang/crates.io-index"
629
 source = "registry+https://github.com/rust-lang/crates.io-index"
607
-checksum = "10d6bb888be1153d3abeb9006b11b02cf5e9b209fda28693c31ae1e4e012e314"
630
+checksum = "4d0d535a57b87e1ae31437b892713aee90cd2d7b0ee48727cd11fc72ef54761c"
608
 dependencies = [
631
 dependencies = [
609
  "futures-core",
632
  "futures-core",
610
  "futures-task",
633
  "futures-task",
613
 
636
 
614
 [[package]]
637
 [[package]]
615
 name = "futures-io"
638
 name = "futures-io"
616
-version = "0.3.5"
639
+version = "0.3.16"
617
 source = "registry+https://github.com/rust-lang/crates.io-index"
640
 source = "registry+https://github.com/rust-lang/crates.io-index"
618
-checksum = "de27142b013a8e869c14957e6d2edeef89e97c289e69d042ee3a49acd8b51789"
641
+checksum = "0b0e06c393068f3a6ef246c75cdca793d6a46347e75286933e5e75fd2fd11582"
619
 
642
 
620
 [[package]]
643
 [[package]]
621
 name = "futures-lite"
644
 name = "futures-lite"
634
 
657
 
635
 [[package]]
658
 [[package]]
636
 name = "futures-macro"
659
 name = "futures-macro"
637
-version = "0.3.5"
660
+version = "0.3.16"
638
 source = "registry+https://github.com/rust-lang/crates.io-index"
661
 source = "registry+https://github.com/rust-lang/crates.io-index"
639
-checksum = "d0b5a30a4328ab5473878237c447333c093297bded83a4983d10f4deea240d39"
662
+checksum = "c54913bae956fb8df7f4dc6fc90362aa72e69148e3f39041fbe8742d21e0ac57"
640
 dependencies = [
663
 dependencies = [
664
+ "autocfg",
641
  "proc-macro-hack",
665
  "proc-macro-hack",
642
  "proc-macro2",
666
  "proc-macro2",
643
  "quote",
667
  "quote",
646
 
670
 
647
 [[package]]
671
 [[package]]
648
 name = "futures-sink"
672
 name = "futures-sink"
649
-version = "0.3.5"
673
+version = "0.3.16"
650
 source = "registry+https://github.com/rust-lang/crates.io-index"
674
 source = "registry+https://github.com/rust-lang/crates.io-index"
651
-checksum = "3f2032893cb734c7a05d85ce0cc8b8c4075278e93b24b66f9de99d6eb0fa8acc"
675
+checksum = "c0f30aaa67363d119812743aa5f33c201a7a66329f97d1a887022971feea4b53"
652
 
676
 
653
 [[package]]
677
 [[package]]
654
 name = "futures-task"
678
 name = "futures-task"
655
-version = "0.3.5"
679
+version = "0.3.16"
656
 source = "registry+https://github.com/rust-lang/crates.io-index"
680
 source = "registry+https://github.com/rust-lang/crates.io-index"
657
-checksum = "bdb66b5f09e22019b1ab0830f7785bcea8e7a42148683f99214f73f8ec21a626"
658
-dependencies = [
659
- "once_cell",
660
-]
681
+checksum = "bbe54a98670017f3be909561f6ad13e810d9a51f3f061b902062ca3da80799f2"
661
 
682
 
662
 [[package]]
683
 [[package]]
663
 name = "futures-util"
684
 name = "futures-util"
664
-version = "0.3.5"
685
+version = "0.3.16"
665
 source = "registry+https://github.com/rust-lang/crates.io-index"
686
 source = "registry+https://github.com/rust-lang/crates.io-index"
666
-checksum = "8764574ff08b701a084482c3c7031349104b07ac897393010494beaa18ce32c6"
687
+checksum = "67eb846bfd58e44a8481a00049e82c43e0ccb5d61f8dc071057cb19249dd4d78"
667
 dependencies = [
688
 dependencies = [
689
+ "autocfg",
668
  "futures-channel",
690
  "futures-channel",
669
  "futures-core",
691
  "futures-core",
670
  "futures-io",
692
  "futures-io",
672
  "futures-sink",
694
  "futures-sink",
673
  "futures-task",
695
  "futures-task",
674
  "memchr",
696
  "memchr",
675
- "pin-project 0.4.14",
697
+ "pin-project-lite 0.2.4",
676
  "pin-utils",
698
  "pin-utils",
677
  "proc-macro-hack",
699
  "proc-macro-hack",
678
  "proc-macro-nested",
700
  "proc-macro-nested",
715
 dependencies = [
737
 dependencies = [
716
  "cfg-if 0.1.10",
738
  "cfg-if 0.1.10",
717
  "libc",
739
  "libc",
718
- "wasi",
740
+ "wasi 0.9.0+wasi-snapshot-preview1",
741
+]
742
+
743
+[[package]]
744
+name = "getrandom"
745
+version = "0.2.3"
746
+source = "registry+https://github.com/rust-lang/crates.io-index"
747
+checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753"
748
+dependencies = [
749
+ "cfg-if 1.0.0",
750
+ "libc",
751
+ "wasi 0.10.2+wasi-snapshot-preview1",
719
 ]
752
 ]
720
 
753
 
721
 [[package]]
754
 [[package]]
730
 
763
 
731
 [[package]]
764
 [[package]]
732
 name = "gpio-cdev"
765
 name = "gpio-cdev"
733
-version = "0.3.0"
734
-source = "git+https://github.com/mgottschlag/gpio-cdev?branch=tokio#21d1704319fd747f67276149afbd7a285700de20"
766
+version = "0.4.0"
767
+source = "registry+https://github.com/rust-lang/crates.io-index"
768
+checksum = "da59d440ef8c26208b3960ed58b71b896db7dfd6bb138622bba733b66d978c3a"
735
 dependencies = [
769
 dependencies = [
736
  "bitflags",
770
  "bitflags",
737
  "futures",
771
  "futures",
738
  "libc",
772
  "libc",
739
- "mio",
773
+ "mio 0.6.22",
740
  "nix 0.14.1",
774
  "nix 0.14.1",
741
- "tokio",
775
+ "tokio 0.2.20",
742
 ]
776
 ]
743
 
777
 
744
 [[package]]
778
 [[package]]
755
  "http",
789
  "http",
756
  "indexmap",
790
  "indexmap",
757
  "slab",
791
  "slab",
758
- "tokio",
792
+ "tokio 0.2.20",
759
  "tokio-util",
793
  "tokio-util",
760
  "tracing",
794
  "tracing",
761
  "tracing-futures",
795
  "tracing-futures",
850
 
884
 
851
 [[package]]
885
 [[package]]
852
 name = "http-client"
886
 name = "http-client"
853
-version = "6.2.0"
887
+version = "6.5.1"
854
 source = "registry+https://github.com/rust-lang/crates.io-index"
888
 source = "registry+https://github.com/rust-lang/crates.io-index"
855
-checksum = "010092b71b94ee49293995625ce7a607778b8b4099c8088fa84fd66bd3e0f21c"
889
+checksum = "ea880b03c18a7e981d7fb3608b8904a98425d53c440758fcebf7d934aa56547c"
856
 dependencies = [
890
 dependencies = [
857
  "async-trait",
891
  "async-trait",
892
+ "cfg-if 1.0.0",
893
+ "dashmap",
858
  "futures-util",
894
  "futures-util",
859
  "http-types",
895
  "http-types",
860
  "hyper",
896
  "hyper",
861
  "hyper-tls",
897
  "hyper-tls",
862
  "log",
898
  "log",
899
+ "tokio 0.2.20",
863
 ]
900
 ]
864
 
901
 
865
 [[package]]
902
 [[package]]
877
  "http",
914
  "http",
878
  "infer",
915
  "infer",
879
  "pin-project-lite 0.1.5",
916
  "pin-project-lite 0.1.5",
880
- "rand",
917
+ "rand 0.7.3",
881
  "serde",
918
  "serde",
882
  "serde_json",
919
  "serde_json",
883
  "serde_qs",
920
  "serde_qs",
899
 
936
 
900
 [[package]]
937
 [[package]]
901
 name = "humantime"
938
 name = "humantime"
902
-version = "1.3.0"
939
+version = "2.1.0"
903
 source = "registry+https://github.com/rust-lang/crates.io-index"
940
 source = "registry+https://github.com/rust-lang/crates.io-index"
904
-checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f"
905
-dependencies = [
906
- "quick-error",
907
-]
941
+checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
908
 
942
 
909
 [[package]]
943
 [[package]]
910
 name = "hyper"
944
 name = "hyper"
924
  "itoa",
958
  "itoa",
925
  "pin-project 1.0.4",
959
  "pin-project 1.0.4",
926
  "socket2",
960
  "socket2",
927
- "tokio",
961
+ "tokio 0.2.20",
928
  "tower-service",
962
  "tower-service",
929
  "tracing",
963
  "tracing",
930
  "want",
964
  "want",
939
  "bytes 0.5.4",
973
  "bytes 0.5.4",
940
  "hyper",
974
  "hyper",
941
  "native-tls",
975
  "native-tls",
942
- "tokio",
976
+ "tokio 0.2.20",
943
  "tokio-tls",
977
  "tokio-tls",
944
 ]
978
 ]
945
 
979
 
984
 
1018
 
985
 [[package]]
1019
 [[package]]
986
 name = "influxdb"
1020
 name = "influxdb"
987
-version = "0.3.0"
1021
+version = "0.4.0"
988
 source = "registry+https://github.com/rust-lang/crates.io-index"
1022
 source = "registry+https://github.com/rust-lang/crates.io-index"
989
-checksum = "930a3730787ddf754d5ffcbca48909e7aaee3076ecfc6b9547c84a10f937e7f7"
1023
+checksum = "9fe060720fd73a206738b3f0beab024eef0db40f49a38f10a5a5e7e82dbf9e0d"
990
 dependencies = [
1024
 dependencies = [
991
  "chrono",
1025
  "chrono",
992
  "futures",
1026
  "futures",
1001
 
1035
 
1002
 [[package]]
1036
 [[package]]
1003
 name = "influxdb_derive"
1037
 name = "influxdb_derive"
1004
-version = "0.3.0"
1038
+version = "0.4.0"
1005
 source = "registry+https://github.com/rust-lang/crates.io-index"
1039
 source = "registry+https://github.com/rust-lang/crates.io-index"
1006
-checksum = "bd351b85d6d79b8b73bda7452d8d9ac7da8a392f8b9eb0a4780b373539fb1e6e"
1040
+checksum = "321345ebf687827f6254b36bb3077f00bdee36f609905d1e65d5905cc92156ab"
1007
 dependencies = [
1041
 dependencies = [
1008
  "proc-macro2",
1042
  "proc-macro2",
1009
  "quote",
1043
  "quote",
1079
 
1113
 
1080
 [[package]]
1114
 [[package]]
1081
 name = "libc"
1115
 name = "libc"
1082
-version = "0.2.70"
1116
+version = "0.2.101"
1083
 source = "registry+https://github.com/rust-lang/crates.io-index"
1117
 source = "registry+https://github.com/rust-lang/crates.io-index"
1084
-checksum = "3baa92041a6fec78c687fa0cc2b3fae8884f743d672cf551bed1d6dac6988d0f"
1118
+checksum = "3cb00336871be5ed2c8ed44b60ae9959dc5b9f08539422ed43f09e34ecaeba21"
1085
 
1119
 
1086
 [[package]]
1120
 [[package]]
1087
 name = "libudev"
1121
 name = "libudev"
1119
  "sysfs_gpio",
1153
  "sysfs_gpio",
1120
 ]
1154
 ]
1121
 
1155
 
1156
+[[package]]
1157
+name = "lock_api"
1158
+version = "0.4.5"
1159
+source = "registry+https://github.com/rust-lang/crates.io-index"
1160
+checksum = "712a4d093c9976e24e7dbca41db895dabcbac38eb5f4045393d17a95bdfb1109"
1161
+dependencies = [
1162
+ "scopeguard",
1163
+]
1164
+
1122
 [[package]]
1165
 [[package]]
1123
 name = "log"
1166
 name = "log"
1124
-version = "0.4.8"
1167
+version = "0.4.14"
1125
 source = "registry+https://github.com/rust-lang/crates.io-index"
1168
 source = "registry+https://github.com/rust-lang/crates.io-index"
1126
-checksum = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
1169
+checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
1127
 dependencies = [
1170
 dependencies = [
1128
- "cfg-if 0.1.10",
1171
+ "cfg-if 1.0.0",
1172
+ "value-bag",
1129
 ]
1173
 ]
1130
 
1174
 
1131
 [[package]]
1175
 [[package]]
1193
  "winapi 0.2.8",
1237
  "winapi 0.2.8",
1194
 ]
1238
 ]
1195
 
1239
 
1240
+[[package]]
1241
+name = "mio"
1242
+version = "0.7.13"
1243
+source = "registry+https://github.com/rust-lang/crates.io-index"
1244
+checksum = "8c2bdb6314ec10835cd3293dd268473a835c02b7b352e788be788b3c6ca6bb16"
1245
+dependencies = [
1246
+ "libc",
1247
+ "log",
1248
+ "miow 0.3.7",
1249
+ "ntapi",
1250
+ "winapi 0.3.8",
1251
+]
1252
+
1196
 [[package]]
1253
 [[package]]
1197
 name = "mio-named-pipes"
1254
 name = "mio-named-pipes"
1198
 version = "0.1.6"
1255
 version = "0.1.6"
1200
 checksum = "f5e374eff525ce1c5b7687c4cef63943e7686524a387933ad27ca7ec43779cb3"
1257
 checksum = "f5e374eff525ce1c5b7687c4cef63943e7686524a387933ad27ca7ec43779cb3"
1201
 dependencies = [
1258
 dependencies = [
1202
  "log",
1259
  "log",
1203
- "mio",
1204
- "miow 0.3.3",
1260
+ "mio 0.6.22",
1261
+ "miow 0.3.7",
1205
  "winapi 0.3.8",
1262
  "winapi 0.3.8",
1206
 ]
1263
 ]
1207
 
1264
 
1211
 source = "registry+https://github.com/rust-lang/crates.io-index"
1268
 source = "registry+https://github.com/rust-lang/crates.io-index"
1212
 checksum = "a0f0c240805cd4c65aa97da44ad99df8bad922cb999d0e451b51fdec13a661fd"
1269
 checksum = "a0f0c240805cd4c65aa97da44ad99df8bad922cb999d0e451b51fdec13a661fd"
1213
 dependencies = [
1270
 dependencies = [
1214
- "mio",
1271
+ "mio 0.6.22",
1215
  "mio-named-pipes",
1272
  "mio-named-pipes",
1216
  "nix 0.17.0",
1273
  "nix 0.17.0",
1217
  "serialport",
1274
  "serialport",
1226
 dependencies = [
1283
 dependencies = [
1227
  "iovec",
1284
  "iovec",
1228
  "libc",
1285
  "libc",
1229
- "mio",
1286
+ "mio 0.6.22",
1230
 ]
1287
 ]
1231
 
1288
 
1232
 [[package]]
1289
 [[package]]
1243
 
1300
 
1244
 [[package]]
1301
 [[package]]
1245
 name = "miow"
1302
 name = "miow"
1246
-version = "0.3.3"
1303
+version = "0.3.7"
1247
 source = "registry+https://github.com/rust-lang/crates.io-index"
1304
 source = "registry+https://github.com/rust-lang/crates.io-index"
1248
-checksum = "396aa0f2003d7df8395cb93e09871561ccc3e785f0acb369170e8cc74ddf9226"
1305
+checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21"
1249
 dependencies = [
1306
 dependencies = [
1250
- "socket2",
1251
  "winapi 0.3.8",
1307
  "winapi 0.3.8",
1252
 ]
1308
 ]
1253
 
1309
 
1254
 [[package]]
1310
 [[package]]
1255
 name = "mqtt-protocol"
1311
 name = "mqtt-protocol"
1256
-version = "0.8.1"
1312
+version = "0.11.0"
1257
 source = "registry+https://github.com/rust-lang/crates.io-index"
1313
 source = "registry+https://github.com/rust-lang/crates.io-index"
1258
-checksum = "0ad527bd1d7917664e1f35f30ac9d0a01fa1425c52c66494a5b875e8b8848058"
1314
+checksum = "28e75553120607736d0a248f483fb0682e0279bb9a6f30a7c76c56a9a6ac9ade"
1259
 dependencies = [
1315
 dependencies = [
1260
  "byteorder",
1316
  "byteorder",
1261
  "lazy_static",
1317
  "lazy_static",
1262
  "log",
1318
  "log",
1263
  "regex",
1319
  "regex",
1320
+ "thiserror",
1264
 ]
1321
 ]
1265
 
1322
 
1266
 [[package]]
1323
 [[package]]
1333
  "futures",
1390
  "futures",
1334
  "nrf24l01-stick-protocol",
1391
  "nrf24l01-stick-protocol",
1335
  "thiserror",
1392
  "thiserror",
1336
- "tokio",
1393
+ "tokio 0.2.20",
1337
  "tokio-serial",
1394
  "tokio-serial",
1338
  "tokio-util",
1395
  "tokio-util",
1339
 ]
1396
 ]
1347
  "serde",
1404
  "serde",
1348
 ]
1405
 ]
1349
 
1406
 
1407
+[[package]]
1408
+name = "ntapi"
1409
+version = "0.3.4"
1410
+source = "registry+https://github.com/rust-lang/crates.io-index"
1411
+checksum = "7a31937dea023539c72ddae0e3571deadc1414b300483fa7aaec176168cfa9d2"
1412
+dependencies = [
1413
+ "winapi 0.3.8",
1414
+]
1415
+
1350
 [[package]]
1416
 [[package]]
1351
 name = "num-integer"
1417
 name = "num-integer"
1352
 version = "0.1.42"
1418
 version = "0.1.42"
1433
 source = "registry+https://github.com/rust-lang/crates.io-index"
1499
 source = "registry+https://github.com/rust-lang/crates.io-index"
1434
 checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72"
1500
 checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72"
1435
 
1501
 
1502
+[[package]]
1503
+name = "parking_lot"
1504
+version = "0.11.1"
1505
+source = "registry+https://github.com/rust-lang/crates.io-index"
1506
+checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb"
1507
+dependencies = [
1508
+ "instant",
1509
+ "lock_api",
1510
+ "parking_lot_core",
1511
+]
1512
+
1513
+[[package]]
1514
+name = "parking_lot_core"
1515
+version = "0.8.3"
1516
+source = "registry+https://github.com/rust-lang/crates.io-index"
1517
+checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018"
1518
+dependencies = [
1519
+ "cfg-if 1.0.0",
1520
+ "instant",
1521
+ "libc",
1522
+ "redox_syscall 0.2.10",
1523
+ "smallvec",
1524
+ "winapi 0.3.8",
1525
+]
1526
+
1436
 [[package]]
1527
 [[package]]
1437
 name = "percent-encoding"
1528
 name = "percent-encoding"
1438
 version = "2.1.0"
1529
 version = "2.1.0"
1533
 
1624
 
1534
 [[package]]
1625
 [[package]]
1535
 name = "ppv-lite86"
1626
 name = "ppv-lite86"
1536
-version = "0.2.6"
1627
+version = "0.2.10"
1537
 source = "registry+https://github.com/rust-lang/crates.io-index"
1628
 source = "registry+https://github.com/rust-lang/crates.io-index"
1538
-checksum = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b"
1629
+checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
1539
 
1630
 
1540
 [[package]]
1631
 [[package]]
1541
 name = "proc-macro-error"
1632
 name = "proc-macro-error"
1563
 
1654
 
1564
 [[package]]
1655
 [[package]]
1565
 name = "proc-macro-hack"
1656
 name = "proc-macro-hack"
1566
-version = "0.5.15"
1657
+version = "0.5.19"
1567
 source = "registry+https://github.com/rust-lang/crates.io-index"
1658
 source = "registry+https://github.com/rust-lang/crates.io-index"
1568
-checksum = "0d659fe7c6d27f25e9d80a1a094c223f5246f6a6596453e09d7229bf42750b63"
1659
+checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
1569
 
1660
 
1570
 [[package]]
1661
 [[package]]
1571
 name = "proc-macro-nested"
1662
 name = "proc-macro-nested"
1575
 
1666
 
1576
 [[package]]
1667
 [[package]]
1577
 name = "proc-macro2"
1668
 name = "proc-macro2"
1578
-version = "1.0.24"
1669
+version = "1.0.28"
1579
 source = "registry+https://github.com/rust-lang/crates.io-index"
1670
 source = "registry+https://github.com/rust-lang/crates.io-index"
1580
-checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71"
1671
+checksum = "5c7ed8b8c7b886ea3ed7dde405212185f423ab44682667c8c6dd14aa1d9f6612"
1581
 dependencies = [
1672
 dependencies = [
1582
  "unicode-xid",
1673
  "unicode-xid",
1583
 ]
1674
 ]
1590
  "xxtea-nostd",
1681
  "xxtea-nostd",
1591
 ]
1682
 ]
1592
 
1683
 
1593
-[[package]]
1594
-name = "quick-error"
1595
-version = "1.2.3"
1596
-source = "registry+https://github.com/rust-lang/crates.io-index"
1597
-checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
1598
-
1599
 [[package]]
1684
 [[package]]
1600
 name = "quote"
1685
 name = "quote"
1601
 version = "1.0.3"
1686
 version = "1.0.3"
1611
 source = "registry+https://github.com/rust-lang/crates.io-index"
1696
 source = "registry+https://github.com/rust-lang/crates.io-index"
1612
 checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
1697
 checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
1613
 dependencies = [
1698
 dependencies = [
1614
- "getrandom",
1699
+ "getrandom 0.1.14",
1700
+ "libc",
1701
+ "rand_chacha 0.2.2",
1702
+ "rand_core 0.5.1",
1703
+ "rand_hc 0.2.0",
1704
+]
1705
+
1706
+[[package]]
1707
+name = "rand"
1708
+version = "0.8.4"
1709
+source = "registry+https://github.com/rust-lang/crates.io-index"
1710
+checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8"
1711
+dependencies = [
1615
  "libc",
1712
  "libc",
1616
- "rand_chacha",
1617
- "rand_core",
1618
- "rand_hc",
1713
+ "rand_chacha 0.3.1",
1714
+ "rand_core 0.6.3",
1715
+ "rand_hc 0.3.1",
1619
 ]
1716
 ]
1620
 
1717
 
1621
 [[package]]
1718
 [[package]]
1625
 checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
1722
 checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
1626
 dependencies = [
1723
 dependencies = [
1627
  "ppv-lite86",
1724
  "ppv-lite86",
1628
- "rand_core",
1725
+ "rand_core 0.5.1",
1726
+]
1727
+
1728
+[[package]]
1729
+name = "rand_chacha"
1730
+version = "0.3.1"
1731
+source = "registry+https://github.com/rust-lang/crates.io-index"
1732
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
1733
+dependencies = [
1734
+ "ppv-lite86",
1735
+ "rand_core 0.6.3",
1629
 ]
1736
 ]
1630
 
1737
 
1631
 [[package]]
1738
 [[package]]
1634
 source = "registry+https://github.com/rust-lang/crates.io-index"
1741
 source = "registry+https://github.com/rust-lang/crates.io-index"
1635
 checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
1742
 checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
1636
 dependencies = [
1743
 dependencies = [
1637
- "getrandom",
1744
+ "getrandom 0.1.14",
1745
+]
1746
+
1747
+[[package]]
1748
+name = "rand_core"
1749
+version = "0.6.3"
1750
+source = "registry+https://github.com/rust-lang/crates.io-index"
1751
+checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
1752
+dependencies = [
1753
+ "getrandom 0.2.3",
1638
 ]
1754
 ]
1639
 
1755
 
1640
 [[package]]
1756
 [[package]]
1643
 source = "registry+https://github.com/rust-lang/crates.io-index"
1759
 source = "registry+https://github.com/rust-lang/crates.io-index"
1644
 checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
1760
 checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
1645
 dependencies = [
1761
 dependencies = [
1646
- "rand_core",
1762
+ "rand_core 0.5.1",
1763
+]
1764
+
1765
+[[package]]
1766
+name = "rand_hc"
1767
+version = "0.3.1"
1768
+source = "registry+https://github.com/rust-lang/crates.io-index"
1769
+checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7"
1770
+dependencies = [
1771
+ "rand_core 0.6.3",
1647
 ]
1772
 ]
1648
 
1773
 
1649
 [[package]]
1774
 [[package]]
1652
 source = "registry+https://github.com/rust-lang/crates.io-index"
1777
 source = "registry+https://github.com/rust-lang/crates.io-index"
1653
 checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84"
1778
 checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84"
1654
 
1779
 
1780
+[[package]]
1781
+name = "redox_syscall"
1782
+version = "0.2.10"
1783
+source = "registry+https://github.com/rust-lang/crates.io-index"
1784
+checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff"
1785
+dependencies = [
1786
+ "bitflags",
1787
+]
1788
+
1655
 [[package]]
1789
 [[package]]
1656
 name = "regex"
1790
 name = "regex"
1657
 version = "1.3.7"
1791
 version = "1.3.7"
1710
 source = "registry+https://github.com/rust-lang/crates.io-index"
1844
 source = "registry+https://github.com/rust-lang/crates.io-index"
1711
 checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2"
1845
 checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2"
1712
 
1846
 
1847
+[[package]]
1848
+name = "scopeguard"
1849
+version = "1.1.0"
1850
+source = "registry+https://github.com/rust-lang/crates.io-index"
1851
+checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
1852
+
1713
 [[package]]
1853
 [[package]]
1714
 name = "security-framework"
1854
 name = "security-framework"
1715
 version = "2.0.0"
1855
 version = "2.0.0"
1750
 
1890
 
1751
 [[package]]
1891
 [[package]]
1752
 name = "serde"
1892
 name = "serde"
1753
-version = "1.0.119"
1893
+version = "1.0.129"
1754
 source = "registry+https://github.com/rust-lang/crates.io-index"
1894
 source = "registry+https://github.com/rust-lang/crates.io-index"
1755
-checksum = "9bdd36f49e35b61d49efd8aa7fc068fd295961fd2286d0b2ee9a4c7a14e99cc3"
1895
+checksum = "d1f72836d2aa753853178eda473a3b9d8e4eefdaf20523b919677e6de489f8f1"
1756
 dependencies = [
1896
 dependencies = [
1757
  "serde_derive",
1897
  "serde_derive",
1758
 ]
1898
 ]
1759
 
1899
 
1760
 [[package]]
1900
 [[package]]
1761
 name = "serde_derive"
1901
 name = "serde_derive"
1762
-version = "1.0.119"
1902
+version = "1.0.129"
1763
 source = "registry+https://github.com/rust-lang/crates.io-index"
1903
 source = "registry+https://github.com/rust-lang/crates.io-index"
1764
-checksum = "552954ce79a059ddd5fd68c271592374bd15cab2274970380c000118aeffe1cd"
1904
+checksum = "e57ae87ad533d9a56427558b516d0adac283614e347abf85b0dc0cbbf0a249f3"
1765
 dependencies = [
1905
 dependencies = [
1766
  "proc-macro2",
1906
  "proc-macro2",
1767
  "quote",
1907
  "quote",
1876
 source = "registry+https://github.com/rust-lang/crates.io-index"
2016
 source = "registry+https://github.com/rust-lang/crates.io-index"
1877
 checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
2017
 checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
1878
 
2018
 
2019
+[[package]]
2020
+name = "smallvec"
2021
+version = "1.6.1"
2022
+source = "registry+https://github.com/rust-lang/crates.io-index"
2023
+checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e"
2024
+
1879
 [[package]]
2025
 [[package]]
1880
 name = "smol"
2026
 name = "smol"
1881
 version = "0.1.18"
2027
 version = "0.1.18"
1893
  "scoped-tls",
2039
  "scoped-tls",
1894
  "slab",
2040
  "slab",
1895
  "socket2",
2041
  "socket2",
1896
- "tokio",
2042
+ "tokio 0.2.20",
1897
  "wepoll-sys-stjepang",
2043
  "wepoll-sys-stjepang",
1898
  "winapi 0.3.8",
2044
  "winapi 0.3.8",
1899
 ]
2045
 ]
1906
 dependencies = [
2052
 dependencies = [
1907
  "cfg-if 0.1.10",
2053
  "cfg-if 0.1.10",
1908
  "libc",
2054
  "libc",
1909
- "redox_syscall",
2055
+ "redox_syscall 0.1.56",
1910
  "winapi 0.3.8",
2056
  "winapi 0.3.8",
1911
 ]
2057
 ]
1912
 
2058
 
2023
 
2169
 
2024
 [[package]]
2170
 [[package]]
2025
 name = "surf"
2171
 name = "surf"
2026
-version = "2.1.0"
2172
+version = "2.3.1"
2027
 source = "registry+https://github.com/rust-lang/crates.io-index"
2173
 source = "registry+https://github.com/rust-lang/crates.io-index"
2028
-checksum = "7189c787d96fe18fef704950de76d590022d9d70858a4a201e1f07a0666882ea"
2174
+checksum = "73f856d60bdb4679fc9ec516c34093484e963431b5016a8429f85a8e74b5ccaa"
2029
 dependencies = [
2175
 dependencies = [
2030
  "async-std",
2176
  "async-std",
2031
  "async-trait",
2177
  "async-trait",
2032
- "cfg-if 0.1.10",
2178
+ "cfg-if 1.0.0",
2033
  "futures-util",
2179
  "futures-util",
2180
+ "getrandom 0.2.3",
2034
  "http-client",
2181
  "http-client",
2035
  "http-types",
2182
  "http-types",
2036
  "log",
2183
  "log",
2037
  "mime_guess",
2184
  "mime_guess",
2038
  "once_cell",
2185
  "once_cell",
2039
- "pin-project-lite 0.1.5",
2186
+ "pin-project-lite 0.2.4",
2040
  "serde",
2187
  "serde",
2041
  "serde_json",
2188
  "serde_json",
2042
 ]
2189
 ]
2043
 
2190
 
2044
 [[package]]
2191
 [[package]]
2045
 name = "syn"
2192
 name = "syn"
2046
-version = "1.0.58"
2193
+version = "1.0.75"
2047
 source = "registry+https://github.com/rust-lang/crates.io-index"
2194
 source = "registry+https://github.com/rust-lang/crates.io-index"
2048
-checksum = "cc60a3d73ea6594cd712d830cc1f0390fd71542d8c8cd24e70cc54cdfd5e05d5"
2195
+checksum = "b7f58f7e8eaa0009c5fec437aabf511bd9933e4b2d7407bd05273c01a8906ea7"
2049
 dependencies = [
2196
 dependencies = [
2050
  "proc-macro2",
2197
  "proc-macro2",
2051
  "quote",
2198
  "quote",
2058
 source = "git+https://github.com/mgottschlag/rust-sysfs-gpio?branch=new-futures#c412bdc6d18910db8d66cea3db2dbad96af780b2"
2205
 source = "git+https://github.com/mgottschlag/rust-sysfs-gpio?branch=new-futures#c412bdc6d18910db8d66cea3db2dbad96af780b2"
2059
 dependencies = [
2206
 dependencies = [
2060
  "futures",
2207
  "futures",
2061
- "mio",
2208
+ "mio 0.6.22",
2062
  "nix 0.14.1",
2209
  "nix 0.14.1",
2063
  "pin-project-lite 0.1.5",
2210
  "pin-project-lite 0.1.5",
2064
- "tokio",
2211
+ "tokio 0.2.20",
2065
 ]
2212
 ]
2066
 
2213
 
2067
 [[package]]
2214
 [[package]]
2072
 dependencies = [
2219
 dependencies = [
2073
  "cfg-if 0.1.10",
2220
  "cfg-if 0.1.10",
2074
  "libc",
2221
  "libc",
2075
- "rand",
2076
- "redox_syscall",
2222
+ "rand 0.7.3",
2223
+ "redox_syscall 0.1.56",
2077
  "remove_dir_all",
2224
  "remove_dir_all",
2078
  "winapi 0.3.8",
2225
  "winapi 0.3.8",
2079
 ]
2226
 ]
2210
  "lazy_static",
2357
  "lazy_static",
2211
  "libc",
2358
  "libc",
2212
  "memchr",
2359
  "memchr",
2213
- "mio",
2360
+ "mio 0.6.22",
2214
  "mio-named-pipes",
2361
  "mio-named-pipes",
2215
  "mio-uds",
2362
  "mio-uds",
2216
  "num_cpus",
2363
  "num_cpus",
2217
  "pin-project-lite 0.1.5",
2364
  "pin-project-lite 0.1.5",
2218
  "signal-hook-registry",
2365
  "signal-hook-registry",
2219
  "slab",
2366
  "slab",
2220
- "tokio-macros",
2367
+ "tokio-macros 0.2.5",
2368
+ "winapi 0.3.8",
2369
+]
2370
+
2371
+[[package]]
2372
+name = "tokio"
2373
+version = "1.10.1"
2374
+source = "registry+https://github.com/rust-lang/crates.io-index"
2375
+checksum = "92036be488bb6594459f2e03b60e42df6f937fe6ca5c5ffdcb539c6b84dc40f5"
2376
+dependencies = [
2377
+ "autocfg",
2378
+ "bytes 1.0.1",
2379
+ "libc",
2380
+ "memchr",
2381
+ "mio 0.7.13",
2382
+ "num_cpus",
2383
+ "once_cell",
2384
+ "parking_lot",
2385
+ "pin-project-lite 0.2.4",
2386
+ "signal-hook-registry",
2387
+ "tokio-macros 1.3.0",
2221
  "winapi 0.3.8",
2388
  "winapi 0.3.8",
2222
 ]
2389
 ]
2223
 
2390
 
2232
  "syn",
2399
  "syn",
2233
 ]
2400
 ]
2234
 
2401
 
2402
+[[package]]
2403
+name = "tokio-macros"
2404
+version = "1.3.0"
2405
+source = "registry+https://github.com/rust-lang/crates.io-index"
2406
+checksum = "54473be61f4ebe4efd09cec9bd5d16fa51d70ea0192213d754d2d500457db110"
2407
+dependencies = [
2408
+ "proc-macro2",
2409
+ "quote",
2410
+ "syn",
2411
+]
2412
+
2235
 [[package]]
2413
 [[package]]
2236
 name = "tokio-serial"
2414
 name = "tokio-serial"
2237
 version = "4.3.3"
2415
 version = "4.3.3"
2239
 checksum = "0ad6436458f961b1345f55f2a771325f8dbdd9b5908285059d34a31e86779e38"
2417
 checksum = "0ad6436458f961b1345f55f2a771325f8dbdd9b5908285059d34a31e86779e38"
2240
 dependencies = [
2418
 dependencies = [
2241
  "mio-serial",
2419
  "mio-serial",
2242
- "tokio",
2420
+ "tokio 0.2.20",
2243
 ]
2421
 ]
2244
 
2422
 
2245
 [[package]]
2423
 [[package]]
2249
 checksum = "9a70f4fcd7b3b24fb194f837560168208f669ca8cb70d0c4b862944452396343"
2427
 checksum = "9a70f4fcd7b3b24fb194f837560168208f669ca8cb70d0c4b862944452396343"
2250
 dependencies = [
2428
 dependencies = [
2251
  "native-tls",
2429
  "native-tls",
2252
- "tokio",
2430
+ "tokio 0.2.20",
2253
 ]
2431
 ]
2254
 
2432
 
2255
 [[package]]
2433
 [[package]]
2263
  "futures-sink",
2441
  "futures-sink",
2264
  "log",
2442
  "log",
2265
  "pin-project-lite 0.1.5",
2443
  "pin-project-lite 0.1.5",
2266
- "tokio",
2444
+ "tokio 0.2.20",
2267
 ]
2445
 ]
2268
 
2446
 
2269
 [[package]]
2447
 [[package]]
2392
  "serde",
2570
  "serde",
2393
 ]
2571
 ]
2394
 
2572
 
2573
+[[package]]
2574
+name = "value-bag"
2575
+version = "1.0.0-alpha.7"
2576
+source = "registry+https://github.com/rust-lang/crates.io-index"
2577
+checksum = "dd320e1520f94261153e96f7534476ad869c14022aee1e59af7c778075d840ae"
2578
+dependencies = [
2579
+ "ctor",
2580
+ "version_check",
2581
+]
2582
+
2395
 [[package]]
2583
 [[package]]
2396
 name = "vcpkg"
2584
 name = "vcpkg"
2397
 version = "0.2.11"
2585
 version = "0.2.11"
2438
 source = "registry+https://github.com/rust-lang/crates.io-index"
2626
 source = "registry+https://github.com/rust-lang/crates.io-index"
2439
 checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
2627
 checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
2440
 
2628
 
2629
+[[package]]
2630
+name = "wasi"
2631
+version = "0.10.2+wasi-snapshot-preview1"
2632
+source = "registry+https://github.com/rust-lang/crates.io-index"
2633
+checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
2634
+
2441
 [[package]]
2635
 [[package]]
2442
 name = "wasm-bindgen"
2636
 name = "wasm-bindgen"
2443
 version = "0.2.69"
2637
 version = "0.2.69"

+ 11
- 12
base-station/software/Cargo.toml Visa fil

15
 linux-embedded-hal = "0.3"
15
 linux-embedded-hal = "0.3"
16
 embedded-nrf24l01 = { git = "https://github.com/mgottschlag/embedded-nrf24l01", branch = "wip" }
16
 embedded-nrf24l01 = { git = "https://github.com/mgottschlag/embedded-nrf24l01", branch = "wip" }
17
 embedded-hal = "0.2.3"
17
 embedded-hal = "0.2.3"
18
-mqtt-protocol = "0.8"
19
-env_logger = "0.7"
20
-log = "0.4"
18
+mqtt-protocol = "0.11"
19
+env_logger = "0.9"
20
+log = "0.4.14"
21
 thiserror = "1.0"
21
 thiserror = "1.0"
22
 protocol = { path = "../../common/rust-protocol" }
22
 protocol = { path = "../../common/rust-protocol" }
23
-rand = "0.7.3"
24
-tokio = { version = "0.2", features = [ "full" ] }
23
+rand = "0.8.4"
24
+tokio = { version = "1.10.1", features = [ "full" ] }
25
 sysfs_gpio = { version = "0.5.4", features = [ "use_tokio" ], optional = true }
25
 sysfs_gpio = { version = "0.5.4", features = [ "use_tokio" ], optional = true }
26
-futures = "0.3.5"
27
-futures-util = "0.3.5"
28
-nb = "0.1.2"
29
-gpio-cdev = { git = "https://github.com/mgottschlag/gpio-cdev", branch = "tokio", features = [ "async-tokio" ], optional = true }
30
-chrono = "0.4.11"
26
+futures = "0.3.16"
27
+futures-util = "0.3.16"
28
+gpio-cdev = { version = "0.4", features = [ "async-tokio" ], optional = true }
29
+chrono = "0.4.19"
31
 nrf24l01-stick-driver = { git = "https://github.com/mgottschlag/nrf24l01-stick", optional = true }
30
 nrf24l01-stick-driver = { git = "https://github.com/mgottschlag/nrf24l01-stick", optional = true }
32
-influxdb = { version = "0.3", features = [ "derive" ] }
33
-serde = { version = "1.0.119", features = ["derive"] }
31
+influxdb = { version = "0.4", features = [ "derive" ] }
32
+serde = { version = "1.0.129", features = ["derive"] }
34
 toml = "0.5.8"
33
 toml = "0.5.8"
35
 structopt = "0.3"
34
 structopt = "0.3"
36
 
35
 

+ 0
- 5
base-station/software/src/config.rs Visa fil

65
     #[error("Invalid settings")]
65
     #[error("Invalid settings")]
66
     Settings(String),
66
     Settings(String),
67
 }
67
 }
68
-
69
-fn default_disabled() -> bool {
70
-    // https://github.com/serde-rs/serde/issues/1030
71
-    true
72
-}

+ 2
- 2
base-station/software/src/main.rs Visa fil

16
 use rand::{rngs::ThreadRng, Rng};
16
 use rand::{rngs::ThreadRng, Rng};
17
 use structopt::StructOpt;
17
 use structopt::StructOpt;
18
 use tokio::sync::Mutex;
18
 use tokio::sync::Mutex;
19
-use tokio::time::delay_for;
19
+use tokio::time::sleep;
20
 
20
 
21
 use config::Config;
21
 use config::Config;
22
 use current::CurrentValues;
22
 use current::CurrentValues;
120
     }
120
     }
121
 
121
 
122
     async fn handle_get_salt(&mut self, device_id: u8) {
122
     async fn handle_get_salt(&mut self, device_id: u8) {
123
-        delay_for(Duration::from_millis(1)).await;
123
+        sleep(Duration::from_millis(1)).await;
124
         let salt = (self.rng.gen::<u64>() & !0xff & !(1 << 63)) | device_id as u64;
124
         let salt = (self.rng.gen::<u64>() & !0xff & !(1 << 63)) | device_id as u64;
125
         // TODO: Store the salt as the expected salt in Radio.
125
         // TODO: Store the salt as the expected salt in Radio.
126
         self.radio
126
         self.radio

+ 9
- 9
base-station/software/src/radio/gpio.rs Visa fil

5
 use embedded_hal::blocking::spi::Transfer;
5
 use embedded_hal::blocking::spi::Transfer;
6
 use embedded_hal::digital::v2::OutputPin;
6
 use embedded_hal::digital::v2::OutputPin;
7
 use embedded_nrf24l01::{Configuration, CrcMode, DataRate, RxMode, NRF24L01};
7
 use embedded_nrf24l01::{Configuration, CrcMode, DataRate, RxMode, NRF24L01};
8
-use futures_util::stream::StreamExt;
8
+use futures::stream::StreamExt;
9
 use gpio_cdev::{AsyncLineEventHandle, Chip, EventRequestFlags, LineRequestFlags};
9
 use gpio_cdev::{AsyncLineEventHandle, Chip, EventRequestFlags, LineRequestFlags};
10
 use linux_embedded_hal::spidev::{SpiModeFlags, Spidev, SpidevOptions};
10
 use linux_embedded_hal::spidev::{SpiModeFlags, Spidev, SpidevOptions};
11
 use linux_embedded_hal::sysfs_gpio::{Direction, Error as GpioError};
11
 use linux_embedded_hal::sysfs_gpio::{Direction, Error as GpioError};
12
-use linux_embedded_hal::Pin;
12
+use linux_embedded_hal::{nb, Pin};
13
 use log::{error, info};
13
 use log::{error, info};
14
 use protocol::Packet;
14
 use protocol::Packet;
15
 use rand::Rng;
15
 use rand::Rng;
16
 use tokio::select;
16
 use tokio::select;
17
 use tokio::sync::mpsc::{UnboundedReceiver, UnboundedSender};
17
 use tokio::sync::mpsc::{UnboundedReceiver, UnboundedSender};
18
-use tokio::time::delay_for;
18
+use tokio::time::sleep;
19
 
19
 
20
 use super::super::spi::EmbeddedHalSpidev;
20
 use super::super::spi::EmbeddedHalSpidev;
21
 use super::get_key;
21
 use super::get_key;
100
         loop {
100
         loop {
101
             cs.set_high()?;
101
             cs.set_high()?;
102
             pwr.set_high()?;
102
             pwr.set_high()?;
103
-            delay_for(Duration::from_millis(100)).await;
103
+            sleep(Duration::from_millis(100)).await;
104
             pwr.set_low()?;
104
             pwr.set_low()?;
105
-            delay_for(Duration::from_millis(50)).await;
105
+            sleep(Duration::from_millis(50)).await;
106
 
106
 
107
             cs.set_low()?;
107
             cs.set_low()?;
108
             let mut read_aw = [0x03, 0x00];
108
             let mut read_aw = [0x03, 0x00];
113
                 }
113
                 }
114
             }
114
             }
115
             info!("radio not yet responding correctly ({:x})...", read_aw[1]);
115
             info!("radio not yet responding correctly ({:x})...", read_aw[1]);
116
-            delay_for(Duration::from_millis(1000)).await;
116
+            sleep(Duration::from_millis(1000)).await;
117
         }
117
         }
118
 
118
 
119
         // Initialize the radio module.
119
         // Initialize the radio module.
149
                     Ok(_) => break,
149
                     Ok(_) => break,
150
                     Err(e) => error!("Radio reinitialization failed: {:?}", e),
150
                     Err(e) => error!("Radio reinitialization failed: {:?}", e),
151
                 }
151
                 }
152
-                delay_for(Duration::from_secs(3)).await;
152
+                sleep(Duration::from_secs(3)).await;
153
             }
153
             }
154
         }
154
         }
155
     }
155
     }
163
                     // interrupt pin is high again.
163
                     // interrupt pin is high again.
164
                     self.receive_packets().await?;
164
                     self.receive_packets().await?;
165
                 },
165
                 },
166
-                packet = self.tx.next() => {
166
+                packet = self.tx.recv() => {
167
                     let (device_id, packet) = packet.unwrap();
167
                     let (device_id, packet) = packet.unwrap();
168
                     // Switch to TX mode and send the packet.
168
                     // Switch to TX mode and send the packet.
169
                     self.send_packet(device_id, packet).await?;
169
                     self.send_packet(device_id, packet).await?;
249
 
249
 
250
             // Wait for the packet to be sent and check whether it was acknowledged.
250
             // Wait for the packet to be sent and check whether it was acknowledged.
251
             loop {
251
             loop {
252
-                delay_for(Duration::from_millis(1)).await;
252
+                sleep(Duration::from_millis(1)).await;
253
                 match tx.poll_send() {
253
                 match tx.poll_send() {
254
                     Ok(status) => {
254
                     Ok(status) => {
255
                         if !status {
255
                         if !status {

+ 3
- 3
base-station/software/src/tsdb.rs Visa fil

102
 struct TemperatureReading {
102
 struct TemperatureReading {
103
     time: DateTime<Utc>,
103
     time: DateTime<Utc>,
104
     temperature: f32,
104
     temperature: f32,
105
-    #[tag]
105
+    #[influxdb(tag)]
106
     location: String,
106
     location: String,
107
 }
107
 }
108
 
108
 
110
 struct PressureReading {
110
 struct PressureReading {
111
     time: DateTime<Utc>,
111
     time: DateTime<Utc>,
112
     pressure: f32,
112
     pressure: f32,
113
-    #[tag]
113
+    #[influxdb(tag)]
114
     location: String,
114
     location: String,
115
 }
115
 }
116
 
116
 
118
 struct HumidityReading {
118
 struct HumidityReading {
119
     time: DateTime<Utc>,
119
     time: DateTime<Utc>,
120
     humidity: f32,
120
     humidity: f32,
121
-    #[tag]
121
+    #[influxdb(tag)]
122
     location: String,
122
     location: String,
123
 }
123
 }
124
 
124
 

Loading…
Avbryt
Spara