[Arduino 1.6.6+ Required!] Utilise the included libs without needing to copy or move them.
This commit is contained in:
Josh Stewart
parent
4210cd61c3
commit
6ef3a3d5d5
|
|
@ -6,8 +6,8 @@ A full copy of the license may be found in the projects root directory
|
|||
|
||||
#include <SPI.h>
|
||||
#include <Wire.h>
|
||||
#include <Adafruit_GFX.h>
|
||||
#include <Adafruit_SSD1306.h>
|
||||
#include "libs/Adafruit_SSD1306/Adafruit_GFX.h"
|
||||
#include "libs/Adafruit_SSD1306/Adafruit_SSD1306.h"
|
||||
|
||||
Adafruit_SSD1306 display(pinDisplayReset);
|
||||
|
||||
|
|
|
|||
|
|
@ -1,22 +0,0 @@
|
|||
This is the core graphics library for all our displays, providing a common set of graphics primitives (points, lines, circles, etc.). It needs to be paired with a hardware-specific library for each display device we carry (to handle the lower-level functions).
|
||||
|
||||
Adafruit invests time and resources providing this open source code, please support Adafruit and open-source hardware by purchasing products from Adafruit!
|
||||
|
||||
Written by Limor Fried/Ladyada for Adafruit Industries.
|
||||
BSD license, check license.txt for more information.
|
||||
All text above must be included in any redistribution.
|
||||
|
||||
To download, click the DOWNLOAD ZIP button, uncompress and rename the uncompressed folder Adafruit_GFX. Confirm that the Adafruit_GFX folder contains Adafruit_GFX.cpp and Adafruit_GFX.h
|
||||
|
||||
Place the Adafruit_GFX library folder your <arduinosketchfolder>/Libraries/ folder. You may need to create the Libraries subfolder if its your first library. Restart the IDE.
|
||||
|
||||
Useful Resources
|
||||
================
|
||||
|
||||
- Image2Code
|
||||
This is a handy Java GUI utility to convert a BMP file into the array code necessary to display the image with the drawBitmap function. Check out the code at ehubin's GitHub repository:
|
||||
https://github.com/ehubin/Adafruit-GFX-Library/tree/master/Img2Code
|
||||
|
||||
- drawXBitmap function
|
||||
You can use the GIMP photo editor to save a .xbm file and use the array saved in the file to draw a bitmap with the drawXBitmap function. See the pull request here for more details:
|
||||
https://github.com/adafruit/Adafruit-GFX-Library/pull/31
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
Software License Agreement (BSD License)
|
||||
|
||||
Copyright (c) 2012 Adafruit Industries. All rights reserved.
|
||||
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
modification, are permitted provided that the following conditions are met:
|
||||
|
||||
- Redistributions of source code must retain the above copyright notice,
|
||||
this list of conditions and the following disclaimer.
|
||||
- Redistributions in binary form must reproduce the above copyright notice,
|
||||
this list of conditions and the following disclaimer in the documentation
|
||||
and/or other materials provided with the distribution.
|
||||
|
||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
||||
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
|
||||
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
||||
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
||||
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
POSSIBILITY OF SUCH DAMAGE.
|
||||
|
|
@ -33,7 +33,7 @@ All text above, and the splash screen must be included in any redistribution
|
|||
#endif
|
||||
|
||||
#include <SPI.h>
|
||||
#include <Adafruit_GFX.h>
|
||||
#include "Adafruit_GFX.h"
|
||||
|
||||
#define BLACK 0
|
||||
#define WHITE 1
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
#include "WProgram.h"
|
||||
#endif
|
||||
|
||||
#include <PID_v1.h>
|
||||
#include "PID_v1.h"
|
||||
|
||||
/*Constructor (...)*********************************************************
|
||||
* The parameters specified here are those for for which we can't set up
|
||||
|
|
|
|||
|
|
@ -35,6 +35,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|||
#include "decoders.h"
|
||||
#include "idle.h"
|
||||
#include "auxiliaries.h"
|
||||
#include "fastAnalog.h"
|
||||
#include "libs/PID_v1/PID_v1.h"
|
||||
|
||||
#ifdef __SAM3X8E__
|
||||
//Do stuff for ARM based CPUs
|
||||
|
|
@ -42,8 +44,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|||
#include "storage.h"
|
||||
#endif
|
||||
|
||||
#include "fastAnalog.h"
|
||||
#include <PID_v1.h>
|
||||
|
||||
struct config1 configPage1;
|
||||
struct config2 configPage2;
|
||||
|
|
@ -1128,7 +1128,7 @@ void loop()
|
|||
//These functions simply trigger the injector/coil driver off or on.
|
||||
//NOTE: squirt status is changed as per http://www.msextra.com/doc/ms1extra/COM_RS232.htm#Acmd
|
||||
/*
|
||||
#ifdef defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
|
||||
#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
|
||||
//For the AVR chips, use the faster bit flipping method of switching pins
|
||||
void ignitionSetter(byte *port, bool startCharge)
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in New Issue