Added Geoff's 5.1 changes

This commit is contained in:
Alex Shepherd
2016-06-11 15:31:34 +12:00
parent 515e56d918
commit 2c55e735b7
26 changed files with 3084 additions and 6190 deletions

View File

@@ -0,0 +1,141 @@
// Production 17 Function DCC Decoder
// Version 5.1 Geoff Bunza 2014,2015,2016
// ******** UNLESS YOU WANT ALL CV'S RESET UPON EVERY POWER UP
// ******** AFTER THE INITIAL DECODER LOAD REMOVE THE "//" IN THE FOOLOWING LINE!!
//#define DECODER_LOADED
#include <NmraDcc.h>
int tim_delay = 500;
#define numleds 17
byte ledpins [] = {0,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19};
const int FunctionPin0 = 3;
const int FunctionPin1 = 4;
const int FunctionPin2 = 5;
const int FunctionPin3 = 6;
const int FunctionPin4 = 7;
const int FunctionPin5 = 8;
const int FunctionPin6 = 9;
const int FunctionPin7 = 10;
const int FunctionPin8 = 11;
const int FunctionPin9 = 12;
const int FunctionPin10 = 13;
const int FunctionPin11 = 14; //A0
const int FunctionPin12 = 15; //A1
const int FunctionPin13 = 16; //A2
const int FunctionPin14 = 17; //A3
const int FunctionPin15 = 18; //A4
const int FunctionPin16 = 19; //A5
NmraDcc Dcc ;
DCC_MSG Packet ;
#define This_Decoder_Address 24
struct CVPair
{
uint16_t CV;
uint8_t Value;
};
CVPair FactoryDefaultCVs [] =
{
{CV_MULTIFUNCTION_PRIMARY_ADDRESS, This_Decoder_Address},
{CV_ACCESSORY_DECODER_ADDRESS_MSB, 0},
{CV_MULTIFUNCTION_EXTENDED_ADDRESS_MSB, 0},
{CV_MULTIFUNCTION_EXTENDED_ADDRESS_LSB, 0},
};
uint8_t FactoryDefaultCVIndex = 4;
void notifyCVResetFactoryDefault()
{
// Make FactoryDefaultCVIndex non-zero and equal to num CV's to be reset
// to flag to the loop() function that a reset to Factory Defaults needs to be done
FactoryDefaultCVIndex = sizeof(FactoryDefaultCVs)/sizeof(CVPair);
};
void setup()
{
// initialize the digital pins as an outputs
for (int i=1; i<= numleds; i++) {
pinMode(ledpins[i], OUTPUT);
digitalWrite(ledpins[i], LOW);
}
for (int i=1; i<= numleds; i++) {
digitalWrite(ledpins[i], HIGH);
delay (tim_delay/10);
}
delay( tim_delay);
for (int i=1; i<= numleds; i++) {
digitalWrite(ledpins[i], LOW);
delay (tim_delay/10);
}
delay( tim_delay);
// Setup which External Interrupt, the Pin it's associated with that we're using and enable the Pull-Up
Dcc.pin(0, 2, 0);
// Call the main DCC Init function to enable the DCC Receiver
Dcc.init( MAN_ID_DIY, 100, FLAGS_MY_ADDRESS_ONLY, 0 );
delay(800);
#if defined(DECODER_LOADED)
if ( Dcc.getCV(CV_DECODER_MASTER_RESET)== CV_DECODER_MASTER_RESET )
#endif
{
for (int j=0; j < FactoryDefaultCVIndex; j++ )
Dcc.setCV( FactoryDefaultCVs[j].CV, FactoryDefaultCVs[j].Value);
digitalWrite(13, 1); //Blink the on board LED
delay (1000);
digitalWrite(13, 0);
}
}
void loop()
{
// You MUST call the NmraDcc.process() method frequently from the Arduino loop() function for correct library operation
Dcc.process();
if( FactoryDefaultCVIndex && Dcc.isSetCVReady())
{
FactoryDefaultCVIndex--; // Decrement first as initially it is the size of the array
Dcc.setCV( FactoryDefaultCVs[FactoryDefaultCVIndex].CV, FactoryDefaultCVs[FactoryDefaultCVIndex].Value);
}
}
void notifyDccFunc( uint16_t Addr, DCC_ADDR_TYPE AddrType, FN_GROUP FuncGrp, uint8_t FuncState)
{
switch(FuncGrp)
{
case FN_0_4:
digitalWrite( FunctionPin0, (FuncState & FN_BIT_00)>>4 );
digitalWrite( FunctionPin1, (FuncState & FN_BIT_01) );
digitalWrite( FunctionPin2, (FuncState & FN_BIT_02)>>1 );
digitalWrite( FunctionPin3, (FuncState & FN_BIT_03)>>2 );
digitalWrite( FunctionPin4, (FuncState & FN_BIT_03)>>3 );
break;
case FN_5_8:
digitalWrite( FunctionPin5, (FuncState & FN_BIT_05) );
digitalWrite( FunctionPin6, (FuncState & FN_BIT_06)>>1 );
digitalWrite( FunctionPin7, (FuncState & FN_BIT_07)>>2 );
digitalWrite( FunctionPin8, (FuncState & FN_BIT_08)>>3 );
break;
case FN_9_12:
digitalWrite( FunctionPin9, (FuncState & FN_BIT_09) );
digitalWrite( FunctionPin10, (FuncState & FN_BIT_10)>>1 );
digitalWrite( FunctionPin11, (FuncState & FN_BIT_11)>>2 );
digitalWrite( FunctionPin12, (FuncState & FN_BIT_12)>>3 );
break;
case FN_13_20:
digitalWrite( FunctionPin13, (FuncState & FN_BIT_13) );
digitalWrite( FunctionPin14, (FuncState & FN_BIT_14)>>1 );
digitalWrite( FunctionPin15, (FuncState & FN_BIT_15)>>2 );
digitalWrite( FunctionPin16, (FuncState & FN_BIT_16)>>3 );
break;
case FN_21_28:
break;
}
}