瀏覽代碼

display: Fix project name and add epd-waveshare dependency.

Mathias Gottschlag 5 年之前
父節點
當前提交
ea8c4889f0
共有 4 個檔案被更改,包括 71 行新增43 行删除
  1. 66
    28
      display/firmware/Cargo.lock
  2. 3
    13
      display/firmware/Cargo.toml
  3. 1
    1
      display/firmware/gdb.sh
  4. 1
    1
      display/firmware/program.sh

+ 66
- 28
display/firmware/Cargo.lock 查看文件

32
 ]
32
 ]
33
 
33
 
34
 [[package]]
34
 [[package]]
35
-name = "base-station-firmware"
36
-version = "0.0.1"
37
-dependencies = [
38
- "bme280 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
39
- "cortex-m 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
40
- "cortex-m-rt 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
41
- "cortex-m-rtfm 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
42
- "cortex-m-semihosting 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
43
- "embedded-epd 0.1.0 (git+https://github.com/mgottschlag/rust-embedded-epd)",
44
- "embedded-hal 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
45
- "epd-assets 0.1.0 (git+https://github.com/mgottschlag/rust-epd-assets)",
46
- "mkl25z4 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
47
- "mkl25z4-hal 0.1.0 (git+https://github.com/mgottschlag/mkl25z4-hal)",
48
- "nb 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
49
- "panic-semihosting 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
50
- "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
51
-]
35
+name = "bitfield"
36
+version = "0.13.2"
37
+source = "registry+https://github.com/rust-lang/crates.io-index"
52
 
38
 
53
 [[package]]
39
 [[package]]
54
 name = "bitflags"
40
 name = "bitflags"
97
 version = "0.1.8"
83
 version = "0.1.8"
98
 source = "registry+https://github.com/rust-lang/crates.io-index"
84
 source = "registry+https://github.com/rust-lang/crates.io-index"
99
 dependencies = [
85
 dependencies = [
100
- "proc-macro2 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
86
+ "proc-macro2 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
101
  "quote 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
87
  "quote 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
102
  "syn 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)",
88
  "syn 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)",
103
 ]
89
 ]
110
  "cortex-m 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
96
  "cortex-m 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
111
  "cortex-m-rt 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
97
  "cortex-m-rt 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
112
  "cortex-m-rtfm-macros 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
98
  "cortex-m-rtfm-macros 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
113
- "heapless 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
99
+ "heapless 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
114
  "rtfm-core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
100
  "rtfm-core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
115
 ]
101
 ]
116
 
102
 
119
 version = "0.5.0"
105
 version = "0.5.0"
120
 source = "registry+https://github.com/rust-lang/crates.io-index"
106
 source = "registry+https://github.com/rust-lang/crates.io-index"
121
 dependencies = [
107
 dependencies = [
122
- "proc-macro2 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
108
+ "proc-macro2 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
123
  "quote 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
109
  "quote 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
124
  "rtfm-syntax 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
110
  "rtfm-syntax 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
125
  "syn 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)",
111
  "syn 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)",
133
  "cortex-m 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
119
  "cortex-m 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
134
 ]
120
 ]
135
 
121
 
122
+[[package]]
123
+name = "display-firmware"
124
+version = "0.0.1"
125
+dependencies = [
126
+ "bme280 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
127
+ "cortex-m 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
128
+ "cortex-m-rt 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
129
+ "cortex-m-rtfm 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
130
+ "cortex-m-semihosting 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
131
+ "embedded-epd 0.1.0 (git+https://github.com/mgottschlag/rust-embedded-epd)",
132
+ "embedded-hal 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
133
+ "embedded-nrf24l01 0.2.0 (git+https://github.com/astro/embedded-nrf24l01)",
134
+ "epd-assets 0.1.0 (git+https://github.com/mgottschlag/rust-epd-assets)",
135
+ "epd-waveshare 0.4.0 (git+https://github.com/mgottschlag/epd-waveshare.git?branch=streaming)",
136
+ "mkl25z4 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
137
+ "mkl25z4-hal 0.1.0 (git+https://github.com/mgottschlag/mkl25z4-hal)",
138
+ "nb 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
139
+ "panic-semihosting 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
140
+ "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
141
+]
142
+
136
 [[package]]
