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

added wait for USB Device to enumerate to some examples

Browse Source 
added CV_MANUFACTURER_START
This commit is contained in:
Alex Shepherd
2022-02-27 18:21:52 +13:00
parent b35c1fbbd0
commit 6f91d4f7d4
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
NmraDcc.h
View File

@@ -112,6 +112,8 @@ typedef struct
#define CV_VERSION_ID 7 #define CV_VERSION_ID 7
#define CV_MANUFACTURER_ID 8 #define CV_MANUFACTURER_ID 8
#define CV_29_CONFIG 29 #define CV_29_CONFIG 29
#define CV_MANUFACTURER_START 33
#if defined(ESP32) #if defined(ESP32)
#include <esp_spi_flash.h> #include <esp_spi_flash.h>

2
examples/NmraDccAccessoryDecoder_1/NmraDccAccessoryDecoder_1.ino
View File

@@ -95,6 +95,8 @@ void notifyDccSigOutputState( uint16_t Addr, uint8_t State)
void setup() void setup()
{ {
Serial.begin(115200); Serial.begin(115200);
elapsedMillis millisWaitedForUSB = 0;
while(!Serial && (millisWaitedForUSB < 3000)); // Wait up to 3 seconds for USB to Connect
// Configure the DCC CV Programing ACK pin for an output // Configure the DCC CV Programing ACK pin for an output
pinMode( DccAckPin, OUTPUT ); pinMode( DccAckPin, OUTPUT );

7
examples/NmraDcc_ARD_DCCSHIELD/NmraDcc_ARD_DCCSHIELD.ino
View File

@@ -1,5 +1,3 @@
#include <NmraDcc.h>
// This Example shows how to use the library with the Iowa Scaled Engineering ARD-DCCSHIELD // This Example shows how to use the library with the Iowa Scaled Engineering ARD-DCCSHIELD
// You can find out more about this DCC Interface here: http://www.iascaled.com/store/ARD-DCCSHIELD // You can find out more about this DCC Interface here: http://www.iascaled.com/store/ARD-DCCSHIELD
// //
@@ -16,6 +14,9 @@
// JP6 - Boards without VIO - User Choice // JP6 - Boards without VIO - User Choice
// JP7 - Enable Programming ACK - 1-2 ON 3-4 ON // JP7 - Enable Programming ACK - 1-2 ON 3-4 ON
// //
#include <NmraDcc.h>
#include <elapsedMillis.h>
// It is a very basic DCC Accessory Decoder that does nothing except allow CV Read/Write and // It is a very basic DCC Accessory Decoder that does nothing except allow CV Read/Write and
// you can also print every DCC packet by uncommenting the "#define NOTIFY_DCC_MSG" line below // you can also print every DCC packet by uncommenting the "#define NOTIFY_DCC_MSG" line below
#define NOTIFY_DCC_MSG #define NOTIFY_DCC_MSG
@@ -101,6 +102,8 @@ void notifyCVChange(uint16_t CV, uint8_t Value)
void setup() void setup()
{ {
Serial.begin(115200); Serial.begin(115200);
elapsedMillis millisWaitedForUSB = 0;
while(!Serial && (millisWaitedForUSB < 3000)); // Wait up to 3 seconds for USB to Connect
Serial.println("NMRA DCC Iowa Scaled Engineering ARD-DCCSHIELD Example"); Serial.println("NMRA DCC Iowa Scaled Engineering ARD-DCCSHIELD Example");