easylinux/NmraDcc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added some final tweaks to chang ethe addressing to better suit

Browse Source
This commit is contained in:
Alex Shepherd
2023-07-13 21:09:47 +12:00
parent 159a4bc5bf
commit b1cd7622e3
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
examples/Fahrstuhl/Fahrstuhl.ino
View File

@@ -17,7 +17,7 @@
#define DCC_PIN 2 #define DCC_PIN 2
// Define the DCC Turnout Address to select the first level = 1 // Define the DCC Turnout Address to select the first level = 1
#define DCC_ACCESSORY_DECODER_BASE_ADDRESS 200 #define DCC_ACCESSORY_DECODER_BASE_ADDRESS 500
// Define the manimus numbr of Levels // Define the manimus numbr of Levels
#define NUM_LIFT_LEVELS 8 #define NUM_LIFT_LEVELS 8
@@ -34,7 +34,7 @@
#define BUTTON_LONG_PRESS_DELAY 2000 #define BUTTON_LONG_PRESS_DELAY 2000
// Uncomment ONE of the next 2 lines to enable AJS or UWE Board Settings // Uncomment ONE of the next 2 lines to enable AJS or UWE Board Settings
//#define AJS_BOARD_SETTINGS // #define AJS_BOARD_SETTINGS
#define UWE_BOARD_SETTINGS #define UWE_BOARD_SETTINGS
#if defined(AJS_BOARD_SETTINGS) // Setting for AJS Dev System #if defined(AJS_BOARD_SETTINGS) // Setting for AJS Dev System
@@ -267,9 +267,9 @@ elapsedMillis lastSpeedChange = 0;
// The DCC Turnout Address is checked to see if it is within the range used to Select Elevator levels and starts a Move if a new level is selected // The DCC Turnout Address is checked to see if it is within the range used to Select Elevator levels and starts a Move if a new level is selected
void notifyDccAccTurnoutOutput(uint16_t receivedAddress, uint8_t direction, uint8_t outputPower) void notifyDccAccTurnoutOutput(uint16_t receivedAddress, uint8_t direction, uint8_t outputPower)
{ {
if((receivedAddress >= DCC_ACCESSORY_DECODER_BASE_ADDRESS) && (receivedAddress < (DCC_ACCESSORY_DECODER_BASE_ADDRESS + NUM_LIFT_LEVELS))) if((receivedAddress >= DCC_ACCESSORY_DECODER_BASE_ADDRESS) && (receivedAddress < (DCC_ACCESSORY_DECODER_BASE_ADDRESS + (NUM_LIFT_LEVELS/2))))
{ {
uint8_t newLevel = receivedAddress - DCC_ACCESSORY_DECODER_BASE_ADDRESS; uint8_t newLevel = (receivedAddress - DCC_ACCESSORY_DECODER_BASE_ADDRESS) * 2 + direction;
if(persistentValues.lastLiftLevel != newLevel) if(persistentValues.lastLiftLevel != newLevel)
{ {
persistentValues.lastLiftLevel = newLevel; persistentValues.lastLiftLevel = newLevel;