Add ACan. Fix bug in OpenLcbCore.cpp.

Author: dpharris

.DS_Store

@@ -0,0 +1 @@
+//

src/.DS_Store

@@ -241,7 +241,7 @@ int ESP32can::write(uint32_t _txId, uint8_t _txLength, uint8_t* _txData) {
 }
 
 int ESP32can::avail() {
-    dP("\nESP32can::avail");
+    //dP("\nESP32can::avail");
   if ((readRegister(REG_SR) & 0x01) != 0x01) {
     // no packet
     return 0;

src/ACan/ACan.cpp

@@ -52,6 +52,8 @@ RTR CAN Message
 #include "debugging.h"
 #include <HardwareSerial.h>
 
+extern void userUI(char) __attribute__((weak));
+
 class OlcbCanClass : public OlcbCan {
   int charToHex(char c){
     if(c>='0' && c<='9') return c - '0';
@@ -130,6 +132,7 @@ class OlcbCanClass : public OlcbCan {
             //while( (c=inf->read()) >0 ) {
             while( (c=Serial.read()) >0 ) {
                 if(c==':') { state = 1; break; }
+                if( userUI ) userUI(c);
             }
             if(state!=1) return false;
             buff[0] =':';

src/ESP32/ESP32can.cpp

@@ -366,8 +366,12 @@ int16_t OpenLcbCore::findIndexOfEventID(EventID *key, int16_t startIndex)
   // get the state of an event from the user program
   extern uint8_t userState(uint16_t) __attribute__((weak));
   uint8_t getState(uint16_t index) {
-    if(userState) return userState(index);
-    return 7;
+      if(userState) {
+          uint8_t us = userState(index);
+          dP("\nUserState="); dP(us);
+          return us;
+      }
+      return 7; // UNKNOWN
   }
   void OpenLcbCore::check() {
      // see in any replies are waiting to send
@@ -460,7 +464,7 @@ void OpenLcbCore::sendTeach(EventID e) {   /// DPH added for Clock
     sendEvent = sendEvent < index ? sendEvent : index;
   }
 
-  bool OpenLcbCore::receivedFrame(OlcbCanInterface* rcv) {
+bool OpenLcbCore::receivedFrame(OlcbCanInterface* rcv) {
       //dP("\nIn receivedFrame");
       //dP("\nIn OpenLcbCore::receivedFrame()");
     EventID eventid;
@@ -473,9 +477,10 @@ void OpenLcbCore::sendTeach(EventID e) {   /// DPH added for Clock
         while((index = findIndexOfEventID(&eventid, index)) != -1)
         {
           // yes, we have to reply with ConsumerIdentified
-          if (events[index].flags & Event::CAN_CONSUME_FLAG) {
-             events[index].flags |= Event::IDENT_FLAG;
-             sendEvent = sendEvent < index ? sendEvent : index;
+          uint16_t eindex = this->eventsIndex[index];
+          if (events[eindex].flags & Event::CAN_CONSUME_FLAG) {
+             events[eindex].flags |= Event::IDENT_FLAG;
+             sendEvent = sendEvent < eindex ? sendEvent : eindex;
           }
           index++;
           if(index>=numEvents) break;
@@ -489,9 +494,10 @@ void OpenLcbCore::sendTeach(EventID e) {   /// DPH added for Clock
         while((index = findIndexOfEventID(&eventid, index)) != -1)
         {
           // yes, we have to reply with ProducerIdentified
-          if (events[index].flags & Event::CAN_PRODUCE_FLAG) {
-             events[index].flags |= Event::IDENT_FLAG;
-             sendEvent = sendEvent < index ? sendEvent : index;
+          uint16_t eindex = this->eventsIndex[index];
+          if (events[eindex].flags & Event::CAN_PRODUCE_FLAG) {
+             events[eindex].flags |= Event::IDENT_FLAG;
+             sendEvent = sendEvent < eindex ? sendEvent : eindex;
           }
           index++;
           if(index>=numEvents) break;
@@ -504,7 +510,7 @@ void OpenLcbCore::sendTeach(EventID e) {   /// DPH added for Clock
         for (int i = 0; i < numEvents; i++) {
           events[i].flags |= Event::IDENT_FLAG;
         }
-        sendEvent = 0;  
+        sendEvent = 0;
     } else if (rcv->isPCEventReport()) {
         // found a PC Event Report, see if we consume it
         handlePCEventReport(rcv);
@@ -514,7 +520,6 @@ void OpenLcbCore::sendTeach(EventID e) {   /// DPH added for Clock
     } else return false;
     return true;
   }
-
   void OpenLcbCore::handlePCEventReport(OlcbCanInterface* rcv) {
 //                 dP("\nIn handlePCEventReport");
       EventID eventid;