mirror of
https://github.com/DCC-EX/CommandStation-EX.git
synced 2024-11-25 00:56:13 +01:00
977802f160
Prepping for version 4.1 SERVO_SIGNAL definition in EXRAIL SERVO_SIGNAL(vpin, redpos, amberpos, greenpos) use RED/AMBER/GREEN as for led signals. * SIGNALH, ATGTE, ATLT UNTESTED * Automatic ALIAS(name) and _ in keywords * EXRAIL FORGET current loco * EXRAIL </KILL ALL> * EXRAIL VIRTUAL_TURNOUT * Cleanup version.h * Update version.h (#223) Rewrite & Updated the 4.0.0 Section * </KILL ALL> fix * Incoming LCN turnout throw. * KILLALL macro and DIAGNOSTIC messages when KILL command used. * EXRAIL PARSE * Rebuild throttle info getters UNTESTED... create different methods to obtain throttle info without being withrottle specific. Also implements turnout description of "*" as hidden. * J command parsing JA JR JT commands parsed EXRAIL sets hidden turnout state HIDDEN description macro Turnouts hidden flag bit UNO seems OK, MEGA UNTESTED * Assist notes draft & syntax tweaks * Throttle notes * uno memory saver * JA JR and <t cab> * Subtle corrections * Update version.h * I2C code corrections Corrections to I2C code: 1) I2CManager_Mega4809.h: Correct bitwise 'and' to logical 'and' - no impact. 2) I2CManager_Wire.h: Ensure that error codes from Wire subsystem are passed back to caller in queueRequest(). * RAG Ifs and cmds * IF block perf/memory * Allow negative route ids. * correct GREEN keyword * Update version.h * myFilter auto detect * Update version.h * fix weak ref to myFilter * ACK defaults now 50-2000-20000 * Update version.h * Improved SIGNALs startup and diagnostics * Update IO_PCA9685.cpp * Allow turnout id 0 * Position servo pin used as GPIO * NoPowerOff LEDS * CALLBACK parameter optional for Write * WRITE CV ON PROG <W CV VALUE> Callback parameters are now optional on PROG * Updated CV read command <R cv> Equivalent to <V cv 0> uses the verify callback. Co-authored-by: Asbelos <asbelos@btinternet.com> Co-authored-by: Kcsmith0708 <kcsmith0708@wowway.com> Co-authored-by: Neil McKechnie <neilmck999@gmail.com> Co-authored-by: Ash-4 <81280775+Ash-4@users.noreply.github.com>
128 lines
4.9 KiB
C
128 lines
4.9 KiB
C
/*
|
|
* © 2021, Neil McKechnie. All rights reserved.
|
|
*
|
|
* This file is part of CommandStation-EX
|
|
*
|
|
* This is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* It is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with CommandStation. If not, see <https://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#ifndef I2CMANAGER_WIRE_H
|
|
#define I2CMANAGER_WIRE_H
|
|
|
|
#include <Arduino.h>
|
|
#include <Wire.h>
|
|
#include "I2CManager.h"
|
|
|
|
// This module is only compiled if I2C_USE_WIRE is defined, so define it here
|
|
// to get intellisense to work correctly.
|
|
#if !defined(I2C_USE_WIRE)
|
|
#define I2C_USE_WIRE
|
|
#endif
|
|
|
|
/***************************************************************************
|
|
* Initialise I2C interface software
|
|
***************************************************************************/
|
|
void I2CManagerClass::_initialise() {
|
|
Wire.begin();
|
|
}
|
|
|
|
/***************************************************************************
|
|
* Set I2C clock speed. Normally 100000 (Standard) or 400000 (Fast)
|
|
* on Arduino. Mega4809 supports 1000000 (Fast+) too.
|
|
***************************************************************************/
|
|
void I2CManagerClass::_setClock(unsigned long i2cClockSpeed) {
|
|
Wire.setClock(i2cClockSpeed);
|
|
}
|
|
|
|
/***************************************************************************
|
|
* Initiate a write to an I2C device (blocking operation on Wire)
|
|
***************************************************************************/
|
|
uint8_t I2CManagerClass::write(uint8_t address, const uint8_t buffer[], uint8_t size, I2CRB *rb) {
|
|
Wire.beginTransmission(address);
|
|
if (size > 0) Wire.write(buffer, size);
|
|
rb->status = Wire.endTransmission();
|
|
return I2C_STATUS_OK;
|
|
}
|
|
|
|
/***************************************************************************
|
|
* Initiate a write from PROGMEM (flash) to an I2C device (blocking operation on Wire)
|
|
***************************************************************************/
|
|
uint8_t I2CManagerClass::write_P(uint8_t address, const uint8_t buffer[], uint8_t size, I2CRB *rb) {
|
|
uint8_t ramBuffer[size];
|
|
const uint8_t *p1 = buffer;
|
|
for (uint8_t i=0; i<size; i++)
|
|
ramBuffer[i] = GETFLASH(p1++);
|
|
return write(address, ramBuffer, size, rb);
|
|
}
|
|
|
|
/***************************************************************************
|
|
* Initiate a write (optional) followed by a read from the I2C device (blocking operation on Wire)
|
|
* If fewer than the number of requested bytes are received, status is I2C_STATUS_TRUNCATED.
|
|
***************************************************************************/
|
|
uint8_t I2CManagerClass::read(uint8_t address, uint8_t readBuffer[], uint8_t readSize,
|
|
const uint8_t writeBuffer[], uint8_t writeSize, I2CRB *rb)
|
|
{
|
|
uint8_t status = I2C_STATUS_OK;
|
|
uint8_t nBytes = 0;
|
|
if (writeSize > 0) {
|
|
Wire.beginTransmission(address);
|
|
Wire.write(writeBuffer, writeSize);
|
|
status = Wire.endTransmission(false); // Don't free bus yet
|
|
}
|
|
if (status == I2C_STATUS_OK) {
|
|
Wire.requestFrom(address, (size_t)readSize);
|
|
while (Wire.available() && nBytes < readSize)
|
|
readBuffer[nBytes++] = Wire.read();
|
|
if (nBytes < readSize) status = I2C_STATUS_TRUNCATED;
|
|
}
|
|
rb->nBytes = nBytes;
|
|
rb->status = status;
|
|
return I2C_STATUS_OK;
|
|
}
|
|
|
|
/***************************************************************************
|
|
* Function to queue a request block and initiate operations.
|
|
*
|
|
* For the Wire version, this executes synchronously.
|
|
* The read/write/write_P functions return I2C_STATUS_OK always, and the
|
|
* completion status of the operation is in the request block, as for
|
|
* the non-blocking version.
|
|
***************************************************************************/
|
|
void I2CManagerClass::queueRequest(I2CRB *req) {
|
|
switch (req->operation) {
|
|
case OPERATION_READ:
|
|
read(req->i2cAddress, req->readBuffer, req->readLen, NULL, 0, req);
|
|
break;
|
|
case OPERATION_SEND:
|
|
write(req->i2cAddress, req->writeBuffer, req->writeLen, req);
|
|
break;
|
|
case OPERATION_SEND_P:
|
|
write_P(req->i2cAddress, req->writeBuffer, req->writeLen, req);
|
|
break;
|
|
case OPERATION_REQUEST:
|
|
read(req->i2cAddress, req->readBuffer, req->readLen, req->writeBuffer, req->writeLen, req);
|
|
break;
|
|
}
|
|
}
|
|
|
|
/***************************************************************************
|
|
* Loop function, for general background work
|
|
***************************************************************************/
|
|
void I2CManagerClass::loop() {}
|
|
|
|
// Loop function
|
|
void I2CManagerClass::checkForTimeout() {}
|
|
|
|
|
|
#endif |