Browse Source

Use libraries from the registry

Scott Lahteine 4 years ago
parent
commit
a0bbdde421

+ 2
- 2
.github/workflows/test-builds.yml View File

@@ -106,6 +106,6 @@ jobs:
106 106
         # Inline tests script
107 107
         [[ "$GITHUB_REPOSITORY" == "MarlinFirmware/Marlin" ]] || exit 0
108 108
         chmod +x buildroot/bin/*
109
-        chmod +x buildroot/share/tests/*
110
-        export PATH=./buildroot/bin/:./buildroot/share/tests/:${PATH}
109
+        chmod +x buildroot/tests/*
110
+        export PATH=./buildroot/bin/:./buildroot/tests/:${PATH}
111 111
         run_tests . ${{ matrix.test-platform }}

+ 2
- 1
buildroot/share/git/mftest View File

@@ -9,7 +9,8 @@
9 9
 MFINFO=$(mfinfo) || exit 1
10 10
 [[ -d Marlin/src ]] || { echo "Please 'cd' up to repo root." ; exit 1 ; }
11 11
 
12
-TESTPATH=buildroot/share/tests
12
+TESTPATH=buildroot/tests
13
+
13 14
 STATE_FILE=$( echo ./.pio/.mftestrc )
14 15
 SED=$(which gsed || which sed)
15 16
 

+ 0
- 1
buildroot/share/tests/.gitattributes View File

@@ -1 +0,0 @@
1
-* text=auto eol=lf

+ 34
- 26
platformio.ini View File

@@ -25,18 +25,18 @@ default_envs = mega2560
25 25
 #
26 26
 [common]
27 27
 default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared>
28
-extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py
29
-build_flags = -fmax-errors=5 -g -D__MARLIN_FIRMWARE__ -fmerge-all-constants
30
-lib_deps =
31
-  LiquidCrystal
32
-  TMCStepper@>=0.7.0
33
-  Adafruit MAX31865 library@>=1.1,<1.2
34
-  Adafruit NeoPixel
35
-  U8glib-HAL=https://github.com/MarlinFirmware/U8glib-HAL/archive/bugfix.zip
36
-  LiquidTWI2=https://github.com/lincomatic/LiquidTWI2/archive/master.zip
37
-  Arduino-L6470=https://github.com/ameyer/Arduino-L6470/archive/0.8.0.zip
28
+extra_scripts      = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py
29
+build_flags        = -fmax-errors=5 -g -D__MARLIN_FIRMWARE__ -fmerge-all-constants
30
+lib_deps           =
31
+  LiquidCrystal@1.5.0
32
+  TMCStepper@~0.7.0
33
+  Adafruit MAX31865 library@~1.1.0
34
+  Adafruit NeoPixel@1.5.0
35
+  U8glib-HAL@0.4.1
36
+  Arduino-L6470@0.8.0
37
+  SlowSoftI2CMaster
38
+  LiquidTWI2@1.2.7
38 39
   SailfishLCD=https://github.com/mikeshub/SailfishLCD/archive/master.zip
39
-  SlowSoftI2CMaster=https://github.com/mikeshub/SlowSoftI2CMaster/archive/master.zip
40 40
 
41 41
 #
42 42
 # Default values apply to all 'env:' prefixed environments
@@ -283,20 +283,20 @@ debug_tool     = jlink
283 283
 [common_LPC]
284 284
 platform          = https://github.com/p3p/pio-nxplpc-arduino-lpc176x/archive/0.1.2.zip
285 285
 board             = nxp_lpc1768
286
-build_flags       = -DU8G_HAL_LINKS -IMarlin/src/HAL/LPC1768/include -IMarlin/src/HAL/LPC1768/u8g ${common.build_flags}
287 286
 lib_ldf_mode      = off
288 287
 lib_compat_mode   = strict
289 288
 extra_scripts     = Marlin/src/HAL/LPC1768/upload_extra_script.py
290 289
 src_filter        = ${common.default_src_filter} +<src/HAL/LPC1768>
291 290
 lib_deps          = Servo
292
-  LiquidCrystal
293
-  U8glib-HAL=https://github.com/MarlinFirmware/U8glib-HAL/archive/bugfix.zip
294
-  TMCStepper@>=0.6.2
295
-  Adafruit NeoPixel=https://github.com/p3p/Adafruit_NeoPixel/archive/release.zip
291
+  LiquidCrystal@1.0.0
292
+  U8glib-HAL@0.4.1
293
+  TMCStepper@~0.7.0
294
+  Adafruit NeoPixel=https://github.com/p3p/Adafruit_NeoPixel/archive/1.5.0.zip
296 295
   SailfishLCD=https://github.com/mikeshub/SailfishLCD/archive/master.zip
297
-# debug options for backtrace
298
-#  -funwind-tables
299
-#  -mpoke-function-name
296
+build_flags       = -DU8G_HAL_LINKS -IMarlin/src/HAL/LPC1768/include -IMarlin/src/HAL/LPC1768/u8g ${common.build_flags}
297
+  # debug options for backtrace
298
+  #-funwind-tables
299
+  #-mpoke-function-name
300 300
 
301 301
 #
302 302
 # NXP LPC176x ARM Cortex-M3
@@ -376,10 +376,18 @@ build_flags       = ${common_stm32f1.build_flags}
376 376
                     -DGENERIC_BOOTLOADER
377 377
 extra_scripts     = pre:buildroot/share/PlatformIO/scripts/STM32F1_create_variant.py
378 378
     buildroot/share/PlatformIO/scripts/STM32F103RC_MEEB_3DP.py
379
-lib_deps          = ${common_stm32f1.lib_deps}
380
-    USBComposite for STM32F1@==0.91
381
-    Adafruit NeoPixel=https://github.com/ccccmagicboy/Adafruit_NeoPixel#meeb_3dp_use
382
-lib_ignore        = SPI, LiquidCrystal
379
+lib_deps          =
380
+  TMCStepper@~0.7.0
381
+  Adafruit MAX31865 library@~1.1.0
382
+  U8glib-HAL@0.4.1
383
+  Arduino-L6470@0.8.0
384
+  SlowSoftI2CMaster
385
+  LiquidTWI2@1.2.7
386
+  Adafruit NeoPixel=https://github.com/ccccmagicboy/Adafruit_NeoPixel#meeb_3dp_use
387
+  SailfishLCD=https://github.com/mikeshub/SailfishLCD/archive/master.zip
388
+  SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
389
+  USBComposite for STM32F1@0.91
390
+lib_ignore        = SPI
383 391
 debug_tool        = stlink
384 392
 upload_protocol   = dfu
385 393
 
@@ -417,7 +425,7 @@ platform          = ${common_stm32f1.platform}
417 425
 extends           = env:STM32F103RC_btt
418 426
 build_flags       = ${env:STM32F103RC_btt.build_flags} -DUSE_USB_COMPOSITE
419 427
 lib_deps          = ${env:STM32F103RC_btt.lib_deps}
420
-  USBComposite for STM32F1@==0.91
428
+  USBComposite for STM32F1@0.91
421 429
 
422 430
 [env:STM32F103RC_btt_512K]
423 431
 platform          = ${common_stm32f1.platform}
@@ -430,7 +438,7 @@ platform          = ${common_stm32f1.platform}
430 438
 extends           = env:STM32F103RC_btt_512K
431 439
 build_flags       = ${env:STM32F103RC_btt_512K.build_flags} -DUSE_USB_COMPOSITE
432 440
 lib_deps          = ${env:STM32F103RC_btt_512K.lib_deps}
433
-  USBComposite for STM32F1@==0.91
441
+  USBComposite for STM32F1@0.91
434 442
 
435 443
 #
436 444
 # STM32F103RE
@@ -459,7 +467,7 @@ platform          = ${common_stm32f1.platform}
459 467
 extends           = env:STM32F103RE_btt
460 468
 build_flags       = ${env:STM32F103RE_btt.build_flags} -DUSE_USB_COMPOSITE
461 469
 lib_deps          = ${common_stm32f1.lib_deps}
462
-  USBComposite for STM32F1@==0.91
470
+  USBComposite for STM32F1@0.91
463 471
 
464 472
 #
465 473
 # STM32F4 with STM32GENERIC

Loading…
Cancel
Save