Skip to content

Commit 5f0e71c

Browse files
author
Melissa LeBlanc-Williams
committed
Merge branch 'master' of https://github.com/adafruit/circuitpython into ssd1351-fix
2 parents a54493b + 3f42a49 commit 5f0e71c

33 files changed

Lines changed: 878 additions & 592 deletions

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ git:
2323
env:
2424
- TRAVIS_TESTS="unix docs translations website" TRAVIS_BOARDS="circuitplayground_express mini_sam_m4 grandcentral_m4_express pca10056 pca10059 feather_nrf52840_express makerdiary_nrf52840_mdk makerdiary_nrf52840_mdk_usb_dongle particle_boron particle_argon particle_xenon sparkfun_nrf52840_mini" TRAVIS_SDK=arm:nrf
2525
- TRAVIS_BOARDS="metro_m0_express metro_m4_express pirkey_m0 trellis_m4_express trinket_m0 sparkfun_lumidrive sparkfun_redboard_turbo pybadge" TRAVIS_SDK=arm
26-
- TRAVIS_BOARDS="feather_radiofruit_zigbee gemma_m0 hallowing_m0_express itsybitsy_m0_express itsybitsy_m4_express meowmeow sam32" TRAVIS_SDK=arm
26+
- TRAVIS_BOARDS="feather_radiofruit_zigbee gemma_m0 hallowing_m0_express itsybitsy_m0_express itsybitsy_m4_express meowmeow sam32 uchip" TRAVIS_SDK=arm
2727
- TRAVIS_BOARDS="feather_m0_express_crickit feather_m0_rfm69 feather_m0_rfm9x feather_m4_express arduino_zero arduino_mkr1300 arduino_mkrzero pewpew10" TRAVIS_SDK=arm
2828
- TRAVIS_BOARDS="circuitplayground_express_crickit feather_m0_adalogger feather_m0_basic feather_m0_express catwan_usbstick pyportal sparkfun_samd21_mini sparkfun_samd21_dev" TRAVIS_SDK=arm
2929

‎docs/design_guide.rst‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -500,6 +500,8 @@ properties.
500500
+-----------------------+-----------------------+-------------------------------------------------------------------------+
501501
| ``value`` | int | 16-bit Analog value, unit-less |
502502
+-----------------------+-----------------------+-------------------------------------------------------------------------+
503+
| ``weight`` | float | grams (g) |
504+
+-----------------------+-----------------------+-------------------------------------------------------------------------+
503505

504506
Adding native modules
505507
--------------------------------------------------------------------------------

‎frozen/Adafruit_CircuitPython_BusDevice‎

‎frozen/Adafruit_CircuitPython_HID‎

‎frozen/Adafruit_CircuitPython_Motor‎

‎frozen/Adafruit_CircuitPython_NeoPixel‎

‎frozen/Adafruit_CircuitPython_seesaw‎

0 commit comments

Comments
 (0)