@@ -140,7 +140,13 @@ impl SDKBuilder<'_> {
140
140
} ,
141
141
target : "thumbv8m.main-none-eabi" ,
142
142
defines : {
143
- let mut v = header2define ( format ! ( "{}/devices/nanosplus/c_sdk_build_nanosplus.defines" , env!( "CARGO_MANIFEST_DIR" ) ) . as_str ( ) ) ;
143
+ let mut v = header2define (
144
+ format ! (
145
+ "{}/devices/nanosplus/c_sdk_build_nanosplus.defines" ,
146
+ env!( "CARGO_MANIFEST_DIR" )
147
+ )
148
+ . as_str ( ) ,
149
+ ) ;
144
150
if env:: var_os ( "CARGO_FEATURE_NANO_NBGL" ) . is_some ( ) {
145
151
println ! ( "cargo:warning=NBGL is built" ) ;
146
152
v. push ( ( String :: from ( "HAVE_NBGL" ) , None ) ) ;
@@ -155,7 +161,10 @@ impl SDKBuilder<'_> {
155
161
v
156
162
} ,
157
163
cflags : {
158
- let m_path = format ! ( "{}/devices/nanosplus/c_sdk_build_nanosplus.cflags" , env!( "CARGO_MANIFEST_DIR" ) ) ;
164
+ let m_path = format ! (
165
+ "{}/devices/nanosplus/c_sdk_build_nanosplus.cflags" ,
166
+ env!( "CARGO_MANIFEST_DIR" )
167
+ ) ;
159
168
let f = File :: open ( m_path)
160
169
. expect ( "Failed to open c_sdk_build_nanosplus.cflags file" ) ;
161
170
let reader = BufReader :: new ( f) ;
@@ -166,7 +175,10 @@ impl SDKBuilder<'_> {
166
175
} ,
167
176
glyphs_folders : Vec :: new ( ) ,
168
177
arm_libs : Default :: default ( ) ,
169
- linker_script : format ! ( "{}/devices/nanosplus/nanosplus_layout.ld" , env!( "CARGO_MANIFEST_DIR" ) )
178
+ linker_script : format ! (
179
+ "{}/devices/nanosplus/nanosplus_layout.ld" ,
180
+ env!( "CARGO_MANIFEST_DIR" )
181
+ ) ,
170
182
} ,
171
183
"nanox" => Device {
172
184
name : DeviceName :: NanoX ,
@@ -176,7 +188,13 @@ impl SDKBuilder<'_> {
176
188
} ,
177
189
target : "thumbv6m-none-eabi" ,
178
190
defines : {
179
- let mut v = header2define ( format ! ( "{}/devices/nanox/c_sdk_build_nanox.defines" , env!( "CARGO_MANIFEST_DIR" ) ) . as_str ( ) ) ;
191
+ let mut v = header2define (
192
+ format ! (
193
+ "{}/devices/nanox/c_sdk_build_nanox.defines" ,
194
+ env!( "CARGO_MANIFEST_DIR" )
195
+ )
196
+ . as_str ( ) ,
197
+ ) ;
180
198
if env:: var_os ( "CARGO_FEATURE_NANO_NBGL" ) . is_some ( ) {
181
199
println ! ( "cargo:warning=NBGL is built" ) ;
182
200
v. push ( ( String :: from ( "HAVE_NBGL" ) , None ) ) ;
@@ -191,8 +209,12 @@ impl SDKBuilder<'_> {
191
209
v
192
210
} ,
193
211
cflags : {
194
- let m_path = format ! ( "{}/devices/nanox/c_sdk_build_nanox.cflags" , env!( "CARGO_MANIFEST_DIR" ) ) ;
195
- let f = File :: open ( m_path) . expect ( "Failed to open c_sdk_build_nanox.cflags file" ) ;
212
+ let m_path = format ! (
213
+ "{}/devices/nanox/c_sdk_build_nanox.cflags" ,
214
+ env!( "CARGO_MANIFEST_DIR" )
215
+ ) ;
216
+ let f =
217
+ File :: open ( m_path) . expect ( "Failed to open c_sdk_build_nanox.cflags file" ) ;
196
218
let reader = BufReader :: new ( f) ;
197
219
reader
198
220
. lines ( )
@@ -201,7 +223,10 @@ impl SDKBuilder<'_> {
201
223
} ,
202
224
glyphs_folders : Vec :: new ( ) ,
203
225
arm_libs : Default :: default ( ) ,
204
- linker_script : format ! ( "{}/devices/nanox/nanox_layout.ld" , env!( "CARGO_MANIFEST_DIR" ) ) ,
226
+ linker_script : format ! (
227
+ "{}/devices/nanox/nanox_layout.ld" ,
228
+ env!( "CARGO_MANIFEST_DIR" )
229
+ ) ,
205
230
} ,
206
231
"stax" => Device {
207
232
name : DeviceName :: Stax ,
@@ -210,10 +235,20 @@ impl SDKBuilder<'_> {
210
235
Err ( _) => return Err ( SDKBuildError :: MissingSDKPath ) ,
211
236
} ,
212
237
target : "thumbv8m.main-none-eabi" ,
213
- defines : header2define ( format ! ( "{}/devices/stax/c_sdk_build_stax.defines" , env!( "CARGO_MANIFEST_DIR" ) ) . as_str ( ) ) ,
238
+ defines : header2define (
239
+ format ! (
240
+ "{}/devices/stax/c_sdk_build_stax.defines" ,
241
+ env!( "CARGO_MANIFEST_DIR" )
242
+ )
243
+ . as_str ( ) ,
244
+ ) ,
214
245
cflags : {
215
- let m_path = format ! ( "{}/devices/stax/c_sdk_build_stax.cflags" , env!( "CARGO_MANIFEST_DIR" ) ) ;
216
- let f = File :: open ( m_path) . expect ( "Failed to open c_sdk_build_stax.cflags file" ) ;
246
+ let m_path = format ! (
247
+ "{}/devices/stax/c_sdk_build_stax.cflags" ,
248
+ env!( "CARGO_MANIFEST_DIR" )
249
+ ) ;
250
+ let f =
251
+ File :: open ( m_path) . expect ( "Failed to open c_sdk_build_stax.cflags file" ) ;
217
252
let reader = BufReader :: new ( f) ;
218
253
reader
219
254
. lines ( )
@@ -222,7 +257,10 @@ impl SDKBuilder<'_> {
222
257
} ,
223
258
glyphs_folders : Vec :: new ( ) ,
224
259
arm_libs : Default :: default ( ) ,
225
- linker_script : format ! ( "{}/devices/stax/stax_layout.ld" , env!( "CARGO_MANIFEST_DIR" ) ) ,
260
+ linker_script : format ! (
261
+ "{}/devices/stax/stax_layout.ld" ,
262
+ env!( "CARGO_MANIFEST_DIR" )
263
+ ) ,
226
264
} ,
227
265
"flex" => Device {
228
266
name : DeviceName :: Flex ,
@@ -231,10 +269,20 @@ impl SDKBuilder<'_> {
231
269
Err ( _) => return Err ( SDKBuildError :: MissingSDKPath ) ,
232
270
} ,
233
271
target : "thumbv8m.main-none-eabi" ,
234
- defines : header2define ( format ! ( "{}/devices/flex/c_sdk_build_flex.defines" , env!( "CARGO_MANIFEST_DIR" ) ) . as_str ( ) ) ,
272
+ defines : header2define (
273
+ format ! (
274
+ "{}/devices/flex/c_sdk_build_flex.defines" ,
275
+ env!( "CARGO_MANIFEST_DIR" )
276
+ )
277
+ . as_str ( ) ,
278
+ ) ,
235
279
cflags : {
236
- let m_path = format ! ( "{}/devices/flex/c_sdk_build_flex.cflags" , env!( "CARGO_MANIFEST_DIR" ) ) ;
237
- let f = File :: open ( m_path) . expect ( "Failed to open c_sdk_build_flex.cflags file" ) ;
280
+ let m_path = format ! (
281
+ "{}/devices/flex/c_sdk_build_flex.cflags" ,
282
+ env!( "CARGO_MANIFEST_DIR" )
283
+ ) ;
284
+ let f =
285
+ File :: open ( m_path) . expect ( "Failed to open c_sdk_build_flex.cflags file" ) ;
238
286
let reader = BufReader :: new ( f) ;
239
287
reader
240
288
. lines ( )
@@ -243,7 +291,10 @@ impl SDKBuilder<'_> {
243
291
} ,
244
292
glyphs_folders : Vec :: new ( ) ,
245
293
arm_libs : Default :: default ( ) ,
246
- linker_script : format ! ( "{}/devices/flex/flex_layout.ld" , env!( "CARGO_MANIFEST_DIR" ) ) ,
294
+ linker_script : format ! (
295
+ "{}/devices/flex/flex_layout.ld" ,
296
+ env!( "CARGO_MANIFEST_DIR" )
297
+ ) ,
247
298
} ,
248
299
"apex_p" => Device {
249
300
name : DeviceName :: ApexP ,
@@ -252,10 +303,20 @@ impl SDKBuilder<'_> {
252
303
Err ( _) => return Err ( SDKBuildError :: MissingSDKPath ) ,
253
304
} ,
254
305
target : "thumbv8m.main-none-eabi" ,
255
- defines : header2define ( format ! ( "{}/devices/apex_p/c_sdk_build_apex_p.defines" , env!( "CARGO_MANIFEST_DIR" ) ) . as_str ( ) ) ,
306
+ defines : header2define (
307
+ format ! (
308
+ "{}/devices/apex_p/c_sdk_build_apex_p.defines" ,
309
+ env!( "CARGO_MANIFEST_DIR" )
310
+ )
311
+ . as_str ( ) ,
312
+ ) ,
256
313
cflags : {
257
- let m_path = format ! ( "{}/devices/apex_p/c_sdk_build_apex_p.cflags" , env!( "CARGO_MANIFEST_DIR" ) ) ;
258
- let f = File :: open ( m_path) . expect ( "Failed to open c_sdk_build_apex_p.cflags file" ) ;
314
+ let m_path = format ! (
315
+ "{}/devices/apex_p/c_sdk_build_apex_p.cflags" ,
316
+ env!( "CARGO_MANIFEST_DIR" )
317
+ ) ;
318
+ let f =
319
+ File :: open ( m_path) . expect ( "Failed to open c_sdk_build_apex_p.cflags file" ) ;
259
320
let reader = BufReader :: new ( f) ;
260
321
reader
261
322
. lines ( )
@@ -264,7 +325,10 @@ impl SDKBuilder<'_> {
264
325
} ,
265
326
glyphs_folders : Vec :: new ( ) ,
266
327
arm_libs : Default :: default ( ) ,
267
- linker_script : format ! ( "{}/devices/apex_p/apex_p_layout.ld" , env!( "CARGO_MANIFEST_DIR" ) ) ,
328
+ linker_script : format ! (
329
+ "{}/devices/apex_p/apex_p_layout.ld" ,
330
+ env!( "CARGO_MANIFEST_DIR" )
331
+ ) ,
268
332
} ,
269
333
_ => {
270
334
return Err ( SDKBuildError :: UnsupportedDevice ) ;
@@ -510,7 +574,9 @@ impl SDKBuilder<'_> {
510
574
// Target specific files
511
575
let csdk_target_name = self . device . name . to_string ( ) ;
512
576
let header = match self . device . name {
513
- DeviceName :: NanoSPlus => String :: from ( "devices/nanosplus/c_sdk_build_nanosplus.defines" ) ,
577
+ DeviceName :: NanoSPlus => {
578
+ String :: from ( "devices/nanosplus/c_sdk_build_nanosplus.defines" )
579
+ }
514
580
DeviceName :: NanoX => String :: from ( "devices/nanox/c_sdk_build_nanox.defines" ) ,
515
581
DeviceName :: Stax => String :: from ( "devices/stax/c_sdk_build_stax.defines" ) ,
516
582
DeviceName :: Flex => String :: from ( "devices/flex/c_sdk_build_flex.defines" ) ,
0 commit comments