Update to MicroChip oa-tc6-lib:v3.1.13.

For details see MicrochipTech/oa-tc6-lib@9138e95 .

Author: aentinger

Diff for: examples/LAN8651-iperf/LAN8651-iperf.ino

@@ -147,7 +147,8 @@ void loop()
   if ((now - prev_beacon_check) > 1000)
   {
     prev_beacon_check = now;
-    tc6_inst->getPlcaStatus(OnPlcaStatus);
+    if (!tc6_inst->getPlcaStatus(OnPlcaStatus))
+      Serial.println("getPlcaStatus(...) failed");
   }
 }
 
@@ -162,8 +163,10 @@ static void OnPlcaStatus(bool success, bool plcaStatus)
 
   if (plcaStatus)
     Serial.println("PLCA Mode active");
-  else
+  else {
     Serial.println("CSMA/CD fallback");
+    tc6_inst->enablePlca();
+  }
 }
 
 static bool get_mac_address(uint8_t * p_mac)

Diff for: src/T1SPlcaSettings.h

@@ -39,19 +39,28 @@ class T1SPlcaSettings
 #endif
 {
 private:
-  uint8_t const _node_id;
-  uint8_t const _node_count;
-  uint8_t const _burst_count;
-  uint8_t const _burst_timer;
+  uint8_t _node_id;
+  uint8_t _node_count;
+  uint8_t _burst_count;
+  uint8_t _burst_timer;
 
 public:
+  static uint8_t const DEFAULT_NODE_ID     =   0;
+  static uint8_t const DEFAULT_NODE_COUNT  =   8;
+  static uint8_t const DEFAULT_BURST_COUNT =   0;
+  static uint8_t const DEFAULT_BURST_TIMER = 128;
+
+
+  T1SPlcaSettings() : T1SPlcaSettings(DEFAULT_NODE_ID, DEFAULT_NODE_COUNT, DEFAULT_BURST_COUNT, DEFAULT_BURST_TIMER) { }
   T1SPlcaSettings(uint8_t const node_id,
                   uint8_t const node_count,
                   uint8_t const burst_count,
                   uint8_t const burst_timer);
 
+
   virtual size_t printTo(Print & p) const override;
 
+
   uint8_t node_id()     const { return _node_id; }
   uint8_t node_count()  const { return _node_count; }
   uint8_t burst_count() const { return _burst_count; }

Diff for: src/microchip/TC6_Arduino_10BASE_T1S_UDP.cpp

@@ -210,6 +210,9 @@ bool TC6_Arduino_10BASE_T1S_UDP::begin(IPAddress const ip_addr,
 
   netif_set_link_up(&_lw.ip.netint);
 
+  /* Copy the settings for internal usage. */
+  _t1s_plca_settings = t1s_plca_settings;
+
   return true;
 }
 
@@ -243,6 +246,11 @@ bool TC6_Arduino_10BASE_T1S_UDP::getPlcaStatus(TC6LwIP_On_PlcaStatus on_plca_sta
   return TC6_ReadRegister(_lw.tc.tc6, 0x0004CA03, true, OnPlcaStatus, &_lw); /* PLCA_status_register.plca_status */
 }
 
+bool TC6_Arduino_10BASE_T1S_UDP::enablePlca()
+{
+  return TC6Regs_SetPlca(_lw.tc.tc6, true, _t1s_plca_settings.node_id(), _t1s_plca_settings.node_count());
+}
+
 bool TC6_Arduino_10BASE_T1S_UDP::sendWouldBlock()
 {
   TC6_RawTxSegment *dummySeg;
@@ -655,9 +663,12 @@ void TC6Regs_CB_OnEvent(TC6_t *pInst, TC6Regs_Event_t event, void *pTag)
     case TC6Regs_Event_GINT_Mask:
       PRINT(ESC_YELLOW "GINT_Mask" ESC_RESETCOLOR "\r\n");
       break;
-    case TC6Regs_Event_PHY_Not_Trimmed:
+    case TC6Regs_Event_Chip_Error:
       PRINT(ESC_RED "PHY is not trimmed" ESC_RESETCOLOR "\r\n");
       break;
+    case TC6Regs_Event_Unsupported_Hardware:
+      PRINT(ESC_RED "Unsupported hardware" ESC_RESETCOLOR "\r\n");
+      break;
   }
   if (reinit)
   {

Diff for: src/microchip/TC6_Arduino_10BASE_T1S_UDP.h

@@ -94,13 +94,15 @@ class TC6_Arduino_10BASE_T1S_UDP : public Arduino_10BASE_T1S_UDP
   void digitalWrite(bool dioa0, bool dioa1, bool dioa2);
 
   bool getPlcaStatus(TC6LwIP_On_PlcaStatus on_plca_status);
+  bool enablePlca();
 
   bool sendWouldBlock();
 
 
 private:
   TC6_Io * _tc6_io;
   TC6LwIP_t _lw;
+  T1SPlcaSettings _t1s_plca_settings;
 };
 
 /**************************************************************************************

Diff for: src/microchip/lib/libtc6/inc/tc6-regs.h

@@ -78,7 +78,8 @@ typedef enum
     TC6Regs_Event_MAC_Int,
     TC6Regs_Event_HMX_Int,
     TC6Regs_Event_GINT_Mask,
-    TC6Regs_Event_PHY_Not_Trimmed
+    TC6Regs_Event_Chip_Error,
+    TC6Regs_Event_Unsupported_Hardware
 } TC6Regs_Event_t;
 
 /*>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/
@@ -112,13 +113,13 @@ bool TC6Regs_GetInitDone(TC6_t *pInst);
 void TC6Regs_Reinit(TC6_t *pInst);
 
 /** \brief Sets the PLCA Node ID and the PLCA Node Count and can enable/disable PLCA.
- *  \param idx - The instance number as returned from the TC6LwIP_Init() function.
+ *  \param pInst - The pointer returned by TC6_Init.
  *  \param plcaEnable - true, if PLCA shall be enabled. false, if CSMA/CD mode shall be used.
  *  \param nodeId - The new Node ID
  *  \param nodeCount - The new Node Count
  *  \return true, if request could be enqueued, the PLCA parameters will be changed soon. false, request failed, no change.
  */
-bool TC6Regs_SetPlca(TC6_t *pTC6, bool plcaEnable, uint8_t nodeId, uint8_t nodeCount);
+bool TC6Regs_SetPlca(TC6_t *pInst, bool plcaEnable, uint8_t nodeId, uint8_t nodeCount);
 
 /** \brief Sets DIOAx GPIOs to the desired status.
  *  \param idx - The instance number as returned from the TC6LwIP_Init() function.

Diff for: src/microchip/lib/libtc6/inc/tc6.h

@@ -27,7 +27,7 @@ Microchip or any third party.
 
   Company:
     Microchip Technology Inc.
-    
+
   File Name:
     tc6.h
 
@@ -52,6 +52,11 @@ extern "C" {
 /*                            DEFINITIONS                               */
 /*>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/
 
+#define TC6_LIB_VER_MAJOR  (3U)
+#define TC6_LIB_VER_MINOR  (1U)
+#define TC6_LIB_VER_BUGFIX (3U)
+#define TC6_LIB_VER_STRING "V3.1.3"
+
 struct TC6_t;
 typedef struct TC6_t TC6_t;
 
@@ -182,35 +187,35 @@ bool TC6_SendRawEthernetSegments(TC6_t *pInst, const TC6_RawTxSegment *pSegments
 /** \brief Reads from MAC / Phy registers
  *  \param pInst - The pointer returned by TC6_Init.
  *  \param addr - The 32 Bit register offset.
- *  \param is_protected - true, enables is_protected control data transmission (normal + inverted data). false, no protection feature is used.
+ *  \param secure - true, enables protected control data transmission (normal + inverted data). false, no protection feature is used.
  *  \param rxCallback - Pointer to a callback handler. May left NULL.
  *  \param pTag - Any pointer. Will be given back in given rxCallback. May left NULL.
  *  \return true, on success. false, otherwise.
  */
-bool TC6_ReadRegister(TC6_t *pInst, uint32_t addr, bool is_protected, TC6_RegCallback_t rxCallback, void *pTag);
+bool TC6_ReadRegister(TC6_t *pInst, uint32_t addr, bool secure, TC6_RegCallback_t rxCallback, void *pTag);
 
 /** \brief Writes to MAC / Phy registers
  *  \param pInst - The pointer returned by TC6_Init.
  *  \param addr - The 32 Bit register offset.
  *  \param value - The new 32 Bit register value.
- *  \param is_protected - true, enables is_protected control data transmission (normal + inverted data). false, no protection feature is used.
+ *  \param secure - true, enables protected control data transmission (normal + inverted data). false, no protection feature is used.
  *  \param txCallback - Pointer to a callback handler. May left NULL.
  *  \param pTag - Any pointer. Will be given back in given txCallback. May left NULL.
  *  \return true, on success. false, otherwise.
  */
-bool TC6_WriteRegister(TC6_t *pInst, uint32_t addr, uint32_t value, bool is_protected, TC6_RegCallback_t txCallback, void *pTag);
+bool TC6_WriteRegister(TC6_t *pInst, uint32_t addr, uint32_t value, bool secure, TC6_RegCallback_t txCallback, void *pTag);
 
 /** \brief Reads, modifies and writes back the changed value to MAC / Phy registers
  *  \param pInst - The pointer returned by TC6_Init.
  *  \param addr - The 32 Bit register offset.
  *  \param value - The 32 Bit register bit values to be changed. This value will be set to register only if mask on the corresponding position is set to 1.
  *  \param mask - The 32 Bit register bit mask. Only Bits set to 1 will be changed accordingly to value.
- *  \param is_protected - true, enables is_protected control data transmission (normal + inverted data). false, no protection feature is used.
+ *  \param secure - true, enables protected control data transmission (normal + inverted data). false, no protection feature is used.
  *  \param modifyCallback - Pointer to a callback handler. May left NULL.
  *  \param pTag - Any pointer. Will be given back in given modifyCallback. May left NULL.
  *  \return true, on success. false, otherwise.
  */
-bool TC6_ReadModifyWriteRegister(TC6_t *pInst, uint32_t addr, uint32_t value, uint32_t mask, bool is_protected, TC6_RegCallback_t modifyCallback, void *pTag);
+bool TC6_ReadModifyWriteRegister(TC6_t *pInst, uint32_t addr, uint32_t value, uint32_t mask, bool secure, TC6_RegCallback_t modifyCallback, void *pTag);
 
 /** \brief Execute a list of register commands
  *  \param pInst - The pointer returned by TC6_Init.