143
 [[package]]
137
 name = "embedded-epd"
144
 name = "embedded-epd"
138
 version = "0.1.0"
145
 version = "0.1.0"
142
  "nb 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
149
  "nb 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
143
 ]
150
 ]
144
 
151
 
152
+[[package]]
153
+name = "embedded-graphics"
154
+version = "0.6.2"
155
+source = "registry+https://github.com/rust-lang/crates.io-index"
156
+dependencies = [
157
+ "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
158
+]
159
+
145
 [[package]]
160
 [[package]]
146
 name = "embedded-hal"
161
 name = "embedded-hal"
147
 version = "0.2.3"
162
 version = "0.2.3"
151
  "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
166
  "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
152
 ]
167
 ]
153
 
168
 
169
+[[package]]
170
+name = "embedded-nrf24l01"
171
+version = "0.2.0"
172
+source = "git+https://github.com/astro/embedded-nrf24l01#0998f622c99d48a3d90261e0eabeb5e84d6f30a0"
173
+dependencies = [
174
+ "bitfield 0.13.2 (registry+https://github.com/rust-lang/crates.io-index)",
175
+ "embedded-hal 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
176
+]
177
+
154
 [[package]]
178
 [[package]]
155
 name = "epd-assets"
179
 name = "epd-assets"
156
 version = "0.1.0"
180
 version = "0.1.0"
160
  "lodepng 2.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
184
  "lodepng 2.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
161
 ]
185
 ]
162
 
186
 
187
+[[package]]
188
+name = "epd-waveshare"
189
+version = "0.4.0"
190
+source = "git+https://github.com/mgottschlag/epd-waveshare.git?branch=streaming#fc18e6f6fa078312879ec978729390ca4a6ab70a"
191
+dependencies = [
192
+ "embedded-graphics 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
193
+ "embedded-hal 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
194
+]
195
+
163
 [[package]]
196
 [[package]]
164
 name = "freetype-rs"
197
 name = "freetype-rs"
165
 version = "0.19.1"
198
 version = "0.19.1"
206
 
239
 
207
 [[package]]
240
 [[package]]
208
 name = "heapless"
241
 name = "heapless"
209
-version = "0.5.3"
242
+version = "0.5.4"
210
 source = "registry+https://github.com/rust-lang/crates.io-index"
243
 source = "registry+https://github.com/rust-lang/crates.io-index"
211
 dependencies = [
244
 dependencies = [
212
  "as-slice 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
245
  "as-slice 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
213
  "generic-array 0.13.2 (registry+https://github.com/rust-lang/crates.io-index)",
246
  "generic-array 0.13.2 (registry+https://github.com/rust-lang/crates.io-index)",
214
  "hash32 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
247
  "hash32 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
248
+ "stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
215
 ]
249
 ]
216
 
250
 
217
 [[package]]
251
 [[package]]
261
 [[package]]
295
 [[package]]
262
 name = "mkl25z4-hal"
296
 name = "mkl25z4-hal"
263
 version = "0.1.0"
297
 version = "0.1.0"
