Browse Source

display: cargo update, and use tinygfx instead of embedded-epd library.

Mathias Gottschlag 5 years ago
parent
commit
86f451d51c

+ 80
- 72
display/firmware/Cargo.lock View File

56
 
56
 
57
 [[package]]
57
 [[package]]
58
 name = "cc"
58
 name = "cc"
59
-version = "1.0.50"
59
+version = "1.0.52"
60
 source = "registry+https://github.com/rust-lang/crates.io-index"
60
 source = "registry+https://github.com/rust-lang/crates.io-index"
61
 
61
 
62
+[[package]]
63
+name = "cmake"
64
+version = "0.1.42"
65
+source = "registry+https://github.com/rust-lang/crates.io-index"
66
+dependencies = [
67
+ "cc 1.0.52 (registry+https://github.com/rust-lang/crates.io-index)",
68
+]
69
+
62
 [[package]]
70
 [[package]]
63
 name = "cortex-m"
71
 name = "cortex-m"
64
 version = "0.6.2"
72
 version = "0.6.2"
84
 source = "registry+https://github.com/rust-lang/crates.io-index"
92
 source = "registry+https://github.com/rust-lang/crates.io-index"
85
 dependencies = [
93
 dependencies = [
86
  "proc-macro2 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
94
  "proc-macro2 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
87
- "quote 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
88
- "syn 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)",
95
+ "quote 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
96
+ "syn 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)",
89
 ]
97
 ]
90
 
98
 
91
 [[package]]
99
 [[package]]
106
 source = "registry+https://github.com/rust-lang/crates.io-index"
114
 source = "registry+https://github.com/rust-lang/crates.io-index"
107
 dependencies = [
115
 dependencies = [
108
  "proc-macro2 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
116
  "proc-macro2 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
109
- "quote 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
117
+ "quote 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
110
  "rtfm-syntax 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
118
  "rtfm-syntax 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
111
- "syn 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)",
119
+ "syn 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)",
112
 ]
120
 ]
113
 
121
 
114
 [[package]]
122
 [[package]]
128
  "cortex-m-rt 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
136
  "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)",
137
  "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)",
138
  "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)",
139
  "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)",
140
  "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)",
141
  "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)",
142
  "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)",
143
  "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)",
144
  "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)",
145
  "panic-semihosting 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
146
+ "tinygfx 0.1.0 (git+https://github.com/mgottschlag/tinygfx)",
147
+ "tinygfx-assets 0.1.0 (git+https://github.com/mgottschlag/tinygfx)",
140
  "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
148
  "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
141
 ]
149
 ]
142
 
150
 
143
-[[package]]
144
-name = "embedded-epd"
145
-version = "0.1.0"
146
-source = "git+https://github.com/mgottschlag/rust-embedded-epd#5ce5a2fd7b84a86938680adab393132d68d01e77"
147
-dependencies = [
148
- "embedded-hal 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
149
- "nb 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
150
-]
151
-
152
 [[package]]
151
 [[package]]
153
 name = "embedded-graphics"
152
 name = "embedded-graphics"
154
 version = "0.6.2"
153
 version = "0.6.2"
175
  "embedded-hal 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
174
  "embedded-hal 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
176
 ]
175
 ]
177
 
176
 
178
-[[package]]
179
-name = "epd-assets"
180
-version = "0.1.0"
181
-source = "git+https://github.com/mgottschlag/rust-epd-assets#3feee66fa2b6885525cb829045102f2dae1b8521"
182
-dependencies = [
183
- "freetype-rs 0.19.1 (registry+https://github.com/rust-lang/crates.io-index)",
184
- "lodepng 2.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
185
-]
186
-
187
 [[package]]
177
 [[package]]
188
 name = "epd-waveshare"
178
 name = "epd-waveshare"
189
 version = "0.4.0"
179
 version = "0.4.0"
195
 
185
 
196
 [[package]]
186
 [[package]]
197
 name = "freetype-rs"
187
 name = "freetype-rs"
198
-version = "0.19.1"
188
+version = "0.24.0"
199
 source = "registry+https://github.com/rust-lang/crates.io-index"
189
 source = "registry+https://github.com/rust-lang/crates.io-index"
200
 dependencies = [
190
 dependencies = [
201
  "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
191
  "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
202
- "freetype-sys 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
203
- "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
192
+ "freetype-sys 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
193
+ "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)",
204
 ]
194
 ]
205
 
195
 
206
 [[package]]
196
 [[package]]
