Misc. general cleanup
This commit is contained in:
Scott Lahteine
parent
8836623e0f
commit
b9327a4d16
|
|
@ -23,9 +23,7 @@
|
|||
// adapted from I2C/master/master.c example
|
||||
// https://www-users.cs.york.ac.uk/~pcc/MCP/HAPR-Course-web/CMSIS/examples/html/master_8c_source.html
|
||||
|
||||
|
||||
|
||||
#if defined(TARGET_LPC1768)
|
||||
#ifdef TARGET_LPC1768
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
|
|
@ -40,8 +38,7 @@
|
|||
// These two routines are exact copies of the lpc17xx_i2c.c routines. Couldn't link to
|
||||
// to the lpc17xx_i2c.c routines so had to copy them into this file & rename them.
|
||||
|
||||
static uint32_t _I2C_Start (LPC_I2C_TypeDef *I2Cx)
|
||||
{
|
||||
static uint32_t _I2C_Start (LPC_I2C_TypeDef *I2Cx) {
|
||||
// Reset STA, STO, SI
|
||||
I2Cx->I2CONCLR = I2C_I2CONCLR_SIC|I2C_I2CONCLR_STOC|I2C_I2CONCLR_STAC;
|
||||
|
||||
|
|
@ -54,21 +51,15 @@
|
|||
return (I2Cx->I2STAT & I2C_STAT_CODE_BITMASK);
|
||||
}
|
||||
|
||||
static void _I2C_Stop (LPC_I2C_TypeDef *I2Cx)
|
||||
{
|
||||
|
||||
static void _I2C_Stop (LPC_I2C_TypeDef *I2Cx) {
|
||||
/* Make sure start bit is not active */
|
||||
if (I2Cx->I2CONSET & I2C_I2CONSET_STA)
|
||||
{
|
||||
I2Cx->I2CONCLR = I2C_I2CONCLR_STAC;
|
||||
}
|
||||
|
||||
I2Cx->I2CONSET = I2C_I2CONSET_STO|I2C_I2CONSET_AA;
|
||||
|
||||
I2Cx->I2CONCLR = I2C_I2CONCLR_SIC;
|
||||
}
|
||||
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#define U8G_I2C_OPT_FAST 16 // from u8g.h
|
||||
|
|
@ -89,13 +80,11 @@
|
|||
#error "Master I2C device not defined!"
|
||||
#endif
|
||||
|
||||
|
||||
PINSEL_CFG_Type PinCfg;
|
||||
I2C_M_SETUP_Type transferMCfg;
|
||||
|
||||
#define I2C_status (LPC_I2C1->I2STAT & I2C_STAT_CODE_BITMASK)
|
||||
|
||||
|
||||
uint8_t u8g_i2c_start(uint8_t sla) { // send slave address and write bit
|
||||
// Sometimes TX data ACK or NAK status is returned. That mean the start state didn't
|
||||
// happen which means only the value of the slave address was send. Keep looping until
|
||||
|
|
@ -120,10 +109,9 @@
|
|||
return 1;
|
||||
}
|
||||
|
||||
|
||||
void u8g_i2c_init(uint8_t clock_option) {
|
||||
|
||||
/*
|
||||
/**
|
||||
* Init I2C pin connect
|
||||
*/
|
||||
PinCfg.OpenDrain = 0;
|
||||
|
|
@ -155,7 +143,7 @@
|
|||
// Initialize I2C peripheral
|
||||
I2C_Init(I2CDEV_M, (clock_option & U8G_I2C_OPT_FAST) ? 400000: 100000); // LCD data rates
|
||||
|
||||
/* Enable Master I2C operation */
|
||||
// Enable Master I2C operation
|
||||
I2C_Cmd(I2CDEV_M, I2C_MASTER_MODE, ENABLE);
|
||||
|
||||
u8g_i2c_start(0); // send slave address and write bit
|
||||
|
|
@ -180,4 +168,5 @@
|
|||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#endif // TARGET_LPC1768
|
||||
|
|
|
|||
|
|
@ -72,8 +72,7 @@ extern "C" void delay(const int msec) {
|
|||
// IO functions
|
||||
// As defined by Arduino INPUT(0x0), OUPUT(0x1), INPUT_PULLUP(0x2)
|
||||
void pinMode(pin_t pin, uint8_t mode) {
|
||||
if (!VALID_PIN(pin))
|
||||
return;
|
||||
if (!VALID_PIN(pin)) return;
|
||||
|
||||
PINSEL_CFG_Type config = { LPC1768_PIN_PORT(pin),
|
||||
LPC1768_PIN_PIN(pin),
|
||||
|
|
@ -100,8 +99,7 @@ void pinMode(pin_t pin, uint8_t mode) {
|
|||
}
|
||||
|
||||
void digitalWrite(pin_t pin, uint8_t pin_status) {
|
||||
if (!VALID_PIN(pin))
|
||||
return;
|
||||
if (!VALID_PIN(pin)) return;
|
||||
|
||||
if (pin_status)
|
||||
LPC_GPIO(LPC1768_PIN_PORT(pin))->FIOSET = LPC_PIN(LPC1768_PIN_PIN(pin));
|
||||
|
|
@ -120,20 +118,18 @@ void digitalWrite(pin_t pin, uint8_t pin_status) {
|
|||
}
|
||||
|
||||
bool digitalRead(pin_t pin) {
|
||||
if (!VALID_PIN(pin)) {
|
||||
return false;
|
||||
}
|
||||
if (!VALID_PIN(pin)) return false;
|
||||
|
||||
return LPC_GPIO(LPC1768_PIN_PORT(pin))->FIOPIN & LPC_PIN(LPC1768_PIN_PIN(pin)) ? 1 : 0;
|
||||
}
|
||||
|
||||
void analogWrite(pin_t pin, int pwm_value) { // 1 - 254: pwm_value, 0: LOW, 255: HIGH
|
||||
if (!VALID_PIN(pin)) return;
|
||||
|
||||
#define MR0_MARGIN 200 // if channel value too close to MR0 the system locks up
|
||||
|
||||
static bool out_of_PWM_slots = false;
|
||||
|
||||
if (!VALID_PIN(pin))
|
||||
return;
|
||||
|
||||
uint value = MAX(MIN(pwm_value, 255), 0);
|
||||
if (value == 0 || value == 255) { // treat as digital pin
|
||||
LPC1768_PWM_detach_pin(pin); // turn off PWM
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@
|
|||
|
||||
#ifndef __HAL_PINMAPPING_H__
|
||||
#define __HAL_PINMAPPING_H__
|
||||
|
||||
#include "../../core/macros.h"
|
||||
|
||||
#include <stdint.h>
|
||||
|
|
|
|||
|
|
@ -43,7 +43,6 @@
|
|||
#define _O2 __attribute__((optimize("O2")))
|
||||
#define _O3 __attribute__((optimize("O3")))
|
||||
|
||||
|
||||
// Clock speed factors
|
||||
#define CYCLES_PER_MICROSECOND (F_CPU / 1000000L) // 16 or 20
|
||||
#define INT0_PRESCALER 8
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
|
||||
/**
|
||||
* This file is the standard Marlin version identifier file, all fields can be
|
||||
* overriden by the ones defined on _Version.h by using the Configuration.h
|
||||
* overriden by the ones defined in _Version.h by using the Configuration.h
|
||||
* directive USE_AUTOMATIC_VERSIONING.
|
||||
*/
|
||||
|
||||
|
|
@ -53,7 +53,7 @@
|
|||
* here we define this default string as the date where the latest release
|
||||
* version was tagged.
|
||||
*/
|
||||
#define STRING_DISTRIBUTION_DATE "2017-10-19 12:00"
|
||||
#define STRING_DISTRIBUTION_DATE "2017-11-19 12:00"
|
||||
|
||||
/**
|
||||
* Required minimum Configuration.h and Configuration_adv.h file versions.
|
||||
|
|
|
|||
Loading…
Reference in a new issue