264
-source = "git+https://github.com/mgottschlag/mkl25z4-hal#69f41e663e7e124adb0813793bf26d8232875ef1"
298
+source = "git+https://github.com/mgottschlag/mkl25z4-hal#80bcfffaef6da16a8257cc8478dba026f618c5f0"
265
 dependencies = [
299
 dependencies = [
266
  "cortex-m 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
300
  "cortex-m 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
267
  "embedded-hal 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
301
  "embedded-hal 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
291
 
325
 
292
 [[package]]
326
 [[package]]
293
 name = "proc-macro2"
327
 name = "proc-macro2"
294
-version = "1.0.9"
328
+version = "1.0.10"
295
 source = "registry+https://github.com/rust-lang/crates.io-index"
329
 source = "registry+https://github.com/rust-lang/crates.io-index"
296
 dependencies = [
330
 dependencies = [
297
  "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
331
  "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
302
 version = "1.0.3"
336
 version = "1.0.3"
303
 source = "registry+https://github.com/rust-lang/crates.io-index"
337
 source = "registry+https://github.com/rust-lang/crates.io-index"
304
 dependencies = [
338
 dependencies = [
305
- "proc-macro2 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
339
+ "proc-macro2 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
306
 ]
340
 ]
307
 
341
 
308
 [[package]]
342
 [[package]]
326
 source = "registry+https://github.com/rust-lang/crates.io-index"
360
 source = "registry+https://github.com/rust-lang/crates.io-index"
327
 dependencies = [
361
 dependencies = [
328
  "indexmap 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
362
  "indexmap 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
329
- "proc-macro2 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
363
+ "proc-macro2 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
330
  "syn 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)",
364
  "syn 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)",
331
 ]
365
 ]
332
 
366
 
361
 version = "1.0.17"
395
 version = "1.0.17"
362
 source = "registry+https://github.com/rust-lang/crates.io-index"
396
 source = "registry+https://github.com/rust-lang/crates.io-index"
363
 dependencies = [
397
 dependencies = [
364
- "proc-macro2 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
398
+ "proc-macro2 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
365
  "quote 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
399
  "quote 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
366
  "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
400
  "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
367
 ]
401
 ]
404
 "checksum as-slice 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "37dfb65bc03b2bc85ee827004f14a6817e04160e3b1a28931986a666a9290e70"
438
 "checksum as-slice 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "37dfb65bc03b2bc85ee827004f14a6817e04160e3b1a28931986a666a9290e70"
405
 "checksum autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d"
439
 "checksum autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d"
406
 "checksum bare-metal 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "5deb64efa5bd81e31fcd1938615a6d98c82eafcbcd787162b6f63b91d6bac5b3"
440
 "checksum bare-metal 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "5deb64efa5bd81e31fcd1938615a6d98c82eafcbcd787162b6f63b91d6bac5b3"
441
+"checksum bitfield 0.13.2 (registry+https://github.com/rust-lang/crates.io-index)" = "46afbd2983a5d5a7bd740ccb198caf5b82f45c40c09c0eed36052d91cb92e719"
407
 "checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
442
 "checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
408
 "checksum bme280 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bc93357f2a5603736e2c1f1ba8e18e9ec80efa7fdade5d6a37c11362b76363f4"
443
 "checksum bme280 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bc93357f2a5603736e2c1f1ba8e18e9ec80efa7fdade5d6a37c11362b76363f4"
409
 "checksum byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de"
444
 "checksum byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de"
415
 "checksum cortex-m-rtfm-macros 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c62092f6ff344e9b0adb748f0302ed69889ba2fae1fce446e3788d4726ea73bb"
450
 "checksum cortex-m-rtfm-macros 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c62092f6ff344e9b0adb748f0302ed69889ba2fae1fce446e3788d4726ea73bb"
416
 "checksum cortex-m-semihosting 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "113ef0ecffee2b62b58f9380f4469099b30e9f9cbee2804771b4203ba1762cfa"
451
 "checksum cortex-m-semihosting 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "113ef0ecffee2b62b58f9380f4469099b30e9f9cbee2804771b4203ba1762cfa"
417
 "checksum embedded-epd 0.1.0 (git+https://github.com/mgottschlag/rust-embedded-epd)" = "<none>"
452
 "checksum embedded-epd 0.1.0 (git+https://github.com/mgottschlag/rust-embedded-epd)" = "<none>"
453
+"checksum embedded-graphics 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "40a69991ceb896bd4810a0cf2bcc46fc94b7860573c71f965d8e5b3d66942fed"
418
 "checksum embedded-hal 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ee4908a155094da7723c2d60d617b820061e3b4efcc3d9e293d206a5a76c170b"
454
 "checksum embedded-hal 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ee4908a155094da7723c2d60d617b820061e3b4efcc3d9e293d206a5a76c170b"
455
+"checksum embedded-nrf24l01 0.2.0 (git+https://github.com/astro/embedded-nrf24l01)" = "<none>"
419
 "checksum epd-assets 0.1.0 (git+https://github.com/mgottschlag/rust-epd-assets)" = "<none>"
456
 "checksum epd-assets 0.1.0 (git+https://github.com/mgottschlag/rust-epd-assets)" = "<none>"
457
+"checksum epd-waveshare 0.4.0 (git+https://github.com/mgottschlag/epd-waveshare.git?branch=streaming)" = "<none>"
420
 "checksum freetype-rs 0.19.1 (registry+https://github.com/rust-lang/crates.io-index)" = "28cc92a7040ee7b631e4279e263f9a83aedc1eb6085c68d8ca4d072b5644e705"
458
 "checksum freetype-rs 0.19.1 (registry+https://github.com/rust-lang/crates.io-index)" = "28cc92a7040ee7b631e4279e263f9a83aedc1eb6085c68d8ca4d072b5644e705"
421
 "checksum freetype-sys 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0f9c8666cce7cf6e51a290623647febfbab92480b4c3e0f495cb9d4d312b5d38"
459
 "checksum freetype-sys 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0f9c8666cce7cf6e51a290623647febfbab92480b4c3e0f495cb9d4d312b5d38"
422
 "checksum generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec"
460
 "checksum generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec"
423
 "checksum generic-array 0.13.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0ed1e761351b56f54eb9dcd0cfaca9fd0daecf93918e1cfc01c8a3d26ee7adcd"
461
 "checksum generic-array 0.13.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0ed1e761351b56f54eb9dcd0cfaca9fd0daecf93918e1cfc01c8a3d26ee7adcd"
424
 "checksum hash32 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d4041af86e63ac4298ce40e5cca669066e75b6f1aa3390fe2561ffa5e1d9f4cc"
462
 "checksum hash32 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d4041af86e63ac4298ce40e5cca669066e75b6f1aa3390fe2561ffa5e1d9f4cc"
425
-"checksum heapless 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "10b591a0032f114b7a77d4fbfab452660c553055515b7d7ece355db080d19087"
463
+"checksum heapless 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8ffa511365b12346c5fbe759d82f80d3aa70d9f1ba01955594f84a1a6bbab985"
426
 "checksum indexmap 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "076f042c5b7b98f31d205f1249267e12a6518c1481e9dae9764af19b707d2292"
464
 "checksum indexmap 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "076f042c5b7b98f31d205f1249267e12a6518c1481e9dae9764af19b707d2292"
427
 "checksum libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)" = "dea0c0405123bba743ee3f91f49b1c7cfb684eef0da0a50110f758ccf24cdff0"
465
 "checksum libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)" = "dea0c0405123bba743ee3f91f49b1c7cfb684eef0da0a50110f758ccf24cdff0"
428
 "checksum libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)" = "2eb5e43362e38e2bca2fd5f5134c4d4564a23a5c28e9b95411652021a8675ebe"
466
 "checksum libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)" = "2eb5e43362e38e2bca2fd5f5134c4d4564a23a5c28e9b95411652021a8675ebe"
432
 "checksum nb 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b1411551beb3c11dedfb0a90a0fa256b47d28b9ec2cdff34c25a2fa59e45dbdc"
470
 "checksum nb 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b1411551beb3c11dedfb0a90a0fa256b47d28b9ec2cdff34c25a2fa59e45dbdc"
433
 "checksum panic-semihosting 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c03864ac862876c16a308f5286f4aa217f1a69ac45df87ad3cd2847f818a642c"
471
 "checksum panic-semihosting 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c03864ac862876c16a308f5286f4aa217f1a69ac45df87ad3cd2847f818a642c"
434
 "checksum pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677"
472
 "checksum pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677"
435
-"checksum proc-macro2 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)" = "6c09721c6781493a2a492a96b5a5bf19b65917fe6728884e7c44dd0c60ca3435"
473
+"checksum proc-macro2 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)" = "df246d292ff63439fea9bc8c0a270bed0e390d5ebd4db4ba15aba81111b5abe3"
436
 "checksum quote 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2bdc6c187c65bca4260c9011c9e3132efe4909da44726bad24cf7572ae338d7f"
474
 "checksum quote 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2bdc6c187c65bca4260c9011c9e3132efe4909da44726bad24cf7572ae338d7f"
437
 "checksum r0 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e2a38df5b15c8d5c7e8654189744d8e396bddc18ad48041a500ce52d6948941f"
475
 "checksum r0 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e2a38df5b15c8d5c7e8654189744d8e396bddc18ad48041a500ce52d6948941f"
438
 "checksum rgb 0.8.16 (registry+https://github.com/rust-lang/crates.io-index)" = "5ec4ab2cf0b27e111e266e161cf7f9efd20125a161190da1c0945c4a4408fef3"
476
 "checksum rgb 0.8.16 (registry+https://github.com/rust-lang/crates.io-index)" = "5ec4ab2cf0b27e111e266e161cf7f9efd20125a161190da1c0945c4a4408fef3"

+ 3
- 13
display/firmware/Cargo.toml 查看文件

4
 description = "smarthome base station firmware"
4
 description = "smarthome base station firmware"
5
 keywords = ["arm", "cortex-m"]
5
 keywords = ["arm", "cortex-m"]
6
 license = "MIT"
6
 license = "MIT"
7
-name = "base-station-firmware"
7
+name = "display-firmware"
8
 version = "0.0.1"
8
 version = "0.0.1"
9
 build = "build.rs"
9
 build = "build.rs"
10
 edition = "2018"
10
 edition = "2018"
22
 nb = "0.1.2"
22
 nb = "0.1.2"
23
 embedded-epd = { git = "https://github.com/mgottschlag/rust-embedded-epd" }
23
 embedded-epd = { git = "https://github.com/mgottschlag/rust-embedded-epd" }
24
 bme280 = "0.2.1"
24
 bme280 = "0.2.1"
25
+embedded-nrf24l01 = { git = "https://github.com/astro/embedded-nrf24l01" }
26
+epd-waveshare = { git = "https://github.com/mgottschlag/epd-waveshare.git", branch = "streaming" }
25
 
27
 
26
 [dependencies.void]
28
 [dependencies.void]
27
 default-features = false
29
 default-features = false
30
 [build-dependencies]
32
 [build-dependencies]
31
 epd-assets = { git = "https://github.com/mgottschlag/rust-epd-assets" }
33
 epd-assets = { git = "https://github.com/mgottschlag/rust-epd-assets" }
32
 
34
 
33
-#[patch."https://github.com/mgottschlag/mkl25z4-hal"]
34
-#mkl25z4-hal = { path = "/home/mathias/Projects/microcontroller/mkl25z4-hal" }
35
-
36
-#[patch."https://github.com/mgottschlag/mkl25z4"]
37
-#mkl25z4 = { path = "/home/mathias/Projects/microcontroller/mkl25z4" }
38
-
39
-#[patch."https://github.com/mgottschlag/rust-embedded-epd"]
40
-#embedded-epd = { path = "/home/mathias/Projects/microcontroller/rust-embedded-epd" }
41
-
42
-#[patch."https://github.com/mgottschlag/rust-epd-assets"]
43
-#epd-assets = { path = "/home/mathias/Projects/microcontroller/rust-epd-assets" }
44
-
45
 [profile]
35
 [profile]
46
 [profile.release]
36
 [profile.release]
47
 debug = true
37
 debug = true

+ 1
- 1
display/firmware/gdb.sh 查看文件

1
 #!/bin/sh
1
 #!/bin/sh
2
-arm-none-eabi-gdb target/thumbv6m-none-eabi/release/smartclock-firmware
2
+arm-none-eabi-gdb target/thumbv6m-none-eabi/release/display-firmware

+ 1
- 1
display/firmware/program.sh 查看文件

1
 #!/bin/sh
1
 #!/bin/sh
2
-openocd -f interface/cmsis-dap.cfg -f target/kl25.cfg -c "program target/thumbv6m-none-eabi/release/smartclock-firmware reset exit"
2
+openocd -f interface/cmsis-dap.cfg -f target/kl25.cfg -c "program target/thumbv6m-none-eabi/release/display-firmware reset exit"

Loading…
取消
儲存