207
 name = "freetype-sys"
197
 name = "freetype-sys"
208
-version = "0.7.1"
198
+version = "0.11.0"
209
 source = "registry+https://github.com/rust-lang/crates.io-index"
199
 source = "registry+https://github.com/rust-lang/crates.io-index"
210
 dependencies = [
200
 dependencies = [
211
- "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
212
- "libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
201
+ "cmake 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
202
+ "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)",
213
  "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
203
  "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
214
 ]
204
 ]
215
 
205
 
218
 version = "0.12.3"
208
 version = "0.12.3"
219
 source = "registry+https://github.com/rust-lang/crates.io-index"
209
 source = "registry+https://github.com/rust-lang/crates.io-index"
220
 dependencies = [
210
 dependencies = [
221
- "typenum 1.11.2 (registry+https://github.com/rust-lang/crates.io-index)",
211
+ "typenum 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
222
 ]
212
 ]
223
 
213
 
224
 [[package]]
214
 [[package]]
226
 version = "0.13.2"
216
 version = "0.13.2"
227
 source = "registry+https://github.com/rust-lang/crates.io-index"
217
 source = "registry+https://github.com/rust-lang/crates.io-index"
228
 dependencies = [
218
 dependencies = [
229
- "typenum 1.11.2 (registry+https://github.com/rust-lang/crates.io-index)",
219
+ "typenum 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
230
 ]
220
 ]
231
 
221
 
232
 [[package]]
222
 [[package]]
258
 
248
 
259
 [[package]]
249
 [[package]]
260
 name = "libc"
250
 name = "libc"
261
-version = "0.2.68"
251
+version = "0.2.69"
262
 source = "registry+https://github.com/rust-lang/crates.io-index"
252
 source = "registry+https://github.com/rust-lang/crates.io-index"
263
 
253
 
264
-[[package]]
265
-name = "libz-sys"
266
-version = "1.0.25"
267
-source = "registry+https://github.com/rust-lang/crates.io-index"
268
-dependencies = [
269
- "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
270
- "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
271
- "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
272
- "vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
273
-]
274
-
275
 [[package]]
254
 [[package]]
276
 name = "lodepng"
255
 name = "lodepng"
277
-version = "2.5.0"
256
+version = "2.6.0"
278
 source = "registry+https://github.com/rust-lang/crates.io-index"
257
 source = "registry+https://github.com/rust-lang/crates.io-index"
279
 dependencies = [
258
 dependencies = [
280
- "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
281
- "rgb 0.8.16 (registry+https://github.com/rust-lang/crates.io-index)",
259
+ "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)",
260
+ "rgb 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)",
282
 ]
261
 ]
283
 
262
 
284
 [[package]]
263
 [[package]]
333
 
312
 
334
 [[package]]
313
 [[package]]
335
 name = "quote"
314
 name = "quote"
336
-version = "1.0.3"
315
+version = "1.0.4"
337
 source = "registry+https://github.com/rust-lang/crates.io-index"
316
 source = "registry+https://github.com/rust-lang/crates.io-index"
