bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

LPC1768: updates to use the new pin_t typedef

Browse Source
This commit is contained in:
Thomas Moore
2017-11-02 18:43:57 -05:00
parent 817175613a
commit 13d839795c
8 changed files with 59 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
frameworks/CMSIS/LPC1768/lib/LiquidCrystal.cpp
View File

@ -24,35 +24,35 @@
// can't assume that its in that state when a sketch starts (and the
// LiquidCrystal constructor is called).
LiquidCrystal::LiquidCrystal(uint8_t rs, uint8_t rw, uint8_t enable,
uint8_t d0, uint8_t d1, uint8_t d2, uint8_t d3,
uint8_t d4, uint8_t d5, uint8_t d6, uint8_t d7)
LiquidCrystal::LiquidCrystal(pin_t rs, pin_t rw, pin_t enable,
pin_t d0, pin_t d1, pin_t d2, pin_t d3,
pin_t d4, pin_t d5, pin_t d6, pin_t d7)
{
init(0, rs, rw, enable, d0, d1, d2, d3, d4, d5, d6, d7);
}
LiquidCrystal::LiquidCrystal(uint8_t rs, uint8_t enable,
uint8_t d0, uint8_t d1, uint8_t d2, uint8_t d3,
uint8_t d4, uint8_t d5, uint8_t d6, uint8_t d7)
LiquidCrystal::LiquidCrystal(pin_t rs, pin_t enable,
pin_t d0, pin_t d1, pin_t d2, pin_t d3,
pin_t d4, pin_t d5, pin_t d6, pin_t d7)
{
init(0, rs, 255, enable, d0, d1, d2, d3, d4, d5, d6, d7);
init(0, rs, P_NC, enable, d0, d1, d2, d3, d4, d5, d6, d7);
}
LiquidCrystal::LiquidCrystal(uint8_t rs, uint8_t rw, uint8_t enable,
uint8_t d0, uint8_t d1, uint8_t d2, uint8_t d3)
LiquidCrystal::LiquidCrystal(pin_t rs, pin_t rw, pin_t enable,
pin_t d0, pin_t d1, pin_t d2, pin_t d3)
{
init(1, rs, rw, enable, d0, d1, d2, d3, 0, 0, 0, 0);
init(1, rs, rw, enable, d0, d1, d2, d3, P_NC, P_NC, P_NC, P_NC);
}
LiquidCrystal::LiquidCrystal(uint8_t rs, uint8_t enable,
uint8_t d0, uint8_t d1, uint8_t d2, uint8_t d3)
LiquidCrystal::LiquidCrystal(pin_t rs, pin_t enable,
pin_t d0, pin_t d1, pin_t d2, pin_t d3)
{
init(1, rs, 255, enable, d0, d1, d2, d3, 0, 0, 0, 0);
init(1, rs, P_NC, enable, d0, d1, d2, d3, P_NC, P_NC, P_NC, P_NC);
}
void LiquidCrystal::init(uint8_t fourbitmode, uint8_t rs, uint8_t rw, uint8_t enable,
uint8_t d0, uint8_t d1, uint8_t d2, uint8_t d3,
uint8_t d4, uint8_t d5, uint8_t d6, uint8_t d7)
void LiquidCrystal::init(uint8_t fourbitmode, pin_t rs, pin_t rw, pin_t enable,
pin_t d0, pin_t d1, pin_t d2, pin_t d3,
pin_t d4, pin_t d5, pin_t d6, pin_t d7)
{
_rs_pin = rs;
_rw_pin = rw;

35
frameworks/CMSIS/LPC1768/lib/LiquidCrystal.h
View File

@ -4,6 +4,7 @@
#include <inttypes.h>
#include "binary.h"
#include "Print.h"
#include <HAL_LPC1768/pinmapping.h>
// commands
#define LCD_CLEARDISPLAY 0x01
@ -45,20 +46,20 @@
class LiquidCrystal : public Print {
public:
LiquidCrystal(uint8_t rs, uint8_t enable,
uint8_t d0, uint8_t d1, uint8_t d2, uint8_t d3,
uint8_t d4, uint8_t d5, uint8_t d6, uint8_t d7);
LiquidCrystal(uint8_t rs, uint8_t rw, uint8_t enable,
uint8_t d0, uint8_t d1, uint8_t d2, uint8_t d3,
uint8_t d4, uint8_t d5, uint8_t d6, uint8_t d7);
LiquidCrystal(uint8_t rs, uint8_t rw, uint8_t enable,
uint8_t d0, uint8_t d1, uint8_t d2, uint8_t d3);
LiquidCrystal(uint8_t rs, uint8_t enable,
uint8_t d0, uint8_t d1, uint8_t d2, uint8_t d3);
LiquidCrystal(pin_t rs, pin_t enable,
pin_t d0, pin_t d1, pin_t d2, pin_t d3,
pin_t d4, pin_t d5, pin_t d6, pin_t d7);
LiquidCrystal(pin_t rs, pin_t rw, pin_t enable,
pin_t d0, pin_t d1, pin_t d2, pin_t d3,
pin_t d4, pin_t d5, pin_t d6, pin_t d7);
LiquidCrystal(pin_t rs, pin_t rw, pin_t enable,
pin_t d0, pin_t d1, pin_t d2, pin_t d3);
LiquidCrystal(pin_t rs, pin_t enable,
pin_t d0, pin_t d1, pin_t d2, pin_t d3);
void init(uint8_t fourbitmode, uint8_t rs, uint8_t rw, uint8_t enable,
uint8_t d0, uint8_t d1, uint8_t d2, uint8_t d3,
uint8_t d4, uint8_t d5, uint8_t d6, uint8_t d7);
void init(uint8_t fourbitmode, pin_t rs, pin_t rw, pin_t enable,
pin_t d0, pin_t d1, pin_t d2, pin_t d3,
pin_t d4, pin_t d5, pin_t d6, pin_t d7);
void begin(uint8_t cols, uint8_t rows, uint8_t charsize = LCD_5x8DOTS);
@ -91,10 +92,10 @@ private:
void write8bits(uint8_t);
void pulseEnable();
uint8_t _rs_pin; // LOW: command. HIGH: character.
uint8_t _rw_pin; // LOW: write to LCD. HIGH: read from LCD.
uint8_t _enable_pin; // activated by a HIGH pulse.
uint8_t _data_pins[8];
pin_t _rs_pin; // LOW: command. HIGH: character.
pin_t _rw_pin; // LOW: write to LCD. HIGH: read from LCD.
pin_t _enable_pin; // activated by a HIGH pulse.
pin_t _data_pins[8];
uint8_t _displayfunction;
uint8_t _displaycontrol;