From 98820b2b2a85be20bc1b1f25ead224dc1b4c9b2f Mon Sep 17 00:00:00 2001 From: caternuson Date: Fri, 12 Oct 2018 08:38:53 -0700 Subject: [PATCH 1/3] move cap1188 to drivers folder --- .gitmodules | 2 +- libraries/cap1188 | 1 - libraries/drivers/cap1188/.gitignore | 4 + libraries/drivers/cap1188/.gitmodules | 303 ++++++++++++++++++ libraries/drivers/cap1188/.travis.yml | 22 ++ libraries/drivers/cap1188/CODE_OF_CONDUCT.md | 74 +++++ libraries/drivers/cap1188/LICENSE | 21 ++ libraries/drivers/cap1188/README.md | 59 ++++ libraries/drivers/cap1188/README.txt | 2 + libraries/drivers/cap1188/requirements.txt | 1 + .../drivers/cap1188/update-submodules.sh | 30 ++ .../cap1188/update_scripts/update_linux.sh | 15 + .../update_scripts/update_macosx.command | 16 + 13 files changed, 548 insertions(+), 2 deletions(-) delete mode 160000 libraries/cap1188 create mode 100644 libraries/drivers/cap1188/.gitignore create mode 100644 libraries/drivers/cap1188/.gitmodules create mode 100644 libraries/drivers/cap1188/.travis.yml create mode 100644 libraries/drivers/cap1188/CODE_OF_CONDUCT.md create mode 100644 libraries/drivers/cap1188/LICENSE create mode 100644 libraries/drivers/cap1188/README.md create mode 100644 libraries/drivers/cap1188/README.txt create mode 100644 libraries/drivers/cap1188/requirements.txt create mode 100755 libraries/drivers/cap1188/update-submodules.sh create mode 100755 libraries/drivers/cap1188/update_scripts/update_linux.sh create mode 100755 libraries/drivers/cap1188/update_scripts/update_macosx.command diff --git a/.gitmodules b/.gitmodules index 73a3fe02..3d4522f8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -302,7 +302,7 @@ path = libraries/drivers/lidarlite url = https://github.com/adafruit/Adafruit_CircuitPython_LIDARLite.git [submodule "libraries/cap1188"] - path = libraries/cap1188 + path = libraries/drivers/cap1188 url = https://github.com/adafruit/Adafruit_CircuitPython_Bundle.git [submodule "libraries/helpers/slideshow"] path = libraries/helpers/slideshow diff --git a/libraries/cap1188 b/libraries/cap1188 deleted file mode 160000 index 4150966f..00000000 --- a/libraries/cap1188 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4150966f21a6fb7ac8e92dbcb01ad3213da553ea diff --git a/libraries/drivers/cap1188/.gitignore b/libraries/drivers/cap1188/.gitignore new file mode 100644 index 00000000..4cac91f3 --- /dev/null +++ b/libraries/drivers/cap1188/.gitignore @@ -0,0 +1,4 @@ +build* +*zip +.env +bundles diff --git a/libraries/drivers/cap1188/.gitmodules b/libraries/drivers/cap1188/.gitmodules new file mode 100644 index 00000000..da207e43 --- /dev/null +++ b/libraries/drivers/cap1188/.gitmodules @@ -0,0 +1,303 @@ +[submodule "libraries/register"] + path = libraries/helpers/register + url = https://github.com/adafruit/Adafruit_CircuitPython_Register.git +[submodule "libraries/bus_device"] + path = libraries/helpers/bus_device + url = https://github.com/adafruit/Adafruit_CircuitPython_BusDevice.git +[submodule "libraries/helpers/simpleio"] + path = libraries/helpers/simpleio + url = https://github.com/adafruit/Adafruit_CircuitPython_SimpleIO.git +[submodule "libraries/drivers/mcp9808"] + path = libraries/drivers/mcp9808 + url = https://github.com/adafruit/Adafruit_CircuitPython_MCP9808.git +[submodule "libraries/drivers/thermistor"] + path = libraries/drivers/thermistor + url = https://github.com/adafruit/Adafruit_CircuitPython_Thermistor.git +[submodule "libraries/drivers/mpr121"] + path = libraries/drivers/mpr121 + url = https://github.com/adafruit/Adafruit_CircuitPython_MPR121.git +[submodule "libraries/drivers/si7021"] + path = libraries/drivers/si7021 + url = https://github.com/adafruit/Adafruit_CircuitPython_SI7021.git +[submodule "libraries/drivers/max31855"] + path = libraries/drivers/max31855 + url = https://github.com/adafruit/Adafruit_CircuitPython_MAX31855.git +[submodule "libraries/drivers/bno055"] + path = libraries/drivers/bno055 + url = https://github.com/adafruit/Adafruit_CircuitPython_BNO055.git +[submodule "libraries/drivers/lis3dh"] + path = libraries/drivers/lis3dh + url = https://github.com/adafruit/Adafruit_CircuitPython_LIS3DH.git +[submodule "libraries/helpers/hid"] + path = libraries/helpers/hid + url = https://github.com/adafruit/Adafruit_CircuitPython_HID.git +[submodule "cipy_pca9685"] + path = libraries/drivers/pca9685 + url = https://github.com/adafruit/Adafruit_CircuitPython_PCA9685.git +[submodule "cipy_ht16k33"] + path = libraries/drivers/ht16k33 + url = https://github.com/adafruit/Adafruit_CircuitPython_HT16K33.git +[submodule "rgb_display"] + path = libraries/drivers/rgb-display + url = https://github.com/adafruit/Adafruit_CircuitPython_RGB_Display.git +[submodule "cipy_neopixel"] + path = libraries/drivers/neopixel + url = https://github.com/adafruit/Adafruit_CircuitPython_NeoPixel.git +[submodule "cipy_ssd1306"] + path = libraries/drivers/ssd1306 + url = https://github.com/adafruit/Adafruit_CircuitPython_SSD1306.git +[submodule "libraries/drivers/pcf8523"] + path = libraries/drivers/pcf8523 + url = https://github.com/adafruit/Adafruit_CircuitPython_PCF8523.git +[submodule "is31fl3731_2"] + path = libraries/drivers/is31fl3731 + url = https://github.com/adafruit/Adafruit_CircuitPython_IS31FL3731.git +[submodule "libraries/helpers/rtttl"] + path = libraries/helpers/rtttl + url = https://github.com/adafruit/Adafruit_CircuitPython_RTTTL.git +[submodule "libraries/helpers/waveform"] + path = libraries/helpers/waveform + url = https://github.com/adafruit/Adafruit_CircuitPython_Waveform.git +[submodule "libraries/drivers/dotstar"] + path = libraries/drivers/dotstar + url = https://github.com/adafruit/Adafruit_CircuitPython_DotStar.git +[submodule "libraries/drivers/circuitplayground"] + path = libraries/drivers/circuitplayground + url = https://github.com/adafruit/Adafruit_CircuitPython_CircuitPlayground.git +[submodule "libraries/drivers/sdcard"] + path = libraries/drivers/sdcard + url = https://github.com/adafruit/Adafruit_CircuitPython_SD.git +[submodule "libraries/drivers/ds3231"] + path = libraries/drivers/ds3231 + url = https://github.com/adafruit/Adafruit_CircuitPython_DS3231.git +[submodule "libraries/drivers/max7219"] + path = libraries/drivers/max7219 + url = https://github.com/adafruit/Adafruit_CircuitPython_MAX7219.git +[submodule "libraries/drivers/dht"] + path = libraries/drivers/dht + url = https://github.com/adafruit/Adafruit_CircuitPython_DHT.git +[submodule "libraries/drivers/ccs811"] + path = libraries/drivers/ccs811 + url = https://github.com/adafruit/Adafruit_CircuitPython_CCS811.git +[submodule "libraries/drivers/bmp280"] + path = libraries/drivers/bmp280 + url = https://github.com/adafruit/Adafruit_CircuitPython_BMP280.git +[submodule "libraries/drivers/bme280"] + path = libraries/drivers/bme280 + url = https://github.com/adafruit/Adafruit_CircuitPython_BME280.git +[submodule "libraries/drivers/bme680"] + path = libraries/drivers/bme680 + url = https://github.com/adafruit/Adafruit_CircuitPython_BME680.git +[submodule "libraries/drivers/tsl2561"] + path = libraries/drivers/tsl2561 + url = https://github.com/adafruit/Adafruit_CircuitPython_TSL2561.git +[submodule "libraries/drivers/ads1x15"] + path = libraries/drivers/ads1x15 + url = https://github.com/adafruit/Adafruit_CircuitPython_ADS1x15.git +[submodule "libraries/drivers/gps"] + path = libraries/drivers/gps + url = https://github.com/adafruit/Adafruit_CircuitPython_GPS.git +[submodule "libraries/drivers/vc0706"] + path = libraries/drivers/vc0706 + url = https://github.com/adafruit/Adafruit_CircuitPython_VC0706.git +[submodule "libraries/drivers/charlcd"] + path = libraries/drivers/charlcd + url = https://github.com/adafruit/Adafruit_CircuitPython_CharLCD.git +[submodule "libraries/drivers/amg88xx"] + path = libraries/drivers/amg88xx + url = https://github.com/adafruit/Adafruit_CircuitPython_AMG88xx.git +[submodule "libraries/drivers/seesaw"] + path = libraries/drivers/seesaw + url = https://github.com/adafruit/Adafruit_CircuitPython_Seesaw.git +[submodule "libraries/drivers/fingerprint"] + path = libraries/drivers/fingerprint + url = https://github.com/adafruit/Adafruit_CircuitPython_Fingerprint.git +[submodule "libraries/drivers/max31865"] + path = libraries/drivers/max31865 + url = https://github.com/adafruit/Adafruit_CircuitPython_MAX31865.git +[submodule "libraries/drivers/ina219"] + path = libraries/drivers/ina219 + url = https://github.com/adafruit/Adafruit_CircuitPython_INA219.git +[submodule "libraries/drivers/ds1307"] + path = libraries/drivers/ds1307 + url = https://github.com/adafruit/Adafruit_CircuitPython_DS1307.git +[submodule "libraries/drivers/irremote"] + path = libraries/drivers/irremote + url = https://github.com/adafruit/Adafruit_CircuitPython_IRRemote.git +[submodule "libraries/drivers/fxos8700"] + path = libraries/drivers/fxos8700 + url = https://github.com/adafruit/Adafruit_CircuitPython_FXOS8700.git +[submodule "libraries/drivers/vcnl4010"] + path = libraries/drivers/vcnl4010 + url = https://github.com/adafruit/Adafruit_CircuitPython_VCNL4010.git +[submodule "libraries/drivers/drv2605"] + path = libraries/drivers/drv2605 + url = https://github.com/adafruit/Adafruit_CircuitPython_DRV2605.git +[submodule "libraries/drivers/tcs34725"] + path = libraries/drivers/tcs34725 + url = https://github.com/adafruit/Adafruit_CircuitPython_TCS34725.git +[submodule "libraries/drivers/lsm9ds0"] + path = libraries/drivers/lsm9ds0 + url = https://github.com/adafruit/Adafruit_CircuitPython_LSM9DS0.git +[submodule "libraries/drivers/lsm9ds1"] + path = libraries/drivers/lsm9ds1 + url = https://github.com/adafruit/Adafruit_CircuitPython_LSM9DS1.git +[submodule "libraries/drivers/fxas21002c"] + path = libraries/drivers/fxas21002c + url = https://github.com/adafruit/Adafruit_CircuitPython_FXAS21002C.git +[submodule "libraries/drivers/vl530l0x"] + path = libraries/drivers/vl53l0x + url = https://github.com/adafruit/Adafruit_CircuitPython_VL53L0X.git +[submodule "libraries/drivers/apds9960"] + path = libraries/drivers/apds9960 + url = https://github.com/adafruit/Adafruit_CircuitPython_APDS9960.git +[submodule "libraries/helpers/featherwing"] + path = libraries/helpers/featherwing + url = https://github.com/adafruit/Adafruit_CircuitPython_FeatherWing.git +[submodule "libraries/helpers/motor"] + path = libraries/helpers/motor + url = https://github.com/adafruit/Adafruit_CircuitPython_Motor.git +[submodule "libraries/helpers/avrprog"] + path = libraries/helpers/avrprog + url = https://github.com/adafruit/Adafruit_CircuitPython_AVRprog.git +[submodule "libraries/drivers/sgp30"] + path = libraries/drivers/sgp30 + url = https://github.com/adafruit/Adafruit_CircuitPython_SGP30.git +[submodule "libraries/helpers/onewire"] + path = libraries/helpers/onewire + url = https://github.com/adafruit/Adafruit_CircuitPython_OneWire.git +[submodule "libraries/drivers/vl6180x"] + path = libraries/drivers/vl6180x + url = https://github.com/adafruit/Adafruit_CircuitPython_VL6180X.git +[submodule "libraries/drivers/ds2413"] + path = libraries/drivers/ds2413 + url = https://github.com/adafruit/Adafruit_CircuitPython_DS2413.git +[submodule "libraries/drivers/thermal_printer"] + path = libraries/drivers/thermal_printer + url = https://github.com/adafruit/Adafruit_CircuitPython_Thermal_Printer.git +[submodule "libraries/drivers/rfm69"] + path = libraries/drivers/rfm69 + url = https://github.com/adafruit/Adafruit_CircuitPython_RFM69.git +[submodule "libraries/drivers/veml6070"] + path = libraries/drivers/veml6070 + url = https://github.com/adafruit/Adafruit_CircuitPython_VEML6070.git +[submodule "libraries/helpers/fancyled"] + path = libraries/helpers/fancyled + url = https://github.com/adafruit/Adafruit_CircuitPython_FancyLED.git +[submodule "libraries/drivers/tsl2591"] + path = libraries/drivers/tsl2591 + url = https://github.com/adafruit/Adafruit_CircuitPython_TSL2591.git +[submodule "libraries/drivers/mcp4725"] + path = libraries/drivers/mcp4725 + url = https://github.com/adafruit/Adafruit_CircuitPython_MCP4725.git +[submodule "libraries/drivers/max9744"] + path = libraries/drivers/max9744 + url = https://github.com/adafruit/Adafruit_CircuitPython_MAX9744.git +[submodule "libraries/drivers/tlc59711"] + path = libraries/drivers/tlc59711 + url = https://github.com/adafruit/Adafruit_CircuitPython_TLC59711.git +[submodule "libraries/drivers/tlc5947"] + path = libraries/drivers/tlc5947 + url = https://github.com/adafruit/Adafruit_CircuitPython_TLC5947.git +[submodule "libraries/drivers/mma8451"] + path = libraries/drivers/mma8451 + url = https://github.com/adafruit/Adafruit_CircuitPython_MMA8451.git +[submodule "libraries/drivers/si5351"] + path = libraries/drivers/si5351 + url = https://github.com/adafruit/Adafruit_CircuitPython_SI5351.git +[submodule "libraries/drivers/sht31"] + path = libraries/drivers/sht31 + url = https://github.com/adafruit/Adafruit_CircuitPython_SHT31D.git +[submodule "libraries/drivers/si4713"] + path = libraries/drivers/si4713 + url = https://github.com/adafruit/Adafruit_CircuitPython_SI4713.git +[submodule "libraries/drivers/mpl3115a2"] + path = libraries/drivers/mpl3115a2 + url = https://github.com/adafruit/Adafruit_CircuitPython_MPL3115A2.git +[submodule "libraries/drivers/lsm303"] + path = libraries/drivers/lsm303 + url = https://github.com/adafruit/Adafruit_CircuitPython_LSM303.git +[submodule "libraries/drivers/ds18x20"] + path = libraries/drivers/ds18x20 + url = https://github.com/adafruit/Adafruit_CircuitPython_DS18X20.git +[submodule "libraries/drivers/rfm9x"] + path = libraries/drivers/rfm9x + url = https://github.com/adafruit/Adafruit_CircuitPython_RFM9x.git +[submodule "libraries/drivers/am2320"] + path = libraries/drivers/am2320 + url = https://github.com/adafruit/Adafruit_CircuitPython_AM2320.git +[submodule "libraries/drivers/mcp230xx"] + path = libraries/drivers/mcp230xx + url = https://github.com/adafruit/Adafruit_CircuitPython_MCP230xx.git +[submodule "libraries/drivers/trellis"] + path = libraries/drivers/trellis + url = https://github.com/adafruit/Adafruit_CircuitPython_Trellis.git +[submodule "libraries/drivers/ws2801"] + path = libraries/drivers/ws2801 + url = https://github.com/adafruit/Adafruit_CircuitPython_WS2801.git +[submodule "libraries/drivers/focaltouch"] + path = libraries/drivers/focaltouch + url = https://github.com/adafruit/Adafruit_CircuitPython_FocalTouch.git +[submodule "libraries/drivers/as726x"] + path = libraries/drivers/as726x + url = https://github.com/adafruit/Adafruit_CircuitPython_AS726x.git +[submodule "libraries/drivers/stmpe610"] + path = libraries/drivers/stmpe610 + url = https://github.com/adafruit/Adafruit_CircuitPython_STMPE610.git +[submodule "libraries/drivers/matrixkeypad"] + path = libraries/drivers/matrixkeypad + url = https://github.com/adafruit/Adafruit_CircuitPython_MatrixKeypad.git +[submodule "libraries/drivers/l3gd20"] + path = libraries/drivers/l3gd20 + url = https://github.com/adafruit/Adafruit_CircuitPython_L3GD20.git +[submodule "libraries/drivers/crickit"] + path = libraries/drivers/crickit + url = https://github.com/adafruit/Adafruit_CircuitPython_Crickit.git +[submodule "libraries/drivers/pixie"] + path = libraries/drivers/pixie + url = https://github.com/adafruit/Adafruit_CircuitPython_Pixie.git +[submodule "libraries/drivers/epd"] + path = libraries/drivers/epd + url = https://github.com/adafruit/Adafruit_CircuitPython_EPD.git +[submodule "libraries/drivers/neotrellis"] + path = libraries/drivers/neotrellis + url = https://github.com/adafruit/Adafruit_CircuitPython_NeoTrellis +[submodule "libraries/drivers/tmp007"] + path = libraries/drivers/tmp007 + url = https://github.com/adafruit/Adafruit_CircuitPython_TMP007.git +[submodule "libraries/drivers/tca9584a"] + path = libraries/drivers/tca9584a + url = https://github.com/adafruit/Adafruit_CircuitPython_TCA9548A.git +[submodule "libraries/drivers/mcp3xxx"] + path = libraries/drivers/mcp3xxx + url = https://github.com/adafruit/Adafruit_CircuitPython_MCP3xxx.git +[submodule "libraries/helpers/led-animation"] + path = libraries/helpers/led-animation + url = https://github.com/adafruit/Adafruit_CircuitPython_LED_Animation.git +[submodule "libraries/drivers/mlx90614"] + path = libraries/drivers/mlx90614 + url = https://github.com/adafruit/Adafruit_CircuitPython_MLX90614.git +[submodule "libraries/drivers/pn532"] + path = libraries/drivers/pn532 + url = https://github.com/adafruit/Adafruit_CircuitPython_PN532.git +[submodule "libraries/helpers/imageload"] + path = libraries/helpers/imageload + url = https://github.com/adafruit/Adafruit_CircuitPython_ImageLoad.git +[submodule "libraries/drivers/hcsr04"] + path = libraries/drivers/hcsr04 + url = https://github.com/adafruit/Adafruit_CircuitPython_HCSR04.git +[submodule "libraries/drivers/mprls"] + path = libraries/drivers/mprls + url = https://github.com/adafruit/Adafruit_CircuitPython_MPRLS.git +[submodule "libraries/drivers/veml6075"] + path = libraries/drivers/veml6075 + url = https://github.com/adafruit/Adafruit_CircuitPython_VEML6075.git +[submodule "libraries/helpers/miniqr"] + path = libraries/helpers/miniqr + url = https://github.com/adafruit/Adafruit_CircuitPython_miniQR.git +[submodule "libraries/drivers/htu21d"] + path = libraries/drivers/htu21d + url = https://github.com/adafruit/Adafruit_CircuitPython_HTU21D.git +[submodule "libraries/drivers/lidarlite"] + path = libraries/drivers/lidarlite + url = https://github.com/adafruit/Adafruit_CircuitPython_LIDARLite.git diff --git a/libraries/drivers/cap1188/.travis.yml b/libraries/drivers/cap1188/.travis.yml new file mode 100644 index 00000000..8a3ce6a5 --- /dev/null +++ b/libraries/drivers/cap1188/.travis.yml @@ -0,0 +1,22 @@ +# Travis CI configuration for automated bundle generation. + +dist: trusty +sudo: false +language: python +python: + - "3.6" + +cache: + pip: true + +deploy: + provider: releases + api_key: $GITHUB_TOKEN + file_glob: true + file: bundles/* + skip_cleanup: true + overwrite: true + on: + tags: true + +script: circuitpython-build-bundles --filename_prefix adafruit-circuitpython-bundle --library_location libraries --library_depth 2 diff --git a/libraries/drivers/cap1188/CODE_OF_CONDUCT.md b/libraries/drivers/cap1188/CODE_OF_CONDUCT.md new file mode 100644 index 00000000..1617586f --- /dev/null +++ b/libraries/drivers/cap1188/CODE_OF_CONDUCT.md @@ -0,0 +1,74 @@ +# Contributor Covenant Code of Conduct + +## Our Pledge + +In the interest of fostering an open and welcoming environment, we as +contributors and maintainers pledge to making participation in our project and +our community a harassment-free experience for everyone, regardless of age, body +size, disability, ethnicity, gender identity and expression, level of experience, +nationality, personal appearance, race, religion, or sexual identity and +orientation. + +## Our Standards + +Examples of behavior that contributes to creating a positive environment +include: + +* Using welcoming and inclusive language +* Being respectful of differing viewpoints and experiences +* Gracefully accepting constructive criticism +* Focusing on what is best for the community +* Showing empathy towards other community members + +Examples of unacceptable behavior by participants include: + +* The use of sexualized language or imagery and unwelcome sexual attention or +advances +* Trolling, insulting/derogatory comments, and personal or political attacks +* Public or private harassment +* Publishing others' private information, such as a physical or electronic + address, without explicit permission +* Other conduct which could reasonably be considered inappropriate in a + professional setting + +## Our Responsibilities + +Project maintainers are responsible for clarifying the standards of acceptable +behavior and are expected to take appropriate and fair corrective action in +response to any instances of unacceptable behavior. + +Project maintainers have the right and responsibility to remove, edit, or +reject comments, commits, code, wiki edits, issues, and other contributions +that are not aligned to this Code of Conduct, or to ban temporarily or +permanently any contributor for other behaviors that they deem inappropriate, +threatening, offensive, or harmful. + +## Scope + +This Code of Conduct applies both within project spaces and in public spaces +when an individual is representing the project or its community. Examples of +representing a project or community include using an official project e-mail +address, posting via an official social media account, or acting as an appointed +representative at an online or offline event. Representation of a project may be +further defined and clarified by project maintainers. + +## Enforcement + +Instances of abusive, harassing, or otherwise unacceptable behavior may be +reported by contacting the project team at support@adafruit.com. All +complaints will be reviewed and investigated and will result in a response that +is deemed necessary and appropriate to the circumstances. The project team is +obligated to maintain confidentiality with regard to the reporter of an incident. +Further details of specific enforcement policies may be posted separately. + +Project maintainers who do not follow or enforce the Code of Conduct in good +faith may face temporary or permanent repercussions as determined by other +members of the project's leadership. + +## Attribution + +This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, +available at [http://contributor-covenant.org/version/1/4][version] + +[homepage]: http://contributor-covenant.org +[version]: http://contributor-covenant.org/version/1/4/ diff --git a/libraries/drivers/cap1188/LICENSE b/libraries/drivers/cap1188/LICENSE new file mode 100644 index 00000000..19a9cd85 --- /dev/null +++ b/libraries/drivers/cap1188/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2016 Adafruit Industries + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/libraries/drivers/cap1188/README.md b/libraries/drivers/cap1188/README.md new file mode 100644 index 00000000..b9124a91 --- /dev/null +++ b/libraries/drivers/cap1188/README.md @@ -0,0 +1,59 @@ +# Adafruit CircuitPython Library Bundle + +[![Doc Status](https://readthedocs.org/projects/circuitpython/badge/?version=latest)](https://circuitpython.readthedocs.io/en/latest/docs/drivers.html) [![Gitter](https://badges.gitter.im/adafruit/circuitpython.svg)](https://gitter.im/adafruit/circuitpython?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) +[![Discord](https://img.shields.io/discord/327254708534116352.svg)](https://discord.gg/nBQh6qu) + +This repo bundles a bunch of useful CircuitPython libraries into an easy to +download zip file. CircuitPython boards can ship with the contents of the zip to +make it easy to provide a lot of libraries by default. + +# Use +To use the bundle download the zip (not source zip) from the +[latest release](https://github.com/adafruit/Adafruit_CircuitPython_Bundle/releases/latest), +unzip it and copy over the subfolders, such as `lib`, into the root of your +CircuitPython device. Make sure to indicate that it should be merged with the +existing folder when it exists. + +# Development + +After you clone this repository you must run `git submodule init` +and then `git submodule update`. + +## Updating libraries +To update the libraries run `update-submodules.sh`. The script will fetch the +latest code and update to the newest tag (not master). + +To find libraries with commits that haven't been included in a release do: + + git submodule foreach "git log --oneline HEAD...origin/master" + +## Adding a library +Determine the best location within `libraries` (`libraries/drivers/` or +`libraries/helpers/`)for the new library and then run: + + git submodule add libraries/ + +The target directory should omit any CircuitPython specific prefixes such as +`adafruit-circuitpython` to simplify the listing. + +## Removing a library +Only do this if you are replacing the module with an equivalent: + + git submodule deinit libraries/ + git rm libraries/ + +## Building the bundle +To build this bundle locally you'll need to install the +`circuitpython-build-tools `_ package. + + python3 -m venv .env + source .env/bin/activate + pip install circuitpython-build-tools + +Once installed, make sure you are in the virtual environment: + + source .env/bin/activate + +Then run the build: + + circuitpython-build-bundles --filename_prefix adafruit-circuitpython-bundle --library_location libraries --library_depth 2 diff --git a/libraries/drivers/cap1188/README.txt b/libraries/drivers/cap1188/README.txt new file mode 100644 index 00000000..8e9b8c8a --- /dev/null +++ b/libraries/drivers/cap1188/README.txt @@ -0,0 +1,2 @@ +See here for more info: https://github.com/adafruit/Adafruit_CircuitPython_Bundle +See VERSIONS.txt for version info. diff --git a/libraries/drivers/cap1188/requirements.txt b/libraries/drivers/cap1188/requirements.txt new file mode 100644 index 00000000..5bef2946 --- /dev/null +++ b/libraries/drivers/cap1188/requirements.txt @@ -0,0 +1 @@ +circuitpython-build-tools diff --git a/libraries/drivers/cap1188/update-submodules.sh b/libraries/drivers/cap1188/update-submodules.sh new file mode 100755 index 00000000..ff303819 --- /dev/null +++ b/libraries/drivers/cap1188/update-submodules.sh @@ -0,0 +1,30 @@ +#! /bin/bash + +# The MIT License (MIT) +# +# Copyright (c) 2016 Scott Shawcroft for Adafruit Industries +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +# This script updates all submodules to the latest tag (hopefully release). +# 'init' to make sure any new libraries are incorporated. +git submodule init +git submodule update +git submodule foreach git fetch +git submodule foreach "tag=\$(git rev-list --tags --max-count=1); git checkout -q \$tag" diff --git a/libraries/drivers/cap1188/update_scripts/update_linux.sh b/libraries/drivers/cap1188/update_scripts/update_linux.sh new file mode 100755 index 00000000..7c70eeba --- /dev/null +++ b/libraries/drivers/cap1188/update_scripts/update_linux.sh @@ -0,0 +1,15 @@ +#! /bin/bash +latest_release=$(curl -s "https://api.github.com/repos/adafruit/Adafruit_CircuitPython_Bundle/releases/latest") +download_link=$(echo $latest_release | grep -o "\"browser_download_url\": \"[^\"]*" | cut -d \" -f 4) +tag=$(echo $latest_release | grep -o "\"tag_name\": \"[^\"]*" | cut -d \" -f 4) +current=$(head -n 1 VERSIONS.txt | tr -d '[:space:]') +if [ $? -ne 0 ] +then echo "No VERSIONS.txt please run from lib/" +fi +if [ $current == $tag ] +then echo "Already updated to the latest."; exit 0 +fi +save_to=~/Downloads/$(basename $download_link) +echo "Downloading to " $save_to +curl -sL $download_link > $save_to +unzip -o $save_to -d .. diff --git a/libraries/drivers/cap1188/update_scripts/update_macosx.command b/libraries/drivers/cap1188/update_scripts/update_macosx.command new file mode 100755 index 00000000..e2266999 --- /dev/null +++ b/libraries/drivers/cap1188/update_scripts/update_macosx.command @@ -0,0 +1,16 @@ +#! /bin/bash +cd $(dirname $0) +latest_release=$(curl -s "https://api.github.com/repos/adafruit/Adafruit_CircuitPython_Bundle/releases/latest") +download_link=$(echo $latest_release | grep -o "\"browser_download_url\": \"[^\"]*" | cut -d \" -f 4) +tag=$(echo $latest_release | grep -o "\"tag_name\": \"[^\"]*" | cut -d \" -f 4) +current=$(head -n 1 VERSIONS.txt | tr -d '[:space:]') +if [ $? -ne 0 ] +then echo "No VERSIONS.txt please run from lib/" +fi +if [ $current == $tag ] +then echo "Already updated to the latest."; exit 0 +fi +save_to=~/Downloads/$(basename $download_link) +echo "Downloading to " $save_to +curl -sL $download_link > $save_to +unzip -o $save_to -d .. From 59c8ae25b5fa44e20f462625521f1be176ecaf88 Mon Sep 17 00:00:00 2001 From: caternuson Date: Fri, 12 Oct 2018 11:13:19 -0700 Subject: [PATCH 2/3] clean up --- .gitmodules | 2 +- libraries/drivers/cap1188/.gitignore | 4 - libraries/drivers/cap1188/.gitmodules | 303 ------------------ libraries/drivers/cap1188/.travis.yml | 22 -- libraries/drivers/cap1188/CODE_OF_CONDUCT.md | 74 ----- libraries/drivers/cap1188/LICENSE | 21 -- libraries/drivers/cap1188/README.md | 59 ---- libraries/drivers/cap1188/README.txt | 2 - libraries/drivers/cap1188/requirements.txt | 1 - .../drivers/cap1188/update-submodules.sh | 30 -- .../cap1188/update_scripts/update_linux.sh | 15 - .../update_scripts/update_macosx.command | 16 - 12 files changed, 1 insertion(+), 548 deletions(-) delete mode 100644 libraries/drivers/cap1188/.gitignore delete mode 100644 libraries/drivers/cap1188/.gitmodules delete mode 100644 libraries/drivers/cap1188/.travis.yml delete mode 100644 libraries/drivers/cap1188/CODE_OF_CONDUCT.md delete mode 100644 libraries/drivers/cap1188/LICENSE delete mode 100644 libraries/drivers/cap1188/README.md delete mode 100644 libraries/drivers/cap1188/README.txt delete mode 100644 libraries/drivers/cap1188/requirements.txt delete mode 100755 libraries/drivers/cap1188/update-submodules.sh delete mode 100755 libraries/drivers/cap1188/update_scripts/update_linux.sh delete mode 100755 libraries/drivers/cap1188/update_scripts/update_macosx.command diff --git a/.gitmodules b/.gitmodules index 3d4522f8..023de48b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -301,7 +301,7 @@ [submodule "libraries/drivers/lidarlite"] path = libraries/drivers/lidarlite url = https://github.com/adafruit/Adafruit_CircuitPython_LIDARLite.git -[submodule "libraries/cap1188"] +[submodule "libraries/drivers/cap1188"] path = libraries/drivers/cap1188 url = https://github.com/adafruit/Adafruit_CircuitPython_Bundle.git [submodule "libraries/helpers/slideshow"] diff --git a/libraries/drivers/cap1188/.gitignore b/libraries/drivers/cap1188/.gitignore deleted file mode 100644 index 4cac91f3..00000000 --- a/libraries/drivers/cap1188/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -build* -*zip -.env -bundles diff --git a/libraries/drivers/cap1188/.gitmodules b/libraries/drivers/cap1188/.gitmodules deleted file mode 100644 index da207e43..00000000 --- a/libraries/drivers/cap1188/.gitmodules +++ /dev/null @@ -1,303 +0,0 @@ -[submodule "libraries/register"] - path = libraries/helpers/register - url = https://github.com/adafruit/Adafruit_CircuitPython_Register.git -[submodule "libraries/bus_device"] - path = libraries/helpers/bus_device - url = https://github.com/adafruit/Adafruit_CircuitPython_BusDevice.git -[submodule "libraries/helpers/simpleio"] - path = libraries/helpers/simpleio - url = https://github.com/adafruit/Adafruit_CircuitPython_SimpleIO.git -[submodule "libraries/drivers/mcp9808"] - path = libraries/drivers/mcp9808 - url = https://github.com/adafruit/Adafruit_CircuitPython_MCP9808.git -[submodule "libraries/drivers/thermistor"] - path = libraries/drivers/thermistor - url = https://github.com/adafruit/Adafruit_CircuitPython_Thermistor.git -[submodule "libraries/drivers/mpr121"] - path = libraries/drivers/mpr121 - url = https://github.com/adafruit/Adafruit_CircuitPython_MPR121.git -[submodule "libraries/drivers/si7021"] - path = libraries/drivers/si7021 - url = https://github.com/adafruit/Adafruit_CircuitPython_SI7021.git -[submodule "libraries/drivers/max31855"] - path = libraries/drivers/max31855 - url = https://github.com/adafruit/Adafruit_CircuitPython_MAX31855.git -[submodule "libraries/drivers/bno055"] - path = libraries/drivers/bno055 - url = https://github.com/adafruit/Adafruit_CircuitPython_BNO055.git -[submodule "libraries/drivers/lis3dh"] - path = libraries/drivers/lis3dh - url = https://github.com/adafruit/Adafruit_CircuitPython_LIS3DH.git -[submodule "libraries/helpers/hid"] - path = libraries/helpers/hid - url = https://github.com/adafruit/Adafruit_CircuitPython_HID.git -[submodule "cipy_pca9685"] - path = libraries/drivers/pca9685 - url = https://github.com/adafruit/Adafruit_CircuitPython_PCA9685.git -[submodule "cipy_ht16k33"] - path = libraries/drivers/ht16k33 - url = https://github.com/adafruit/Adafruit_CircuitPython_HT16K33.git -[submodule "rgb_display"] - path = libraries/drivers/rgb-display - url = https://github.com/adafruit/Adafruit_CircuitPython_RGB_Display.git -[submodule "cipy_neopixel"] - path = libraries/drivers/neopixel - url = https://github.com/adafruit/Adafruit_CircuitPython_NeoPixel.git -[submodule "cipy_ssd1306"] - path = libraries/drivers/ssd1306 - url = https://github.com/adafruit/Adafruit_CircuitPython_SSD1306.git -[submodule "libraries/drivers/pcf8523"] - path = libraries/drivers/pcf8523 - url = https://github.com/adafruit/Adafruit_CircuitPython_PCF8523.git -[submodule "is31fl3731_2"] - path = libraries/drivers/is31fl3731 - url = https://github.com/adafruit/Adafruit_CircuitPython_IS31FL3731.git -[submodule "libraries/helpers/rtttl"] - path = libraries/helpers/rtttl - url = https://github.com/adafruit/Adafruit_CircuitPython_RTTTL.git -[submodule "libraries/helpers/waveform"] - path = libraries/helpers/waveform - url = https://github.com/adafruit/Adafruit_CircuitPython_Waveform.git -[submodule "libraries/drivers/dotstar"] - path = libraries/drivers/dotstar - url = https://github.com/adafruit/Adafruit_CircuitPython_DotStar.git -[submodule "libraries/drivers/circuitplayground"] - path = libraries/drivers/circuitplayground - url = https://github.com/adafruit/Adafruit_CircuitPython_CircuitPlayground.git -[submodule "libraries/drivers/sdcard"] - path = libraries/drivers/sdcard - url = https://github.com/adafruit/Adafruit_CircuitPython_SD.git -[submodule "libraries/drivers/ds3231"] - path = libraries/drivers/ds3231 - url = https://github.com/adafruit/Adafruit_CircuitPython_DS3231.git -[submodule "libraries/drivers/max7219"] - path = libraries/drivers/max7219 - url = https://github.com/adafruit/Adafruit_CircuitPython_MAX7219.git -[submodule "libraries/drivers/dht"] - path = libraries/drivers/dht - url = https://github.com/adafruit/Adafruit_CircuitPython_DHT.git -[submodule "libraries/drivers/ccs811"] - path = libraries/drivers/ccs811 - url = https://github.com/adafruit/Adafruit_CircuitPython_CCS811.git -[submodule "libraries/drivers/bmp280"] - path = libraries/drivers/bmp280 - url = https://github.com/adafruit/Adafruit_CircuitPython_BMP280.git -[submodule "libraries/drivers/bme280"] - path = libraries/drivers/bme280 - url = https://github.com/adafruit/Adafruit_CircuitPython_BME280.git -[submodule "libraries/drivers/bme680"] - path = libraries/drivers/bme680 - url = https://github.com/adafruit/Adafruit_CircuitPython_BME680.git -[submodule "libraries/drivers/tsl2561"] - path = libraries/drivers/tsl2561 - url = https://github.com/adafruit/Adafruit_CircuitPython_TSL2561.git -[submodule "libraries/drivers/ads1x15"] - path = libraries/drivers/ads1x15 - url = https://github.com/adafruit/Adafruit_CircuitPython_ADS1x15.git -[submodule "libraries/drivers/gps"] - path = libraries/drivers/gps - url = https://github.com/adafruit/Adafruit_CircuitPython_GPS.git -[submodule "libraries/drivers/vc0706"] - path = libraries/drivers/vc0706 - url = https://github.com/adafruit/Adafruit_CircuitPython_VC0706.git -[submodule "libraries/drivers/charlcd"] - path = libraries/drivers/charlcd - url = https://github.com/adafruit/Adafruit_CircuitPython_CharLCD.git -[submodule "libraries/drivers/amg88xx"] - path = libraries/drivers/amg88xx - url = https://github.com/adafruit/Adafruit_CircuitPython_AMG88xx.git -[submodule "libraries/drivers/seesaw"] - path = libraries/drivers/seesaw - url = https://github.com/adafruit/Adafruit_CircuitPython_Seesaw.git -[submodule "libraries/drivers/fingerprint"] - path = libraries/drivers/fingerprint - url = https://github.com/adafruit/Adafruit_CircuitPython_Fingerprint.git -[submodule "libraries/drivers/max31865"] - path = libraries/drivers/max31865 - url = https://github.com/adafruit/Adafruit_CircuitPython_MAX31865.git -[submodule "libraries/drivers/ina219"] - path = libraries/drivers/ina219 - url = https://github.com/adafruit/Adafruit_CircuitPython_INA219.git -[submodule "libraries/drivers/ds1307"] - path = libraries/drivers/ds1307 - url = https://github.com/adafruit/Adafruit_CircuitPython_DS1307.git -[submodule "libraries/drivers/irremote"] - path = libraries/drivers/irremote - url = https://github.com/adafruit/Adafruit_CircuitPython_IRRemote.git -[submodule "libraries/drivers/fxos8700"] - path = libraries/drivers/fxos8700 - url = https://github.com/adafruit/Adafruit_CircuitPython_FXOS8700.git -[submodule "libraries/drivers/vcnl4010"] - path = libraries/drivers/vcnl4010 - url = https://github.com/adafruit/Adafruit_CircuitPython_VCNL4010.git -[submodule "libraries/drivers/drv2605"] - path = libraries/drivers/drv2605 - url = https://github.com/adafruit/Adafruit_CircuitPython_DRV2605.git -[submodule "libraries/drivers/tcs34725"] - path = libraries/drivers/tcs34725 - url = https://github.com/adafruit/Adafruit_CircuitPython_TCS34725.git -[submodule "libraries/drivers/lsm9ds0"] - path = libraries/drivers/lsm9ds0 - url = https://github.com/adafruit/Adafruit_CircuitPython_LSM9DS0.git -[submodule "libraries/drivers/lsm9ds1"] - path = libraries/drivers/lsm9ds1 - url = https://github.com/adafruit/Adafruit_CircuitPython_LSM9DS1.git -[submodule "libraries/drivers/fxas21002c"] - path = libraries/drivers/fxas21002c - url = https://github.com/adafruit/Adafruit_CircuitPython_FXAS21002C.git -[submodule "libraries/drivers/vl530l0x"] - path = libraries/drivers/vl53l0x - url = https://github.com/adafruit/Adafruit_CircuitPython_VL53L0X.git -[submodule "libraries/drivers/apds9960"] - path = libraries/drivers/apds9960 - url = https://github.com/adafruit/Adafruit_CircuitPython_APDS9960.git -[submodule "libraries/helpers/featherwing"] - path = libraries/helpers/featherwing - url = https://github.com/adafruit/Adafruit_CircuitPython_FeatherWing.git -[submodule "libraries/helpers/motor"] - path = libraries/helpers/motor - url = https://github.com/adafruit/Adafruit_CircuitPython_Motor.git -[submodule "libraries/helpers/avrprog"] - path = libraries/helpers/avrprog - url = https://github.com/adafruit/Adafruit_CircuitPython_AVRprog.git -[submodule "libraries/drivers/sgp30"] - path = libraries/drivers/sgp30 - url = https://github.com/adafruit/Adafruit_CircuitPython_SGP30.git -[submodule "libraries/helpers/onewire"] - path = libraries/helpers/onewire - url = https://github.com/adafruit/Adafruit_CircuitPython_OneWire.git -[submodule "libraries/drivers/vl6180x"] - path = libraries/drivers/vl6180x - url = https://github.com/adafruit/Adafruit_CircuitPython_VL6180X.git -[submodule "libraries/drivers/ds2413"] - path = libraries/drivers/ds2413 - url = https://github.com/adafruit/Adafruit_CircuitPython_DS2413.git -[submodule "libraries/drivers/thermal_printer"] - path = libraries/drivers/thermal_printer - url = https://github.com/adafruit/Adafruit_CircuitPython_Thermal_Printer.git -[submodule "libraries/drivers/rfm69"] - path = libraries/drivers/rfm69 - url = https://github.com/adafruit/Adafruit_CircuitPython_RFM69.git -[submodule "libraries/drivers/veml6070"] - path = libraries/drivers/veml6070 - url = https://github.com/adafruit/Adafruit_CircuitPython_VEML6070.git -[submodule "libraries/helpers/fancyled"] - path = libraries/helpers/fancyled - url = https://github.com/adafruit/Adafruit_CircuitPython_FancyLED.git -[submodule "libraries/drivers/tsl2591"] - path = libraries/drivers/tsl2591 - url = https://github.com/adafruit/Adafruit_CircuitPython_TSL2591.git -[submodule "libraries/drivers/mcp4725"] - path = libraries/drivers/mcp4725 - url = https://github.com/adafruit/Adafruit_CircuitPython_MCP4725.git -[submodule "libraries/drivers/max9744"] - path = libraries/drivers/max9744 - url = https://github.com/adafruit/Adafruit_CircuitPython_MAX9744.git -[submodule "libraries/drivers/tlc59711"] - path = libraries/drivers/tlc59711 - url = https://github.com/adafruit/Adafruit_CircuitPython_TLC59711.git -[submodule "libraries/drivers/tlc5947"] - path = libraries/drivers/tlc5947 - url = https://github.com/adafruit/Adafruit_CircuitPython_TLC5947.git -[submodule "libraries/drivers/mma8451"] - path = libraries/drivers/mma8451 - url = https://github.com/adafruit/Adafruit_CircuitPython_MMA8451.git -[submodule "libraries/drivers/si5351"] - path = libraries/drivers/si5351 - url = https://github.com/adafruit/Adafruit_CircuitPython_SI5351.git -[submodule "libraries/drivers/sht31"] - path = libraries/drivers/sht31 - url = https://github.com/adafruit/Adafruit_CircuitPython_SHT31D.git -[submodule "libraries/drivers/si4713"] - path = libraries/drivers/si4713 - url = https://github.com/adafruit/Adafruit_CircuitPython_SI4713.git -[submodule "libraries/drivers/mpl3115a2"] - path = libraries/drivers/mpl3115a2 - url = https://github.com/adafruit/Adafruit_CircuitPython_MPL3115A2.git -[submodule "libraries/drivers/lsm303"] - path = libraries/drivers/lsm303 - url = https://github.com/adafruit/Adafruit_CircuitPython_LSM303.git -[submodule "libraries/drivers/ds18x20"] - path = libraries/drivers/ds18x20 - url = https://github.com/adafruit/Adafruit_CircuitPython_DS18X20.git -[submodule "libraries/drivers/rfm9x"] - path = libraries/drivers/rfm9x - url = https://github.com/adafruit/Adafruit_CircuitPython_RFM9x.git -[submodule "libraries/drivers/am2320"] - path = libraries/drivers/am2320 - url = https://github.com/adafruit/Adafruit_CircuitPython_AM2320.git -[submodule "libraries/drivers/mcp230xx"] - path = libraries/drivers/mcp230xx - url = https://github.com/adafruit/Adafruit_CircuitPython_MCP230xx.git -[submodule "libraries/drivers/trellis"] - path = libraries/drivers/trellis - url = https://github.com/adafruit/Adafruit_CircuitPython_Trellis.git -[submodule "libraries/drivers/ws2801"] - path = libraries/drivers/ws2801 - url = https://github.com/adafruit/Adafruit_CircuitPython_WS2801.git -[submodule "libraries/drivers/focaltouch"] - path = libraries/drivers/focaltouch - url = https://github.com/adafruit/Adafruit_CircuitPython_FocalTouch.git -[submodule "libraries/drivers/as726x"] - path = libraries/drivers/as726x - url = https://github.com/adafruit/Adafruit_CircuitPython_AS726x.git -[submodule "libraries/drivers/stmpe610"] - path = libraries/drivers/stmpe610 - url = https://github.com/adafruit/Adafruit_CircuitPython_STMPE610.git -[submodule "libraries/drivers/matrixkeypad"] - path = libraries/drivers/matrixkeypad - url = https://github.com/adafruit/Adafruit_CircuitPython_MatrixKeypad.git -[submodule "libraries/drivers/l3gd20"] - path = libraries/drivers/l3gd20 - url = https://github.com/adafruit/Adafruit_CircuitPython_L3GD20.git -[submodule "libraries/drivers/crickit"] - path = libraries/drivers/crickit - url = https://github.com/adafruit/Adafruit_CircuitPython_Crickit.git -[submodule "libraries/drivers/pixie"] - path = libraries/drivers/pixie - url = https://github.com/adafruit/Adafruit_CircuitPython_Pixie.git -[submodule "libraries/drivers/epd"] - path = libraries/drivers/epd - url = https://github.com/adafruit/Adafruit_CircuitPython_EPD.git -[submodule "libraries/drivers/neotrellis"] - path = libraries/drivers/neotrellis - url = https://github.com/adafruit/Adafruit_CircuitPython_NeoTrellis -[submodule "libraries/drivers/tmp007"] - path = libraries/drivers/tmp007 - url = https://github.com/adafruit/Adafruit_CircuitPython_TMP007.git -[submodule "libraries/drivers/tca9584a"] - path = libraries/drivers/tca9584a - url = https://github.com/adafruit/Adafruit_CircuitPython_TCA9548A.git -[submodule "libraries/drivers/mcp3xxx"] - path = libraries/drivers/mcp3xxx - url = https://github.com/adafruit/Adafruit_CircuitPython_MCP3xxx.git -[submodule "libraries/helpers/led-animation"] - path = libraries/helpers/led-animation - url = https://github.com/adafruit/Adafruit_CircuitPython_LED_Animation.git -[submodule "libraries/drivers/mlx90614"] - path = libraries/drivers/mlx90614 - url = https://github.com/adafruit/Adafruit_CircuitPython_MLX90614.git -[submodule "libraries/drivers/pn532"] - path = libraries/drivers/pn532 - url = https://github.com/adafruit/Adafruit_CircuitPython_PN532.git -[submodule "libraries/helpers/imageload"] - path = libraries/helpers/imageload - url = https://github.com/adafruit/Adafruit_CircuitPython_ImageLoad.git -[submodule "libraries/drivers/hcsr04"] - path = libraries/drivers/hcsr04 - url = https://github.com/adafruit/Adafruit_CircuitPython_HCSR04.git -[submodule "libraries/drivers/mprls"] - path = libraries/drivers/mprls - url = https://github.com/adafruit/Adafruit_CircuitPython_MPRLS.git -[submodule "libraries/drivers/veml6075"] - path = libraries/drivers/veml6075 - url = https://github.com/adafruit/Adafruit_CircuitPython_VEML6075.git -[submodule "libraries/helpers/miniqr"] - path = libraries/helpers/miniqr - url = https://github.com/adafruit/Adafruit_CircuitPython_miniQR.git -[submodule "libraries/drivers/htu21d"] - path = libraries/drivers/htu21d - url = https://github.com/adafruit/Adafruit_CircuitPython_HTU21D.git -[submodule "libraries/drivers/lidarlite"] - path = libraries/drivers/lidarlite - url = https://github.com/adafruit/Adafruit_CircuitPython_LIDARLite.git diff --git a/libraries/drivers/cap1188/.travis.yml b/libraries/drivers/cap1188/.travis.yml deleted file mode 100644 index 8a3ce6a5..00000000 --- a/libraries/drivers/cap1188/.travis.yml +++ /dev/null @@ -1,22 +0,0 @@ -# Travis CI configuration for automated bundle generation. - -dist: trusty -sudo: false -language: python -python: - - "3.6" - -cache: - pip: true - -deploy: - provider: releases - api_key: $GITHUB_TOKEN - file_glob: true - file: bundles/* - skip_cleanup: true - overwrite: true - on: - tags: true - -script: circuitpython-build-bundles --filename_prefix adafruit-circuitpython-bundle --library_location libraries --library_depth 2 diff --git a/libraries/drivers/cap1188/CODE_OF_CONDUCT.md b/libraries/drivers/cap1188/CODE_OF_CONDUCT.md deleted file mode 100644 index 1617586f..00000000 --- a/libraries/drivers/cap1188/CODE_OF_CONDUCT.md +++ /dev/null @@ -1,74 +0,0 @@ -# Contributor Covenant Code of Conduct - -## Our Pledge - -In the interest of fostering an open and welcoming environment, we as -contributors and maintainers pledge to making participation in our project and -our community a harassment-free experience for everyone, regardless of age, body -size, disability, ethnicity, gender identity and expression, level of experience, -nationality, personal appearance, race, religion, or sexual identity and -orientation. - -## Our Standards - -Examples of behavior that contributes to creating a positive environment -include: - -* Using welcoming and inclusive language -* Being respectful of differing viewpoints and experiences -* Gracefully accepting constructive criticism -* Focusing on what is best for the community -* Showing empathy towards other community members - -Examples of unacceptable behavior by participants include: - -* The use of sexualized language or imagery and unwelcome sexual attention or -advances -* Trolling, insulting/derogatory comments, and personal or political attacks -* Public or private harassment -* Publishing others' private information, such as a physical or electronic - address, without explicit permission -* Other conduct which could reasonably be considered inappropriate in a - professional setting - -## Our Responsibilities - -Project maintainers are responsible for clarifying the standards of acceptable -behavior and are expected to take appropriate and fair corrective action in -response to any instances of unacceptable behavior. - -Project maintainers have the right and responsibility to remove, edit, or -reject comments, commits, code, wiki edits, issues, and other contributions -that are not aligned to this Code of Conduct, or to ban temporarily or -permanently any contributor for other behaviors that they deem inappropriate, -threatening, offensive, or harmful. - -## Scope - -This Code of Conduct applies both within project spaces and in public spaces -when an individual is representing the project or its community. Examples of -representing a project or community include using an official project e-mail -address, posting via an official social media account, or acting as an appointed -representative at an online or offline event. Representation of a project may be -further defined and clarified by project maintainers. - -## Enforcement - -Instances of abusive, harassing, or otherwise unacceptable behavior may be -reported by contacting the project team at support@adafruit.com. All -complaints will be reviewed and investigated and will result in a response that -is deemed necessary and appropriate to the circumstances. The project team is -obligated to maintain confidentiality with regard to the reporter of an incident. -Further details of specific enforcement policies may be posted separately. - -Project maintainers who do not follow or enforce the Code of Conduct in good -faith may face temporary or permanent repercussions as determined by other -members of the project's leadership. - -## Attribution - -This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, -available at [http://contributor-covenant.org/version/1/4][version] - -[homepage]: http://contributor-covenant.org -[version]: http://contributor-covenant.org/version/1/4/ diff --git a/libraries/drivers/cap1188/LICENSE b/libraries/drivers/cap1188/LICENSE deleted file mode 100644 index 19a9cd85..00000000 --- a/libraries/drivers/cap1188/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2016 Adafruit Industries - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/libraries/drivers/cap1188/README.md b/libraries/drivers/cap1188/README.md deleted file mode 100644 index b9124a91..00000000 --- a/libraries/drivers/cap1188/README.md +++ /dev/null @@ -1,59 +0,0 @@ -# Adafruit CircuitPython Library Bundle - -[![Doc Status](https://readthedocs.org/projects/circuitpython/badge/?version=latest)](https://circuitpython.readthedocs.io/en/latest/docs/drivers.html) [![Gitter](https://badges.gitter.im/adafruit/circuitpython.svg)](https://gitter.im/adafruit/circuitpython?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) -[![Discord](https://img.shields.io/discord/327254708534116352.svg)](https://discord.gg/nBQh6qu) - -This repo bundles a bunch of useful CircuitPython libraries into an easy to -download zip file. CircuitPython boards can ship with the contents of the zip to -make it easy to provide a lot of libraries by default. - -# Use -To use the bundle download the zip (not source zip) from the -[latest release](https://github.com/adafruit/Adafruit_CircuitPython_Bundle/releases/latest), -unzip it and copy over the subfolders, such as `lib`, into the root of your -CircuitPython device. Make sure to indicate that it should be merged with the -existing folder when it exists. - -# Development - -After you clone this repository you must run `git submodule init` -and then `git submodule update`. - -## Updating libraries -To update the libraries run `update-submodules.sh`. The script will fetch the -latest code and update to the newest tag (not master). - -To find libraries with commits that haven't been included in a release do: - - git submodule foreach "git log --oneline HEAD...origin/master" - -## Adding a library -Determine the best location within `libraries` (`libraries/drivers/` or -`libraries/helpers/`)for the new library and then run: - - git submodule add libraries/ - -The target directory should omit any CircuitPython specific prefixes such as -`adafruit-circuitpython` to simplify the listing. - -## Removing a library -Only do this if you are replacing the module with an equivalent: - - git submodule deinit libraries/ - git rm libraries/ - -## Building the bundle -To build this bundle locally you'll need to install the -`circuitpython-build-tools `_ package. - - python3 -m venv .env - source .env/bin/activate - pip install circuitpython-build-tools - -Once installed, make sure you are in the virtual environment: - - source .env/bin/activate - -Then run the build: - - circuitpython-build-bundles --filename_prefix adafruit-circuitpython-bundle --library_location libraries --library_depth 2 diff --git a/libraries/drivers/cap1188/README.txt b/libraries/drivers/cap1188/README.txt deleted file mode 100644 index 8e9b8c8a..00000000 --- a/libraries/drivers/cap1188/README.txt +++ /dev/null @@ -1,2 +0,0 @@ -See here for more info: https://github.com/adafruit/Adafruit_CircuitPython_Bundle -See VERSIONS.txt for version info. diff --git a/libraries/drivers/cap1188/requirements.txt b/libraries/drivers/cap1188/requirements.txt deleted file mode 100644 index 5bef2946..00000000 --- a/libraries/drivers/cap1188/requirements.txt +++ /dev/null @@ -1 +0,0 @@ -circuitpython-build-tools diff --git a/libraries/drivers/cap1188/update-submodules.sh b/libraries/drivers/cap1188/update-submodules.sh deleted file mode 100755 index ff303819..00000000 --- a/libraries/drivers/cap1188/update-submodules.sh +++ /dev/null @@ -1,30 +0,0 @@ -#! /bin/bash - -# The MIT License (MIT) -# -# Copyright (c) 2016 Scott Shawcroft for Adafruit Industries -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -# This script updates all submodules to the latest tag (hopefully release). -# 'init' to make sure any new libraries are incorporated. -git submodule init -git submodule update -git submodule foreach git fetch -git submodule foreach "tag=\$(git rev-list --tags --max-count=1); git checkout -q \$tag" diff --git a/libraries/drivers/cap1188/update_scripts/update_linux.sh b/libraries/drivers/cap1188/update_scripts/update_linux.sh deleted file mode 100755 index 7c70eeba..00000000 --- a/libraries/drivers/cap1188/update_scripts/update_linux.sh +++ /dev/null @@ -1,15 +0,0 @@ -#! /bin/bash -latest_release=$(curl -s "https://api.github.com/repos/adafruit/Adafruit_CircuitPython_Bundle/releases/latest") -download_link=$(echo $latest_release | grep -o "\"browser_download_url\": \"[^\"]*" | cut -d \" -f 4) -tag=$(echo $latest_release | grep -o "\"tag_name\": \"[^\"]*" | cut -d \" -f 4) -current=$(head -n 1 VERSIONS.txt | tr -d '[:space:]') -if [ $? -ne 0 ] -then echo "No VERSIONS.txt please run from lib/" -fi -if [ $current == $tag ] -then echo "Already updated to the latest."; exit 0 -fi -save_to=~/Downloads/$(basename $download_link) -echo "Downloading to " $save_to -curl -sL $download_link > $save_to -unzip -o $save_to -d .. diff --git a/libraries/drivers/cap1188/update_scripts/update_macosx.command b/libraries/drivers/cap1188/update_scripts/update_macosx.command deleted file mode 100755 index e2266999..00000000 --- a/libraries/drivers/cap1188/update_scripts/update_macosx.command +++ /dev/null @@ -1,16 +0,0 @@ -#! /bin/bash -cd $(dirname $0) -latest_release=$(curl -s "https://api.github.com/repos/adafruit/Adafruit_CircuitPython_Bundle/releases/latest") -download_link=$(echo $latest_release | grep -o "\"browser_download_url\": \"[^\"]*" | cut -d \" -f 4) -tag=$(echo $latest_release | grep -o "\"tag_name\": \"[^\"]*" | cut -d \" -f 4) -current=$(head -n 1 VERSIONS.txt | tr -d '[:space:]') -if [ $? -ne 0 ] -then echo "No VERSIONS.txt please run from lib/" -fi -if [ $current == $tag ] -then echo "Already updated to the latest."; exit 0 -fi -save_to=~/Downloads/$(basename $download_link) -echo "Downloading to " $save_to -curl -sL $download_link > $save_to -unzip -o $save_to -d .. From ed6b28a9d2b8c2e9dd967f2c5ffc0d5779b7f266 Mon Sep 17 00:00:00 2001 From: caternuson Date: Fri, 12 Oct 2018 11:30:56 -0700 Subject: [PATCH 3/3] fix URL --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 023de48b..c2f5f0f2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -303,7 +303,7 @@ url = https://github.com/adafruit/Adafruit_CircuitPython_LIDARLite.git [submodule "libraries/drivers/cap1188"] path = libraries/drivers/cap1188 - url = https://github.com/adafruit/Adafruit_CircuitPython_Bundle.git + url = https://github.com/adafruit/Adafruit_CircuitPython_CAP1188.git [submodule "libraries/helpers/slideshow"] path = libraries/helpers/slideshow url = https://github.com/adafruit/Adafruit_CircuitPython_Slideshow.git