338
 dependencies = [
317
 dependencies = [
339
  "proc-macro2 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
318
  "proc-macro2 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
346
 
325
 
347
 [[package]]
326
 [[package]]
348
 name = "rgb"
327
 name = "rgb"
349
-version = "0.8.16"
328
+version = "0.8.17"
350
 source = "registry+https://github.com/rust-lang/crates.io-index"
329
 source = "registry+https://github.com/rust-lang/crates.io-index"
351
 
330
 
352
 [[package]]
331
 [[package]]
361
 dependencies = [
340
 dependencies = [
362
  "indexmap 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
341
  "indexmap 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
363
  "proc-macro2 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
342
  "proc-macro2 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
364
- "syn 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)",
343
+ "syn 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)",
365
 ]
344
 ]
366
 
345
 
367
 [[package]]
346
 [[package]]
392
 
371
 
393
 [[package]]
372
 [[package]]
394
 name = "syn"
373
 name = "syn"
395
-version = "1.0.17"
374
+version = "1.0.18"
396
 source = "registry+https://github.com/rust-lang/crates.io-index"
375
 source = "registry+https://github.com/rust-lang/crates.io-index"
397
 dependencies = [
376
 dependencies = [
398
  "proc-macro2 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
377
  "proc-macro2 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
399
- "quote 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
378
+ "quote 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
400
  "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
379
  "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
401
 ]
380
 ]
402
 
381
 
382
+[[package]]
383
+name = "thiserror"
384
+version = "1.0.16"
385
+source = "registry+https://github.com/rust-lang/crates.io-index"
386
+dependencies = [
387
+ "thiserror-impl 1.0.16 (registry+https://github.com/rust-lang/crates.io-index)",
388
+]
389
+
390
+[[package]]
391
+name = "thiserror-impl"
392
+version = "1.0.16"
393
+source = "registry+https://github.com/rust-lang/crates.io-index"
394
+dependencies = [
395
+ "proc-macro2 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
396
+ "quote 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
397
+ "syn 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)",
398
+]
399
+
400
+[[package]]
401
+name = "tinygfx"
402
+version = "0.1.0"
403
+source = "git+https://github.com/mgottschlag/tinygfx#9dd1ff4155b47048bce4c7ed49c87c98e8d91b3b"
404
+
405
+[[package]]
406
+name = "tinygfx-assets"
407
+version = "0.1.0"
408
+source = "git+https://github.com/mgottschlag/tinygfx#9dd1ff4155b47048bce4c7ed49c87c98e8d91b3b"
409
+dependencies = [
410
+ "freetype-rs 0.24.0 (registry+https://github.com/rust-lang/crates.io-index)",
411
+ "lodepng 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
412
+ "thiserror 1.0.16 (registry+https://github.com/rust-lang/crates.io-index)",
413
+]
414
+
403
 [[package]]
415
 [[package]]
404
 name = "typenum"
416
 name = "typenum"
405
-version = "1.11.2"
417
+version = "1.12.0"
406
 source = "registry+https://github.com/rust-lang/crates.io-index"
418
 source = "registry+https://github.com/rust-lang/crates.io-index"
407
 
419
 
408
 [[package]]
420
 [[package]]
415
 version = "0.1.2"
427
 version = "0.1.2"
416
 source = "registry+https://github.com/rust-lang/crates.io-index"
428
 source = "registry+https://github.com/rust-lang/crates.io-index"
417
 
429
 
418
-[[package]]
419
-name = "vcpkg"
420
-version = "0.2.8"
421
-source = "registry+https://github.com/rust-lang/crates.io-index"
422
-
423
 [[package]]
430
 [[package]]
424
 name = "void"
431
 name = "void"
425
 version = "1.0.2"
432
 version = "1.0.2"
442
 "checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
449
 "checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
443
 "checksum bme280 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bc93357f2a5603736e2c1f1ba8e18e9ec80efa7fdade5d6a37c11362b76363f4"
450
 "checksum bme280 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bc93357f2a5603736e2c1f1ba8e18e9ec80efa7fdade5d6a37c11362b76363f4"
444
 "checksum byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de"
451
 "checksum byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de"
445
-"checksum cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)" = "95e28fa049fda1c330bcf9d723be7663a899c4679724b34c81e9f5a326aab8cd"
452
+"checksum cc 1.0.52 (registry+https://github.com/rust-lang/crates.io-index)" = "c3d87b23d6a92cd03af510a5ade527033f6aa6fa92161e2d5863a907d4c5e31d"
453
+"checksum cmake 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "81fb25b677f8bf1eb325017cb6bb8452f87969db0fedb4f757b297bee78a7c62"
446
 "checksum cortex-m 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2954942fbbdd49996704e6f048ce57567c3e1a4e2dc59b41ae9fde06a01fc763"
454
 "checksum cortex-m 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2954942fbbdd49996704e6f048ce57567c3e1a4e2dc59b41ae9fde06a01fc763"
447
 "checksum cortex-m-rt 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "00d518da72bba39496024b62607c1d8e37bcece44b2536664f1132a73a499a28"
455
 "checksum cortex-m-rt 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "00d518da72bba39496024b62607c1d8e37bcece44b2536664f1132a73a499a28"
448
 "checksum cortex-m-rt-macros 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "4717562afbba06e760d34451919f5c3bf3ac15c7bb897e8b04862a7428378647"
456
 "checksum cortex-m-rt-macros 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "4717562afbba06e760d34451919f5c3bf3ac15c7bb897e8b04862a7428378647"
449
 "checksum cortex-m-rtfm 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "eaf0b9fd3f042cb3793d15daf3cea201b2f25c99b0b5b936a551bb6909c3ae5b"
457
 "checksum cortex-m-rtfm 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "eaf0b9fd3f042cb3793d15daf3cea201b2f25c99b0b5b936a551bb6909c3ae5b"
450
 "checksum cortex-m-rtfm-macros 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c62092f6ff344e9b0adb748f0302ed69889ba2fae1fce446e3788d4726ea73bb"
458
 "checksum cortex-m-rtfm-macros 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c62092f6ff344e9b0adb748f0302ed69889ba2fae1fce446e3788d4726ea73bb"
451
 "checksum cortex-m-semihosting 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "113ef0ecffee2b62b58f9380f4469099b30e9f9cbee2804771b4203ba1762cfa"
459
 "checksum cortex-m-semihosting 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "113ef0ecffee2b62b58f9380f4469099b30e9f9cbee2804771b4203ba1762cfa"
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"
460
 "checksum embedded-graphics 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "40a69991ceb896bd4810a0cf2bcc46fc94b7860573c71f965d8e5b3d66942fed"
454
 "checksum embedded-hal 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ee4908a155094da7723c2d60d617b820061e3b4efcc3d9e293d206a5a76c170b"
461
 "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>"
462
 "checksum embedded-nrf24l01 0.2.0 (git+https://github.com/astro/embedded-nrf24l01)" = "<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>"
463
 "checksum epd-waveshare 0.4.0 (git+https://github.com/mgottschlag/epd-waveshare.git?branch=streaming)" = "<none>"
458
-"checksum freetype-rs 0.19.1 (registry+https://github.com/rust-lang/crates.io-index)" = "28cc92a7040ee7b631e4279e263f9a83aedc1eb6085c68d8ca4d072b5644e705"
459
-"checksum freetype-sys 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0f9c8666cce7cf6e51a290623647febfbab92480b4c3e0f495cb9d4d312b5d38"
464
+"checksum freetype-rs 0.24.0 (registry+https://github.com/rust-lang/crates.io-index)" = "340519227cdc8f41c27b3840a02e32dac6102dc314aefe6189cfa355233c445f"
465
+"checksum freetype-sys 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d48ac0ce366dd47a115ec8e598d7c51b4a974fc52ded5e53a56b31f55f34f3ea"
460
 "checksum generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec"
466
 "checksum generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec"
461
 "checksum generic-array 0.13.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0ed1e761351b56f54eb9dcd0cfaca9fd0daecf93918e1cfc01c8a3d26ee7adcd"
467
 "checksum generic-array 0.13.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0ed1e761351b56f54eb9dcd0cfaca9fd0daecf93918e1cfc01c8a3d26ee7adcd"
462
 "checksum hash32 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d4041af86e63ac4298ce40e5cca669066e75b6f1aa3390fe2561ffa5e1d9f4cc"
468
 "checksum hash32 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d4041af86e63ac4298ce40e5cca669066e75b6f1aa3390fe2561ffa5e1d9f4cc"
463
 "checksum heapless 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8ffa511365b12346c5fbe759d82f80d3aa70d9f1ba01955594f84a1a6bbab985"
469
 "checksum heapless 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8ffa511365b12346c5fbe759d82f80d3aa70d9f1ba01955594f84a1a6bbab985"
464
 "checksum indexmap 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "076f042c5b7b98f31d205f1249267e12a6518c1481e9dae9764af19b707d2292"
470
 "checksum indexmap 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "076f042c5b7b98f31d205f1249267e12a6518c1481e9dae9764af19b707d2292"
465
-"checksum libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)" = "dea0c0405123bba743ee3f91f49b1c7cfb684eef0da0a50110f758ccf24cdff0"
466
-"checksum libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)" = "2eb5e43362e38e2bca2fd5f5134c4d4564a23a5c28e9b95411652021a8675ebe"
467
-"checksum lodepng 2.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "40ed9859b15e009b494528f32ad054c5baf67afabf3c05d27973ea151563d430"
471
+"checksum libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)" = "99e85c08494b21a9054e7fe1374a732aeadaff3980b6990b94bfd3a70f690005"
472
+"checksum lodepng 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9b1237d003f81f68a886aa31fd31fc932da1344b5e81337cbd88783e672e2ff5"
468
 "checksum mkl25z4 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "91f9b185f1346b1fdc8337481e2fdf5f282d0e884e2c59e4ddea5328105017d7"
473
 "checksum mkl25z4 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "91f9b185f1346b1fdc8337481e2fdf5f282d0e884e2c59e4ddea5328105017d7"
469
 "checksum mkl25z4-hal 0.1.0 (git+https://github.com/mgottschlag/mkl25z4-hal)" = "<none>"
474
 "checksum mkl25z4-hal 0.1.0 (git+https://github.com/mgottschlag/mkl25z4-hal)" = "<none>"
470
 "checksum nb 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b1411551beb3c11dedfb0a90a0fa256b47d28b9ec2cdff34c25a2fa59e45dbdc"
475
 "checksum nb 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b1411551beb3c11dedfb0a90a0fa256b47d28b9ec2cdff34c25a2fa59e45dbdc"
471
 "checksum panic-semihosting 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c03864ac862876c16a308f5286f4aa217f1a69ac45df87ad3cd2847f818a642c"
476
 "checksum panic-semihosting 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c03864ac862876c16a308f5286f4aa217f1a69ac45df87ad3cd2847f818a642c"
472
 "checksum pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677"
477
 "checksum pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677"
473
 "checksum proc-macro2 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)" = "df246d292ff63439fea9bc8c0a270bed0e390d5ebd4db4ba15aba81111b5abe3"
478
 "checksum proc-macro2 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)" = "df246d292ff63439fea9bc8c0a270bed0e390d5ebd4db4ba15aba81111b5abe3"
474
-"checksum quote 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2bdc6c187c65bca4260c9011c9e3132efe4909da44726bad24cf7572ae338d7f"
479
+"checksum quote 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4c1f4b0efa5fc5e8ceb705136bfee52cfdb6a4e3509f770b478cd6ed434232a7"
475
 "checksum r0 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e2a38df5b15c8d5c7e8654189744d8e396bddc18ad48041a500ce52d6948941f"
480
 "checksum r0 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e2a38df5b15c8d5c7e8654189744d8e396bddc18ad48041a500ce52d6948941f"
476
-"checksum rgb 0.8.16 (registry+https://github.com/rust-lang/crates.io-index)" = "5ec4ab2cf0b27e111e266e161cf7f9efd20125a161190da1c0945c4a4408fef3"
481
+"checksum rgb 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)" = "a85b83fd629b0ce765f45316774fa6aaa95947fd74c8e4bbf3c6d1e349701d95"
477
 "checksum rtfm-core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9ec893edb2aa5b70320b94896ffea22a7ebb1cf3f942bb67cd5b60a865a63493"
482
 "checksum rtfm-core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9ec893edb2aa5b70320b94896ffea22a7ebb1cf3f942bb67cd5b60a865a63493"
478
 "checksum rtfm-syntax 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4455e23c34df3d66454e7e218a4d76a7f83321d04a806be614463341cec4116e"
483
 "checksum rtfm-syntax 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4455e23c34df3d66454e7e218a4d76a7f83321d04a806be614463341cec4116e"
479
 "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
484
 "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
480
 "checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
485
 "checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
481
 "checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
486
 "checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
482
 "checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8"
487
 "checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8"
483
-"checksum syn 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)" = "0df0eb663f387145cab623dea85b09c2c5b4b0aef44e945d928e682fce71bb03"
484
-"checksum typenum 1.11.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6d2783fe2d6b8c1101136184eb41be8b1ad379e4657050b8aaff0c79ee7575f9"
488
+"checksum syn 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)" = "410a7488c0a728c7ceb4ad59b9567eb4053d02e8cc7f5c0e0eeeb39518369213"
489
+"checksum thiserror 1.0.16 (registry+https://github.com/rust-lang/crates.io-index)" = "d12a1dae4add0f0d568eebc7bf142f145ba1aa2544cafb195c76f0f409091b60"
490
+"checksum thiserror-impl 1.0.16 (registry+https://github.com/rust-lang/crates.io-index)" = "3f34e0c1caaa462fd840ec6b768946ea1e7842620d94fe29d5b847138f521269"
491
+"checksum tinygfx 0.1.0 (git+https://github.com/mgottschlag/tinygfx)" = "<none>"
492
+"checksum tinygfx-assets 0.1.0 (git+https://github.com/mgottschlag/tinygfx)" = "<none>"
493
+"checksum typenum 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33"
485
 "checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
494
 "checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
486
 "checksum vcell 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "876e32dcadfe563a4289e994f7cb391197f362b6315dc45e8ba4aa6f564a4b3c"
495
 "checksum vcell 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "876e32dcadfe563a4289e994f7cb391197f362b6315dc45e8ba4aa6f564a4b3c"
487
-"checksum vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168"
488
 "checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
496
 "checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
489
 "checksum volatile-register 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0d67cb4616d99b940db1d6bd28844ff97108b498a6ca850e5b6191a532063286"
497
 "checksum volatile-register 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0d67cb4616d99b940db1d6bd28844ff97108b498a6ca850e5b6191a532063286"

+ 2
- 2
display/firmware/Cargo.toml View File

20
 mkl25z4-hal = { git = "https://github.com/mgottschlag/mkl25z4-hal" }
20
 mkl25z4-hal = { git = "https://github.com/mgottschlag/mkl25z4-hal" }
21
 embedded-hal = "0.2.3"
21
 embedded-hal = "0.2.3"
22
 nb = "0.1.2"
22
 nb = "0.1.2"
23
-embedded-epd = { git = "https://github.com/mgottschlag/rust-embedded-epd" }
24
 bme280 = "0.2.1"
23
 bme280 = "0.2.1"
25
 embedded-nrf24l01 = { git = "https://github.com/astro/embedded-nrf24l01" }
24
 embedded-nrf24l01 = { git = "https://github.com/astro/embedded-nrf24l01" }
26
 epd-waveshare = { git = "https://github.com/mgottschlag/epd-waveshare.git", branch = "streaming" }
25
 epd-waveshare = { git = "https://github.com/mgottschlag/epd-waveshare.git", branch = "streaming" }
26
+tinygfx = { git = "https://github.com/mgottschlag/tinygfx" }
27
 
27
 
28
 [dependencies.void]
28
 [dependencies.void]
29
 default-features = false
29
 default-features = false
30
 version = "1.0.2"
30
 version = "1.0.2"
31
 
31
 
32
 [build-dependencies]
32
 [build-dependencies]
33
-epd-assets = { git = "https://github.com/mgottschlag/rust-epd-assets" }
33
+tinygfx-assets = { git = "https://github.com/mgottschlag/tinygfx" }
34
 
34
 
35
 [profile]
35
 [profile]
36
 [profile.release]
36
 [profile.release]

+ 4
- 4
display/firmware/build.rs View File

1
-extern crate epd_assets as assets;
1
+extern crate tinygfx_assets as assets;
2
 
2
 
3
 use std::env;
3
 use std::env;
4
 use std::fs::File;
4
 use std::fs::File;
12
 
12
 
13
     let mut font = assets::Font::load("assets/Roboto-Regular.ttf").unwrap();
13
     let mut font = assets::Font::load("assets/Roboto-Regular.ttf").unwrap();
14
 
14
 
15
-    let epd_font = font.generate("ROBOTO_100", 100, " 0123456789:", "crate::epd");
15
+    let epd_font = font.generate("ROBOTO_100", 100, " 0123456789:", "::tinygfx");
16
     f.write_all(epd_font.as_bytes()).unwrap();
16
     f.write_all(epd_font.as_bytes()).unwrap();
17
 
17
 
18
     let epd_font = font.generate(
18
     let epd_font = font.generate(
19
         "ROBOTO_30",
19
         "ROBOTO_30",
20
         30,
20
         30,
21
         " abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789:.",
21
         " abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789:.",
22
-        "crate::epd",
22
+        "::tinygfx",
23
     );
23
     );
24
 
24
 
25
     f.write_all(epd_font.as_bytes()).unwrap();
25
     f.write_all(epd_font.as_bytes()).unwrap();
28
 
28
 
29
     f.write_all(
29
     f.write_all(
30
         clock_image
30
         clock_image
31
-            .generate_bitmap("ALARM_CLOCK_36", "crate::epd")
31
+            .generate_bitmap("ALARM_CLOCK_36", "::tinygfx")
32
             .as_bytes(),
32
             .as_bytes(),
33
     )
33
     )
34
     .unwrap();
34
     .unwrap();

+ 0
- 1
display/firmware/src/main.rs View File

11
     include!(concat!(env!("OUT_DIR"), "/assets.rs"));
11
     include!(concat!(env!("OUT_DIR"), "/assets.rs"));
12
 }
12
 }
13
 
13
 
14
-use embedded_epd as epd;
15
 use mkl25z4_hal::clocks::ClockConfiguration;
14
 use mkl25z4_hal::clocks::ClockConfiguration;
16
 use mkl25z4_hal::time::{CopyableMonoTimer, NonCopyableMonoTimer, U32Ext};
15
 use mkl25z4_hal::time::{CopyableMonoTimer, NonCopyableMonoTimer, U32Ext};
17
 use panic_semihosting as _;
16
 use panic_semihosting as _;

Loading…
Cancel
Save