fixed bugs on big systems.

probably doesn't work like that but that's for later.

0BUILD

@@ -2,7 +2,7 @@
 
 <gwbuild>
 
-  <project name="aqhome" version="0.0.11" so_current="0" so_age="0" so_revision="11" write_config_h="TRUE">
+  <project name="aqhome" version="0.0.14" so_current="0" so_age="0" so_revision="14" write_config_h="TRUE">
     <setVar name="package">$(project_name)</setVar>
     <setVar name="version">
       $(project_vmajor).$(project_vminor).$(project_vpatchlevel)

apps/aqhome-nodes/r_getnodes.c

@@ -54,7 +54,7 @@ void AQH_NodeServer_HandleGetNodes(AQH_OBJECT *o, AQH_OBJECT *ep, const AQH_MESS
                                                 AQH_Endpoint_GetNextMessageId(ep), AQH_IpcMessage_GetMsgId(msg),
                                                 niNext?0:AQH_MSGNODE_GETDEVICES_RSP_FLAGS_LASTMSG, ni);
         AQH_Endpoint_AddMsgOut(ep, outMsg);
-        DBG_ERROR(NULL, "Messages in clients out queue: %d", AQH_Message_List_GetCount(AQH_Endpoint_GetMsgOutList(ep)));
+        DBG_DEBUG(NULL, "Messages in clients out queue: %d", AQH_Message_List_GetCount(AQH_Endpoint_GetMsgOutList(ep)));
         ni=niNext;
       }
     }

apps/aqhome-nodes/server.c

@@ -41,6 +41,7 @@
 #include <aqhome/msg/node/m_value.h>
 #include <aqhome/msg/node/m_recvstats.h>
 #include <aqhome/msg/node/m_sendstats.h>
+#include <aqhome/msg/node/m_memstats.h>
 #include <aqhome/data/value.h>
 
 #include <gwenhywfar/args.h>
@@ -122,7 +123,9 @@ static void _forwardTtyMsgToBroker(AQH_OBJECT *o, AQH_NODE_SERVER *xo, const AQH
 static void _forwardValueMessageToBroker(AQH_OBJECT *o, AQH_NODE_SERVER *xo, const AQH_MESSAGE *msg);
 static void _forwardDataFromSendStatsMsgToBroker(AQH_NODE_SERVER *xo, const AQH_MESSAGE *msg);
 static void _forwardDataFromRecvStatsMsgToBroker(AQH_NODE_SERVER *xo, const AQH_MESSAGE *msg);
+static void _forwardDataFromMemStatsMsgToBroker(AQH_NODE_SERVER *xo, const AQH_MESSAGE *msg);
 static void _forwardTtyMsgToClients(AQH_NODE_SERVER *xo, const AQH_MESSAGE *msg);
+static void _publishIntWithIdx(AQH_NODE_SERVER *xo, uint32_t uid, const char *vPath, int idx, int vModality, const char *vUnits, int v);
 static void _publishInt(AQH_NODE_SERVER *xo, uint32_t uid, const char *vPath, int vModality, const char *vUnits, int v);
 static void _publishDouble(AQH_NODE_SERVER *xo, uint32_t uid, const char *vPath, int vModality, const char *vUnits, double v);
 static void _setDeviceName(AQH_VALUE *value, uint32_t uid);
@@ -827,9 +830,11 @@ void _forwardTtyMsgToBroker(AQH_OBJECT *o, AQH_NODE_SERVER *xo, const AQH_MESSAG
 
   code=AQH_NodeMessage_GetMsgType(msg);
   switch(code) {
-  case AQH_MSG_TYPE_VALUE_REPORT: _forwardValueMessageToBroker(o, xo, msg);             break;
+  case AQH_MSG_TYPE_VALUE_REPORT: _forwardValueMessageToBroker(o, xo, msg);      break;
   case AQH_MSG_TYPE_COMSENDSTATS: _forwardDataFromSendStatsMsgToBroker(xo, msg); break;
   case AQH_MSG_TYPE_COMRECVSTATS: _forwardDataFromRecvStatsMsgToBroker(xo, msg); break;
+  case AQH_MSG_TYPE_MEMSTATS:     _forwardDataFromMemStatsMsgToBroker(xo, msg);  break;
+
   default: break;
   }
 }
@@ -898,24 +903,21 @@ void _forwardDataFromSendStatsMsgToBroker(AQH_NODE_SERVER *xo, const AQH_MESSAGE
   packetsOutInt=AQH_SendStatsMessage_GetPacketsOut(msg);
   if (packetsOutInt) {
     uint32_t uid;
-    double packetsOut;
-    double collisions;
-    double busy;
-    double collisionsPercentage=0.0;
-    double busyPercentage=0.0;
+    int devNum;
 
     uid=AQH_SendStatsMessage_GetUid(msg);
-    packetsOut=/*(double)*/ packetsOutInt;
-    collisions=/*(double)*/ AQH_SendStatsMessage_GetCollisions(msg);
-    busy=/*(double)*/ AQH_SendStatsMessage_GetBusyErrors(msg);
+    devNum=AQH_SendStatsMessage_GetInterface(msg);
 
-    collisionsPercentage=collisions*100.0/packetsOut;
-    busyPercentage=busy*100.0/packetsOut;
-
-    _publishInt(   xo, uid, "net/packetsOut",        0, NULL, packetsOutInt);
-    _publishInt(   xo, uid, "net/collisions",        0, NULL, (int) AQH_SendStatsMessage_GetCollisions(msg));
-    _publishDouble(xo, uid, "net/collisionsPercent", 0, "%",  collisionsPercentage);
-    _publishDouble(xo, uid, "net/busyPercent",       0, "%",  busyPercentage);
+    if (devNum==0) {
+      _publishInt(xo, uid, "net/packetsOut", 0, NULL, packetsOutInt);
+      _publishInt(xo, uid, "net/collisions", 0, NULL, (int) AQH_SendStatsMessage_GetCollisions(msg));
+      _publishInt(xo, uid, "net/busy",       0, NULL, (int) AQH_SendStatsMessage_GetBusyErrors(msg));
+    }
+    else {
+      _publishIntWithIdx(xo, uid, "net/packetsOut", devNum, 0, NULL, packetsOutInt);
+      _publishIntWithIdx(xo, uid, "net/collisions", devNum, 0, NULL, (int) AQH_SendStatsMessage_GetCollisions(msg));
+      _publishIntWithIdx(xo, uid, "net/busy",       devNum, 0, NULL, (int) AQH_SendStatsMessage_GetBusyErrors(msg));
+    }
   }
 }
 
@@ -928,30 +930,56 @@ void _forwardDataFromRecvStatsMsgToBroker(AQH_NODE_SERVER *xo, const AQH_MESSAGE
   packetsInInt=AQH_RecvStatsMessage_GetPacketsIn(msg);
   if (packetsInInt) {
     uint32_t uid;
-    double packetsIn;
-    double crcErrors;
-    double ioErrors;
-    double crcErrorsPercentage=0.0;
-    double ioErrorsPercentage=0.0;
+    int devNum;
 
-    uid=AQH_SendStatsMessage_GetUid(msg);
-    packetsIn=/*(double)*/ packetsInInt;
-    crcErrors=/*(double)*/AQH_RecvStatsMessage_GetCrcErrors(msg);
-    ioErrors=/*(double)*/AQH_RecvStatsMessage_GetIoErrors(msg);
+    uid=AQH_RecvStatsMessage_GetUid(msg);
+    devNum=AQH_RecvStatsMessage_GetInterface(msg);
 
-    crcErrorsPercentage=crcErrors*100.0/packetsIn;
-    ioErrorsPercentage=ioErrors*100.0/packetsIn;
-
-    _publishInt(   xo, uid, "net/packetsIn",        0, NULL, packetsInInt);
-    _publishInt(   xo, uid, "net/crcerrors",        0, NULL, (int) AQH_RecvStatsMessage_GetCrcErrors(msg));
-    _publishInt(   xo, uid, "net/ioerrors",         0, NULL, (int) AQH_RecvStatsMessage_GetIoErrors(msg));
-    _publishDouble(xo, uid, "net/crcerrorsPercent", 0, "%",  crcErrorsPercentage);
-    _publishDouble(xo, uid, "net/ioerrorsPercent",  0, "%",  ioErrorsPercentage);
+    if (devNum==0) {
+      _publishInt(xo, uid, "net/packetsIn",      0, NULL, packetsInInt);
+      _publishInt(xo, uid, "net/crcErrors",      0, NULL, (int) AQH_RecvStatsMessage_GetCrcErrors(msg));
+      _publishInt(xo, uid, "net/ioErrors",       0, NULL, (int) AQH_RecvStatsMessage_GetIoErrors(msg));
+      _publishInt(xo, uid, "net/nobufferErrors", 0, NULL, (int) AQH_RecvStatsMessage_GetNoBufferErrors(msg));
+      _publishInt(xo, uid, "net/msgSizeErrors",  0, NULL, (int) AQH_RecvStatsMessage_GetMsgSizeErrors(msg));
+      _publishInt(xo, uid, "net/missed",         0, NULL, (int) AQH_RecvStatsMessage_GetMissed(msg));
+    }
+    else {
+      _publishIntWithIdx(xo, uid, "net/packetsIn",      devNum, 0, NULL, packetsInInt);
+      _publishIntWithIdx(xo, uid, "net/crcErrors",      devNum, 0, NULL, (int) AQH_RecvStatsMessage_GetCrcErrors(msg));
+      _publishIntWithIdx(xo, uid, "net/ioErrors",       devNum, 0, NULL, (int) AQH_RecvStatsMessage_GetIoErrors(msg));
+      _publishIntWithIdx(xo, uid, "net/nobufferErrors", devNum, 0, NULL, (int) AQH_RecvStatsMessage_GetNoBufferErrors(msg));
+      _publishIntWithIdx(xo, uid, "net/msgSizeErrors",  devNum, 0, NULL, (int) AQH_RecvStatsMessage_GetMsgSizeErrors(msg));
+      _publishIntWithIdx(xo, uid, "net/missed",         devNum, 0, NULL, (int) AQH_RecvStatsMessage_GetMissed(msg));
+    }
   }
 }
 
 
 
+void _forwardDataFromMemStatsMsgToBroker(AQH_NODE_SERVER *xo, const AQH_MESSAGE *msg)
+{
+  uint32_t uid;
+
+  uid=AQH_MemStatsMessage_GetUid(msg);
+
+  _publishInt(   xo, uid, "mem/buffersUsed",       0, NULL, AQH_MemStatsMessage_GetBuffersUsed(msg));
+  _publishInt(   xo, uid, "mem/maxBuffersUsed",    0, NULL, AQH_MemStatsMessage_GetMaxBuffersUsed(msg));
+}
+
+
+
+void _publishIntWithIdx(AQH_NODE_SERVER *xo, uint32_t uid, const char *vPath, int idx, int vModality, const char *vUnits, int v)
+{
+  GWEN_BUFFER *tbuf;
+
+  tbuf=GWEN_Buffer_new(0, 256, 0, 1);
+  GWEN_Buffer_AppendArgs(tbuf, "%s%d", vPath, idx);
+  _publishInt(xo, uid, GWEN_Buffer_GetStart(tbuf), vModality, vUnits, v);
+  GWEN_Buffer_free(tbuf);
+}
+
+
+
 void _publishInt(AQH_NODE_SERVER *xo, uint32_t uid, const char *vPath, int vModality, const char *vUnits, int v)
 {
   _publishDouble(xo, uid, vPath, vModality, vUnits, /*(double)*/ v);

apps/aqhome-tool/data/0BUILD

@@ -43,6 +43,7 @@
       setdata.h
       moddevice.h
       watch.h
+      devicestate.h
     </headers>
   
     <sources>
@@ -58,6 +59,7 @@
       setdata.c
       moddevice.c
       watch.c
+      devicestate.c
     </sources>
 
     <useTargets>

apps/aqhome-tool/data/devicestate.c

@@ -0,0 +1,265 @@
+/****************************************************************************
+ * This file is part of the project AqHome.
+ * AqHome (c) by 2025 Martin Preuss, all rights reserved.
+ *
+ * The license for this file can be found in the file COPYING which you
+ * should have received along with this file.
+ ****************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include "./devicestate.h"
+#include "../utils.h"
+
+#include "aqhome/aqhome.h"
+#include "aqhome/dataclient/client.h"
+#include "aqhome/msg/ipc/m_ipc.h"
+#include "aqhome/msg/ipc/m_ipc_result.h"
+#include "aqhome/msg/ipc/data/m_ipcd.h"
+#include "aqhome/msg/ipc/data/m_ipcd_getdata.h"
+#include "aqhome/msg/ipc/data/m_ipcd_multidata.h"
+#include "aqhome/dataclient/client.h"
+
+#include <gwenhywfar/args.h>
+#include <gwenhywfar/i18n.h>
+#include <gwenhywfar/debug.h>
+#include <gwenhywfar/text.h>
+#include <gwenhywfar/timestamp.h>
+
+#include <ctype.h>
+
+
+
+/* ------------------------------------------------------------------------------------------------
+ * defs
+ * ------------------------------------------------------------------------------------------------
+ */
+
+#define I18S(msg) msg
+#define I18N(msg) GWEN_I18N_Translate(PACKAGE, msg)
+
+#define A_ARG GWEN_ARGS_FLAGS_HAS_ARGUMENT
+#define A_END (GWEN_ARGS_FLAGS_HELP | GWEN_ARGS_FLAGS_LAST)
+#define A_CHAR GWEN_ArgsType_Char
+#define A_INT GWEN_ArgsType_Int
+
+
+
+/* ------------------------------------------------------------------------------------------------
+ * forward declarations
+ * ------------------------------------------------------------------------------------------------
+ */
+
+static int _runCommand(AQH_DATACLIENT *dc);
+static void _handleDevice(AQH_DATACLIENT *dc, const AQH_DEVICE *device);
+static void _handleValue(AQH_DATACLIENT *dc, const AQH_VALUE *value);
+static void _printDataPoints(const uint64_t *dataPoints, uint32_t numValues);
+static void _printSingleDataPoint(uint64_t timestamp, double data);
+
+
+
+
+/* ------------------------------------------------------------------------------------------------
+ * code
+ * ------------------------------------------------------------------------------------------------
+ */
+
+int AQH_Tool_DeviceState(GWEN_DB_NODE *dbGlobalArgs, int argc, char **argv)
+{
+  AQH_EVENT_LOOP *eventLoop;
+  AQH_DATACLIENT *dc;
+  int rv;
+  const GWEN_ARGS args[]= {
+    /* flags type    name                   min max s     long           short_descr, long_descr */
+    { A_ARG, A_CHAR, "brokerAddress",       0,  1,  "t",  "tcpaddress",  I18S("TCP address to connect to [127.0.0.1]"), NULL},
+    { A_ARG, A_INT,  "brokerPort",          0,  1,  "P",  "tcpport",     I18S("Specify the TCP port to listen on"), NULL},
+    { A_ARG, A_INT,  "timeout",             0,  1,  "T",  NULL,          I18S("Specify timeout in seconds for response"), NULL},
+    { A_ARG, A_CHAR, "brokerClientId",      0,  1,  "c",  "clientid",    I18S("Specify CLIENTID"), NULL},
+    { A_ARG, A_CHAR, "userId",              0,  1,  "u",  "userid",      I18S("Specify user id"), NULL},
+    { A_ARG, A_CHAR, "password",            0,  1,  "p",  "password",    I18S("Specify service password"), NULL},
+    { A_ARG, A_CHAR, "device",              1,  1,  "d",  "device",      I18S("device name"), NULL},
+    { A_ARG, A_CHAR, "valueName",           0,  1,  "N",  "valuename",   I18S("Value name for device(e.g. LIGHT)"), NULL},
+    { A_ARG, A_INT,  "numOfDatapoints",     0,  1,  "n",  NULL,          I18S("Get up to n datapoints"), NULL},
+    { A_END, A_INT,  "help",                0,  0,  "h",  "help",        I18S("Show this help screen"), NULL}
+  };
+
+  eventLoop=AQH_EventLoop_new();
+  dc=AQH_DataClient_new(eventLoop, AQH_IPC_PROTOCOL_DATA_ID, AQH_IPC_PROTOCOL_DATA_VERSION);
+
+  rv=AQH_DataClient_ReadLocalArgs(dc, dbGlobalArgs, args, argc, argv);
+  if (rv<0) {
+    DBG_ERROR(NULL, "here (%d)", rv);
+    AQH_DataClient_free(dc);
+    AQH_EventLoop_free(eventLoop);
+    return 2;
+  }
+
+  rv=AQH_DataClient_ConnectWithArgs(dc, 0);
+  if (rv<0) {
+    DBG_ERROR(NULL, "Error connecting (%d)", rv);
+    AQH_DataClient_free(dc);
+    AQH_EventLoop_free(eventLoop);
+    return 2;
+  }
+
+  rv=_runCommand(dc);
+  if (rv<0) {
+    DBG_ERROR(NULL, "Error running (%d)", rv);
+    AQH_DataClient_free(dc);
+    AQH_EventLoop_free(eventLoop);
+    return 2;
+  }
+
+  AQH_DataClient_free(dc);
+  AQH_EventLoop_free(eventLoop);
+  return 0;
+}
+
+
+
+int _runCommand(AQH_DATACLIENT *dc)
+{
+  GWEN_DB_NODE *dbLocalArgs;
+  const char *deviceName;
+  AQH_DEVICE_LIST *deviceList;
+  AQH_DEVICE *device;
+
+  dbLocalArgs=AQH_DataClient_GetDbLocalArgs(dc);
+  deviceName=GWEN_DB_GetCharValue(dbLocalArgs, "device", 0, "*");
+
+  deviceList=AQH_DataClient_GetDevices(dc);
+  if (deviceList==NULL)  {
+    DBG_ERROR(NULL, "Error getting devices");
+    return GWEN_ERROR_GENERIC;
+  }
+
+  device=AQH_Device_List_First(deviceList);
+  while(device) {
+    const char *s;
+
+    s=AQH_Device_GetNameForSystem(device);
+    if (s && *s && -1!=GWEN_Text_ComparePattern(s, deviceName, 0)) {
+      _handleDevice(dc, device);
+    }
+
+    device=AQH_Device_List_Next(device);
+  }
+
+  AQH_Device_List_free(deviceList);
+
+  return 0;
+}
+
+
+
+void _handleDevice(AQH_DATACLIENT *dc, const AQH_DEVICE *device)
+{
+  AQH_VALUE_LIST *valueList;
+  const char *devName;
+  const char *roomName;
+  const char *location;
+  const char *descr;
+
+  devName=AQH_Device_GetNameForSystem(device);
+  roomName=AQH_Device_GetRoomName(device);
+  location=AQH_Device_GetLocation(device);
+  descr=AQH_Device_GetDescription(device);
+
+  fprintf(stdout, "%s (room: %s, loc: %s, descr: %s)\n",
+	  devName,
+	  roomName?roomName:"--",
+	  location?location:"--",
+	  descr?descr:"--");
+  valueList=AQH_DataClient_GetValues(dc, devName, 0);
+  if (valueList) {
+    const AQH_VALUE *value;
+
+    value=AQH_Value_List_First(valueList);
+    while(value) {
+      if (AQH_Value_GetValueType(value)==AQH_ValueType_Sensor)
+	_handleValue(dc, value);
+      value=AQH_Value_List_Next(value);
+    }
+  }
+
+  AQH_Value_List_free(valueList);
+}
+
+
+
+void _handleValue(AQH_DATACLIENT *dc, const AQH_VALUE *value)
+{
+  GWEN_DB_NODE *dbLocalArgs;
+  const char *wantedValueName;
+  const char *valueName;
+  int numDataPoints;
+
+  dbLocalArgs=AQH_DataClient_GetDbLocalArgs(dc);
+  numDataPoints=GWEN_DB_GetIntValue(dbLocalArgs, "numOfDatapoints", 0, 5);
+  wantedValueName=GWEN_DB_GetCharValue(dbLocalArgs, "valueName", 0, "*");
+
+  valueName=AQH_Value_GetName(value);
+  if (valueName &&
+      -1==GWEN_Text_ComparePattern(valueName, "stats_*", 0) &&
+      -1!=GWEN_Text_ComparePattern(valueName, wantedValueName, 0)) {
+    const char *valueNameForSystem;
+    uint64_t *dataPoints;
+    uint64_t recvdNum;
+
+    valueNameForSystem=AQH_Value_GetNameForSystem(value);
+    fprintf(stdout, "  %s: ", valueName?valueName:"<empty>");
+
+    dataPoints=malloc(numDataPoints*sizeof(uint64_t)*2);
+
+    recvdNum=AQH_DataClient_GetLastData(dc, valueNameForSystem, dataPoints, numDataPoints);
+    if (recvdNum>0)
+      _printDataPoints(dataPoints, recvdNum);
+
+    free(dataPoints);
+    fprintf(stdout, "\n");
+  }
+}
+
+
+
+void _printDataPoints(const uint64_t *dataPoints, uint32_t numValues)
+{
+  uint32_t i;
+  
+  for(i=0; i<numValues; i++) {
+    uint64_t timestamp;
+    union {double f; uint64_t i;} u;
+
+    if (i)
+      fprintf(stdout, " | ");
+    timestamp=*(dataPoints++);
+    u.i=*(dataPoints++);
+
+    _printSingleDataPoint(timestamp, u.f);
+  }
+}
+
+
+
+void _printSingleDataPoint(uint64_t timestamp, double data)
+{
+  GWEN_TIMESTAMP *ts;
+
+  ts=GWEN_Timestamp_fromLocalTime((time_t) timestamp);
+  if (ts)
+    fprintf(stdout, "%lf (%04d/%02d/%02d-%02d:%02d:%02d)",
+	    data,
+	    GWEN_Timestamp_GetYear(ts),
+            GWEN_Timestamp_GetMonth(ts),
+            GWEN_Timestamp_GetDay(ts),
+            GWEN_Timestamp_GetHour(ts),
+            GWEN_Timestamp_GetMinute(ts),
+            GWEN_Timestamp_GetSecond(ts));
+  else
+    fprintf(stdout, "%lf", data);
+}
+
+
+

apps/aqhome-tool/data/devicestate.h

@@ -0,0 +1,21 @@
+/****************************************************************************
+ * This file is part of the project AqHome.
+ * AqHome (c) by 2025 Martin Preuss, all rights reserved.
+ *
+ * The license for this file can be found in the file COPYING which you
+ * should have received along with this file.
+ ****************************************************************************/
+
+#ifndef AQHOME_TOOL_DEVICESTATE_H
+#define AQHOME_TOOL_DEVICESTATE_H
+
+
+#include <gwenhywfar/db.h>
+
+
+
+int AQH_Tool_DeviceState(GWEN_DB_NODE *dbGlobalArgs, int argc, char **argv);
+
+
+#endif
+

apps/aqhome-tool/main.c

@@ -23,6 +23,7 @@
 #include "./data/setdata.h"
 #include "./data/moddevice.h"
 #include "./data/watch.h"
+#include "./data/devicestate.h"
 
 #include <aqhome/api.h>
 #include <aqhome/aqhome.h>
@@ -101,6 +102,7 @@ int main(int argc, char **argv)
     GWEN_FE_DAH("setdata", AQH_Tool_SetData, I18N("Set data for a value on the data server (e.g. a switch or thermostat)")),
     GWEN_FE_DAH("moddevice", AQH_Tool_ModDevice, I18N("Modify a device on the data server")),
     GWEN_FE_DAH("watch", AQH_Tool_Watch, I18N("Watch and print changes of values on the data server")),
+    GWEN_FE_DAH("devicestate", AQH_Tool_DeviceState, I18N("Show state of devices")),
     GWEN_FE_END(),
   };
   const GWEN_FUNCS *func;

aqhome/data/storage.c

@@ -23,7 +23,7 @@
 
 
 #define AQH_STORAGE_DATAPOINTS_STEPS 128
-
+#define AQH_STORAGE_MAXOPENFILES     128
 
 
 /* ------------------------------------------------------------------------------------------------
@@ -650,6 +650,16 @@ AQH_DATAFILE *_getDataFileByValueId(AQH_STORAGE *sto, uint64_t valueId)
       DBG_ERROR(AQH_LOGDOMAIN, "Error opening/creating datafile for valueId \"%lu\"", (unsigned long int) valueId);
       return NULL;
     }
+    if (AQH_DataFile_List_GetCount(sto->dataFileList)>=AQH_STORAGE_MAXOPENFILES) {
+      AQH_DATAFILE *dfLast;
+
+      dfLast=AQH_DataFile_List_Last(sto->dataFileList);
+      if (dfLast) {
+        AQH_DataFile_Close(dfLast);
+        AQH_DataFile_List_Del(dfLast);
+        AQH_DataFile_free(dfLast);
+      }
+    }
     DBG_DEBUG(AQH_LOGDOMAIN, "Adding datafile for valueId \"%lu\" to list", (unsigned long int) valueId);
     AQH_DataFile_List_Add(df, sto->dataFileList);
   }
@@ -661,8 +671,17 @@ AQH_DATAFILE *_getDataFileByValueId(AQH_STORAGE *sto, uint64_t valueId)
 
 AQH_DATAFILE *_findDataFileByValueId(const AQH_STORAGE *sto, uint64_t valueId)
 {
-  if (sto && sto->dataFileList)
-    return AQH_DataFile_List_GetByValueId(sto->dataFileList, valueId);
+  if (sto && sto->dataFileList) {
+    AQH_DATAFILE *df;
+
+    df=AQH_DataFile_List_GetByValueId(sto->dataFileList, valueId);
+    if (df) {
+      /* move to front of list */
+      AQH_DataFile_List_Del(df);
+      AQH_DataFile_List_Insert(df, sto->dataFileList);
+      return df;
+    }
+  }
   return NULL;
 }
 

aqhome/dataclient/client.c

@@ -467,7 +467,7 @@ uint64_t _handleDataResponses(AQH_DATACLIENT *dc, uint64_t *dataPtr, uint64_t ma
         break;
       }
       else if (code==AQH_MSGTYPE_IPC_DATA_RESULT) {
-        DBG_ERROR(NULL, "Server Error: %d", AQH_IpcMessageResult_GetResult(tagList));
+        DBG_INFO(NULL, "Server Error: %d", AQH_IpcMessageResult_GetResult(tagList));
         GWEN_Tag16_List_free(tagList);
         AQH_Message_free(msgIn);
         return 0;
@@ -538,7 +538,7 @@ int AQH_DataClient_ConnectWithArgs(AQH_DATACLIENT *dc, uint32_t flags)
 
   brokerPort=GWEN_DB_GetIntValue(dc->dbLocalArgs, "brokerPort", 0, -1);
   if (brokerPort<0)
-    brokerPort=GWEN_DB_GetIntValue(dc->dbLocalArgs, "ConfigFile/brokerPort", 0, 45456);
+    brokerPort=GWEN_DB_GetIntValue(dc->dbLocalArgs, "ConfigFile/brokerPort", 0, 1899);
 
   userId=GWEN_DB_GetCharValue(dc->dbLocalArgs, "userId", 0, NULL);
   passwd=GWEN_DB_GetCharValue(dc->dbLocalArgs, "password", 0, NULL);

aqhome/ipc2/ipc_endpoint.c

@@ -79,7 +79,7 @@ AQH_MESSAGE *AQH_IpcEndpoint_WaitForResponseMsg(AQH_OBJECT *ipcEndpoint, uint32_
         uint16_t code;
 
         code=AQH_IpcMessage_GetCode(msg);
-        DBG_ERROR(NULL, "Received unexpected message %d (%x), ignoring", code, code);
+        DBG_DEBUG(NULL, "Received unexpected message %d (%x), ignoring", code, code);
         AQH_Message_free(msg);
       }
     }

aqhome/ipc2/tcpd_object.c

@@ -176,17 +176,17 @@ int _handleSocketReady(AQH_OBJECT *o)
 {
   AQH_TCPD_OBJECT *xo;
 
-  DBG_INFO(NULL, "Socket ready");
+  DBG_DEBUG(NULL, "Socket ready");
   xo=GWEN_INHERIT_GETDATA(AQH_OBJECT, AQH_TCPD_OBJECT, o);
   if (xo) {
     int clientSk;
 
     clientSk=_acceptConnection(xo->fdSocket);
     if (clientSk<0) {
-      DBG_ERROR(AQH_LOGDOMAIN, "here (%d)", clientSk);
+      DBG_INFO(AQH_LOGDOMAIN, "here (%d)", clientSk);
     }
     else {
-      DBG_INFO(AQH_LOGDOMAIN, "New connection");
+      DBG_NOTICE(AQH_LOGDOMAIN, "New connection");
       if (0==AQH_Object_EmitSignal(o, AQH_TCPD_OBJECT_SIGNAL_NEWCONN, clientSk, NULL)) {
         DBG_ERROR(AQH_LOGDOMAIN, "New connection not handled");
         close(clientSk);

aqhome/msg/node/0BUILD

@@ -62,6 +62,7 @@
       m_flashend.h
       m_flashready.h
       m_flashresponse.h
+      m_range.h
     </headers>
 
 
@@ -89,6 +90,7 @@
       m_flashend.c
       m_flashready.c
       m_flashresponse.c
+      m_range.c
     </sources>
 
 

aqhome/msg/node/m_memstats.c

@@ -19,8 +19,8 @@
 
 
 
-#define AQH_MSG_OFFS_MEMSTATS_SECONDS         0  /* 4 bytes */
-#define AQH_MSG_OFFS_MEMSTATS_UID             4  /* 4 bytes */
+#define AQH_MSG_OFFS_MEMSTATS_UID             0  /* 4 bytes */
+#define AQH_MSG_OFFS_MEMSTATS_SECONDS         4  /* 4 bytes */
 #define AQH_MSG_OFFS_MEMSTATS_STACKUSAGE      8  /* 2 bytes */
 #define AQH_MSG_OFFS_MEMSTATS_BUFFERSUSED    10 /* 1 byte */
 #define AQH_MSG_OFFS_MEMSTATS_MAXBUFFERSUSED 11 /* 1 byte */

aqhome/msg/node/m_node.c

@@ -28,6 +28,7 @@
 #include "aqhome/msg/node/m_flashend.h"
 #include "aqhome/msg/node/m_flashready.h"
 #include "aqhome/msg/node/m_flashresponse.h"
+#include "aqhome/msg/node/m_range.h"
 
 #include <gwenhywfar/text.h>
 
@@ -212,6 +213,7 @@ const char *AQH_NodeMessage_MsgTypeToChar(uint8_t i)
   case AQH_MSG_TYPE_CLAIM_ADDRESS:  return "ClaimAddress";
   case AQH_MSG_TYPE_DENY_ADDRESS:   return "DenyAddress";
   case AQH_MSG_TYPE_ADDRESS_RANGE:  return "Range";
+  case AQH_MSG_TYPE_REENUM:         return "Reenum";
 
   case AQH_MSG_TYPE_FLASH_START:    return "FlashStart";
   case AQH_MSG_TYPE_FLASH_END:      return "FlashEnd";
@@ -246,6 +248,8 @@ void AQH_NodeMessage_DumpSpecificToBuffer(const AQH_MESSAGE *msg, GWEN_BUFFER *d
     case AQH_MSG_TYPE_HAVE_ADDRESS:   AQH_AddrMessage_DumpToBuffer(msg, dbuf, sText); break;
     case AQH_MSG_TYPE_CLAIM_ADDRESS:  AQH_AddrMessage_DumpToBuffer(msg, dbuf, sText); break;
     case AQH_MSG_TYPE_DENY_ADDRESS:   AQH_AddrMessage_DumpToBuffer(msg, dbuf, sText); break;
+    case AQH_MSG_TYPE_ADDRESS_RANGE:  AQH_RangeMessage_DumpToBuffer(msg, dbuf, sText); break;
+    case AQH_MSG_TYPE_REENUM:         AQH_RangeMessage_DumpToBuffer(msg, dbuf, sText); break;
   
     case AQH_MSG_TYPE_FLASH_START:    AQH_FlashStartMessage_DumpToBuffer(msg, dbuf, sText); break;
     case AQH_MSG_TYPE_FLASH_END:      AQH_FlashEndMessage_DumpToBuffer(msg, dbuf, sText); break;
@@ -266,7 +270,6 @@ void AQH_NodeMessage_DumpSpecificToBuffer(const AQH_MESSAGE *msg, GWEN_BUFFER *d
 
     case AQH_MSG_TYPE_DEBUG:         
     case AQH_MSG_TYPE_TWIBUSMEMBER:  
-    case AQH_MSG_TYPE_ADDRESS_RANGE: 
     default:                         AQH_NodeMessage_DumpToBuffer(msg, dbuf, sText); break;
     }
   }

aqhome/msg/node/m_node.h

@@ -29,8 +29,8 @@
 
 #define AQH_MSG_TYPE_PING           10
 #define AQH_MSG_TYPE_PONG           11
-#define AQH_MSG_TYPE_COMSENDSTATS   20
-#define AQH_MSG_TYPE_COMRECVSTATS   21
+#define AQH_MSG_TYPE_COMSENDSTATS   22
+#define AQH_MSG_TYPE_COMRECVSTATS   23
 #define AQH_MSG_TYPE_TWIBUSMEMBER   30
 #define AQH_MSG_TYPE_DEBUG          40
 #define AQH_MSG_TYPE_VALUE          50 /* deprecated */
@@ -40,6 +40,7 @@
 #define AQH_MSG_TYPE_CLAIM_ADDRESS  62
 #define AQH_MSG_TYPE_DENY_ADDRESS   63
 #define AQH_MSG_TYPE_ADDRESS_RANGE  64
+#define AQH_MSG_TYPE_REENUM         65
 
 #define AQH_MSG_TYPE_FLASH_START    70
 #define AQH_MSG_TYPE_FLASH_END      71

aqhome/msg/node/m_range.c

@@ -0,0 +1,61 @@
+/****************************************************************************
+ * This file is part of the project AqHome.
+ * AqHome (c) by 2025 Martin Preuss, all rights reserved.
+ *
+ * The license for this file can be found in the file COPYING which you
+ * should have received along with this file.
+ ****************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+
+
+#include "aqhome/msg/node/m_range.h"
+#include "aqhome/msg/node/m_node.h"
+
+#include <gwenhywfar/debug.h>
+
+
+#define AQH_MSG_OFFS_RANGE_UID         0   /* 4 bytes */
+#define AQH_MSG_OFFS_RANGE_BEGIN       4   /* 1 bytes */
+#define AQH_MSG_OFFS_RANGE_END         5   /* 1 bytes */
+
+
+
+uint32_t AQH_RangeMessage_GetUid(const AQH_MESSAGE *msg)
+{
+  return AQH_Message_ReadUint32At(msg, AQH_MSG_OFFS_ALL_DATA_BEGIN+AQH_MSG_OFFS_RANGE_UID, 0);
+}
+
+
+
+uint8_t AQH_RangeMessage_GetRangeBegin(const AQH_MESSAGE *msg)
+{
+  return AQH_Message_ReadUint8At(msg, AQH_MSG_OFFS_ALL_DATA_BEGIN+AQH_MSG_OFFS_RANGE_BEGIN, 0);
+}
+
+
+
+uint8_t AQH_RangeMessage_GetRangeEnd(const AQH_MESSAGE *msg)
+{
+  return AQH_Message_ReadUint8At(msg, AQH_MSG_OFFS_ALL_DATA_BEGIN+AQH_MSG_OFFS_RANGE_END, 0);
+}
+
+
+
+void AQH_RangeMessage_DumpToBuffer(const AQH_MESSAGE *msg, GWEN_BUFFER *dbuf, const char *sText)
+{
+  GWEN_Buffer_AppendArgs(dbuf,
+                         "0x%02x->0x%02x: RANGE(%s) %s (uid=0x%08x, begin=0x%x, end=0x%x)\n",
+                         AQH_NodeMessage_GetSourceAddress(msg),
+                         AQH_NodeMessage_GetDestAddress(msg),
+                         AQH_NodeMessage_MsgTypeToChar(AQH_NodeMessage_GetMsgType(msg)),
+                         sText,
+                         (unsigned int) AQH_RangeMessage_GetUid(msg),
+                         AQH_RangeMessage_GetRangeBegin(msg),
+                         AQH_RangeMessage_GetRangeEnd(msg));
+}
+
+

aqhome/msg/node/m_range.h

@@ -0,0 +1,30 @@
+/****************************************************************************
+ * This file is part of the project AqHome.
+ * AqHome (c) by 2025 Martin Preuss, all rights reserved.
+ *
+ * The license for this file can be found in the file COPYING which you
+ * should have received along with this file.
+ ****************************************************************************/
+
+#ifndef AQH_M_RANGE_H
+#define AQH_M_RANGE_H
+
+
+#include <aqhome/api.h>
+#include <aqhome/ipc2/message.h>
+
+#include <gwenhywfar/debug.h>
+
+
+/* This message is used for message types ClaimAddr, DenyAddr, HaveAddr */
+
+AQHOME_API uint32_t AQH_RangeMessage_GetUid(const AQH_MESSAGE *msg);
+AQHOME_API uint8_t AQH_RangeMessage_GetAddr(const AQH_MESSAGE *msg);
+AQHOME_API uint8_t AQH_RangeMessage_GetRangeBegin(const AQH_MESSAGE *msg);
+AQHOME_API uint8_t AQH_RangeMessage_GetRangeEnd(const AQH_MESSAGE *msg);
+
+AQHOME_API void AQH_RangeMessage_DumpToBuffer(const AQH_MESSAGE *msg, GWEN_BUFFER *dbuf, const char *sText);
+
+
+
+#endif

aqhome/msg/node/m_recvstats.c

@@ -18,13 +18,21 @@
 #include <gwenhywfar/debug.h>
 
 
-#define AQH_MSG_OFFS_RECVSTATS_UID          0   /* 4 bytes */
-#define AQH_MSG_OFFS_RECVSTATS_PACKETSIN    4   /* 2 bytes */
-#define AQH_MSG_OFFS_RECVSTATS_CRCERRORS    6   /* 2 bytes */
-#define AQH_MSG_OFFS_RECVSTATS_IOERRORS     8   /* 2 bytes */
-#define AQH_MSG_OFFS_RECVSTATS_NOBUFFER    10   /* 2 bytes */
-#define AQH_MSG_OFFS_RECVSTATS_HANDLED     12   /* 2 bytes */
-#define AQH_MSG_OFFS_RECVSTATS_MISSED      14   /* 2 bytes */
+#define AQH_MSG_OFFS_RECVSTATS_UID            0   /* 4 bytes */
+#define AQH_MSG_OFFS_RECVSTATS_IFACE          4   /* 1 byte */
+#define AQH_MSG_OFFS_RECVSTATS_PACKETSIN      5   /* 2 bytes */
+#define AQH_MSG_OFFS_RECVSTATS_CRCERRORS      7   /* 2 bytes */
+#define AQH_MSG_OFFS_RECVSTATS_IOERRORS       9   /* 2 bytes */
+#define AQH_MSG_OFFS_RECVSTATS_NOBUFFER      11   /* 2 bytes */
+#define AQH_MSG_OFFS_RECVSTATS_MSGSIZEERRORS 13   /* 2 bytes */
+#define AQH_MSG_OFFS_RECVSTATS_MISSED        15   /* 2 bytes */
+
+
+
+uint8_t AQH_RecvStatsMessage_GetInterface(const AQH_MESSAGE *msg)
+{
+  return AQH_Message_ReadUint8At(msg, AQH_MSG_OFFS_ALL_DATA_BEGIN+AQH_MSG_OFFS_RECVSTATS_IFACE, 0);
+}
 
 
 
@@ -63,9 +71,9 @@ uint16_t AQH_RecvStatsMessage_GetNoBufferErrors(const AQH_MESSAGE *msg)
 
 
 
-uint16_t AQH_RecvStatsMessage_GetHandled(const AQH_MESSAGE *msg)
+uint16_t AQH_RecvStatsMessage_GetMsgSizeErrors(const AQH_MESSAGE *msg)
 {
-  return AQH_Message_ReadUint16At(msg, AQH_MSG_OFFS_ALL_DATA_BEGIN+AQH_MSG_OFFS_RECVSTATS_HANDLED, 0);
+  return AQH_Message_ReadUint16At(msg, AQH_MSG_OFFS_ALL_DATA_BEGIN+AQH_MSG_OFFS_RECVSTATS_MSGSIZEERRORS, 0);
 }
 
 
@@ -80,17 +88,18 @@ uint16_t AQH_RecvStatsMessage_GetMissed(const AQH_MESSAGE *msg)
 void AQH_RecvStatsMessage_DumpToBuffer(const AQH_MESSAGE *msg, GWEN_BUFFER *dbuf, const char *sText)
 {
   GWEN_Buffer_AppendArgs(dbuf,
-                         "0x%02x->0x%02x: RECVSTATS %s "
-                         "(uid=0x%08x, in=%d, crc errs=%d, io errs=%d, nobuf errs=%d, handled=%d, missed=%d)\n",
+                         "0x%02x->0x%02x: RECVSTATS %s"
+                         "(uid=0x%08x, dev=%d, in=%d, eCrc=%d, eIo=%d, eNobuf=%d, eMsgSize=%d, eMissed=%d)\n",
                          AQH_NodeMessage_GetSourceAddress(msg),
                          AQH_NodeMessage_GetDestAddress(msg),
                          sText,
                          (unsigned int) AQH_RecvStatsMessage_GetUid(msg),
+                         AQH_RecvStatsMessage_GetInterface(msg),
                          AQH_RecvStatsMessage_GetPacketsIn(msg),
                          AQH_RecvStatsMessage_GetCrcErrors(msg),
                          AQH_RecvStatsMessage_GetIoErrors(msg),
                          AQH_RecvStatsMessage_GetNoBufferErrors(msg),
-                         AQH_RecvStatsMessage_GetHandled(msg),
+                         AQH_RecvStatsMessage_GetMsgSizeErrors(msg),
                          AQH_RecvStatsMessage_GetMissed(msg));
 }
 

aqhome/msg/node/m_recvstats.h

@@ -17,12 +17,13 @@
 
 
 
+AQHOME_API uint8_t AQH_RecvStatsMessage_GetInterface(const AQH_MESSAGE *msg);
 AQHOME_API uint32_t AQH_RecvStatsMessage_GetUid(const AQH_MESSAGE *msg);
 AQHOME_API uint16_t AQH_RecvStatsMessage_GetPacketsIn(const AQH_MESSAGE *msg);
 AQHOME_API uint16_t AQH_RecvStatsMessage_GetCrcErrors(const AQH_MESSAGE *msg);
 AQHOME_API uint16_t AQH_RecvStatsMessage_GetIoErrors(const AQH_MESSAGE *msg);
 AQHOME_API uint16_t AQH_RecvStatsMessage_GetNoBufferErrors(const AQH_MESSAGE *msg);
-AQHOME_API uint16_t AQH_RecvStatsMessage_GetHandled(const AQH_MESSAGE *msg);
+AQHOME_API uint16_t AQH_RecvStatsMessage_GetMsgSizeErrors(const AQH_MESSAGE *msg);
 AQHOME_API uint16_t AQH_RecvStatsMessage_GetMissed(const AQH_MESSAGE *msg);
 
 AQHOME_API void AQH_RecvStatsMessage_DumpToBuffer(const AQH_MESSAGE *msg, GWEN_BUFFER *dbuf, const char *sText);

aqhome/msg/node/m_sendstats.c

@@ -1,6 +1,6 @@
 /****************************************************************************
  * This file is part of the project AqHome.
- * AqHome (c) by 2023 Martin Preuss, all rights reserved.
+ * AqHome (c) by 2025 Martin Preuss, all rights reserved.
  *
  * The license for this file can be found in the file COPYING which you
  * should have received along with this file.
@@ -19,9 +19,17 @@
 
 
 #define AQH_MSG_OFFS_SENDSTATS_UID         0 /* 4 bytes */
-#define AQH_MSG_OFFS_SENDSTATS_PACKETSOUT  4 /* 2 bytes */
-#define AQH_MSG_OFFS_SENDSTATS_COLLISIONS  6 /* 2 bytes */
-#define AQH_MSG_OFFS_SENDSTATS_BUSY        8 /* 2 bytes */
+#define AQH_MSG_OFFS_SENDSTATS_IFACE       4 /* 1 byte */
+#define AQH_MSG_OFFS_SENDSTATS_PACKETSOUT  5 /* 2 bytes */
+#define AQH_MSG_OFFS_SENDSTATS_COLLISIONS  7 /* 2 bytes */
+#define AQH_MSG_OFFS_SENDSTATS_BUSY        9 /* 2 bytes */
+
+
+
+uint8_t AQH_SendStatsMessage_GetInterface(const AQH_MESSAGE *msg)
+{
+  return AQH_Message_ReadUint8At(msg, AQH_MSG_OFFS_ALL_DATA_BEGIN+AQH_MSG_OFFS_SENDSTATS_IFACE, 0);
+}
 
 
 
@@ -57,11 +65,12 @@ void AQH_SendStatsMessage_DumpToBuffer(const AQH_MESSAGE *msg, GWEN_BUFFER *dbuf
 {
   if (msg)
     GWEN_Buffer_AppendArgs(dbuf,
-                           "0x%02x->0x%02x: SENDSTATS %s (uid=0x%08x, out=%d, collisions=%d, busy line=%d)\n",
+                           "0x%02x->0x%02x: SENDSTATS %s (uid=0x%08x, dev=%d, out=%d, collisions=%d, busy line=%d)\n",
                            AQH_NodeMessage_GetSourceAddress(msg),
                            AQH_NodeMessage_GetDestAddress(msg),
                            sText,
                            (unsigned int) AQH_SendStatsMessage_GetUid(msg),
+                           AQH_SendStatsMessage_GetInterface(msg),
                            AQH_SendStatsMessage_GetPacketsOut(msg),
                            AQH_SendStatsMessage_GetCollisions(msg),
                            AQH_SendStatsMessage_GetBusyErrors(msg));

aqhome/msg/node/m_sendstats.h

@@ -17,6 +17,7 @@
 
 
 
+AQHOME_API uint8_t AQH_SendStatsMessage_GetInterface(const AQH_MESSAGE *msg);
 AQHOME_API uint32_t AQH_SendStatsMessage_GetUid(const AQH_MESSAGE *msg);
 AQHOME_API uint16_t AQH_SendStatsMessage_GetPacketsOut(const AQH_MESSAGE *msg);
 AQHOME_API uint16_t AQH_SendStatsMessage_GetCollisions(const AQH_MESSAGE *msg);

avr/apps/0BUILD

@@ -9,6 +9,9 @@
     network
     reportsensors
     stats
+    router
+    hub
+    forwarder
   </subdirs>
 
   <extradist>

avr/apps/forwarder/0BUILD

@@ -3,15 +3,13 @@
 <gwbuild>
 
   <subdirs>
-    boot
-    main
   </subdirs>
 
   <extradist>
-    defs.asm
-    README
+    main.asm
   </extradist>
   
 
 </gwbuild>
 
+

avr/apps/forwarder/main.asm

@@ -0,0 +1,359 @@
+; ***************************************************************************
+; copyright   : (C) 2025 by Martin Preuss
+; email       : martin@libchipcard.de
+;
+; ***************************************************************************
+; * This file is part of the project "AqHome".                              *
+; * Please see toplevel file COPYING of that project for license details.   *
+; ***************************************************************************
+
+
+
+; ***************************************************************************
+; defines
+
+; ---------------------------------------------------------------------------
+; network interfaces
+
+.equ NETDEV0_IFACENUM = 1
+.equ NETDEV1_IFACENUM = 2
+
+
+
+; ***************************************************************************
+; data
+
+.dseg
+
+; nothing so far
+
+
+
+; ***************************************************************************
+; code
+
+.cseg
+
+; ---------------------------------------------------------------------------
+; @routine AppForwarder_Init @global
+
+AppForwarder_Init:
+  ; set interface number for NETDEV0
+  ldi r16, NETDEV0_IFACENUM
+  sts netInterfaceData+NET_IFACE_OFFS_IFACENUM, r16
+  ; set interface number for NETDEV1
+  ldi r16, NETDEV1_IFACENUM
+  sts netInterfaceData2+NET_IFACE_OFFS_IFACENUM, r16
+  sec
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine AppForwarder_EveryDay @global
+;
+; @clobbers R16, R17, X
+
+AppForwarder_EveryDay:
+  ldi yl, LOW(netInterfaceData)
+  ldi yh, HIGH(netInterfaceData)
+  bigcall NET_Interface_ResetStats ; (R16, R17, X)
+
+  ldi yl, LOW(netInterfaceData2)
+  ldi yh, HIGH(netInterfaceData2)
+  bigcall NET_Interface_ResetStats ; (R16, R17, X)
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine AppForwarder_Run @global
+;
+; Read messages from either interface and forward to the other one.
+
+AppForwarder_Run:
+  rjmp appForwarderCheckRecvdMsg
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine appForwarderCheckRecvdMsg
+;
+; Read messages from either interface and forward to the other one.
+; @return CFLAG set if something done, cleared otherwise
+; @clobbers any
+
+appForwarderCheckRecvdMsg:
+  rcall NET_PeekNextIncomingMsgNum             ; check read queue (bufNum->r16)
+  brcc appForwarderCheckRecvdMsg_ret           ; no msg, jmp
+  rcall NET_Buffer_Locate                      ; (R17)
+  push r16
+    ld r16, X                                  ; read buffer header
+    andi r16, 0x0f                             ; keep interface number (in low nibble)
+    rcall appForwarderGetDeviceByIfaceNum      ; Y=src interface (R17)
+  pop r16
+  brcc appForwarderCheckRecvdMsg_ret           ; interface not found
+  adiw xh:xl, 1                                ; point to message begin
+
+  push r16
+    rcall appForwarderHandleMsgAnyDev          ; check for message we should handle (ping etc)
+  pop r16
+
+  ; let system handle incoming messages
+  push r16
+    rcall appForwarderLetSysHandleMsg
+  pop r16
+
+  ; forward to other interface
+  ldd r17, Y+NET_IFACE_OFFS_IFACENUM
+  rcall appForwarderSendToOtherDev
+  brcc appForwarderCheckRecvdMsg_ret           ; could not add, jmp
+  rcall NET_GetNextIncomingMsgNum              ; take off the queue
+  sec
+appForwarderCheckRecvdMsg_ret:
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine appForwarderHandleMsgAnyDev @global
+;
+; @param Y pointer to source interface for the message
+; @param X pointer to received message
+; @return CFLAG set if msg handled, cleared otherwise
+; @clobbers any, !X
+
+appForwarderHandleMsgAnyDev:
+  push xl
+    push xh
+      rcall appForwarderHandleMsgAnyDev_savedX
+    pop xh
+  pop xl
+  rjmp appForwarderHandleMsgAnyDev_end
+appForwarderHandleMsgAnyDev_savedX:
+  adiw xh:xl, NETMSG_OFFS_CMD                       ; maybe move ping/reboot handling to all/main.asm?
+  ld r16, X
+  sbiw xh:xl, NETMSG_OFFS_CMD
+  cpi r16, NETMSG_CMD_REBOOT_REQUEST
+  breq appForwarderHandleMsgAnyDev_handleRebootMsg
+  cpi r16, NETMSG_CMD_PING
+  breq appForwarderHandleMsgAnyDev_handlePingMsg
+  cpi r16, NETMSG_CMD_CLAIM_ADDRESS
+  breq appForwarderHandleMsgAnyDev_handleClaimAddr
+  rjmp appForwarderHandleMsgAnyDev_clcRet
+appForwarderHandleMsgAnyDev_handleRebootMsg:
+  rcall appForwarderHandleRebootRequest
+  ret
+appForwarderHandleMsgAnyDev_handlePingMsg:
+  rcall appForwarderHandlePingRequest
+  clc
+  ret
+appForwarderHandleMsgAnyDev_handleClaimAddr:
+  rcall appForwarderHandleClaimAddrRequest
+  clc
+  ret
+appForwarderHandleMsgAnyDev_clcRet:
+  clc
+appForwarderHandleMsgAnyDev_end:
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine appForwarderHandleClaimAddrRequest
+;
+; @param X pointer to received message
+; @param Y pointer to source interface for the message
+; @clobbers
+
+appForwarderHandleClaimAddrRequest:
+  rcall NETMSG_Address_Read                        ; R18=cmd, R19=addr(R18, R19)
+  lds r16, netInterfaceData+NET_IFACE_OFFS_ADDRESS
+  cp r19, r16
+  brne appForwarderHandleClaimAddrRequest_ret
+  ldi r18, NETMSG_CMD_DENY_ADDRESS                 ; deny addr
+  rcall appForwarderSendAddrMsg                    ; (R16, R17, R18, R19, R20, R21, X, Y)
+appForwarderHandleClaimAddrRequest_ret:
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine appForwarderSendAddrMsg
+;
+; @param R18 command
+; @param R19 address to send
+; @param Y pointer to interface to send to
+; @clobbers R16 (R17, R18, R19, R20, R21, X, Y)
+
+appForwarderSendAddrMsg:
+  bigcall NET_Buffer_Alloc                 ; (R16, R17, X)
+  brcc appForwarderSendAddrMsg_end
+  push r16
+    adiw xh:xl, 1
+    bigcall NETMSG_Address_Write           ; (R16, R17, R18, R19, R20, R21)
+    sbiw xh:xl, 1
+  pop r16
+  bigcall NET_Interface_AddOrReleaseOutMsg ; (R16, R17, R18, X)
+appForwarderSendAddrMsg_end:
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine appForwarderHandleRebootRequest
+;
+; Doesn't return if reboot msg is valid.
+;
+; @param X pointer to received message
+
+appForwarderHandleRebootRequest:
+  rcall NETMSG_RebootRequestRead
+  brcc appForwarderHandleRebootRequest_end
+  ; reboot
+  cli
+  bigjmp BOOTLOADER_ADDR
+appForwarderHandleRebootRequest_end:
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine appForwarderHandlePingRequest
+;
+; @param X pointer to received message
+; @param Y pointer to source interface for the message
+
+appForwarderHandlePingRequest:
+  ld r17, X
+  lds r16, (netInterfaceData+NET_IFACE_OFFS_ADDRESS)
+  cp r16, r17
+  breq appForwarderHandlePingRequest_forMe
+  cpi r17, 0xff
+  breq appForwarderHandlePingRequest_forMe
+  clc
+  rjmp appForwarderHandlePingRequest_end
+appForwarderHandlePingRequest_forMe:
+  adiw xh:xl, NETMSG_OFFS_SRCADDR
+  ld r17, X
+  sbiw xh:xl, NETMSG_OFFS_SRCADDR
+  push r17
+    bigcall NET_Buffer_Alloc               ; (R16, R17, X)
+  pop r17
+  brcc appForwarderHandlePingRequest_end   ; jmp on error
+  push r16                                 ; buffer num
+    mov r16, r17                           ; DEST addr
+    adiw xh:xl, 1
+    bigcall NETMSG_Pong_Write              ; (R16, R17, R18, R19, R20, X)
+    sbiw xh:xl, 1
+  pop r16                                  ; buffer num
+  bigcall NET_Interface_AddOrReleaseOutMsg ; (R16, R17, R18, X)
+appForwarderHandlePingRequest_end:
+  ret
+
+
+
+
+
+; ---------------------------------------------------------------------------
+; @routine appForwarderLetSysHandleMsg
+;
+; @param X pointer to msg to handle (point behind the buffer header!)
+; @param Y pointer to source interface for the message
+; @clobbers any, !X
+
+appForwarderLetSysHandleMsg:
+  ld r16, X
+  cpi r16, 0xff
+  breq appForwarderLetSysHandleMsg_forMe
+  lds r17, netInterfaceData+NET_IFACE_OFFS_ADDRESS
+  cp r16, r17
+  brne appForwarderLetSysHandleMsg_end
+appForwarderLetSysHandleMsg_forMe:
+  push xl
+    push xh
+      rcall onMessageReceived
+    pop xh
+  pop xl
+  push xl
+    push xh
+      rcall mainModulesOnPacketReceived
+    pop xh
+  pop xl
+  push xl
+    push xh
+      rcall mainAppsOnPacketReceived
+    pop xh
+  pop xl
+appForwarderLetSysHandleMsg_end:
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine appForwarderSendToOtherDev
+; @param r16 buffer num
+; @param r17 src interface num
+
+appForwarderSendToOtherDev:
+  ldi yl, LOW(netInterfaceData)
+  ldi yh, HIGH(netInterfaceData)
+  ldd r18, Y+NET_IFACE_OFFS_IFACENUM
+  andi r18, 0x0f
+  cp r18, r17
+  breq appForwarderSendToAllDevsBut_check2
+  bigcall NET_Interface_AddOutgoingMsgNum  ; (R17, R18, X)
+  rjmp appForwarderSendToOtherDev_ret
+appForwarderSendToAllDevsBut_check2:
+  ldi yl, LOW(netInterfaceData2)
+  ldi yh, HIGH(netInterfaceData2)
+  ldd r18, Y+NET_IFACE_OFFS_IFACENUM
+  andi r18, 0x0f
+  cp r18, r17
+  breq appForwarderSendToOtherDev_ret
+  bigcall NET_Interface_AddOutgoingMsgNum  ; (R17, R18, X)
+appForwarderSendToOtherDev_ret:
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine appForwarderGetDeviceByIfaceNum
+;
+; @param r16 interface number
+; @return CFLAG set if interface found (cleared otherwise)
+; @return Y pointer to interface with given number
+; @clobbers r17
+
+appForwarderGetDeviceByIfaceNum:
+  ldi yl, LOW(netInterfaceData)
+  ldi yh, HIGH(netInterfaceData)
+  ldd r17, Y+NET_IFACE_OFFS_IFACENUM
+  cp r16, r17
+  breq appForwarderGetDeviceByIfaceNum_secRet
+  ldi yl, LOW(netInterfaceData2)
+  ldi yh, HIGH(netInterfaceData2)
+  ldd r17, Y+NET_IFACE_OFFS_IFACENUM
+  cp r16, r17
+  breq appForwarderGetDeviceByIfaceNum_secRet
+  clc
+  rjmp appForwarderGetDeviceByIfaceNum_ret
+appForwarderGetDeviceByIfaceNum_secRet:
+  sec
+appForwarderGetDeviceByIfaceNum_ret:
+  ret
+; @end
+
+
+
+

avr/apps/hub/0BUILD

@@ -3,15 +3,13 @@
 <gwbuild>
 
   <subdirs>
-    boot
-    main
   </subdirs>
 
   <extradist>
-    defs.asm
-    README
+    main.asm
   </extradist>
   
 
 </gwbuild>
 
+

avr/apps/hub/main.asm

@@ -0,0 +1,715 @@
+; ***************************************************************************
+; copyright   : (C) 2025 by Martin Preuss
+; email       : martin@libchipcard.de
+;
+; ***************************************************************************
+; * This file is part of the project "AqHome".                              *
+; * Please see toplevel file COPYING of that project for license details.   *
+; ***************************************************************************
+
+
+
+; ***************************************************************************
+; defines
+
+; ---------------------------------------------------------------------------
+; network interfaces
+
+
+
+
+; ***************************************************************************
+; data
+
+.dseg
+
+appHubDataBegin:
+  appHubRangeBegin: .byte 1
+  appHubRangeEnd:   .byte 1
+appHubDataEnd:
+
+
+
+
+; ***************************************************************************
+; code
+
+.cseg
+
+; ---------------------------------------------------------------------------
+; @routine AppHub_Init @global
+
+AppHub_Init:
+  ldi xh, HIGH(appHubDataBegin)
+  ldi xl, LOW(appHubDataBegin)
+  clr r16
+  ldi r17, (appHubDataEnd-appHubDataBegin)
+  rcall Utils_FillSram
+
+  ; set device address and interface number in all interfaces
+  ldi r16, 0xf0                         ; hub address
+  ldi r17, 1                            ; first interface number
+  rcall appHubAllSetAddrIfaceNumAndRange  ; (R17, R19, R20, Y)
+  
+  ; TODO: read ranges from EEPROM
+  ; TODO: send range msg to all interfaces
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine AppHub_Run @global
+;
+; Read messages from any interface, handle them and probably forward to the other
+; interfaces.
+; @return CFLAG set if something done, cleared otherwise
+; @clobbers all
+
+AppHub_Run:
+  rjmp appHubCheckRecvdMsg
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine appHubGetDeviceByIfaceNum
+;
+; @param r16 interface number
+; @clobbers r17, r19, r20, Y
+
+appHubGetDeviceByIfaceNum:
+  ldi r19, COM_PORTS
+  ldi yl, LOW(com2w0_iface)             ; first interface
+  ldi yh, HIGH(com2w0_iface)
+appHubGetDeviceByIfaceNum_loop:
+    ldd r17, Y+NET_IFACE_OFFS_IFACENUM
+    cp r16, r17
+    sec                                 ; mark "found"
+    breq appHubGetDeviceByIfaceNum_ret
+    ldi r20, COM2W_IFACE_SIZE
+    add yl, r20
+    adc yh, r20
+    sub yh, r20
+    dec r19
+  brne appHubGetDeviceByIfaceNum_loop
+  clc                                   ; mark "not found"
+appHubGetDeviceByIfaceNum_ret:
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine appHubAllSetAddrIfaceNumAndRange
+;
+; @clobbers R17, R18, R19, R20, Y
+
+appHubAllSetAddrIfaceNumAndRange:
+  ldi r19, COM_PORTS
+  ldi yl, LOW(com2w0_iface)             ; first interface
+  ldi yh, HIGH(com2w0_iface)
+  ldi r18, 0x10
+appHubAllSetAddrIfaceNumAndRange_loop:
+    ; set address
+    std Y+NET_IFACE_OFFS_ADDRESS, r16
+    ; set interface number
+    std Y+NET_IFACE_OFFS_IFACENUM, r17
+    inc r17
+    ; set default range (step of 16)
+    std Y+NET_IFACE_OFFS_RANGE_BEGIN, r18
+    subi r18, -15
+    std Y+NET_IFACE_OFFS_RANGE_END, r18
+    inc r18
+    ; next interface
+    ldi r20, COM2W_IFACE_SIZE
+    add yl, r20
+    adc yh, r20
+    sub yh, r20
+    dec r19
+  brne appHubAllSetAddrIfaceNumAndRange_loop
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine appHubSendRangeMsg
+;
+; @param R18 msg code
+; @param Y pointer to interface data
+; @return CFLAG set if message enqueued, cleared on error
+; @clobbers (R16, R17, R18, R19, R20, R21, R24, R25, X)
+
+appHubSendRangeMsg:
+  bigcall NET_Buffer_Alloc                ; (R16, R17, X)
+  brcc appHubSendRangeMsg_end
+  push r16
+    ldd r20, Y+NET_IFACE_OFFS_RANGE_BEGIN
+    ldd r21, Y+NET_IFACE_OFFS_RANGE_END
+    adiw xh:xl, 1
+    bigcall NETMSG_Range_Write            ; (R16, R17, R18, R19, R20, R21)
+    sbiw xh:xl, 1
+  pop r16
+  rcall appHubSendMsg                     ; (R16, R17, R18, R24, R25, X)
+appHubSendRangeMsg_end:
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine appHubSendDenyAddrR19
+;
+; @param R19 address to send
+; @clobbers R16, R17, R18, R19, R20, R21, X, Y
+
+appHubSendDenyAddrR19:
+  ldi r18, NETMSG_CMD_DENY_ADDRESS      ; deny addr
+  rjmp appHubSendAddrMsg                ; (R16, R17, R18, R19, R20, R21, X, Y)
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine appHubSendAddrMsg
+;
+; @param R18 command
+; @param R19 address to send
+; @clobbers R16 (R17, R18, R19, R20, R21, X, Y)
+
+appHubSendAddrMsg:
+  bigcall NET_Buffer_Alloc       ; (R16, R17, X)
+  brcc appHubSendAddrMsg_end
+  push r16
+    adiw xh:xl, 1
+    bigcall NETMSG_Address_Write ; (R16, R17, R18, R19, R20, R21)
+    sbiw xh:xl, 1
+  pop r16
+  rcall appHubSendMsg            ; (R16, R17, R18, R24, R25, X)
+appHubSendAddrMsg_end:
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine appHubSendValueResponse
+;
+; @param  R17     value id
+; @param  R19:R18 value
+; @param  R21:R20 denom (e.g. 100, meaning value must be divided by 100)
+; @param  R23     command
+; @param  R25:R24 ref msg id
+; @return CFLAG on success, cleared on error
+; @clobbers r22 (r16, r17, r18, r19, r20, r21, r23, r24, r25, X)
+
+appHubSendValueResponse:
+  push r17
+    rcall NET_Buffer_Alloc               ; (R16, R17, X)
+  pop r17
+  brcc appHubSendValueResponse_end       ; jmp on error
+  push r16                               ; buffer num
+    ldi r16, 0xff                        ; DEST addr
+    clr r22                              ; value type
+    adiw xh:xl, 1
+    rcall NETMSG_ValueWriteResponse      ; (R16, R17, R18, R19, R20, R21, R23, R24, R25)
+    sbiw xh:xl, 1
+  pop r16                                ; buffer num
+  rcall NET_Interface_AddOrReleaseOutMsg ; (R16, R17, R18, X)
+appHubSendValueResponse_end:
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine appHubSendMsg
+;
+; @param R16 num of allocated buffer
+; @param Y pointer to interface data
+; @param X msg to send (points to start of allocated buffer, e.g. buffer header)
+; @return CFLAG set if message enqueued, cleared on error
+; @clobbers R16 (R17, R18, R24, R25, X)
+
+appHubSendMsg:
+  bigcall NET_Interface_AddOutgoingMsgNum ; (R17, R18, X)
+  brcs appHubSendMsg_end
+  bigcall NET_Buffer_ReleaseByNum         ; (R16, X)
+  ldi r16, NET_IFACE_OFFS_ERR_NOBUF_LOW
+  rcall NET_Interface_IncCounter16        ; (R24, R25)
+  clc
+appHubSendMsg_end:
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine appHubAllResetStats
+;
+; @clobbers r19, r20, Y (r16, r17, X)
+
+appHubAllResetStats:
+  ldi r19, COM_PORTS
+  ldi yl, LOW(com2w0_iface)             ; first interface
+  ldi yh, HIGH(com2w0_iface)
+appHubAllResetStats_loop:
+    bigcall NET_Interface_ResetStats ; (R16, R17, X)
+
+    ldi r20, COM2W_IFACE_SIZE
+    add yl, r20
+    adc yh, r20
+    sub yh, r20
+    dec r19
+  brne appHubAllResetStats_loop
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine AppHub_EveryDay @global
+;
+; @clobbers R16, R17, X
+
+AppHub_EveryDay:
+  rcall appHubAllResetStats
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine appHubSendMsgToAllOthers
+;
+; @param R16 buffer number
+; @param X buffer pointer
+; @clobbers r17, r19, r20, r24, r25 (r16, r18, X)
+
+appHubSendMsgToAllOthers:
+  ld r24, X
+  andi r24, 0x0f                              ; get sender interface num
+  ldi r19, COM_PORTS                          ; number of ports
+  ldi yl, LOW(com2w0_iface)                   ; first interface
+  ldi yh, HIGH(com2w0_iface)
+appHubSendMsgToAllOthers_loop:
+    ldd r25, Y+NET_IFACE_OFFS_IFACENUM
+    cp r24, r25                               ; same interface?
+    breq appHubSendMsgToAllOthers_next
+    ; current iface is not source, send and inc ref counter
+    bigcall NET_Interface_AddOutgoingMsgNum   ; (R17, R18, X)
+    brcs appHubSendMsgToAllOthers_added
+    ; inc error counter
+    push r24
+      mov r17, r16                            ; save r16
+      ldi r16, NET_IFACE_OFFS_ERR_NOBUF_LOW
+      bigcall NET_Interface_IncCounter16      ; (R24, R25)
+      mov r16, r17                            ; restore r16
+    pop r24
+    rjmp appHubSendMsgToAllOthers_next
+appHubSendMsgToAllOthers_added:
+    mov r17, r16                              ; save r16
+    bigcall NET_Buffer_IncRef                 ; (r16)
+    mov r16, r17                              ; restore r16
+appHubSendMsgToAllOthers_next:
+    ldi r20, COM2W_IFACE_SIZE
+    add yl, r20
+    adc yh, r20
+    sub yh, r20
+    dec r19
+  brne appHubSendMsgToAllOthers_loop
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine appHubHandleMsgLocally
+;
+; @param X pointer to received buffer (points to header byte)
+; @param Y pointer to IFACE data from which msg was received
+; @clobbers all, !X
+
+appHubHandleMsgLocally:
+  push xl
+    push xh
+      rcall appHubHandleMsgLocally_savedX
+    pop xh
+  pop xl
+  rjmp appHubHandleMsgLocally_ret
+appHubHandleMsgLocally_savedX:
+  ; get message type
+  adiw xh:xl, NETMSG_OFFS_CMD+1    ; account for header byte
+  ld r16, X
+  sbiw xh:xl, NETMSG_OFFS_CMD+1
+  cpi r16, NETMSG_CMD_PING
+  breq appHubHandleMsgLocally_handlePingMsg
+  cpi r16, NETMSG_CMD_REBOOT_REQUEST
+  breq appHubHandleMsgLocally_handleRebootMsg
+  cpi r16, NETMSG_CMD_VALUE_SET
+  breq appHubHandleMsgLocally_handleSetValue
+  rjmp appHubHandleMsgLocally_ret
+appHubHandleMsgLocally_handlePingMsg:
+  rjmp appHubHandlePingMsg
+appHubHandleMsgLocally_handleRebootMsg:
+  rjmp appHubHandleRebootMsg
+appHubHandleMsgLocally_handleSetValue:
+  rjmp appHubHandleSetValueMsg
+appHubHandleMsgLocally_ret:
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine appHubHandlePingMsg
+;
+; @param X pointer to received message
+; @clobbers any, !X, !Y
+
+appHubHandlePingMsg:
+  adiw xh:xl, NETMSG_OFFS_DESTADDR+1
+  ld r17, X
+  sbiw xh:xl, NETMSG_OFFS_DESTADDR+1
+  ldd r16, Y+NET_IFACE_OFFS_ADDRESS
+  cp r16, r17
+  breq appHubHandlePingMsg_forMe
+  cpi r17, 0xff
+  breq appHubHandlePingMsg_forMe
+  clc
+  rjmp appHubHandlePingMsg_end
+appHubHandlePingMsg_forMe:
+  adiw xh:xl, NETMSG_OFFS_SRCADDR+1
+  ld r17, X
+  sbiw xh:xl, NETMSG_OFFS_SRCADDR+1
+  push r17
+    bigcall NET_Buffer_Alloc               ; (R16, R17, X)
+  pop r17
+  brcc appHubHandlePingMsg_end             ; jmp on error
+  push r16                                 ; buffer num
+    mov r16, r17                           ; DEST addr
+    adiw xh:xl, 1
+    bigcall NETMSG_Pong_Write              ; (R16, R17, R18, R19, R20, X)
+    sbiw xh:xl, 1
+  pop r16                                  ; buffer num
+  bigcall NET_Interface_AddOrReleaseOutMsg ; (R16, R17, R18, X)
+appHubHandlePingMsg_end:
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine appHubHandleRebootMsg
+;
+; Doesn't return if reboot msg is valid.
+;
+; @param X pointer to received message
+
+appHubHandleRebootMsg:
+  rcall NETMSG_RebootRequestRead
+  brcc appHubHandleRebootMsg_end
+  ; reboot
+  cli
+  bigjmp BOOTLOADER_ADDR
+appHubHandleRebootMsg_end:
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine appHubHandleSetValueMsg
+;
+; @param X pointer to received message
+; @param Y pointer to IFACE data from which msg was received
+; @clobbers all, !Y
+
+appHubHandleSetValueMsg:
+  adiw xh:xl, NETMSG_OFFS_DESTADDR+1
+  ld r17, X
+  sbiw xh:xl, NETMSG_OFFS_DESTADDR+1
+  ldd r16, Y+NET_IFACE_OFFS_ADDRESS
+  cp r16, r17
+  breq appHubHandleSetValueMsg_forMe
+  cpi r17, 0xff
+  breq appHubHandleSetValueMsg_forMe
+  rjmp appHubHandleSetValueMsg_ret
+appHubHandleSetValueMsg_forMe:
+  rcall NETMSG_ValueRead                            ; (none)
+  cpi r17, VALUE_ID_HUB_SETRANGE1
+  brcs appHubHandleSetValueMsg_ret
+  cpi r17, VALUE_ID_HUB_SETRANGE8+1
+  brcc appHubHandleSetValueMsg_ret
+appHubHandleSetValueMsg_setRange:
+  push yl
+    push yh
+      subi r17, (VALUE_ID_HUB_SETRANGE1-1)
+      push r18
+        push r19
+          ; send ACK back the same interface the request came from
+          push r17                                       ; interface number
+            ldi r23, NETMSG_CMD_VALUE_SET_ACK
+            rcall appHubSendValueResponse                ; r22 (r16, r17, r18, r19, r20, r21, r23, r24, r25, X)
+          pop r16                                        ; pop interface number to r16 (from r17)
+          rcall appHubGetDeviceByIfaceNum                ; Y=interface to modify (r17, r19, r20)
+        pop r19
+      pop r18
+      ; modify interface
+      std Y+NET_IFACE_OFFS_RANGE_BEGIN, r18
+      std Y+NET_IFACE_OFFS_RANGE_END, r19   
+      ; TODO: store new config
+      
+      ; let subnodes of modified interface re-eunumerate
+      ldi r18, NETMSG_CMD_REENUM
+      rcall appHubSendRangeMsg                           ; (R16, R17, R18, R19, R20, R21, X)
+    pop yh
+  pop yl  
+
+appHubHandleSetValueMsg_ret:
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine appHubHandleRoutingMsg
+;
+; @param X pointer to received buffer (points to header byte)
+; @param Y pointer to IFACE data from which msg was received
+; @clobbers all, !X
+
+appHubHandleRoutingMsg:
+  push xl
+    push xh
+      rcall appHubHandleRoutingMsg_savedX
+    pop xh
+  pop xl
+  rjmp appHubHandleRoutingMsg_ret
+appHubHandleRoutingMsg_savedX:
+  ; get message type
+  adiw xh:xl, NETMSG_OFFS_CMD+1    ; account for header byte
+  ld r16, X
+  sbiw xh:xl, NETMSG_OFFS_CMD+1
+  cpi r16, NETMSG_CMD_NEED_ADDRESS
+  breq appHubHandleRoutingMsg_handleNeedAddress
+  cpi r16, NETMSG_CMD_CLAIM_ADDRESS
+  breq appHubHandleRoutingMsg_handleClaimAddress
+  clc
+  rjmp appHubHandleRoutingMsg_ret
+appHubHandleRoutingMsg_handleNeedAddress:
+  rcall appHubHandleNeedAddressMsg
+  rjmp appHubHandleRoutingMsg_secRet
+appHubHandleRoutingMsg_handleClaimAddress:
+  rcall appHubHandleClaimAddressMsg
+appHubHandleRoutingMsg_secRet:
+  sec
+appHubHandleRoutingMsg_ret:
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine appHubHandleNeedAddressMsg
+;
+; @param X pointer to received message
+; @param Y pointer to IFACE data from which msg was received
+; @clobbers all, !Y
+
+appHubHandleNeedAddressMsg:
+  ldi r18, NETMSG_CMD_ADDRESS_RANGE
+  rcall appHubSendRangeMsg                           ; (R16, R17, R18, R19, R20, R21, X)
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine appHubHandleClaimAddressMsg
+;
+; @param X pointer to received message
+; @param Y pointer to IFACE data from which msg was received
+; @clobbers all, !Y
+
+appHubHandleClaimAddressMsg:
+  rcall NETMSG_Address_Read            ; R18=cmd, R19=addr(R18, R19)
+  rcall appHubIsR19InRange
+  brcs appHubHandleClaimAddressMsg_end
+  ; is not in subnet range, deny
+  rcall appHubSendDenyAddrR19          ; (R16, R17, R18, R19, R20, R21, X)
+appHubHandleClaimAddressMsg_end:
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine appHubIsR19InRange
+;
+; @param R19 address to check against range
+; @param Y pointer to IFACE data
+; @clobbers R16
+
+appHubIsR19InRange:
+  ldd r16, Y+NET_IFACE_OFFS_RANGE_BEGIN
+  cp r19, r16
+  brcs appHubIsR19InRangeClcRet
+  ldd r16, Y+NET_IFACE_OFFS_RANGE_END
+  cp r16, r19
+  brcs appHubIsR19InRangeClcRet
+  sec
+  rjmp appHubIsR19InRange_end
+appHubIsR19InRangeClcRet:
+  clc
+appHubIsR19InRange_end:
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine appHubCheckRecvdMsg
+;
+; Read messages from any interface and forward to the other ones.
+;
+; @return CFLAG set if something done, cleared otherwise
+
+appHubCheckRecvdMsg:
+  rcall NET_PeekNextIncomingMsgNum       ; check read queue (R16=bufNum)
+  brcc appHubCheckRecvdMsg_end           ; no msg, jmp
+  rcall NET_Buffer_Locate                ; (R17)
+  rcall appHubHandleRecvdMsg             ; (all, !X)
+  rcall NET_GetNextIncomingMsgNum        ; take off the queue
+  rcall NET_Buffer_ReleaseByNum          ; (R16, X)
+  sec                                    ; we had a message, so something was done
+appHubCheckRecvdMsg_end:
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine appHubHandleRecvdMsg
+;
+; @param R16 buffer number
+; @param X pointer to received message
+; @clobbers all, !X
+
+appHubHandleRecvdMsg:
+  mov r18, r16
+  ld r16, X
+  andi r16, 0x0f
+  rcall appHubGetDeviceByIfaceNum  ; Y=source iface (r17, r19, r20)
+  brcc appHubHandleRecvdMsg_ret
+  ; filter out routing msgs
+  push yl
+    push yh
+      push r18
+        rcall appHubHandleRoutingMsg   ; (all, !X)
+      pop r18
+    pop yh
+  pop yl
+  brcs appHubHandleRecvdMsg_ret
+  ; check for PING, SETVALUE etc
+  push r18
+    push yl
+      push yh
+        rcall appHubHandleMsgLocally   ; (all, !X)
+      pop yh
+    pop yl
+    ; let other apps and modules handle message
+    push xl
+      push xh
+        bigcall mainHandleMessages
+      pop xh
+    pop xl
+  pop r18
+  ; forward message to all other interfaces
+  mov r16, r18                              ; buffer number
+  push xl
+    push xh
+      rcall appHubSendMsgToAllOthers            ; (r17, r19, r20, r24, r25 (r16, r18, X)
+    pop xh
+  pop xl
+appHubHandleRecvdMsg_ret:
+  ret
+; @end
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+; ---------------------------------------------------------------------------
+; @routine appHubWriteConfToEeprom
+;
+; @clobbers R16, X (R17)
+
+appHubWriteConfToEeprom:
+  ; write range begin
+  ldi xl, LOW(EEPROM_OFFS_ROUTER_RANGE_BEGIN)
+  ldi xh, HIGH(EEPROM_OFFS_ROUTER_RANGE_BEGIN)
+  lds r16, appHubRangeBegin
+  rcall Eeprom_WriteByteIfChanged                ; (R17)
+  brcc appHubWriteConfToEeprom_end
+
+  ; write range end
+  ldi xl, LOW(EEPROM_OFFS_ROUTER_RANGE_END)
+  ldi xh, HIGH(EEPROM_OFFS_ROUTER_RANGE_END)
+  lds r16, appHubRangeEnd
+  rcall Eeprom_WriteByteIfChanged                ; (R17)
+appHubWriteConfToEeprom_end:
+  ret
+; @end
+
+
+#if 0
+; ---------------------------------------------------------------------------
+; @routine appHubReadConfFromEeprom
+;
+; @clobbers R16, X (R17)
+
+appHubReadConfFromEeprom:
+  ; read range begin
+  ldi xl, LOW(EEPROM_OFFS_ROUTER_RANGE_BEGIN)
+  ldi xh, HIGH(EEPROM_OFFS_ROUTER_RANGE_BEGIN)
+  rcall Eeprom_ReadByte
+  brcc appHubReadConfFromEeprom_end
+  cpi r16, 0xff
+  breq appHubReadConfFromEeprom_okay                ; not set, jmp
+  cpi r16, 2                                           ; range should at least start at 2 to assign 1 to router
+  brcs appHubReadConfFromEeprom_okay
+  sts appHubRangeBegin, r16
+  dec r16
+  sts netInterfaceData+NET_IFACE_OFFS_ADDRESS, r16     ; use addr rangeBegin-1 for router itself
+  sts netInterfaceData2+NET_IFACE_OFFS_ADDRESS, r16    ; use same address for both interfaces to save on addresses
+
+  ; read range end
+  ldi xl, LOW(EEPROM_OFFS_ROUTER_RANGE_END)
+  ldi xh, HIGH(EEPROM_OFFS_ROUTER_RANGE_END)
+  rcall Eeprom_ReadByte
+  brcc appHubReadConfFromEeprom_end
+  cpi r16, 0xff
+  breq appHubReadConfFromEeprom_okay
+  sts appHubRangeEnd, r16
+appHubReadConfFromEeprom_okay:
+  sec
+appHubReadConfFromEeprom_end:
+  ret
+; @end
+#endif
+
+
+

avr/apps/network/main.asm

@@ -101,7 +101,7 @@ AppNetwork_Every100ms_jump:
 
 
 ; ---------------------------------------------------------------------------
-; @routine AppNetwork_Every100ms @global
+; @routine AppNetwork_EveryDay @global
 ;
 ; @clobbers R16, R17, X
 
@@ -117,6 +117,13 @@ AppNetwork_EveryDay:
 ; @param X pointer to received message
 
 AppNetwork_HandleMsg:
+  push xl
+    push xh
+      rcall AppNetwork_HandleMsg_savedX
+    pop xh
+  pop xl
+  rjmp AppNetwork_HandleMsg_end
+AppNetwork_HandleMsg_savedX:
   adiw xh:xl, NETMSG_OFFS_CMD
   ld r16, X
   sbiw xh:xl, NETMSG_OFFS_CMD
@@ -124,14 +131,21 @@ AppNetwork_HandleMsg:
   breq AppNetwork_HandleMsg_handleRebootMsg
   cpi r16, NETMSG_CMD_PING
   breq AppNetwork_HandleMsg_handlePingMsg
+  cpi r16, NETMSG_CMD_REENUM
+  breq AppNetwork_HandleMsg_handleReenumMsg
   cpi r16, NETMSG_CMD_NEED_ADDRESS
   brcs AppNetwork_HandleMsg_clcRet         ; lower than "HAVE_NEED"
   cpi r16, NETMSG_CMD_ADDRESS_RANGE
   breq AppNetwork_HandleMsg_handleRangeMsg
   brcc AppNetwork_HandleMsg_clcRet         ; higher or equal to "ADDR_RANGE"
   rjmp AppNetwork_HandleMsg_handleAddrMsg
+AppNetwork_HandleMsg_handleReenumMsg:
+  rjmp appNetworkHandleReeunumRequest
 AppNetwork_HandleMsg_handleRangeMsg:
-  ; TODO
+  bigcall NETMSG_Range_Read
+  std Y+NET_IFACE_OFFS_RANGE_BEGIN, r20
+  std Y+NET_IFACE_OFFS_RANGE_END, r21
+  std Y+NET_IFACE_OFFS_ADDRESS, r20
   rjmp AppNetwork_HandleMsg_clcRet
   
 AppNetwork_HandleMsg_handleAddrMsg:
@@ -145,21 +159,13 @@ AppNetwork_HandleMsg_handleAddrMsg:
   sub zh, r16
   ijmp
 AppNetwork_HandleMsg_handleRebootMsg:
-  push xl
-    push xh
-      rcall appNetworkHandleRebootRequest
-    pop xh
-  pop xl
+  rcall appNetworkHandleRebootRequest
   ret
 AppNetwork_HandleMsg_handlePingMsg:
-  push xl
-    push xh
-      rcall appNetworkHandlePingRequest
-    pop xh
-  pop xl
-  ret
+  rjmp appNetworkHandlePingRequest
 AppNetwork_HandleMsg_clcRet:
   clc
+AppNetwork_HandleMsg_end:
   ret
 ; @end
 
@@ -172,7 +178,7 @@ AppNetwork_HandleMsg_clcRet:
 
 appNetworkHandleRebootRequest:
   rcall NETMSG_RebootRequestRead
-  brcc appNetworkHandleRebootRequest_end
+  brcc appNetworkHandleRebootRequest_end  ; uid doesn't match
   ; reboot
   cli
   bigjmp BOOTLOADER_ADDR
@@ -183,6 +189,15 @@ appNetworkHandleRebootRequest_end:
 
 
 appNetworkHandlePingRequest:
+  ld r17, X
+  lds r16, (netInterfaceData+NET_IFACE_OFFS_ADDRESS)
+  cp r16, r17
+  breq appNetworkHandlePingRequest_forMe
+  cpi r17, 0xff
+  breq appNetworkHandlePingRequest_forMe
+  clc
+  rjmp appNetworkHandlePingRequest_end
+appNetworkHandlePingRequest_forMe:
   adiw xh:xl, NETMSG_OFFS_SRCADDR
   ld r17, X
   push r17
@@ -203,6 +218,27 @@ appNetworkHandlePingRequest_end:
 
 
 
+appNetworkHandleReeunumRequest:
+  push xl
+    push xh
+      bigcall Utils_ReadUid                ; r21:r20:r19:r18=uid (r16, X)
+    pop xh
+  pop xl
+  rcall NETMSG_Range_Read                     ; r20=range begin, r21=range end (none)
+  ldi r16, APP_NETWORK_STATE_INITIALWAIT
+  std Y+NET_IFACE_OFFS_STATUS, r16
+  cpi r18, 20
+  brcc appNetworkHandleReeunumRequest_setWait
+  subi r18, -20                               ; minimum 2s
+appNetworkHandleReeunumRequest_setWait:
+  std Y+NET_IFACE_OFFS_STATETIMER, r18        ; use lowest byte of uid as wat time
+  std Y+NET_IFACE_OFFS_RANGE_BEGIN, r20
+  std Y+NET_IFACE_OFFS_RANGE_END, r21
+  ret
+; @end
+
+
+
 appNetworkTimerTable:
   rjmp appNetworkHandleStateInitialWait
   rjmp appNetworkHandleStateNeedAddress
@@ -249,20 +285,11 @@ appNetworkHandleStateHaveAddress2:
   std Y+NET_IFACE_OFFS_STATUS, r16
   ldi r16, APP_NETWORK_TIMER_100MS
   std Y+NET_IFACE_OFFS_STATETIMER, r16
-  ldd r16, Y+NET_IFACE_OFFS_RANGE_BEGIN  ; set interface address
-  ldd r17, Y+NET_IFACE_OFFS_ADDRESS
-  cp r16, r17
-  breq appNetworkHandleStateHaveAddress2_end
   ; store new address in IFACE and in EEPROM
-  std Y+NET_IFACE_OFFS_ADDRESS, r16
-  push r15
-    in r15, SREG
-    cli
-    ldi xl, LOW(EEPROM_OFFS_COMADDR)
-    ldi xh, HIGH(EEPROM_OFFS_COMADDR)
-    bigcall Utils_WriteEepromIncr            ; write address to EEPROM
-    out SREG, r15
-  pop r15
+  ldd r16, Y+NET_IFACE_OFFS_ADDRESS
+  ldi xl, LOW(EEPROM_OFFS_COMADDR)
+  ldi xh, HIGH(EEPROM_OFFS_COMADDR)
+  bigcall Eeprom_WriteByteIfChanged   ; write address to EEPROM (R17)
 appNetworkHandleStateHaveAddress2_end:
   ret
 
@@ -280,7 +307,7 @@ appNetworkHandleStateUp:
 ; @clobbers R16, R19 (R17, R18, R20, R21, X)
 
 appNetworkSendMsgNextState:
-  ldd r19, Y+NET_IFACE_OFFS_RANGE_BEGIN
+  ldd r19, Y+NET_IFACE_OFFS_ADDRESS
   rcall appNetworkSendAddrMsg               ; (R16, R17, R18, R19, R20, R21, X)
   brcc appNetworkSendMsgNextState_retry
   ldd r16, Y+NET_IFACE_OFFS_STATUS
@@ -345,9 +372,9 @@ appNetworkHandleMsgClaimAddr:
   cp r19, r16
   brne appNetworkHandleMsgClaimAddr_end ; not our address
   ldd r16, Y+NET_IFACE_OFFS_STATUS
-  cpi r16, APP_NETWORK_STATE_UP         ; up?
-  brne appNetworkHandleMsgClaimAddr_end ; nope, ignore
-  ; network is up, someone claimed our address, deny it
+  cpi r16, APP_NETWORK_STATE_CLAIMADDRESS1
+  brcs appNetworkHandleMsgClaimAddr_end    ; nope, ignore
+  ; network is somewhat up, someone claimed our address, deny it
   ldi r18, NETMSG_CMD_DENY_ADDRESS      ; deny our addr
   ldd r19, Y+NET_IFACE_OFFS_ADDRESS
   rjmp appNetworkSendAddrMsg
@@ -369,12 +396,12 @@ appNetworkHandleMsgDenyAddr:
   cpi r16, APP_NETWORK_STATE_UP
   breq appNetworkHandleMsgDenyAddr_end  ; ignore (our network stack is up)
   ; still setting up address, check whether the last one is denied now
-  ldd r16, Y+NET_IFACE_OFFS_RANGE_BEGIN
+  ldd r16, Y+NET_IFACE_OFFS_ADDRESS
   cp r19, r16                           ; our claimed address?
   brne appNetworkHandleMsgDenyAddr_end  ; nope, jump
   ; try next address (if any left)
   ldd r17, Y+NET_IFACE_OFFS_RANGE_END
-  inc r16                               ; RANGE_BEGIN+1
+  inc r16                               ; next address
   cp r17, r16                           ; smaller than or equal to RANGE_END?
   brcc appNetworkHandleMsgDenyAddr_claimNext
   ; out of addresses, start completely new after some waiting time
@@ -384,7 +411,7 @@ appNetworkHandleMsgDenyAddr:
   rjmp appNetworkHandleMsgDenyAddr_end
 appNetworkHandleMsgDenyAddr_claimNext:
   ; send CLAIM_ADDR for next address (new state: APP_NETWORK_STATE_NEEDADDRESS+1)
-  std Y+NET_IFACE_OFFS_RANGE_BEGIN, r16
+  std Y+NET_IFACE_OFFS_ADDRESS, r16
   ldi r16, APP_NETWORK_STATE_NEEDADDRESS
   std Y+NET_IFACE_OFFS_STATUS, r16
   ldi r18, NETMSG_CMD_CLAIM_ADDRESS
@@ -435,6 +462,7 @@ appNetworkResetState:
   std Y+NET_IFACE_OFFS_STATETIMER, r16
   ldi r16, APP_NETWORK_ADDRESS_RANGE_BEGIN
   std Y+NET_IFACE_OFFS_RANGE_BEGIN, r16
+  std Y+NET_IFACE_OFFS_ADDRESS, r16
   rcall appNetworkGetAddressFromEeprom       ; R16=addr (R15, X)
   tst r16
   breq appNetworkResetState_setRangeEnd

avr/apps/network/stats.asm

@@ -25,7 +25,13 @@ AppNetwork_SendTxdStats:
     bigcall NETMSG_SendStats_Write             ; (R16, R17, R18, R19, R20, R21, Z)
     sbiw xh:xl, 1
   pop r16
-  bigcall NET_Interface_AddOrReleaseOutMsg     ; (R16, R17, R18, X)
+  push yl
+    push yh
+      ldi yl, LOW(netInterfaceData)
+      ldi yh, HIGH(netInterfaceData)
+      bigcall NET_Interface_AddOrReleaseOutMsg     ; (R16, R17, R18, X)
+    pop yh
+  pop yl
 AppNetwork_SendTxdStats_end:
   ret
 ; @end
@@ -35,7 +41,7 @@ AppNetwork_SendTxdStats_end:
 ; ---------------------------------------------------------------------------
 ; @routine AppNetwork_SendRxdStats
 
-; @param Y network interface to work with
+; @param Y network interface whose stats to send
 ; @clobbers R16, X (R17, R18, R19, R20, R21, Z)
 
 AppNetwork_SendRxdStats:
@@ -46,7 +52,13 @@ AppNetwork_SendRxdStats:
     bigcall NETMSG_RecvStats_Write             ; (R16, R17, R18, R19, R20, R21, Z)
     sbiw xh:xl, 1
   pop r16
-  bigcall NET_Interface_AddOrReleaseOutMsg     ; (R16, R17, R18, X)
+  push yl
+    push yh
+      ldi yl, LOW(netInterfaceData)
+      ldi yh, HIGH(netInterfaceData)
+      bigcall NET_Interface_AddOrReleaseOutMsg ; (R16, R17, R18, X)
+    pop yh
+  pop yl
 AppNetwork_SendRxdStats_end:
   ret
 ; @end
@@ -54,9 +66,8 @@ AppNetwork_SendRxdStats_end:
 
 
 ; ---------------------------------------------------------------------------
-; @routine AppNetwork_SendRxdStats
+; @routine AppNetwork_SendMemStats
 
-; @param Y network interface to work with
 ; @clobbers R16, X (R17, R18, R19, R20, R21, Z)
 
 AppNetwork_SendMemStats:
@@ -67,7 +78,13 @@ AppNetwork_SendMemStats:
     bigcall NETMSG_MemStats_Write             ; (R16, R17, R18, R19, R20, R21)
     sbiw xh:xl, 1
   pop r16
-  bigcall NET_Interface_AddOrReleaseOutMsg     ; (R16, R17, R18, X)
+  push yl
+    push yh
+      ldi yl, LOW(netInterfaceData)
+      ldi yh, HIGH(netInterfaceData)
+      bigcall NET_Interface_AddOrReleaseOutMsg ; (R16, R17, R18, X)
+    pop yh
+  pop yl
 AppNetwork_SendMemStats_end:
   ret
 ; @end

avr/apps/router/0BUILD

@@ -3,15 +3,13 @@
 <gwbuild>
 
   <subdirs>
-    boot
-    main
   </subdirs>
 
   <extradist>
-    defs.asm
-    README
+    main.asm
   </extradist>
   
 
 </gwbuild>
 
+

avr/apps/router/main.asm

@@ -0,0 +1,579 @@
+; ***************************************************************************
+; copyright   : (C) 2025 by Martin Preuss
+; email       : martin@libchipcard.de
+;
+; ***************************************************************************
+; * This file is part of the project "AqHome".                              *
+; * Please see toplevel file COPYING of that project for license details.   *
+; ***************************************************************************
+
+
+
+; ***************************************************************************
+; defines
+
+; ---------------------------------------------------------------------------
+; network interfaces
+
+.equ NETDEV0_IFACENUM = 1
+.equ NETDEV1_IFACENUM = 2
+
+
+
+; ***************************************************************************
+; data
+
+.dseg
+
+appRouterDataBegin:
+  appRouterRangeBegin: .byte 1
+  appRouterRangeEnd:   .byte 1
+appRouterDataEnd:
+
+
+
+
+; ***************************************************************************
+; code
+
+.cseg
+
+; ---------------------------------------------------------------------------
+; @routine AppRouter_Init @global
+
+AppRouter_Init:
+  ldi xh, HIGH(appRouterDataBegin)
+  ldi xl, LOW(appRouterDataBegin)
+  clr r16
+  ldi r17, (appRouterDataEnd-appRouterDataBegin)
+  rcall Utils_FillSram
+
+#ifndef APP_ROUTER_NO_ADDR_MGR
+  ldi r16, 0xe0                                        ; default range from 0xe0-0xef (will be changed later)
+  sts netInterfaceData+NET_IFACE_OFFS_ADDRESS, r16     ; use first address for router itself
+  sts netInterfaceData2+NET_IFACE_OFFS_ADDRESS, r16    ; use same address for both interfaces to save on addresses
+  inc r16
+  sts appRouterRangeBegin, r16                         ; range from router+1
+  ldi r16, 0xef
+  sts appRouterRangeEnd, r16
+
+  rcall appRouterReadConfFromEeprom                    ; try to read config from EEPROM
+#endif
+
+  ; set interface number for NETDEV0
+  ldi r16, NETDEV0_IFACENUM
+  sts netInterfaceData+NET_IFACE_OFFS_IFACENUM, r16
+  ; set interface number for NETDEV1
+  ldi r16, NETDEV1_IFACENUM
+  sts netInterfaceData2+NET_IFACE_OFFS_IFACENUM, r16
+  
+#ifndef APP_ROUTER_NO_ADDR_MGR
+  ldi r18, NETMSG_CMD_ADDRESS_RANGE
+  rcall appRouterSendRangeMsgToDev1
+#endif
+
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine AppRouter_EveryDay @global
+;
+; @clobbers R16, R17, X
+
+AppRouter_EveryDay:
+  ldi yl, LOW(netInterfaceData)
+  ldi yh, HIGH(netInterfaceData)
+  bigcall NET_Interface_ResetStats ; (R16, R17, X)
+
+  ldi yl, LOW(netInterfaceData2)
+  ldi yh, HIGH(netInterfaceData2)
+  bigcall NET_Interface_ResetStats ; (R16, R17, X)
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine AppRouter_Run @global
+;
+; Read messages from either interface and forward to the other one.
+
+AppRouter_Run:
+  rjmp appRouterCheckRecvdMsg
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine appRouterHandleMsgAnyDev @global
+;
+; @param X pointer to received message
+; @return CFLAG set if msg handled, cleared otherwise
+; @clobbers any, !X
+
+appRouterHandleMsgAnyDev:
+  push xl
+    push xh
+      rcall appRouterHandleMsgAnyDev_savedX
+    pop xh
+  pop xl
+  rjmp appRouterHandleMsgAnyDev_end
+appRouterHandleMsgAnyDev_savedX:
+  adiw xh:xl, NETMSG_OFFS_CMD                       ; maybe move ping/reboot handling to all/main.asm?
+  ld r16, X
+  sbiw xh:xl, NETMSG_OFFS_CMD
+  cpi r16, NETMSG_CMD_REBOOT_REQUEST
+  breq appRouterHandleMsgAnyDev_handleRebootMsg
+  cpi r16, NETMSG_CMD_PING
+  breq appRouterHandleMsgAnyDev_handlePingMsg
+  cpi r16, NETMSG_CMD_VALUE_SET
+  breq appRouterHandleMsgAnyDev_handleSetValue
+  rjmp appRouterHandleMsgAnyDev_clcRet
+appRouterHandleMsgAnyDev_handleRebootMsg:
+  rcall appRouterHandleRebootRequest
+  ret
+appRouterHandleMsgAnyDev_handlePingMsg:
+  rcall appRouterHandlePingRequest
+  clc
+  ret
+appRouterHandleMsgAnyDev_handleSetValue:
+  rcall NETMSG_ValueRead                            ; (none)
+  cpi r17, VALUE_ID_ROUTER_SETRANGE
+  breq appRouterHandleMsgAnyDev_handleSetRange
+  rjmp appRouterHandleMsgAnyDev_clcRet
+appRouterHandleMsgAnyDev_handleSetRange:
+#ifndef APP_ROUTER_NO_ADDR_MGR
+  sts netInterfaceData+NET_IFACE_OFFS_ADDRESS, r18  ; use first address for router itself
+  sts netInterfaceData2+NET_IFACE_OFFS_ADDRESS, r18 ; use same address for both interfaces to save on addresses
+  inc r18                                           ; start range after router
+  sts appRouterRangeBegin, r18
+  sts appRouterRangeEnd, r19
+  ; send ACK
+  ldi r23, NETMSG_CMD_VALUE_SET_ACK
+  rcall Main_SendValueResponse                      ; (clobbers all, including Y)
+  ; let subnodes re-eunumerate
+  ldi r18, NETMSG_CMD_REENUM
+  rcall appRouterSendRangeMsgToDev1                 ; (R16, R17, R18, R19, R20, R21, X, Y)
+  rcall appRouterWriteConfToEeprom                  ; (r16, r17, X)
+#endif
+  sec
+  ret
+appRouterHandleMsgAnyDev_clcRet:
+  clc
+appRouterHandleMsgAnyDev_end:
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine appRouterHandleDev1Msg @global
+;
+; Handle messages from controlled subnet.
+;
+; @param X pointer to received message
+; @return CFLAG set if msg handled, cleared otherwise
+; @clobbers any, !X
+
+appRouterHandleDev1Msg:
+#ifndef APP_ROUTER_NO_ADDR_MGR
+  push xl
+    push xh
+      rcall appRouterHandleDev1Msg_savedX
+    pop xh
+  pop xl
+  rjmp appRouterHandleDev1Msg_end
+appRouterHandleDev1Msg_savedX:
+  adiw xh:xl, NETMSG_OFFS_CMD
+  ld r16, X
+  sbiw xh:xl, NETMSG_OFFS_CMD
+  cpi r16, NETMSG_CMD_NEED_ADDRESS
+  breq appRouterHandleDev1Msg_handleNeedAddr
+  cpi r16, NETMSG_CMD_CLAIM_ADDRESS
+  breq appRouterHandleDev1Msg_handleClaimAddr
+  ; add more here
+  ldi r16, 0
+  rjmp appRouterHandleDev1Msg_clcRet
+appRouterHandleDev1Msg_handleNeedAddr:
+  ldi r18, NETMSG_CMD_ADDRESS_RANGE
+  rcall appRouterSendRangeMsgToDev1           ; (R16, R17, R18, R19, R20, R21, X, Y)
+  sec
+  rjmp appRouterHandleDev1Msg_end
+appRouterHandleDev1Msg_handleClaimAddr:
+  rcall NETMSG_Address_Read                   ; R18=cmd, R19=addr(R18, R19)
+  rcall appRouterIsR19InRange
+  brcs appRouterHandleDev1Msg_end
+  ; is not in subnet range, deny
+  rcall appRouterSendDenyAddrR19ToDev1        ; (R16, R17, R18, R19, R20, R21, X, Y)
+  sec
+  rjmp appRouterHandleDev1Msg_end
+#endif
+appRouterHandleDev1Msg_clcRet:
+  clc
+appRouterHandleDev1Msg_end:
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine appRouterIsR19InRange
+;
+; @param R19 address to check against range
+; @clobbers R16
+
+appRouterIsR19InRange:
+  lds r16, appRouterRangeBegin
+  cp r19, r16
+  brcs appRouterIsR19InRangeClcRet
+  lds r16, appRouterRangeEnd
+  cp r16, r19
+  brcs appRouterIsR19InRangeClcRet
+  sec
+  rjmp appRouterIsR19InRange_end
+appRouterIsR19InRangeClcRet:
+  clc
+appRouterIsR19InRange_end:
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine appRouterSendDenyAddrR19ToDev1
+;
+; @param R19 address to send
+; @clobbers R16, R17, R18, R19, R20, R21, X, Y
+
+appRouterSendDenyAddrR19ToDev1:
+  ldi r18, NETMSG_CMD_DENY_ADDRESS      ; deny addr
+  rjmp appRouterSendAddrMsgToDev1       ; (R16, R17, R18, R19, R20, R21, X, Y)
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine appRouterSendAddrMsgToDev1
+;
+; @param R18 command
+; @param R19 address to send
+; @clobbers R16 (R17, R18, R19, R20, R21, X, Y)
+
+appRouterSendAddrMsgToDev1:
+  bigcall NET_Buffer_Alloc                ; (R16, R17, X)
+  brcc appRouterSendAddrMsgToDev1_end
+  push r16
+    adiw xh:xl, 1
+    bigcall NETMSG_Address_Write          ; (R16, R17, R18, R19, R20, R21)
+    sbiw xh:xl, 1
+  pop r16
+  rcall appRouterSendMsgToDev1            ; (R16, R17, R18, R24, R25, X, Y)
+appRouterSendAddrMsgToDev1_end:
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine appRouterSendRangeMsgToDev1
+;
+; @param R18 msg code
+; @return CFLAG set if message enqueued, cleared on error
+; @clobbers (R16, R17, R18, R19, R20, R21, R24, R25, X, Y)
+
+appRouterSendRangeMsgToDev1:
+  bigcall NET_Buffer_Alloc                ; (R16, R17, X)
+  brcc appRouterSendRangeMsgToDev1_end
+  push r16
+    lds r20, appRouterRangeBegin
+    lds r21, appRouterRangeEnd
+    adiw xh:xl, 1
+    bigcall NETMSG_Range_Write            ; (R16, R17, R18, R19, R20, R21)
+    sbiw xh:xl, 1
+  pop r16
+  rcall appRouterSendMsgToDev1            ; (R16, R17, R18, R24, R25, X, Y)
+appRouterSendRangeMsgToDev1_end:
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine appRouterSendMsgToDev1
+;
+; @param R16 num of allocated buffer
+; @param X msg to send (points to start of allocated buffer, e.g. buffer header)
+; @return CFLAG set if message enqueued, cleared on error
+; @clobbers Y (R16, R17, R18, R24, R25, X)
+
+appRouterSendMsgToDev1:
+  ldi yl, LOW(netInterfaceData2)
+  ldi yh, HIGH(netInterfaceData2)
+  bigcall NET_Interface_AddOutgoingMsgNum ; (R17, R18, X)
+  brcs appRouterSendMsgToDev1_end
+  bigcall NET_Buffer_ReleaseByNum         ; (R16, X)
+  ldi r16, NET_IFACE_OFFS_ERR_NOBUF_LOW
+  rcall NET_Interface_IncCounter16        ; (R24, R25)
+  clc
+appRouterSendMsgToDev1_end:
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine appRouterHandleRebootRequest
+;
+; Doesn't return if reboot msg is valid.
+;
+; @param X pointer to received message
+
+appRouterHandleRebootRequest:
+  rcall NETMSG_RebootRequestRead
+  brcc appRouterHandleRebootRequest_end
+  ; reboot
+  cli
+  bigjmp BOOTLOADER_ADDR
+appRouterHandleRebootRequest_end:
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine appRouterHandlePingRequest
+;
+; @param X pointer to received message
+
+appRouterHandlePingRequest:
+  ld r17, X
+  lds r16, (netInterfaceData+NET_IFACE_OFFS_ADDRESS)
+  cp r16, r17
+  breq appRouterHandlePingRequest_forMe
+  cpi r17, 0xff
+  breq appRouterHandlePingRequest_forMe
+  clc
+  rjmp appRouterHandlePingRequest_end
+appRouterHandlePingRequest_forMe:
+  adiw xh:xl, NETMSG_OFFS_SRCADDR
+  ld r17, X
+  sbiw xh:xl, NETMSG_OFFS_SRCADDR
+  push r17
+    bigcall NET_Buffer_Alloc               ; (R16, R17, X)
+  pop r17
+  brcc appRouterHandlePingRequest_end      ; jmp on error
+  push r16                                 ; buffer num
+    mov r16, r17                           ; DEST addr
+    adiw xh:xl, 1
+    ldi yl, LOW(netInterfaceData)
+    ldi yh, HIGH(netInterfaceData)
+    bigcall NETMSG_Pong_Write              ; (R16, R17, R18, R19, R20, X)
+    sbiw xh:xl, 1
+  pop r16                                  ; buffer num
+  bigcall NET_Interface_AddOrReleaseOutMsg ; (R16, R17, R18, X)
+appRouterHandlePingRequest_end:
+  ret
+
+
+
+; ---------------------------------------------------------------------------
+; @routine appRouterCheckRecvdMsg
+;
+; Read messages from either interface and forward to the other one.
+;
+; @return CFLAG set if something done, cleared otherwise
+
+appRouterCheckRecvdMsg:
+  rcall NET_PeekNextIncomingMsgNum          ; check read queue (bufNum->r16)
+  brcc appRouterCheckRecvdMsg_end           ; no msg, jmp
+  rcall NET_Buffer_Locate                   ; (R17)
+  rcall appRouterHandleRouterMsgWithHdr     ; filter out router msgs
+  brcs appRouterCheckRecvdMsg_removeMsg     ; handled by router code, don't forward
+  ; let system handle incoming messages
+  adiw xh:xl, 1
+  rcall appRouterLetSysHandleMsg
+  sbiw xh:xl, 1
+
+  ; forward to other interface
+  ld r17, X
+  andi r17, (1<<NET_IFACE_BUFFER_IFACENUM1_BIT) | (1<<NET_IFACE_BUFFER_IFACENUM0_BIT)
+  rcall appRouterReverseInterfaceNum                 ; (R16, R17)
+  rcall appRouterAddMsgToInterface
+  brcc appRouterCheckRecvdMsg_end                    ; could not add, jmp
+  rcall NET_GetNextIncomingMsgNum                    ; take off the queue
+  sec
+  ret
+appRouterCheckRecvdMsg_removeMsg:
+  rcall NET_GetNextIncomingMsgNum                    ; take off the queue
+  rcall NET_Buffer_ReleaseByNum                      ; (R16, X)
+  sec
+appRouterCheckRecvdMsg_end:
+  ret
+; @end
+
+
+; ---------------------------------------------------------------------------
+; @routine appRouterHandleRouterMsgWithHdr
+;
+; @param X pointer to msg
+; @return CFLAG set if msg handled, cleared otherwise
+
+appRouterHandleRouterMsgWithHdr:
+  ld r17, X
+  adiw xh:xl, 1
+  andi r17, (1<<NET_IFACE_BUFFER_IFACENUM1_BIT) | (1<<NET_IFACE_BUFFER_IFACENUM0_BIT)
+  cpi r17, NETDEV1_IFACENUM
+  brne appRouterHandleRouterMsgWithHdr_any
+#ifndef APP_ROUTER_NO_ADDR_MGR
+  rcall appRouterHandleDev1Msg                       ; handle messages from controlled subnet
+  brcs appRouterHandleRouterMsgWithHdr_msgHandled
+#endif
+appRouterHandleRouterMsgWithHdr_any:
+  rcall appRouterHandleMsgAnyDev                     ; handle any msg
+  brcs appRouterHandleRouterMsgWithHdr_msgHandled
+  sbiw xh:xl, 1                                      ; CFLAG cleared
+  rjmp appRouterHandleRouterMsgWithHdr_end
+appRouterHandleRouterMsgWithHdr_msgHandled:
+  sbiw xh:xl, 1
+  sec
+appRouterHandleRouterMsgWithHdr_end:
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine appRouterLetSysHandleMsg
+;
+; @param X pointer to msg to handle (point behind the buffer header!)
+; @clobbers any, !X
+
+appRouterLetSysHandleMsg:
+  ld r16, X
+  cpi r16, 0xff
+  breq appRouterLetSysHandleMsg_forMe
+  lds r17, netInterfaceData+NET_IFACE_OFFS_ADDRESS
+  cp r16, r17
+  brne appRouterLetSysHandleMsg_end
+appRouterLetSysHandleMsg_forMe:
+  push xl
+    push xh
+      rcall onMessageReceived
+    pop xh
+  pop xl
+  push xl
+    push xh
+      rcall mainModulesOnPacketReceived
+    pop xh
+  pop xl
+  push xl
+    push xh
+      rcall mainAppsOnPacketReceived
+    pop xh
+  pop xl
+appRouterLetSysHandleMsg_end:
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine appRouterReverseInterfaceNum
+;
+; @param r17 buffer num
+; @return r17 reversed interface number
+; @clobbers r16, r17
+
+appRouterReverseInterfaceNum:
+  ldi r16, (1<<NET_IFACE_BUFFER_IFACENUM1_BIT) | (1<<NET_IFACE_BUFFER_IFACENUM0_BIT)
+  eor r17, r16
+  and r17, r16
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine appRouterAddMsgToInterface
+; @param r16 buffer num
+; @param r17 interface num
+
+appRouterAddMsgToInterface:
+  cpi r17, NETDEV0_IFACENUM
+  brne appRouterAddMsgToInterface_notNetDev0
+  ldi yl, LOW(netInterfaceData)
+  ldi yh, HIGH(netInterfaceData)
+  rjmp NET_Interface_AddOutgoingMsgNum     ; try to add msg to interface
+appRouterAddMsgToInterface_notNetDev0:
+  ldi yl, LOW(netInterfaceData2)
+  ldi yh, HIGH(netInterfaceData2)
+  rjmp NET_Interface_AddOutgoingMsgNum     ; try to add msg to interface
+appRouterAddMsgToInterface_end:
+  clc
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine appRouterWriteConfToEeprom
+;
+; @clobbers R16, X (R17)
+
+appRouterWriteConfToEeprom:
+  ; write range begin
+  ldi xl, LOW(EEPROM_OFFS_ROUTER_RANGE_BEGIN)
+  ldi xh, HIGH(EEPROM_OFFS_ROUTER_RANGE_BEGIN)
+  lds r16, appRouterRangeBegin
+  rcall Eeprom_WriteByteIfChanged                ; (R17)
+  brcc appRouterWriteConfToEeprom_end
+
+  ; write range end
+  ldi xl, LOW(EEPROM_OFFS_ROUTER_RANGE_END)
+  ldi xh, HIGH(EEPROM_OFFS_ROUTER_RANGE_END)
+  lds r16, appRouterRangeEnd
+  rcall Eeprom_WriteByteIfChanged                ; (R17)
+appRouterWriteConfToEeprom_end:
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine appRouterReadConfFromEeprom
+;
+; @clobbers R16, X (R17)
+
+appRouterReadConfFromEeprom:
+  ; read range begin
+  ldi xl, LOW(EEPROM_OFFS_ROUTER_RANGE_BEGIN)
+  ldi xh, HIGH(EEPROM_OFFS_ROUTER_RANGE_BEGIN)
+  rcall Eeprom_ReadByte
+  brcc appRouterReadConfFromEeprom_end
+  cpi r16, 0xff
+  breq appRouterReadConfFromEeprom_okay                ; not set, jmp
+  cpi r16, 2                                           ; range should at least start at 2 to assign 1 to router
+  brcs appRouterReadConfFromEeprom_okay
+  sts appRouterRangeBegin, r16
+  dec r16
+  sts netInterfaceData+NET_IFACE_OFFS_ADDRESS, r16     ; use addr rangeBegin-1 for router itself
+  sts netInterfaceData2+NET_IFACE_OFFS_ADDRESS, r16    ; use same address for both interfaces to save on addresses
+
+  ; read range end
+  ldi xl, LOW(EEPROM_OFFS_ROUTER_RANGE_END)
+  ldi xh, HIGH(EEPROM_OFFS_ROUTER_RANGE_END)
+  rcall Eeprom_ReadByte
+  brcc appRouterReadConfFromEeprom_end
+  cpi r16, 0xff
+  breq appRouterReadConfFromEeprom_okay
+  sts appRouterRangeEnd, r16
+appRouterReadConfFromEeprom_okay:
+  sec
+appRouterReadConfFromEeprom_end:
+  ret
+; @end
+
+
+

avr/apps/stats/main.asm

@@ -11,7 +11,7 @@
 ; ***************************************************************************
 ; defines
 
-.equ APP_STATS_INTERVAL_MINS = 31
+.equ APP_STATS_INTERVAL_MINS = 30
 
 
 
@@ -62,10 +62,6 @@ AppStats_OnEveryMinute:
   ret
 
 AppStats_OnEveryMinute_noIrq:
-;  ldi yl, LOW(netInterfaceData)
-;  ldi yh, HIGH(netInterfaceData)
-;  rcall AppNetwork_SendRxdStats     ; debug
-  
   lds r16, appStatsTimer
   inc r16
   cpi r16, APP_STATS_INTERVAL_MINS
@@ -73,148 +69,68 @@ AppStats_OnEveryMinute_noIrq:
   clr r16
 AppStats_OnEveryMinute_store:
   sts appStatsTimer, r16
-  ldi yl, LOW(netInterfaceData)
-  ldi yh, HIGH(netInterfaceData)
-  
-  ldi r17, AQHOME_VALUEID_STATS_PACKETS_IN
-  ldi xl, LOW(netInterfaceData)
-  ldi xh, HIGH(netInterfaceData)
-  cpi r16, 1
-  breq AppStats_OnEveryMinute_sendDevice
+
+  mov r17, r16
+  andi r17, 3
+  brne AppStats_OnEveryMinute_sendStats
+  ; send device announcement
+  push yl
+    push yh
+      ldi yl, LOW(netInterfaceData)
+      ldi yh, HIGH(netInterfaceData)
+      rcall AppNetwork_SendDevice
+#ifdef APP_STATS_NETDEV2
+      ldi yl, LOW(netInterfaceData2)
+      ldi yh, HIGH(netInterfaceData2)
+      rcall AppNetwork_SendDevice
+#endif
+    pop yh
+  pop yl
+AppStats_OnEveryMinute_sendStats:
+  cpi r16, 2
+  breq AppStats_OnEveryMinute_sendMemStats
+
   cpi r16, 3
-  breq AppStats_OnEveryMinute_sendPacketsIn
+  breq AppStats_OnEveryMinute_sendRecvStats1
+
   cpi r16, 5
-  breq AppStats_OnEveryMinute_sendPacketsOut
-  cpi r16, 6
-  breq AppStats_OnEveryMinute_sendDevice
-  cpi r16, 7
-  breq AppStats_OnEveryMinute_sendContentErrs
-  cpi r16, 9
-  breq AppStats_OnEveryMinute_sendIoErrs
-  cpi r16, 10
-  breq AppStats_OnEveryMinute_sendDevice
-  cpi r16, 11
-  breq AppStats_OnEveryMinute_sendNoBufErrs
-  cpi r16, 13
-  breq AppStats_OnEveryMinute_sendCollisionErrs
-  cpi r16, 14
-  breq AppStats_OnEveryMinute_sendDevice
-  cpi r16, 15
-  breq AppStats_OnEveryMinute_sendBusyErrs
+  breq AppStats_OnEveryMinute_sendSendStats1
 
 #ifdef APP_STATS_NETDEV2
-  ldi r17, AQHOME_VALUEID_STATS_PACKETS_IN2
-  ldi xl, LOW(netInterfaceData2)
-  ldi xh, HIGH(netInterfaceData2)
-  cpi r16, 16
-  breq AppStats_OnEveryMinute_sendPacketsIn
-  cpi r16, 17
-  breq AppStats_OnEveryMinute_sendPacketsOut
-  cpi r16, 18
-  breq AppStats_OnEveryMinute_sendDevice
-  cpi r16, 19
-  breq AppStats_OnEveryMinute_sendContentErrs
-  cpi r16, 20
-  breq AppStats_OnEveryMinute_sendIoErrs
-  cpi r16, 21
-  breq AppStats_OnEveryMinute_sendDevice
-  cpi r16, 22
-  breq AppStats_OnEveryMinute_sendNoBufErrs
-  cpi r16, 23
-  breq AppStats_OnEveryMinute_sendDevice
-  cpi r16, 24
-  breq AppStats_OnEveryMinute_sendCollisionErrs
-  cpi r16, 25
-  breq AppStats_OnEveryMinute_sendBusyErrs
-#endif
+  cpi r16, 6
+  breq AppStats_OnEveryMinute_sendRecvStats2
 
-#ifdef MODULES_HEAP
-  cpi r16, 26
-  breq AppStats_OnEveryMinute_sendHeapUsed
-  cpi r16, 27
-  breq AppStats_OnEveryMinute_sendHeapfree
+  cpi r16, 7
+  breq AppStats_OnEveryMinute_sendSendStats2
 #endif
-  cpi r16, 28
-  breq AppStats_OnEveryMinute_sendDevice
+  ; add more here
   ret
+AppStats_OnEveryMinute_sendMemStats:
+  rjmp AppNetwork_SendMemStats
 
-AppStats_OnEveryMinute_sendDevice:
-  rjmp AppNetwork_SendDevice
+AppStats_OnEveryMinute_sendRecvStats1:
+  ldi yl, LOW(netInterfaceData)
+  ldi yh, HIGH(netInterfaceData)
+  rjmp AppNetwork_SendRxdStats
 
-AppStats_OnEveryMinute_sendPacketsIn:
-  ldi r16, 0
-  rjmp appStatsSendDeviceStat
-AppStats_OnEveryMinute_sendPacketsOut:
-  ldi r16, 1
-  rjmp appStatsSendDeviceStat
-AppStats_OnEveryMinute_sendContentErrs:
-  ldi r16, 2
-  rjmp appStatsSendDeviceStat
-AppStats_OnEveryMinute_sendIoErrs:
-  ldi r16, 3
-  rjmp appStatsSendDeviceStat
-AppStats_OnEveryMinute_sendNoBufErrs:
-  ldi r16, 4
-  rjmp appStatsSendDeviceStat
-AppStats_OnEveryMinute_sendCollisionErrs:
-  ldi r16, 5
-  rjmp appStatsSendDeviceStat
-AppStats_OnEveryMinute_sendBusyErrs:
-  ldi r16, 6
-  rjmp appStatsSendDeviceStat
+AppStats_OnEveryMinute_sendSendStats1:
+  ldi yl, LOW(netInterfaceData)
+  ldi yh, HIGH(netInterfaceData)
+  rjmp AppNetwork_SendTxdStats
 
-#ifdef MODULES_HEAP
-AppStats_OnEveryMinute_sendHeapUsed:
-  ldi r17, AQHOME_VALUEID_STATS_HEAP_USED
-  lds r18, heapUsed
-  lds r19, heapUsed+1
-  rjmp appStatsSend16BitValue
-AppStats_OnEveryMinute_sendHeapfree:
-  ldi r17, AQHOME_VALUEID_STATS_HEAP_FREE
-  lds r18, heapFree
-  lds r19, heapFree+1
-  rjmp appStatsSend16BitValue
+#ifdef APP_STATS_NETDEV2
+AppStats_OnEveryMinute_sendRecvStats2:
+  ldi yl, LOW(netInterfaceData2)
+  ldi yh, HIGH(netInterfaceData2)
+  rjmp AppNetwork_SendRxdStats
+
+AppStats_OnEveryMinute_sendSendStats2:
+  ldi yl, LOW(netInterfaceData2)
+  ldi yh, HIGH(netInterfaceData2)
+  rjmp AppNetwork_SendTxdStats
 #endif
 ; @end
 
 
 
 
-; ---------------------------------------------------------------------------
-; @routine AppStats_OnEveryMinute @global
-;
-; @param r16 index into device table (e.g. 0 for NET_IFACE_OFFS_PACKETSIN_LOW)
-; @param r17 offset to first value id (e.g. AQHOME_VALUEID_STATS_PACKETS_IN for device 0,
-;                                           AQHOME_VALUEID_STATS_PACKETS_IN2 for device 1)
-; @param Y   pointer to device to send data to
-; @param X   pointer to device to inspect
-
-appStatsSendDeviceStat:
-  add r17, r16
-  lsl r16
-  adiw xh:xl, NET_IFACE_OFFS_PACKETSIN_LOW
-  add xl, r16
-  adc xh, r16
-  sub xh, r16
-  ld r18, X+
-  ld r19, X
-  rjmp appStatsSend16BitValue
-; @end
-
-
-
-; ---------------------------------------------------------------------------
-; @routine AppStats_OnEveryMinute @global
-;
-; @param  R17     value id
-; @param  R19:R18 value
-
-appStatsSend16BitValue:
-  ldi r20, 1
-  clr r21
-  ldi r22, AQHOME_VALUETYPE_STATS
-  bigjmp Main_SendValueReport
-; @end
-
-
-

avr/common/0BUILD

@@ -30,6 +30,8 @@
     list_t.asm
     tree.asm
     tree_t.asm
+    eeprom-r.asm
+    eeprom-w.asm
   </extradist>
 
 </gwbuild>

avr/common/eeprom-r.asm

@@ -0,0 +1,80 @@
+; ***************************************************************************
+; copyright   : (C) 2025 by Martin Preuss
+; email       : martin@libchipcard.de
+;
+; ***************************************************************************
+; * This file is part of the project "AqHome".                              *
+; * Please see toplevel file COPYING of that project for license details.   *
+; ***************************************************************************
+
+#ifndef AQH_AVR_COMMON_EEPROM_R_H
+#define AQH_AVR_COMMON_EEPROM_R_H
+
+
+
+; ---------------------------------------------------------------------------
+; @routine Eeprom_ReadByte
+;
+; Read a byte from EEPROM (see example in ATtiny24/44/84 manual p.19).
+;
+; @param X EEPROM Address to read from
+; @return CFLAG set if address okay, cleared if out of range
+; @return R16 byte read
+; @return X   EEPROM Address incremented
+; @clobbers none
+
+Eeprom_ReadByte:
+  rcall Eeprom_CheckAddr
+  brcs Eeprom_ReadByte_addrOk
+  ret
+Eeprom_ReadByte_addrOk:
+  ; call routine with IRQs disabled
+  push r15
+    inr r15, SREG
+    cli
+    rcall Eeprom_ReadByte_noirq
+    outr SREG, r15
+  pop r15
+  sec
+  ret
+Eeprom_ReadByte_noirq:
+  ; wait until EEPROM ready
+Eeprom_ReadByte_waitLoop:
+.ifdef EEPE
+    sbic EECR, EEPE          ; wait for previous write to complete (if any)
+.else
+    sbic EECR, EEWE          ; wait for previous write to complete (if any)
+.endif
+  rjmp Eeprom_ReadByte_waitLoop
+; read from EEPROM
+  out EEARH, xh            ; set EEPROM address
+  out EEARL, xl
+  sbi EECR, EERE           ; start EEPROM read by writing EERE
+  in r16, EEDR             ; read data from data register
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine Eeprom_CheckAddr
+;
+;
+; @param X EEPROM Address to validate
+; @return CFLAG set if address okay, cleared if out of range
+; @clobbers r16
+
+Eeprom_CheckAddr:
+  mov r16, xl
+  subi r16, LOW(EEPROMEND)
+  mov r16, xh
+  sbci r16, HIGH(EEPROMEND)
+  ret
+; @end
+
+
+
+
+#endif ; AQH_AVR_COMMON_EEPROM_R_H
+
+

avr/common/eeprom-w.asm

@@ -0,0 +1,100 @@
+; ***************************************************************************
+; copyright   : (C) 2025 by Martin Preuss
+; email       : martin@libchipcard.de
+;
+; ***************************************************************************
+; * This file is part of the project "AqHome".                              *
+; * Please see toplevel file COPYING of that project for license details.   *
+; ***************************************************************************
+
+#ifndef AQH_AVR_COMMON_EEPROM_W_H
+#define AQH_AVR_COMMON_EEPROM_W_H
+
+
+; ---------------------------------------------------------------------------
+; Utils_WriteEepromIncr
+;
+; Write a byte to EEPROM (see example in ATtiny24/44/84 manual p.18).
+;
+; @param R16 byte to write
+; @param X   EEPROM Address to write to
+; @return CFLAG set if data written, cleared on error
+; @clobbers R17
+
+Eeprom_WriteByte:
+  mov r17, r16
+    rcall Eeprom_CheckAddr          ; (r16)
+  mov r16, r17
+  brcs Eeprom_WriteByte_addrOk
+  ret
+Eeprom_WriteByte_addrOk:
+  ; call routine with IRQs disabled
+  push r15
+    inr r15, SREG
+    cli
+    rcall Eeprom_WriteByte_noirq
+    outr SREG, r15
+  pop r15
+  sec
+  ret
+Eeprom_WriteByte_noirq:
+  ; wait for EEPROM to be ready
+Eeprom_WriteByte_waitLoop:
+.ifdef EEPE
+    sbic EECR, EEPE                 ; wait for previous write to complete (if any)
+.else
+    sbic EECR, EEWE                 ; wait for previous write to complete (if any)
+.endif
+  rjmp Eeprom_WriteByte_waitLoop
+  ; write data
+.ifdef EEPM1
+  ldi r17, (0<<EEPM1) | (0<<EEPM0) ; set programming mode
+.endif
+  out EECR, r17
+  out EEARH, xh                    ; set EEPROM address
+  out EEARL, xl
+  out EEDR,  r16                   ; write data to data register
+.ifdef EEMPE
+  sbi EECR, EEMPE                  ; write logical one to EEMPE
+.else
+  sbi EECR, EEMWE                  ; write logical one to EEMWE
+.endif
+.ifdef EEPE
+  sbi EECR, EEPE                   ; start EEPROM write by setting EEPE
+.else
+  sbi EECR, EEWE                   ; start EEPROM write by setting EEWE
+.endif
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine Eeprom_WriteByteIfChanged @global
+;
+; Only write EEPROM byte if changed from current value (save on write cycles)
+;
+; @param r16 byte to write
+; @param X   eeprom address to write to
+; @clobbers r17
+
+Eeprom_WriteByteIfChanged:
+  mov r17, r16  
+  rcall Eeprom_ReadByte
+  brcc Eeprom_WriteByteIfChanged_end
+  cp r16, r17
+  sec
+  breq Eeprom_WriteByteIfChanged_end
+  mov r16, r17
+  rcall Eeprom_WriteByte              ; (R17)
+Eeprom_WriteByteIfChanged_end:
+  ret
+; @end
+
+
+
+
+
+#endif ; AQH_AVR_COMMON_EEPROM_W_H
+
+

avr/common/eeprom_tlv.asm

@@ -0,0 +1,135 @@
+; ***************************************************************************
+; copyright   : (C) 2025 by Martin Preuss
+; email       : martin@libchipcard.de
+;
+; ***************************************************************************
+; * This file is part of the project "AqHome".                              *
+; * Please see toplevel file COPYING of that project for license details.   *
+; ***************************************************************************
+
+#ifndef AQH_AVR_COMMON_EEPROM_TLV_H
+#define AQH_AVR_COMMON_EEPROM_TLV_H
+
+
+; ---------------------------------------------------------------------------
+; @routine EepromTlv_AddTlv @global
+;
+; @param r16 type (must not be 0xff!)
+; @param r17 length
+; @return CFLAG set if free bytes found, cleared on error
+; @return X EEPROM address of data for TLV (behind TLV header)
+; @clobbers R16, R20, R21, X (R18)
+
+EepromTlv_AddTlv:
+  mov r20, r16
+  mov r21, r17
+  ldi r16, 0xff
+  rcall EepromTlv_FindFirst       ; (R18)
+  brcc EepromTlv_AddTlv_end
+  cpi r17, 0xff
+  brne EepromTlv_AddTlv_clcEnd
+  add xl, r21                     ; wanted size
+  adc xh, r21
+  sub xh, r21
+  rcall Eeprom_CheckAddr          ; check end address
+  brcc EepromTlv_AddTlv_end
+  sub xl, r21
+  sbc xh, r21
+  add xh, r21
+  sbiw xh:xl, 2
+  mov r16, r20                    ; type
+  rcall Eeprom_WriteByte
+  adiw xh:xl, 1
+  mov r16, r21                    ; length
+  rcall Eeprom_WriteByte
+  adiw xh:xl, 1
+  sec
+  rjmp EepromTlv_AddTlv_end
+EepromTlv_AddTlv_clcEnd:
+  clc
+EepromTlv_AddTlv_end:
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine EepromTlv_FindFirst @global
+;
+; Find first matching TLV
+;
+; @param r16 TLV type to find
+; @return CFLAG set if TLV found, cleared otherwise
+; @return r16 type
+; @return r17 length
+; @return X points to begin of TLV data
+; @clobbers r18
+
+EepromTlv_FindFirst:
+  ldi xl, LOW(EEPROM_OFFS_TLV)
+  ldi xh, HIGH(EEPROM_OFFS_TLV)
+  rjmp EepromTlv_Find
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine EepromTlv_Find @global
+;
+; @param r16 TLV type to find
+; @param X EEPROM address to start search
+; @return CFLAG set if TLV found, cleared otherwise
+; @return r16 type
+; @return r17 length
+; @return X points to begin of TLV data
+; @clobbers r18
+
+EepromTlv_Find:
+  mov r18, r16
+EepromTlv_Find_loop:
+    rcall EepromTlv_ReadHeader
+    brcc EepromTlv_Find_notFound
+    cpi r16, r18                   ; the one we wanted?
+    breq EepromTlv_Find_found
+    add xl, r17                    ; skip TLV data
+    adc xh, r17
+    sub xh, r17
+  rjmp EepromTlv_Find_loop
+EepromTlv_Find_notFound:
+  clc
+  rjmp EepromTlv_Find_end
+EepromTlv_Find_found:
+  sec
+EepromTlv_Find_end:
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine EepromTlv_ReadHeader
+;
+; @param X EEPROM address
+; @return CFLAG set if address okay, cleared if out of range
+; @return r16 type
+; @return r17 length (only data length, can be 0)
+; @return X EEPROM address behind TLV header
+; @clobbers none
+
+EepromTlv_ReadHeader:
+  rcall Eeprom_ReadByteIncr   ; read type
+  brcc EepromTlv_ReadHeader
+  adiw xh:xl, 1
+  push r16
+    rcall Eeprom_ReadByteIncr ; read length
+    mov r17, r16
+  pop r16
+  brcc EepromTlv_ReadHeader
+  adiw xh:xl, 1
+  sec
+EepromTlv_ReadHeader:
+  ret
+; @end
+
+
+

avr/common/m_fixedbuffers.asm

@@ -52,7 +52,7 @@ l_loop:
   brcs l_loop
   rjmp l_end           ; use cleared CFLAG
 l_foundfree:
-  ldi r16, 0x80        ; mark as used
+  ldi r16, 0x10        ; mark as used
   st X, r16
   mov r16, r17
   sec                  ; set CFLAG, return bufnum in r16, pointre in X

avr/common/ringbuffer_y.asm

@@ -120,7 +120,7 @@ RingBufferY_Reset:
 ;
 ; @return CFLAG on success, cleared on error
 ; @return r16 byte read
-; @param Y pointer to start of interface data
+; @param Y  base address of ringbuffer struct
 ; @clobbers R17, R18, X
 
 RingBufferY_ReadByteGuarded:

avr/common/utils_io.asm

@@ -7,29 +7,6 @@
 ; * Please see toplevel file COPYING of that project for license details.   *
 ; ***************************************************************************
 
-#if 0
-; M_IO_READ DEST, SRC
-.macro M_IO_READ
-.if @1 < 64
-  in @0, @1
-.else
-  lds @0, @1
-.endif
-.endmacro
-
-
-
-; M_IO_WRITE DEST, SRC
-.macro M_IO_WRITE
-.if @0 < 64
-  out @0, @1
-.else
-  sts @0, @1
-.endif
-.endmacro
-
-#endif
-
 
 ; inr DEST, SRC
 .macro inr

avr/common/wait_50us.asm

@@ -18,7 +18,8 @@
 ; @clobbers r22
 
 Utils_WaitFor50MicroSecs:
-    Utils_WaitNanoSecs 50000, 7, r22            ; wait for 50us (minus RCALL and RET)
+    Utils_WaitNanoSecs 25000, 0, r22            ; wait for 25us
+    Utils_WaitNanoSecs 25000, 7, r22            ; wait for 25us (minus RCALL and RET)
     ret
 ; @end
 

avr/devices/0BUILD

@@ -28,18 +28,17 @@
     c02
     n14
     n16
-    n19
-    n20
     n21
-    n22
-    n23
     n24
     n25
     n26
     n27
-    r04
+    n28
     r05
+    r06
+    s03
     t03
+    t04
   </subdirs>
 
 </gwbuild>

avr/devices/all/apps.asm

@@ -29,6 +29,18 @@ initApps:
   bigcall AppNetwork_Init
 #endif
 
+#ifdef APPS_ROUTER
+  bigcall AppRouter_Init
+#endif
+
+#ifdef APPS_HUB
+  bigcall AppHub_Init
+#endif
+
+#ifdef APPS_FORWARDER
+  bigcall AppForwarder_Init
+#endif
+
 #ifdef APPS_MOTION
   bigcall AppMotion_Init
 #endif
@@ -62,9 +74,37 @@ initApps:
 ;
 
 runApps:
+  clr r16
+#ifdef APPS_ROUTER
+  push r16
+    bigcall AppRouter_Run
+  pop r16
+  sbci r16, 0              ; decrease r16 only if CFLAG set
+#endif
+
+#ifdef APPS_HUB
+  push r16
+    bigcall AppHub_Run
+  pop r16
+  sbci r16, 0              ; decrease r16 only if CFLAG set
+#endif
+
+#ifdef APPS_FORWARDER
+  push r16
+    bigcall AppForwarder_Run
+  pop r16
+  sbci r16, 0              ; decrease r16 only if CFLAG set
+#endif
 
   ; add more modules here
+
+  tst r16
+  clc
+  breq runApps_end
+  sec
+runApps_end:
   ret
+; @end
 
 
 

avr/devices/all/defs.asm

@@ -57,6 +57,12 @@
 
 
 
+.equ TLV_OFFS_LEN   = 0
+.equ TLV_OFFS_TYPE  = 1
+.equ TLV_OFFS_VALUE = 2
+
+
+
 ; ---------------------------------------------------------------------------
 ; EEPROM positions
 
@@ -76,5 +82,18 @@
 .equ EEPROM_OFFS_MAL_CONF_SRC2_VALUEID = 19 ; 1 byte
 .equ EEPROM_OFFS_MAL_CONF_RGBWVALUE    = 20 ; 4 bytes
 
-; next is 24
+.equ EEPROM_OFFS_ROUTER_RANGE_BEGIN    = 24 ; 1 byte
+.equ EEPROM_OFFS_ROUTER_RANGE_END      = 25 ; 1 byte
+; next is 26
+
+
+.equ EEPROM_OFFS_TLV                   = 32 ; begin TLV area here
+
+
+
+
+.equ EEPROM_TLV_ROUTER_RANGE           = 0x10   ; 2 bytes (range begin, range end)
+
+
+
 

avr/devices/all/hw_m644p.asm

@@ -103,13 +103,11 @@ systemSetupTimer0:            ; setup timer for IRQ every 100ms
   ldi r16, 1
   sts baseTimerModuleReloadValue, r16
   sts baseTimerModuleTickCounter, r16
-.endif
 
-;
 ; Settings for clock 8Mhz
 ; use timer0 with OCR0=78 (irq every 9.984 millisecs), baseTimerModuleReloadValue 10
 ;
-.if clock == 8000000
+.elif clock == 8000000
   ; CMP interrupt about every 10ms
   ldi r16, 78-1
   outr OCR0A, r16
@@ -117,6 +115,24 @@ systemSetupTimer0:            ; setup timer for IRQ every 100ms
   ldi r16, 10
   sts baseTimerModuleReloadValue, r16
   sts baseTimerModuleTickCounter, r16
+.elif clock == 10000000
+  ; CMP-A interrupt about every 10ms
+  ldi r16, 98-1      ; (10,000,000/1024)/10 = 97.65625
+  outr OCR0A, r16
+
+  ldi r16, 10
+  sts baseTimerModuleReloadValue, r16
+  sts baseTimerModuleTickCounter, r16
+.elif clock == 20000000
+  ; CMP-A interrupt about every 5ms
+  ldi r16, 98-1
+  outr OCR0A, r16
+
+  ldi r16, 20
+  sts baseTimerModuleReloadValue, r16
+  sts baseTimerModuleTickCounter, r16
+.else
+  .error "Unhandled clock frequency"
 .endif
 
   ldi r16, (1<<OCF0A)         ; clear pending interrupts

avr/devices/all/includes.asm

@@ -96,6 +96,66 @@
 #endif
 
 
+
+#ifdef MODULES_COM2W
+.include "modules/com2w/defs.asm"
+.include "modules/com2w/com2w.asm"
+#endif
+
+
+
+#ifdef MODULES_COM2W0
+.include "modules/com2w/defs.asm"
+.include "modules/com2w/common.asm"
+.include "modules/com2w/com2w0.asm"
+#endif
+
+
+
+#ifdef MODULES_COM2W1
+.include "modules/com2w/defs.asm"
+.include "modules/com2w/common.asm"
+.include "modules/com2w/com2w1.asm"
+#endif
+
+
+
+#ifdef MODULES_COM2WN
+.include "modules/com2w/defs.asm"
+.include "modules/com2w/com2wn_init.asm"
+.include "modules/com2w/com2wn_io.asm"
+.include "modules/com2w/com2wn_irq.asm"
+.include "modules/com2w/com2wn_recv.asm"
+.include "modules/com2w/com2wn_run.asm"
+.include "modules/com2w/com2wn_send.asm"
+.include "modules/com2w/com2wn_wait.asm"
+.include "modules/com2w/com2wn_data.asm"
+#endif
+
+
+
+#ifdef MODULES_COM2WI
+.include "modules/com2w/com2wi2.asm"
+#endif
+
+
+
+#ifdef MODULES_UARTFD0
+.include "modules/uart_fd/defs.asm"
+.include "modules/uart_fd/macros.asm"
+.include "modules/uart_fd/uartfd0.asm"
+#endif
+
+
+
+#ifdef MODULES_UARTFD1
+.include "modules/uart_fd/defs.asm"
+.include "modules/uart_fd/macros.asm"
+.include "modules/uart_fd/uartfd1.asm"
+#endif
+
+
+
 #ifdef MODULES_CLOCK
 .include "modules/clock/main.asm"
 #endif
@@ -107,6 +167,16 @@
   #endif
 #endif
 
+#ifdef MODULES_LED_SIGNAL
+.include "modules/led_signal/main.asm"
+#endif
+
+
+#ifdef MODULES_LED_ACTIVITY
+.include "modules/led_activity/main.asm"
+#endif
+
+
 #ifdef MODULES_TWI_MASTER
 .include "modules/twimaster/main.asm"
 #endif
@@ -239,6 +309,44 @@
 .include "modules/network/msg/reboot-d.asm"
 .include "modules/network/msg/reboot-r.asm"
 .include "modules/network/msg/pong-w.asm"
+.include "modules/network/msg/range-d.asm"
+.include "modules/network/msg/range-r.asm"
+.include "common/eeprom-r.asm"
+.include "common/eeprom-w.asm"
+#endif
+
+
+#ifdef APPS_ROUTER
+.include "apps/router/main.asm"
+.include "modules/network/msg/reboot-d.asm"
+.include "modules/network/msg/reboot-r.asm"
+.include "modules/network/msg/pong-w.asm"
+.include "modules/network/msg/range-d.asm"
+.include "modules/network/msg/range-r.asm"
+.include "modules/network/msg/range-w.asm"
+.include "common/eeprom-r.asm"
+.include "common/eeprom-w.asm"
+#endif
+
+
+#ifdef APPS_HUB
+.include "apps/hub/main.asm"
+.include "modules/network/msg/reboot-d.asm"
+.include "modules/network/msg/reboot-r.asm"
+.include "modules/network/msg/pong-w.asm"
+.include "modules/network/msg/range-d.asm"
+.include "modules/network/msg/range-r.asm"
+.include "modules/network/msg/range-w.asm"
+.include "common/eeprom-r.asm"
+.include "common/eeprom-w.asm"
+#endif
+
+
+#ifdef APPS_FORWARDER
+.include "apps/forwarder/main.asm"
+.include "modules/network/msg/reboot-r.asm"
+.include "modules/network/msg/reboot-d.asm"
+.include "modules/network/msg/pong-w.asm"
 #endif
 
 

avr/devices/all/main.asm

@@ -55,11 +55,35 @@ main:
 
 main_loop:
     bigcall systemSleep   ; system-dependant
-    bigcall runModules
-    bigcall runApps
-    
-    bigcall onEveryLoop   ; call into main app
+
+    ; run loop as long as some run function returns with CFLAG set
+    clr r17
+main_runLoop:
+    push r17
+      clr r16
+      push r16
+        bigcall runModules
+      pop r16
+      sbci r16, 0
+      
+      push r16
+        bigcall runApps
+      pop r16
+      sbci r16, 0
     
+      push r16
+        bigcall onEveryLoop   ; call into main app
+      pop r16
+    pop r17
+
+    tst r16
+    breq main_endRunLoop
+    inc r17
+    cpi r17, 10
+    brcc main_endRunLoop
+  brne main_runLoop
+main_endRunLoop:
+
 #ifdef MODULES_NETWORK
   #ifndef MAIN_WITHOUT_MSG_HANDLING
     rcall mainHandleMessages
@@ -91,6 +115,16 @@ onSystemTimerTick:
   bigcall LedSimple_Every100ms
 #endif
 
+#ifdef MODULES_LED_SIGNAL
+  bigcall LedSignal_Every100ms
+#endif
+
+
+#ifdef MODULES_LED_ACTIVITY
+  bigcall LedActivity_Every100ms
+#endif
+
+
 #ifdef MODULES_UART_BITBANG
   bigcall UART_BitBang_Every100ms
 #endif
@@ -103,6 +137,14 @@ onSystemTimerTick:
   bigcall TtyOnUart1_Periodically
 #endif
 
+#ifdef MODULES_UARTFD0
+  bigcall UARTFD0_Every100ms
+#endif
+
+#ifdef MODULES_UARTFD1
+  bigcall UARTFD1_Every100ms
+#endif
+
 #ifdef MODULES_COMONUART0
   bigcall ComOnUart0_Periodically
 #endif
@@ -111,6 +153,24 @@ onSystemTimerTick:
   bigcall ComOnUart1_Periodically
 #endif
 
+#ifdef MODULES_COM2W
+  bigcall COM2W_Every100ms
+#endif
+
+
+#ifdef MODULES_COM2W0
+  bigcall COM2W0_Periodically
+#endif
+
+#ifdef MODULES_COM2W1
+  bigcall COM2W1_Periodically
+#endif
+
+#ifdef MODULES_COM2WN
+  bigcall COM2WN_Periodically
+#endif
+
+
 #ifdef MODULES_TCRT1000
   bigcall TCRT1K_Every100ms
 #endif
@@ -186,6 +246,14 @@ sysOnEveryDay:
   bigcall AppNetwork_EveryDay
 #endif
 
+#ifdef APPS_ROUTER
+  bigcall AppRouter_EveryDay
+#endif
+
+#ifdef APPS_FORWARDER
+  bigcall AppForwarder_EveryDay
+#endif
+
   bigjmp onEveryDay
 ; @end
 

avr/devices/all/modules.asm

@@ -51,7 +51,19 @@ initModules:
 #ifdef MODULES_LED_SIMPLE
   bigcall LedSimple_Init
 #endif
-  
+
+
+#ifdef MODULES_LED_SIGNAL
+  bigcall LedSignal_Init
+#endif
+
+
+
+#ifdef MODULES_LED_ACTIVITY
+  bigcall LedActivity_Init
+#endif
+
+
 #ifdef MODULES_COM
   bigcall Com2_Init   ; init COM module
   bigcall CPRO_Init   ; init COM protocol module
@@ -73,6 +85,14 @@ initModules:
   bigcall TtyOnUart1_Init
 #endif
 
+#ifdef MODULES_UARTFD0
+  bigcall UARTFD0_Init
+#endif
+
+#ifdef MODULES_UARTFD1
+  bigcall UARTFD1_Init
+#endif
+
 #ifdef MODULES_COMONUART0
   bigcall ComOnUart0_Init
 #endif
@@ -81,6 +101,27 @@ initModules:
   bigcall ComOnUart1_Init
 #endif
 
+#ifdef MODULES_COM2W
+  bigcall COM2W_Init
+#endif
+
+#ifdef MODULES_COM2W0
+  bigcall COM2W0_Init
+#endif
+
+#ifdef MODULES_COM2W1
+  bigcall COM2W1_Init
+#endif
+
+#ifdef MODULES_COM2WN
+  bigcall COM2WN_Init
+#endif
+
+#ifdef MODULES_COM2WI
+  bigcall COM2WI_Init
+#endif
+
+
 #ifdef MODULES_MOTION
   bigcall Motion_Init
 #endif
@@ -168,66 +209,99 @@ initModules:
 ;
 ; Call run functions of the used modules. Add your routine calls here.
 ;
-; IN:
-; - nothing
-; OUT:
-; - nothing
-; USED: depending on called routines
+; @return CFLAG set: at least one RUN routine returned CFLAG set
+; @clobbers all
 
 runModules:
-  bigcall BaseTimer_Run
+  clr r16
   
-#ifdef MODULES_COM
-; COM module (call until carry flag cleared but at most 10 times to not starve other modules)
-  ldi r16, 10
-runModules_Com:
-    push r16
-      bigcall Com2_Run
-    pop r16
-    brcc runModules_ComEnd
-    dec r16
-  brne runModules_Com
-runModules_ComEnd:  
+  push r16
+    bigcall BaseTimer_Run
+  pop r16
+  sbci r16, 0
+  
+#ifdef MODULES_TTYONUART1
+  push r16
+    bigcall TtyOnUart1_Run
+  pop r16
 #endif
 
-#ifdef MODULES_TTYONUART1
-  bigcall TtyOnUart1_Run
+
+#ifdef MODULES_UARTFD0
+  push r16
+    bigcall UARTFD0_Run
+  pop r16
+  sbci r16, 0
+#endif
+
+#ifdef MODULES_UARTFD1
+  push r16
+    bigcall UARTFD1_Run
+  pop r16
+  sbci r16, 0
 #endif
 
 #ifdef MODULES_COMONUART0
-  bigcall ComOnUart0_Run
+  push r16
+    bigcall ComOnUart0_Run
+  pop r16
+  sbci r16, 0
 #endif
 
 #ifdef MODULES_COMONUART1
-  bigcall ComOnUart1_Run
-#endif
-
-#ifdef MODULES_STATS
-  bigcall Stats_Run
-#endif
-
-#ifdef MODULES_REED
-  bigcall REED_Run
-#endif
-
-#ifdef MODULES_CNY70
-  bigcall CNY70_Run
-#endif
-
-#ifdef MODULES_MOTION_LIGHT
-;  rcall MotionLight_Run
+  push r16
+    bigcall ComOnUart1_Run
+  pop r16
+  sbci r16, 0
 #endif
 
 
-#ifdef MODULES_TCRT1000
-;  rcall TCRT1K_Run
+#ifdef MODULES_COM2W
+  push r16
+    bigcall COM2W_Run
+  pop r16
+  sbci r16, 0
 #endif
 
 
+#ifdef MODULES_COM2W0
+  push r16
+    bigcall COM2W0_Run
+  pop r16
+  sbci r16, 0
+#endif
+
+#ifdef MODULES_COM2W1
+  push r16
+    bigcall COM2W1_Run
+  pop r16
+  sbci r16, 0
+#endif
+
+#ifdef MODULES_COM2WN
+  push r16
+    bigcall COM2WN_Run
+  pop r16
+  sbci r16, 0
+#endif
+
+#ifdef MODULES_COM2WI
+  push r16
+    bigcall COM2WI_Run
+  pop r16
+  sbci r16, 0
+#endif
+
   ; add more modules here
+
+  ; check for repeat request
+  tst r16
+  clc
+  breq runModules_end
+  sec
+runModules_end:
   ret
-
-
+; @end
 
 
 mainModulesOnPacketReceived:

avr/devices/all/sendvalue.asm

@@ -23,6 +23,7 @@
 ; @param  R19:R18 value
 ; @param  R21:R20 denom (e.g. 100, meaning value must be divided by 100)
 ; @param  R22     value type
+; @return CFLAG on success, cleared on error
 
 Main_SendValueReport:
   push r17
@@ -52,6 +53,7 @@ Main_SendValueReport_end:
 ; @param  R21:R20 denom (e.g. 100, meaning value must be divided by 100)
 ; @param  R23     command
 ; @param  R25:R24 ref msg id
+; @return CFLAG on success, cleared on error
 
 Main_SendValueResponse:
   push r17

avr/devices/c01/aqua_c01.xml

@@ -7,18 +7,6 @@
   <values>
     <value name="LEDTIMING"    id="0x88" type="actor"  dataType="uint16" />
 
-    <value name="stats_packets_in"       id="0xe0" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_packets_out"      id="0xe1" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_content_errors"   id="0xe2" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_io_errors"        id="0xe3" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_nobuf_errors"     id="0xe4" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_collision_errors" id="0xe5" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_busy_errors"      id="0xe6" type="sensor" dataType="uint16" denom="1" />
-
-    <value name="stats_heap_used"        id="0xe7" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_heap_free"        id="0xe8" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_noram_errors"     id="0xe9" type="sensor" dataType="uint16" denom="1" />
-
   </values>
 
 </device>

avr/devices/c01/main/main.asm

@@ -34,7 +34,8 @@
 ; generic
 
 .equ NET_BUFFERS_NUM              = 8
-.equ NET_BUFFERS_SIZE             = 32
+.equ NET_MSGNUMINBUF_SIZE         =  8 ; max buffer nums in ringbuffer (global incoming)
+.equ NET_IFACE_OUTMSGBUF_SIZE     =  8 ; max buffer nums in ringbuffer (per interface outbound)
 
 
 
@@ -60,9 +61,9 @@
 ;#define MODULES_UART_HW
 #define MODULES_UART_BITBANG
 #define MODULES_SPI_HW
-#define MODULES_ILI9341
+;#define MODULES_ILI9341
 ;#define MODULES_FONT_8X8
-#define MODULES_FONT_6X8
+;#define MODULES_FONT_6X8
 ;#define MODULES_UART_BITBANG
 ;#define MODULES_TWI_MASTER
 ;#define MODULES_LCD

avr/devices/c02/aqua_c02.xml

@@ -7,18 +7,6 @@
   <values>
     <value name="LEDTIMING"    id="0x88" type="actor"  dataType="uint16" />
 
-    <value name="stats_packets_in"       id="0xe0" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_packets_out"      id="0xe1" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_content_errors"   id="0xe2" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_io_errors"        id="0xe3" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_nobuf_errors"     id="0xe4" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_collision_errors" id="0xe5" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_busy_errors"      id="0xe6" type="sensor" dataType="uint16" denom="1" />
-
-    <value name="stats_heap_used"        id="0xe7" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_heap_free"        id="0xe8" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_noram_errors"     id="0xe9" type="sensor" dataType="uint16" denom="1" />
-
   </values>
 
 </device>

avr/devices/c02/main/main.asm

@@ -36,7 +36,8 @@
 .equ STACK_SIZE                   = 256
 
 .equ NET_BUFFERS_NUM              = 8
-.equ NET_BUFFERS_SIZE             = 32
+.equ NET_MSGNUMINBUF_SIZE         =  8 ; max buffer nums in ringbuffer (global incoming)
+.equ NET_IFACE_OUTMSGBUF_SIZE     =  8 ; max buffer nums in ringbuffer (per interface outbound)
 
 
 

avr/devices/n00/0BUILD

@@ -1,52 +0,0 @@
-<?xml?>
-
-<gwbuild>
-
-  <target type="AvrHexFile" name="n00_firmware" >
-
-    <includes type="avrasm" >
-      -I $(builddir)
-      -I $(srcdir)
-      -I $(topsrcdir)/avr
-      -I $(topbuilddir)/avr
-    </includes>
-
-
-    <sources type="avrasm" >
-      n00_main.asm
-    </sources>
-
-
-  </target>
-
-
-
-  <target type="AvrHexFile" name="n00_boot" >
-
-    <includes type="avrasm" >
-      -I $(builddir)
-      -I $(srcdir)
-      -I $(topsrcdir)/avr
-      -I $(topbuilddir)/avr
-    </includes>
-
-
-    <sources type="avrasm" >
-      n00_boot.asm
-    </sources>
-
-
-  </target>
-
-
-  <subdirs>
-  </subdirs>
-
-  <extradist>
-    n00_defs.asm
-  </extradist>
-  
-
-</gwbuild>
-
-

avr/devices/n00/n00_boot.asm

@@ -1,143 +0,0 @@
-; ***************************************************************************
-; Source file for base system node on AtTiny 84
-;
-; This is for the maintenance system (i.e. the flash loader).
-;
-; All definitions and changes should go into this file.
-; ***************************************************************************
-
-.equ clock=1000000 ; Define the clock frequency
-
-.nolist
-.include "include/tn84def.inc" ; Define device ATtiny84
-.list
-
-.include "./n00_defs.asm"
-.include "defs_all.asm"
-
-
-
-; ***************************************************************************
-; defines
-
-; ---------------------------------------------------------------------------
-; generic
-
-.include "common/utils_wait.asm"
-.include "modules/com2/defs.asm"
-.include "modules/comproto/defs.asm"
-
-
-
-; ---------------------------------------------------------------------------
-; firmware settings
-
-.equ FIRMWARE_VERSION_MAJOR       = 0
-.equ FIRMWARE_VERSION_MINOR       = 0
-.equ FIRMWARE_VERSION_PATCHLEVEL  = 1
-
-
-
-; ---------------------------------------------------------------------------
-; LED
-
-.equ LED_DDR             = DDRA
-.equ LED_PORT            = PORTA
-.equ LED_PIN             = PINA
-.equ LED_PINNUM          = PORTA3
-
-
-; ***************************************************************************
-; code segment
-
-.cseg
-.org 0x0000
-
-
-
-; ---------------------------------------------------------------------------
-; Reset and interrupt vectors
-;  rjmp start ; Reset vector
-  rjmp main ; Reset vector
-  reti ; EXT_INT0
-  reti ; PCI0
-  reti ; PCI1
-  reti ; WATCHDOG
-  reti ; ICP1
-  reti ; OC1A
-  reti ; OC1B
-  reti ; OVF1
-  reti ; OC0A
-  reti ; OC0B
-  reti ; OVF0
-  reti ; ACI
-  reti ; ADCC
-  reti ; ERDY
-  reti ; USI_STR
-  reti ; USI_OVF
-
-
-devInfoBlock:        ; 12 bytes
-devInfoManufacturer: .db 'A', 'Q', 'U', 'A'
-devInfoId:           .db 'N', 0
-devInfoVersion:      .db 0, 1                 ; version, revision
-firmwareVersion:     .db FIRMWARE_VARIANT_BOOT, FIRMWARE_VERSION_MAJOR
-                     .db FIRMWARE_VERSION_MINOR, FIRMWARE_VERSION_PATCHLEVEL
-
-firmwareStart:   rjmp main ; will be overwritten when flashing
-
-
-
-; ***************************************************************************
-; main code
-
-
-.org BOOTLOADER_ADDR
-
-
-main:
-  rjmp bootLoader ; this routine is in modules/flash/proto.asm
-
-
-
-
-; ***************************************************************************
-; includes
-
-.include "common/utils_wait_fixed.asm"
-.include "common/utils_copy_from_flash.asm"
-.include "common/utils_copy_sdram.asm"
-
-.include "modules/flash/defs.asm"
-.include "modules/flash/eeprom.asm"
-.include "modules/flash/io.asm"
-.include "modules/flash/io_attn.asm"
-.include "modules/flash/io_bitbang.asm"
-.include "modules/flash/flash1p.asm"
-.include "modules/flash/flashprocess.asm"
-.include "modules/flash/wait.asm"
-.include "modules/bootloader/main.asm"
-.include "modules/network/msg/defs.asm"
-.include "modules/network/msg/crc.asm"
-
-
-
-systemSetSpeed:
-.if clock == 8000000
-  ldi r16, (1<<CLKPCE)
-  ldi r17, 0
-  out CLKPR, r16
-  out CLKPR, r17
-.endif
-
-.if clock == 1000000
-  ldi r16, (1<<CLKPCE)
-  ldi r17, (1<<CLKPS1) | (1<<CLKPS0)
-  out CLKPR, r16
-  out CLKPR, r17
-.endif
-  ret
-
-
-
-

avr/devices/n00/n00_defs.asm

@@ -1,135 +0,0 @@
-; ***************************************************************************
-; copyright   : (C) 2023 by Martin Preuss
-; email       : martin@libchipcard.de
-;
-; ***************************************************************************
-; * This file is part of the project "AqHome".                              *
-; * Please see toplevel file COPYING of that project for license details.   *
-; ***************************************************************************
-
-
-; ***************************************************************************
-;
-;                                 AtTiny84
-;                                 --------
-;                            VCC  1     14  GND
-;                            PB0  2     13  PA0
-;                  CNY70-K   PB1  3     12  PA1  COM-DATA
-;                  /RESET    PB3  4     11  PA2
-;                  AUX       PB2  5     10  PA3  LED
-;                  COM_ATTN  PA7  6      9  PA4  TWI-SCL
-;                  TWI-SDA   PA6  7      8  PA5  CNY70-C
-;                                 --------
-;
-; ***************************************************************************
-
-
-
-.equ BOOTLOADER_ADDR = 0xd00
-
-.equ FIRMWARE_VARIANT_BOOT        = 0
-.equ FIRMWARE_VARIANT_TEMP_WINDOW = 1
-
-
-
-
-; ---------------------------------------------------------------------------
-; LED module
-
-.equ LED_SIMPLE_ONTIME  = 2
-.equ LED_SIMPLE_OFFTIME = 30
-.equ LED_SIMPLE_DDR     = DDRA
-.equ LED_SIMPLE_PORT    = PORTA
-.equ LED_SIMPLE_PINNUM  = PORTA3
-
-
-
-; ---------------------------------------------------------------------------
-; COM module
-
-.equ COM_BIT_LENGTH      = 52000 ; 104000ns=9600, 52000ns=19200, 26000ns=38400
-.equ COM_HALFBIT_LENGTH  = 26000 ; see https://de.wikipedia.org/wiki/Universal_Asynchronous_Receiver_Transmitter
-
-.equ COM_DATA_DDR       = DDRA
-.equ COM_DATA_INPUT     = PINA
-.equ COM_DATA_OUTPUT    = PORTA
-.equ COM_DATA_PIN       = PORTA1
-
-.equ COM_ATTN_DDR       = DDRA
-.equ COM_ATTN_INPUT     = PINA
-.equ COM_ATTN_OUTPUT    = PORTA
-.equ COM_ATTN_PIN       = PORTA7
-
-.equ COM_IRQ_ADDR_ATTN   = PCMSK0
-.equ COM_IRQ_BIT_ATTN    = 7              ; bit 7 in PCMSK0
-.equ COM_IRQ_GIFR_ATTN   = PCIF0
-.equ COM_IRQ_GIMSK_ATTN  = PCIE0
-
-
-
-; ---------------------------------------------------------------------------
-; TWI master module
-
-;.equ TWI_BIT_LENGTH = 10000 ; 100000 and 200000 works for display: 10000, 100000, 200000
-.equ TWI_BIT_LENGTH = 1 ; 10, 100, 500, 100000 and 200000 works for display: 10000, 100000, 200000
-
-.equ TWI_DDR_SCL          = DDRA
-.equ TWI_PORT_SCL         = PORTA
-.equ TWI_PIN_SCL          = PINA
-.equ TWI_PINNUM_SCL       = PORTA4
-
-.equ TWI_DDR_SDA          = DDRA
-.equ TWI_PORT_SDA         = PORTA
-.equ TWI_PIN_SDA          = PINA
-.equ TWI_PINNUM_SDA       = PORTA6
-
-
-
-; ---------------------------------------------------------------------------
-; LCD module
-
-.equ LCD_TWI_ADDRESS      = 0x3c
-
-
-
-; ---------------------------------------------------------------------------
-; BMP 280
-
-.equ BMP280_ADDR          = 0x76
-
-
-
-; ---------------------------------------------------------------------------
-; SI 7021
-
-.equ SI7021_ADDR          = 0x40
-
-
-
-; ---------------------------------------------------------------------------
-; ADC/CNY70
-
-
-.equ CNY70_PORT_LED       = PORTB
-.equ CNY70_DDR_LED        = DDRB
-.equ CNY70_PINNUM_LED     = PORTB1
-
-.equ CNY70_PORT_ADC       = PORTA ; adc5
-.equ CNY70_DDR_ADC        = DDRA
-.equ CNY70_PINNUM_ADC     = PORTA5
-.equ CNY70_MUX_ADC        = MUX5
-
-
-
-; ---------------------------------------------------------------------------
-; 1-Wire Master
-;
-
-.equ OWI_DDR     = DDRB
-.equ OWI_PORTOUT = PORTB
-.equ OWI_PORTIN  = PINB
-.equ OWI_PINNUM  = PORTB2
-
-
-
-

avr/devices/n00/n00_main.asm

@@ -1,363 +0,0 @@
-; ***************************************************************************
-; copyright   : (C) 2024 by Martin Preuss
-; email       : martin@libchipcard.de
-;
-; ***************************************************************************
-; * This file is part of the project "AqHome".                              *
-; * Please see toplevel file COPYING of that project for license details.   *
-; ***************************************************************************
-
-
-
-
-; ***************************************************************************
-; Source file for temperature sensor node on AtTiny 84
-;
-; This is for the full system (i.e. not the boot loader).
-;
-; All definitions and changes should go into this file.
-;
-;
-; ***************************************************************************
-
-
-.equ clock=1000000 ; Define the clock frequency
-
-
-
-.nolist
-.include "include/tn84def.inc" ; Define device ATtiny84
-.list
-
-.include "./n00_defs.asm"
-.include "defs_all.asm"
-
-
-
-; ***************************************************************************
-; defines
-
-; ---------------------------------------------------------------------------
-; generic
-
-
-.include "common/utils_wait.asm"
-
-
-; ---------------------------------------------------------------------------
-; firmware settings including list of modules used
-
-.equ FIRMWARE_VERSION_MAJOR       = 0
-.equ FIRMWARE_VERSION_MINOR       = 0
-.equ FIRMWARE_VERSION_PATCHLEVEL  = 1
-
-
-#define MODULES_TIMER
-#define MODULES_COM
-#define MODULES_COM_WITH_ADDR_PROTO
-;#define MODULES_LED
-#define MODULES_LED_SIMPLE
-;#define MODULES_TWI_MASTER
-;#define MODULES_LCD
-#define LCD_MINIMAL_FONT
-;#define MODULES_SI7021
-#define MODULES_STATS
-;#define MODULES_CNY70
-;#define MODULES_REED
-
-
-
-; ---------------------------------------------------------------------------
-; defines for values
-
-.equ VALUE_ID_SI7021_TEMP = 0x01
-.equ VALUE_ID_SI7021_HUM  = 0x02
-
-.equ VALUE_ID_ADC         = 0x03
-.equ VALUE_ID_REED1       = 0x04
-.equ VALUE_ID_REED2       = 0x05
-
-
-
-; ***************************************************************************
-; code segment
-
-.cseg
-.org 000000
-
-
-
-; ---------------------------------------------------------------------------
-; Reset and interrupt vectors (will be removed as soon as we can flash data over COM)
-
-;	rjmp main ; Reset vector
-        rjmp BOOTLOADER_ADDR ; Reset vector  ; use this for flashed system
-	reti ; EXT_INT0
-	rjmp uartBitbangIsrPcint0 ; PCI0
-	reti ; PCI1
-	reti ; WATCHDOG
-	reti ; ICP1
-	reti ; OC1A
-	reti ; OC1B
-	reti ; OVF1
-        rjmp baseTimerIrqOC0A ; OC0A
-	reti ; OC0B
-	reti ; OVF0
-	reti ; ACI
-        reti ; ADCC
-	reti ; ERDY
-	reti ; USI_STR
-	reti ; USI_OVF
-
-
-devInfoBlock:        ; 12 bytes
-devInfoManufacturer: .db 'A', 'Q', 'U', 'A'
-devInfoId:           .db 'N', 0
-devInfoVersion:      .db 0, 1                 ; version, revision
-firmwareVersion:     .db FIRMWARE_VARIANT_TEMP_WINDOW, FIRMWARE_VERSION_MAJOR
-                     .db FIRMWARE_VERSION_MINOR, FIRMWARE_VERSION_PATCHLEVEL
-
-firmwareStart:   rjmp main
-
-
-; ***************************************************************************
-; includes
-
-.include "common/utils.asm"
-.include "common/utils_wait_fixed.asm"
-.include "common/utils_copy_from_flash.asm"
-.include "common/utils_copy_sdram.asm"
-.include "common/crc8.asm"
-
-.include "modules/basetimer/main.asm"
-
-#ifdef MODULES_TIMER
-  .include "modules/timer/main.asm"
-#endif
-#ifdef MODULES_LED
-.include "modules/led/main.asm"
-#endif
-#ifdef MODULES_LED_SIMPLE
-.include "modules/led_simple/main.asm"
-#endif
-#ifdef MODULES_COM
-  .include "modules/com2/defs.asm"
-  .include "modules/com2/main.asm"
-  .include "modules/com2/buffer.asm"
-  .include "modules/uart_bitbang/defs.asm"
-  .include "modules/uart_bitbang/main.asm"
-  .include "modules/uart_bitbang/bytelevel.asm"
-  .include "modules/uart_bitbang/packetlevel.asm"
-  #ifdef MODULES_COM_WITH_ADDR_PROTO
-    .include "modules/comproto/defs.asm"
-    .include "modules/comproto/main.asm"
-    .include "modules/comproto/addr.asm"
-    .include "modules/comproto/msg_recvstats.asm"
-    .include "modules/comproto/msg_sendstats.asm"
-    .include "modules/comproto/msg_sysstats.asm"
-    .include "modules/comproto/msg_memstats.asm"
-    .include "modules/comproto/msg_pong.asm"
-    .include "modules/comproto/msg_value.asm"
-    .include "modules/comproto/msg_device.asm"
-    .include "modules/comproto/msg_reboot.asm"
-  #endif
-#endif
-#ifdef MODULES_TWI_MASTER
-  .include "modules/twimaster/main.asm"
-#endif
-#ifdef MODULES_LCD
-  .include "modules/lcd/main.asm"
-#endif
-#ifdef MODULES_SI7021
-  .include "modules/si7021/main.asm"
-#endif
-#ifdef MODULES_STATS
-  .include "modules/stats/main.asm"
-#endif
-#ifdef MODULES_CNY70
-  .include "modules/cny70/main.asm"
-#endif
-#ifdef MODULES_REED
-  .include "modules/reed/main.asm"
-#endif
-
-
-
-; ***************************************************************************
-; data in SRAM
-
-.dseg
-
-
-#ifdef MODULES_LCD
-  sramTimerWriteStats:       .byte 2
-#endif
-sramTimerEnqueueValues:      .byte 2
-#ifdef MODULES_SI7021
-  sramTimerSI7021Measure:      .byte 2
-  sramTimerSI7021SendTemp:     .byte 2
-  sramTimerSI7021SendHumidity: .byte 2
-#endif
-#ifdef MODULES_CNY70
-  sramTimerCny70SendAdc:       .byte 2
-#endif
-#ifdef MODULES_LCD
-  sramPeriodicalLcdMark:       .byte 2
-#endif
-
-
-; ***************************************************************************
-; data in FLASH
-
-.cseg
-
-ledA3Flash:    .db DDRA+0x20, PORTA+0x20, PINA+0x20, (1<<PORTA3)
-blinkPattern:  .db 2, 50, 0xff, 0xff   ; 1 short blink, 5s pause, restart
-;blinkPattern2: .db 2, 2, 0xff, 0xff   ; 1 short blink, short pause, restart
-
-
-
-
-; ---------------------------------------------------------------------------
-; timer list
-
-
-timerList:
-;     SRAM variable/counter        routine                     flags                secs (0=don't start or restart)
-#ifdef MODULES_COM_WITH_ADDR_PROTO
-  .dw cproAddresModeTimer,         CPRO_Address_OnTimer,       0,                   0     ; (no restart)
-#endif
-#ifdef MODULES_STATS
-  .dw statsSendTimer,              Stats_Timer,                TIMER_FLAGS_IF_ADDR, 3000   ; every 5m
-#endif
-#ifdef MODULES_LCD
-;  .dw sramPeriodicalLcdMark,       periodicalLcdMark,          0,                    20    ; every 2s
-  .dw sramTimerWriteStats,         writeStats,                 0,                   100
-#endif
-#ifdef MODULES_SI7021
-  .dw sramTimerSI7021Measure,      SI7021_PeriodicMeasurement, 0,                   300    ; every 30s
-  .dw sramTimerSI7021SendTemp,     sendTemp,                   TIMER_FLAGS_IF_ADDR, 600    ; every 60s
-  .dw sramTimerSI7021SendHumidity, sendHumidity,               TIMER_FLAGS_IF_ADDR, 600    ; every 60s
-#endif
-#ifdef MODULES_CNY70
-  .dw sramTimerCny70SendAdc,       CNY70_OnTimer,              TIMER_FLAGS_IF_ADDR, 50    ; every 5s
-#endif
-  .dw 0 ; end of list
-
-
-
-
-
-.include "main_all.asm"
-
-
-systemSetSpeed:
-.if clock == 8000000
-  ldi r16, (1<<CLKPCE)
-  ldi r17, 0
-  out CLKPR, r16
-  out CLKPR, r17
-.endif
-  ret
-
-
-systemSetBootSpeed:
-.if clock == 8000000
-  ldi r16, (1<<CLKPCE)
-  ldi r17, (1<<CLKPS1) | (1<<CLKPS0)
-  out CLKPR, r16
-  out CLKPR, r17
-.endif
-  ret
-
-
-; ---------------------------------------------------------------------------
-; Called on first time run, i.e. on system start. No arguments, no results.
-
-onSystemStart:
-  ret
-
-
-#ifdef MODULES_LCD
-periodicalLcdMark:
-  rcall printTimerMark
-  ret
-
-
-writeStats:
-  rcall printSendStats
-  ret
-#endif
-
-
-
-#ifdef MODULES_SI7021
-
-sendHumidity:
-  rcall SI7021_SendHumidity
-  brcs sendHumidity_okay
-  ; set timer to 1s to retry later
-  ldi xl, LOW(sramTimerSI7021SendHumidity)
-  ldi xh, HIGH(sramTimerSI7021SendHumidity)
-  rjmp Timer_SetValueTo1s
-sendHumidity_okay:
-  ret
-
-
-sendTemp:
-  rcall SI7021_SendTemp
-  brcs sendTemp_okay
-  ; set timer to 1s to retry later
-  ldi xl, LOW(sramTimerSI7021SendTemp)
-  ldi xh, HIGH(sramTimerSI7021SendTemp)
-  rjmp Timer_SetValueTo1s
-sendTemp_okay:
-  ret
-
-#endif
-
-
-
-; ---------------------------------------------------------------------------
-; Called every 100ms. Add your routine calls here. No arguments, no results.
-
-onEvery100ms:
-#ifdef MODULES_LED
-  ; ticker for LED module
-  ldi zl, LOW(ledA3Flash)
-  ldi zh, HIGH(ledA3Flash)
-  ldi yl, LOW(ledA3Sram)
-  ldi yh, HIGH(ledA3Sram)
-  rcall Led_Tick
-#endif
-
-#ifdef MODULES_LED_SIMPLE
-  rcall LedSimple_Every100ms
-#endif
-
-#ifdef MODULES_REED
-  rcall REED_Every100ms
-#endif
-
-  ret
-
-
-
-; ---------------------------------------------------------------------------
-; onPacketReceived:
-;
-; Called after a packet was received via COM module. Add your routine calls here.
-;
-; The packet will be released in any case after return from this call.
-; IN:
-; - X  : pointer to received buffer
-; OUT:
-; - CFLAG: set if handled, cleared otherwise
-; USED: depending on called routines
-
-onPacketReceived:
-  rcall CPRO_OnPacketReceived
-  ret
-
-
-

avr/devices/n06/0BUILD

@@ -1,52 +0,0 @@
-<?xml?>
-
-<gwbuild>
-
-  <target type="AvrHexFile" name="n06_main" >
-
-    <includes type="avrasm" >
-      -I $(builddir)
-      -I $(srcdir)
-      -I $(topsrcdir)/avr
-      -I $(topbuilddir)/avr
-    </includes>
-
-
-    <sources type="avrasm" >
-      n06_main.asm
-    </sources>
-
-
-  </target>
-
-
-
-  <target type="AvrHexFile" name="n06_boot" >
-
-    <includes type="avrasm" >
-      -I $(builddir)
-      -I $(srcdir)
-      -I $(topsrcdir)/avr
-      -I $(topbuilddir)/avr
-    </includes>
-
-
-    <sources type="avrasm" >
-      n06_boot.asm
-    </sources>
-
-
-  </target>
-
-
-  <subdirs>
-  </subdirs>
-
-  <extradist>
-    n06_defs.asm
-  </extradist>
-  
-
-</gwbuild>
-
-

avr/devices/n06/n06_boot.asm

@@ -1,142 +0,0 @@
-; ***************************************************************************
-; Source file for base system node on AtTiny 84
-;
-; This is for the maintenance system (i.e. the flash loader).
-;
-; All definitions and changes should go into this file.
-; ***************************************************************************
-
-.equ clock=1000000 ; Define the clock frequency
-
-.nolist
-.include "include/tn84def.inc" ; Define device ATtiny84
-.list
-
-.include "./n06_defs.asm"
-.include "defs_all.asm"
-
-
-
-; ***************************************************************************
-; defines
-
-; ---------------------------------------------------------------------------
-; generic
-
-.include "common/utils_wait.asm"
-.include "modules/com2/defs.asm"
-.include "modules/comproto/defs.asm"
-
-
-
-; ---------------------------------------------------------------------------
-; firmware settings
-
-.equ FIRMWARE_VERSION_MAJOR       = 0
-.equ FIRMWARE_VERSION_MINOR       = 0
-.equ FIRMWARE_VERSION_PATCHLEVEL  = 1
-
-
-
-; ---------------------------------------------------------------------------
-; LED
-
-.equ LED_DDR             = DDRA
-.equ LED_PORT            = PORTA
-.equ LED_PIN             = PINA
-.equ LED_PINNUM          = PORTA3
-
-
-; ***************************************************************************
-; code segment
-
-.cseg
-.org 0x0000
-
-
-
-; ---------------------------------------------------------------------------
-; Reset and interrupt vectors
-;  rjmp start ; Reset vector
-  rjmp main ; Reset vector
-  reti ; EXT_INT0
-  reti ; PCI0
-  reti ; PCI1
-  reti ; WATCHDOG
-  reti ; ICP1
-  reti ; OC1A
-  reti ; OC1B
-  reti ; OVF1
-  reti ; OC0A
-  reti ; OC0B
-  reti ; OVF0
-  reti ; ACI
-  reti ; ADCC
-  reti ; ERDY
-  reti ; USI_STR
-  reti ; USI_OVF
-
-
-devInfoBlock:        ; 12 bytes
-devInfoManufacturer: .db 'A', 'Q', 'U', 'A'
-devInfoId:           .db DEVICEINFO_ID, 0
-devInfoVersion:      .db DEVICEINFO_VERSION, DEVICEINFO_REVISION             ; version, revision
-firmwareVersion:     .db FIRMWARE_VARIANT_BOOT, FIRMWARE_VERSION_MAJOR
-                     .db FIRMWARE_VERSION_MINOR, FIRMWARE_VERSION_PATCHLEVEL
-
-firmwareStart:   rjmp main ; will be overwritten when flashing
-
-
-
-; ***************************************************************************
-; main code
-
-
-.org BOOTLOADER_ADDR
-
-
-main:
-  rjmp bootLoader ; this routine is in modules/flash/proto.asm
-
-
-
-
-; ***************************************************************************
-; includes
-
-.include "common/utils_wait_fixed.asm"
-.include "common/utils_copy_from_flash.asm"
-.include "common/utils_copy_sdram.asm"
-
-.include "modules/flash/defs.asm"
-.include "modules/flash/eeprom.asm"
-.include "modules/flash/io.asm"
-.include "modules/flash/io_attn.asm"
-.include "modules/flash/io_bitbang.asm"
-.include "modules/flash/flash1p.asm"
-.include "modules/flash/flashprocess.asm"
-.include "modules/flash/wait.asm"
-.include "modules/bootloader/main.asm"
-.include "modules/network/msg/defs.asm"
-.include "modules/network/msg/crc.asm"
-
-
-
-systemSetSpeed:
-.if clock == 8000000
-  ldi r16, (1<<CLKPCE)
-  ldi r17, 0
-  out CLKPR, r16
-  out CLKPR, r17
-.endif
-
-.if clock == 1000000
-  ldi r16, (1<<CLKPCE)
-  ldi r17, (1<<CLKPS1) | (1<<CLKPS0)
-  out CLKPR, r16
-  out CLKPR, r17
-.endif
-  ret
-
-
-

avr/devices/n06/n06_defs.asm

@@ -1,139 +0,0 @@
-; ***************************************************************************
-; copyright   : (C) 2023 by Martin Preuss
-; email       : martin@libchipcard.de
-;
-; ***************************************************************************
-; * This file is part of the project "AqHome".                              *
-; * Please see toplevel file COPYING of that project for license details.   *
-; ***************************************************************************
-
-
-; ***************************************************************************
-;
-;                                 AtTiny84
-;                                 --------
-;                            VCC  1     14  GND
-;                            PB0  2     13  PA0
-;                  CNY70-K   PB1  3     12  PA1  COM-DATA
-;                  /RESET    PB3  4     11  PA2
-;                  AUX       PB2  5     10  PA3  LED
-;                  COM_ATTN  PA7  6      9  PA4  TWI-SCL
-;                  TWI-SDA   PA6  7      8  PA5  CNY70-C
-;                                 --------
-;
-; ***************************************************************************
-
-
-
-.equ BOOTLOADER_ADDR = 0xd00
-
-.equ FIRMWARE_VARIANT_BOOT        = 0
-.equ FIRMWARE_VARIANT_TEMP_WINDOW = 1
-
-.equ DEVICEINFO_ID       = 'N'
-.equ DEVICEINFO_VERSION  = 6
-.equ DEVICEINFO_REVISION = 4
-
-
-
-
-; ---------------------------------------------------------------------------
-; LED module
-
-.equ LED_SIMPLE_ONTIME  = 2
-.equ LED_SIMPLE_OFFTIME = 30
-.equ LED_SIMPLE_DDR     = DDRA
-.equ LED_SIMPLE_PORT    = PORTA
-.equ LED_SIMPLE_PINNUM  = PORTA3
-
-
-
-; ---------------------------------------------------------------------------
-; COM module
-
-.equ COM_BIT_LENGTH      = 52000 ; 104000ns=9600, 52000ns=19200, 26000ns=38400
-.equ COM_HALFBIT_LENGTH  = 26000 ; see https://de.wikipedia.org/wiki/Universal_Asynchronous_Receiver_Transmitter
-
-.equ COM_DATA_DDR       = DDRA
-.equ COM_DATA_OUTPUT    = PORTA
-.equ COM_DATA_INPUT     = PINA
-.equ COM_DATA_PIN       = PORTA1
-
-.equ COM_ATTN_DDR       = DDRA
-.equ COM_ATTN_INPUT     = PINA
-.equ COM_ATTN_OUTPUT    = PORTA
-.equ COM_ATTN_PIN       = PORTA7
-
-.equ COM_IRQ_ADDR_ATTN   = PCMSK0
-.equ COM_IRQ_BIT_ATTN    = PCINT7              ; bit 7 in PCMSK0
-.equ COM_IRQ_GIFR_ATTN   = PCIF0
-.equ COM_IRQ_GIMSK_ATTN  = PCIE0
-
-
-
-; ---------------------------------------------------------------------------
-; TWI master module
-
-;.equ TWI_BIT_LENGTH = 10000 ; 100000 and 200000 works for display: 10000, 100000, 200000
-.equ TWI_BIT_LENGTH = 1 ; 10, 100, 500, 100000 and 200000 works for display: 10000, 100000, 200000
-
-.equ TWI_DDR_SCL          = DDRA
-.equ TWI_PORT_SCL         = PORTA
-.equ TWI_PIN_SCL          = PINA
-.equ TWI_PINNUM_SCL       = PORTA4
-
-.equ TWI_DDR_SDA          = DDRA
-.equ TWI_PORT_SDA         = PORTA
-.equ TWI_PIN_SDA          = PINA
-.equ TWI_PINNUM_SDA       = PORTA6
-
-
-
-; ---------------------------------------------------------------------------
-; LCD module
-
-.equ LCD_TWI_ADDRESS      = 0x3c
-
-
-
-; ---------------------------------------------------------------------------
-; BMP 280
-
-.equ BMP280_ADDR          = 0x76
-
-
-
-; ---------------------------------------------------------------------------
-; SI 7021
-
-.equ SI7021_ADDR          = 0x40
-
-
-
-; ---------------------------------------------------------------------------
-; ADC/CNY70
-
-
-.equ CNY70_PORT_LED       = PORTB
-.equ CNY70_DDR_LED        = DDRB
-.equ CNY70_PINNUM_LED     = PORTB1
-
-.equ CNY70_PORT_ADC       = PORTA ; adc5
-.equ CNY70_DDR_ADC        = DDRA
-.equ CNY70_PINNUM_ADC     = PORTA5
-.equ CNY70_MUX_ADC        = MUX5
-
-
-
-; ---------------------------------------------------------------------------
-; 1-Wire Master
-;
-
-.equ OWI_DDR     = DDRB
-.equ OWI_PORTOUT = PORTB
-.equ OWI_PORTIN  = PINB
-.equ OWI_PINNUM  = PORTB2
-
-
-
-

avr/devices/n06/n06_main.asm

@@ -1,363 +0,0 @@
-; ***************************************************************************
-; copyright   : (C) 2024 by Martin Preuss
-; email       : martin@libchipcard.de
-;
-; ***************************************************************************
-; * This file is part of the project "AqHome".                              *
-; * Please see toplevel file COPYING of that project for license details.   *
-; ***************************************************************************
-
-
-
-
-; ***************************************************************************
-; Source file for temperature sensor node on AtTiny 84
-;
-; This is for the full system (i.e. not the boot loader).
-;
-; All definitions and changes should go into this file.
-;
-;
-; ***************************************************************************
-
-
-.equ clock=1000000 ; Define the clock frequency
-
-
-
-.nolist
-.include "include/tn84def.inc" ; Define device ATtiny84
-.list
-
-.include "n06_defs.asm"
-.include "defs_all.asm"
-
-
-
-; ***************************************************************************
-; defines
-
-; ---------------------------------------------------------------------------
-; generic
-
-
-.include "common/utils_wait.asm"
-
-
-; ---------------------------------------------------------------------------
-; firmware settings including list of modules used
-
-.equ FIRMWARE_VERSION_MAJOR       = 0
-.equ FIRMWARE_VERSION_MINOR       = 0
-.equ FIRMWARE_VERSION_PATCHLEVEL  = 1
-
-
-#define MODULES_TIMER
-#define MODULES_COM
-#define MODULES_COM_WITH_ADDR_PROTO
-;#define MODULES_LED
-#define MODULES_LED_SIMPLE
-#define MODULES_TWI_MASTER
-;#define MODULES_LCD
-#define LCD_MINIMAL_FONT
-#define MODULES_SI7021
-#define MODULES_STATS
-;#define MODULES_CNY70
-;#define MODULES_REED
-
-
-
-; ---------------------------------------------------------------------------
-; defines for values
-
-.equ VALUE_ID_SI7021_TEMP = 0x01
-.equ VALUE_ID_SI7021_HUM  = 0x02
-
-.equ VALUE_ID_ADC         = 0x03
-.equ VALUE_ID_REED1       = 0x04
-.equ VALUE_ID_REED2       = 0x05
-
-
-
-; ***************************************************************************
-; code segment
-
-.cseg
-.org 000000
-
-
-
-; ---------------------------------------------------------------------------
-; Reset and interrupt vectors (will be removed as soon as we can flash data over COM)
-
-;	rjmp main ; Reset vector
-        rjmp BOOTLOADER_ADDR ; Reset vector  ; use this for flashed system
-	reti ; EXT_INT0
-	rjmp uartBitbangIsrPcint0 ; PCI0
-	reti ; PCI1
-	reti ; WATCHDOG
-	reti ; ICP1
-	reti ; OC1A
-	reti ; OC1B
-	reti ; OVF1
-        rjmp baseTimerIrqOC0A ; OC0A
-	reti ; OC0B
-	reti ; OVF0
-	reti ; ACI
-        reti ; ADCC
-	reti ; ERDY
-	reti ; USI_STR
-	reti ; USI_OVF
-
-
-devInfoBlock:        ; 12 bytes
-devInfoManufacturer: .db 'A', 'Q', 'U', 'A'
-devInfoId:           .db DEVICEINFO_ID, 0
-devInfoVersion:      .db DEVICEINFO_VERSION, DEVICEINFO_REVISION             ; version, revision
-firmwareVersion:     .db FIRMWARE_VARIANT_TEMP_WINDOW, FIRMWARE_VERSION_MAJOR
-                     .db FIRMWARE_VERSION_MINOR, FIRMWARE_VERSION_PATCHLEVEL
-
-firmwareStart:   rjmp main
-
-
-; ***************************************************************************
-; includes
-
-.include "common/utils.asm"
-.include "common/utils_wait_fixed.asm"
-.include "common/utils_copy_from_flash.asm"
-.include "common/utils_copy_sdram.asm"
-.include "common/crc8.asm"
-
-.include "modules/basetimer/main.asm"
-
-#ifdef MODULES_TIMER
-  .include "modules/timer/main.asm"
-#endif
-#ifdef MODULES_LED
-.include "modules/led/main.asm"
-#endif
-#ifdef MODULES_LED_SIMPLE
-.include "modules/led_simple/main.asm"
-#endif
-#ifdef MODULES_COM
-  .include "modules/com2/defs.asm"
-  .include "modules/com2/main.asm"
-  .include "modules/com2/buffer.asm"
-  .include "modules/uart_bitbang/defs.asm"
-  .include "modules/uart_bitbang/main.asm"
-  .include "modules/uart_bitbang/bytelevel.asm"
-  .include "modules/uart_bitbang/packetlevel.asm"
-  #ifdef MODULES_COM_WITH_ADDR_PROTO
-    .include "modules/comproto/defs.asm"
-    .include "modules/comproto/main.asm"
-    .include "modules/comproto/addr.asm"
-    .include "modules/comproto/msg_recvstats.asm"
-    .include "modules/comproto/msg_sendstats.asm"
-    .include "modules/comproto/msg_sysstats.asm"
-    .include "modules/comproto/msg_memstats.asm"
-    .include "modules/comproto/msg_pong.asm"
-    .include "modules/comproto/msg_value.asm"
-    .include "modules/comproto/msg_device.asm"
-    .include "modules/comproto/msg_reboot.asm"
-  #endif
-#endif
-#ifdef MODULES_TWI_MASTER
-  .include "modules/twimaster/main.asm"
-#endif
-#ifdef MODULES_LCD
-  .include "modules/lcd/main.asm"
-#endif
-#ifdef MODULES_SI7021
-  .include "modules/si7021/main.asm"
-#endif
-#ifdef MODULES_STATS
-  .include "modules/stats/main.asm"
-#endif
-#ifdef MODULES_CNY70
-  .include "modules/cny70/main.asm"
-#endif
-#ifdef MODULES_REED
-  .include "modules/reed/main.asm"
-#endif
-
-
-
-; ***************************************************************************
-; data in SRAM
-
-.dseg
-
-
-#ifdef MODULES_LCD
-  sramTimerWriteStats:       .byte 2
-#endif
-sramTimerEnqueueValues:      .byte 2
-#ifdef MODULES_SI7021
-  sramTimerSI7021Measure:      .byte 2
-  sramTimerSI7021SendTemp:     .byte 2
-  sramTimerSI7021SendHumidity: .byte 2
-#endif
-#ifdef MODULES_CNY70
-  sramTimerCny70SendAdc:       .byte 2
-#endif
-#ifdef MODULES_LCD
-  sramPeriodicalLcdMark:       .byte 2
-#endif
-
-
-; ***************************************************************************
-; data in FLASH
-
-.cseg
-
-ledA3Flash:    .db DDRA+0x20, PORTA+0x20, PINA+0x20, (1<<PORTA3)
-blinkPattern:  .db 2, 50, 0xff, 0xff   ; 1 short blink, 5s pause, restart
-;blinkPattern2: .db 2, 2, 0xff, 0xff   ; 1 short blink, short pause, restart
-
-
-
-
-; ---------------------------------------------------------------------------
-; timer list
-
-
-timerList:
-;     SRAM variable/counter        routine                     flags                secs (0=don't start or restart)
-#ifdef MODULES_COM_WITH_ADDR_PROTO
-  .dw cproAddresModeTimer,         CPRO_Address_OnTimer,       0,                   0     ; (no restart)
-#endif
-#ifdef MODULES_STATS
-  .dw statsSendTimer,              Stats_Timer,                TIMER_FLAGS_IF_ADDR, 3000   ; every 5m
-#endif
-#ifdef MODULES_LCD
-;  .dw sramPeriodicalLcdMark,       periodicalLcdMark,          0,                    20    ; every 2s
-  .dw sramTimerWriteStats,         writeStats,                 0,                   100
-#endif
-#ifdef MODULES_SI7021
-  .dw sramTimerSI7021Measure,      SI7021_OnTimer,             0,                   300    ; every 30s
-  .dw sramTimerSI7021SendTemp,     sendTemp,                   TIMER_FLAGS_IF_ADDR, 600    ; every 60s
-  .dw sramTimerSI7021SendHumidity, sendHumidity,               TIMER_FLAGS_IF_ADDR, 600    ; every 60s
-#endif
-#ifdef MODULES_CNY70
-  .dw sramTimerCny70SendAdc,       CNY70_OnTimer,              TIMER_FLAGS_IF_ADDR, 50    ; every 5s
-#endif
-  .dw 0 ; end of list
-
-
-
-
-
-.include "main_all.asm"
-
-
-systemSetSpeed:
-.if clock == 8000000
-  ldi r16, (1<<CLKPCE)
-  ldi r17, 0
-  out CLKPR, r16
-  out CLKPR, r17
-.endif
-  ret
-
-
-systemSetBootSpeed:
-.if clock == 8000000
-  ldi r16, (1<<CLKPCE)
-  ldi r17, (1<<CLKPS1) | (1<<CLKPS0)
-  out CLKPR, r16
-  out CLKPR, r17
-.endif
-  ret
-
-
-; ---------------------------------------------------------------------------
-; Called on first time run, i.e. on system start. No arguments, no results.
-
-onSystemStart:
-  ret
-
-
-#ifdef MODULES_LCD
-periodicalLcdMark:
-  rcall printTimerMark
-  ret
-
-
-writeStats:
-  rcall printSendStats
-  ret
-#endif
-
-
-
-#ifdef MODULES_SI7021
-
-sendHumidity:
-  rcall SI7021_SendHumidity
-  brcs sendHumidity_okay
-  ; set timer to 1s to retry later
-  ldi xl, LOW(sramTimerSI7021SendHumidity)
-  ldi xh, HIGH(sramTimerSI7021SendHumidity)
-  rjmp Timer_SetValueTo1s
-sendHumidity_okay:
-  ret
-
-
-sendTemp:
-  rcall SI7021_SendTemp
-  brcs sendTemp_okay
-  ; set timer to 1s to retry later
-  ldi xl, LOW(sramTimerSI7021SendTemp)
-  ldi xh, HIGH(sramTimerSI7021SendTemp)
-  rjmp Timer_SetValueTo1s
-sendTemp_okay:
-  ret
-
-#endif
-
-
-
-; ---------------------------------------------------------------------------
-; Called every 100ms. Add your routine calls here. No arguments, no results.
-
-onEvery100ms:
-#ifdef MODULES_LED
-  ; ticker for LED module
-  ldi zl, LOW(ledA3Flash)
-  ldi zh, HIGH(ledA3Flash)
-  ldi yl, LOW(ledA3Sram)
-  ldi yh, HIGH(ledA3Sram)
-  rcall Led_Tick
-#endif
-
-#ifdef MODULES_LED_SIMPLE
-  rcall LedSimple_Every100ms
-#endif
-
-#ifdef MODULES_REED
-  rcall REED_Every100ms
-#endif
-
-  ret
-
-
-
-; ---------------------------------------------------------------------------
-; onPacketReceived:
-;
-; Called after a packet was received via COM module. Add your routine calls here.
-;
-; The packet will be released in any case after return from this call.
-; IN:
-; - X  : pointer to received buffer
-; OUT:
-; - CFLAG: set if handled, cleared otherwise
-; USED: depending on called routines
-
-onPacketReceived:
-  rcall CPRO_OnPacketReceived
-  ret
-
-
-

avr/devices/n11/0BUILD

@@ -1,52 +0,0 @@
-<?xml?>
-
-<gwbuild>
-
-  <target type="AvrHexFile" name="n11_main" >
-
-    <includes type="avrasm" >
-      -I $(builddir)
-      -I $(srcdir)
-      -I $(topsrcdir)/avr
-      -I $(topbuilddir)/avr
-    </includes>
-
-
-    <sources type="avrasm" >
-      n11_main.asm
-    </sources>
-
-
-  </target>
-
-
-
-  <target type="AvrHexFile" name="n11_boot" >
-
-    <includes type="avrasm" >
-      -I $(builddir)
-      -I $(srcdir)
-      -I $(topsrcdir)/avr
-      -I $(topbuilddir)/avr
-    </includes>
-
-
-    <sources type="avrasm" >
-      n11_boot.asm
-    </sources>
-
-
-  </target>
-
-
-  <subdirs>
-  </subdirs>
-
-  <extradist>
-    n11_defs.asm
-  </extradist>
-  
-
-</gwbuild>
-
-

avr/devices/n11/n11_boot.asm

@@ -1,142 +0,0 @@
-; ***************************************************************************
-; Source file for base system node on AtTiny 84
-;
-; This is for the maintenance system (i.e. the flash loader).
-;
-; All definitions and changes should go into this file.
-; ***************************************************************************
-
-.equ clock=1000000 ; Define the clock frequency
-
-.nolist
-.include "include/tn84def.inc" ; Define device ATtiny84
-.list
-
-.include "n11_defs.asm"
-.include "defs_all.asm"
-
-
-
-; ***************************************************************************
-; defines
-
-; ---------------------------------------------------------------------------
-; generic
-
-.include "common/utils_wait.asm"
-.include "modules/com2/defs.asm"
-.include "modules/comproto/defs.asm"
-
-
-
-; ---------------------------------------------------------------------------
-; firmware settings
-
-.equ FIRMWARE_VERSION_MAJOR       = 0
-.equ FIRMWARE_VERSION_MINOR       = 0
-.equ FIRMWARE_VERSION_PATCHLEVEL  = 1
-
-
-
-; ---------------------------------------------------------------------------
-; LED
-
-.equ LED_DDR             = DDRA
-.equ LED_PORT            = PORTA
-.equ LED_PIN             = PINA
-.equ LED_PINNUM          = PORTA3
-
-
-; ***************************************************************************
-; code segment
-
-.cseg
-.org 0x0000
-
-
-
-; ---------------------------------------------------------------------------
-; Reset and interrupt vectors
-;  rjmp start ; Reset vector
-  rjmp main ; Reset vector
-  reti ; EXT_INT0
-  reti ; PCI0
-  reti ; PCI1
-  reti ; WATCHDOG
-  reti ; ICP1
-  reti ; OC1A
-  reti ; OC1B
-  reti ; OVF1
-  reti ; OC0A
-  reti ; OC0B
-  reti ; OVF0
-  reti ; ACI
-  reti ; ADCC
-  reti ; ERDY
-  reti ; USI_STR
-  reti ; USI_OVF
-
-
-devInfoBlock:        ; 12 bytes
-devInfoManufacturer: .db 'A', 'Q', 'U', 'A'
-devInfoId:           .db DEVICEINFO_ID, 0
-devInfoVersion:      .db DEVICEINFO_VERSION, DEVICEINFO_REVISION             ; version, revision
-firmwareVersion:     .db FIRMWARE_VARIANT_BOOT, FIRMWARE_VERSION_MAJOR
-                     .db FIRMWARE_VERSION_MINOR, FIRMWARE_VERSION_PATCHLEVEL
-
-firmwareStart:   rjmp main ; will be overwritten when flashing
-
-
-
-; ***************************************************************************
-; main code
-
-
-.org BOOTLOADER_ADDR
-
-
-main:
-  rjmp bootLoader ; this routine is in modules/flash/proto.asm
-
-
-
-
-; ***************************************************************************
-; includes
-
-.include "common/utils_wait_fixed.asm"
-.include "common/utils_copy_from_flash.asm"
-.include "common/utils_copy_sdram.asm"
-
-.include "modules/flash/defs.asm"
-.include "modules/flash/eeprom.asm"
-.include "modules/flash/io.asm"
-.include "modules/flash/io_attn.asm"
-.include "modules/flash/io_bitbang.asm"
-.include "modules/flash/flash1p.asm"
-.include "modules/flash/flashprocess.asm"
-.include "modules/flash/wait.asm"
-.include "modules/bootloader/main.asm"
-.include "modules/network/msg/defs.asm"
-.include "modules/network/msg/crc.asm"
-
-
-
-systemSetSpeed:
-.if clock == 8000000
-  ldi r16, (1<<CLKPCE)
-  ldi r17, 0
-  out CLKPR, r16
-  out CLKPR, r17
-.endif
-
-.if clock == 1000000
-  ldi r16, (1<<CLKPCE)
-  ldi r17, (1<<CLKPS1) | (1<<CLKPS0)
-  out CLKPR, r16
-  out CLKPR, r17
-.endif
-  ret
-
-
-

avr/devices/n11/n11_defs.asm

@@ -1,172 +0,0 @@
-; ***************************************************************************
-; copyright   : (C) 2023 by Martin Preuss
-; email       : martin@libchipcard.de
-;
-; ***************************************************************************
-; * This file is part of the project "AqHome".                              *
-; * Please see toplevel file COPYING of that project for license details.   *
-; ***************************************************************************
-
-
-; ***************************************************************************
-;
-;                                 AtTiny84
-;                                 --------
-;                            VCC  1     14  GND
-;                  REED_OUT2 PB0  2     13  PA0  REED_OUT1
-;                        PIR PB1  3     12  PA1  COM-DATA
-;                  /RESET    PB3  4     11  PA2  REED_IN1
-;                  [KEY1]    PB2  5     10  PA3  LED
-;                  COM_ATTN  PA7  6      9  PA4  TWI-SCL
-;                  TWI-SDA   PA6  7      8  PA5  REED_IN2
-;                                 --------
-;
-; ***************************************************************************
-
-
-
-.equ BOOTLOADER_ADDR = 0xd00
-
-.equ FIRMWARE_VARIANT_BOOT        = 0
-.equ FIRMWARE_VARIANT_TEMP_WINDOW = 1
-
-.equ DEVICEINFO_ID       = 'N'
-.equ DEVICEINFO_VERSION  = 11
-.equ DEVICEINFO_REVISION = 0
-
-
-
-; ---------------------------------------------------------------------------
-; LED module
-
-.equ LED_SIMPLE_ONTIME  = 2
-.equ LED_SIMPLE_OFFTIME = 30
-.equ LED_SIMPLE_DDR     = DDRA
-.equ LED_SIMPLE_PORT    = PORTA
-.equ LED_SIMPLE_PINNUM  = PORTA3
-
-
-
-; ---------------------------------------------------------------------------
-; COM module
-
-.equ COM_BIT_LENGTH      = 52000 ; 104000ns=9600, 52000ns=19200, 26000ns=38400
-.equ COM_HALFBIT_LENGTH  = 26000 ; see https://de.wikipedia.org/wiki/Universal_Asynchronous_Receiver_Transmitter
-
-
-.equ COM_DATA_DDR       = DDRA
-.equ COM_DATA_INPUT     = PINA
-.equ COM_DATA_OUTPUT    = PORTA
-.equ COM_DATA_PIN       = PORTA1
-
-.equ COM_ATTN_DDR       = DDRA
-.equ COM_ATTN_INPUT     = PINA
-.equ COM_ATTN_OUTPUT    = PORTA
-.equ COM_ATTN_PIN       = PORTA7
-
-.equ COM_IRQ_ADDR_ATTN   = PCMSK0
-.equ COM_IRQ_BIT_ATTN    = PCINT7        ; bit 7 in PCMSK0
-.equ COM_IRQ_GIFR_ATTN   = PCIF0
-.equ COM_IRQ_GIMSK_ATTN  = PCIE0
-
-
-
-; ---------------------------------------------------------------------------
-; TWI master module
-
-;.equ TWI_BIT_LENGTH = 10000 ; 100000 and 200000 works for display: 10000, 100000, 200000
-.equ TWI_BIT_LENGTH = 10000 ; 10, 100, 500, 100000 and 200000 works for display: 10000, 100000, 200000
-
-.equ TWI_DDR_SCL          = DDRA
-.equ TWI_PORT_SCL         = PORTA
-.equ TWI_PIN_SCL          = PINA
-.equ TWI_PINNUM_SCL       = PORTA4
-
-.equ TWI_DDR_SDA          = DDRA
-.equ TWI_PORT_SDA         = PORTA
-.equ TWI_PIN_SDA          = PINA
-.equ TWI_PINNUM_SDA       = PORTA6
-
-
-
-; ---------------------------------------------------------------------------
-; LCD module
-
-.equ LCD_TWI_ADDRESS      = 0x3c
-
-
-
-; ---------------------------------------------------------------------------
-; BMP 280
-
-.equ BMP280_ADDR          = 0x76
-
-
-
-; ---------------------------------------------------------------------------
-; SI 7021
-
-.equ SI7021_ADDR          = 0x40
-
-
-
-; ---------------------------------------------------------------------------
-; ADC/CNY70
-
-
-.equ CNY70_PORT_LED       = PORTB
-.equ CNY70_DDR_LED        = DDRB
-.equ CNY70_PINNUM_LED     = PORTB1
-
-.equ CNY70_PORT_ADC       = PORTA ; adc5
-.equ CNY70_DDR_ADC        = DDRA
-.equ CNY70_PINNUM_ADC     = PORTA5
-.equ CNY70_MUX_ADC        = MUX5
-.equ CNY70_ADCSRB_ADC     = ADC5D
-
-
-
-
-; ---------------------------------------------------------------------------
-; Reed
-;
-
-.equ REEDOUT1_DDR         = DDRA
-.equ REEDOUT1_PORT        = PORTA
-.equ REEDOUT1_PIN         = PINA
-.equ REEDOUT1_PINNUM      = PORTA0
-
-.equ REEDOUT2_DDR         = DDRB
-.equ REEDOUT2_PORT        = PORTB
-.equ REEDOUT2_PIN         = PINB
-.equ REEDOUT2_PINNUM      = PORTB0
-
-.equ REED1_DDR            = DDRA
-.equ REED1_PORT           = PORTA
-.equ REED1_PIN            = PINA
-.equ REED1_PINNUM         = PORTA2
-
-.equ REED2_DDR            = DDRA
-.equ REED2_PORT           = PORTA
-.equ REED2_PIN            = PINA
-.equ REED2_PINNUM         = PORTA5
-
-
-; ---------------------------------------------------------------------------
-; 1-Wire Master
-;
-
-.equ OWI_DDR     = DDRB
-.equ OWI_PORTOUT = PORTB
-.equ OWI_PORTIN  = PINB
-.equ OWI_PINNUM  = PORTB2
-
-
-
-; ---------------------------------------------------------------------------
-; CCS 811
-;
-
-.equ CCS811_ADDR = 0x5a ; or 0x5b
-
-

avr/devices/n11/n11_main.asm

@@ -1,522 +0,0 @@
-; ***************************************************************************
-; copyright   : (C) 2024 by Martin Preuss
-; email       : martin@libchipcard.de
-;
-; ***************************************************************************
-; * This file is part of the project "AqHome".                              *
-; * Please see toplevel file COPYING of that project for license details.   *
-; ***************************************************************************
-
-
-
-
-; ***************************************************************************
-; Source file for temperature sensor node on AtTiny 84
-;
-; This is for the full system (i.e. not the boot loader).
-;
-; All definitions and changes should go into this file.
-;
-;
-; ***************************************************************************
-
-
-.equ clock=1000000 ; Define the clock frequency
-;.equ clock=8000000 ; Define the clock frequency
-
-
-
-.nolist
-.include "include/tn84def.inc" ; Define device ATtiny84
-.list
-
-.include "n11_defs.asm"
-.include "defs_all.asm"
-
-
-
-; ***************************************************************************
-; defines
-
-; ---------------------------------------------------------------------------
-; generic
-
-
-.include "common/utils_wait.asm"
-
-
-; ---------------------------------------------------------------------------
-; firmware settings including list of modules used
-
-.equ FIRMWARE_VERSION_MAJOR       = 0
-.equ FIRMWARE_VERSION_MINOR       = 0
-.equ FIRMWARE_VERSION_PATCHLEVEL  = 1
-
-
-#define MODULES_TIMER
-#define MODULES_COM
-#define MODULES_COM_WITH_ADDR_PROTO
-;#define MODULES_LED
-#define MODULES_LED_SIMPLE
-#define MODULES_TWI_MASTER
-;#define MODULES_LCD
-#define LCD_MINIMAL_FONT
-#define MODULES_SI7021
-#define MODULES_STATS
-;#define MODULES_CNY70
-;#define MODULES_REED
-;#define MODULES_OWI_MASTER
-;#define MODULES_DS18B20
-; #define MODULES_CCS811
-
-
-; ---------------------------------------------------------------------------
-; defines for values
-
-.equ VALUE_ID_SI7021_TEMP  = 0x01
-.equ VALUE_ID_SI7021_HUM   = 0x02
-
-.equ VALUE_ID_ADC          = 0x03
-.equ VALUE_ID_REED1        = 0x04
-.equ VALUE_ID_REED2        = 0x05
-.equ VALUE_ID_DS18B20_TEMP = 0x06
-
-.equ VALUE_ID_CO2          = 0x07
-.equ VALUE_ID_TVOC         = 0x08
-
-.equ VALUE_ID_DEBUG        = 0x7f
-
-.equ VALUE_ID_REED_CONF    = 0x81
-
-
-
-; ***************************************************************************
-; code segment
-
-.cseg
-.org 000000
-
-
-
-; ---------------------------------------------------------------------------
-; Reset and interrupt vectors (will be removed as soon as we can flash data over COM)
-
-;	rjmp main ; Reset vector
-        rjmp BOOTLOADER_ADDR ; Reset vector  ; use this for flashed system
-	reti ; EXT_INT0
-	rjmp uartBitbangIsrPcint0 ; PCI0
-	reti ; PCI1
-	reti ; WATCHDOG
-	reti ; ICP1
-	reti ; OC1A
-	reti ; OC1B
-	reti ; OVF1
-        rjmp baseTimerIrqOC0A ; OC0A
-	reti ; OC0B
-	reti ; OVF0
-	reti ; ACI
-        reti ; ADCC
-	reti ; ERDY
-	reti ; USI_STR
-	reti ; USI_OVF
-
-
-devInfoBlock:        ; 12 bytes
-devInfoManufacturer: .db 'A', 'Q', 'U', 'A'
-devInfoId:           .db DEVICEINFO_ID, 0
-devInfoVersion:      .db DEVICEINFO_VERSION, DEVICEINFO_REVISION             ; version, revision
-firmwareVersion:     .db FIRMWARE_VARIANT_TEMP_WINDOW, FIRMWARE_VERSION_MAJOR
-                     .db FIRMWARE_VERSION_MINOR, FIRMWARE_VERSION_PATCHLEVEL
-
-firmwareStart:   rjmp main
-
-
-; ***************************************************************************
-; includes
-
-.include "common/utils.asm"
-.include "common/utils_wait_fixed.asm"
-.include "common/utils_copy_from_flash.asm"
-.include "common/utils_copy_sdram.asm"
-.include "common/crc8.asm"
-
-.include "modules/basetimer/main.asm"
-
-#ifdef MODULES_TIMER
-  .include "modules/timer/main.asm"
-#endif
-#ifdef MODULES_LED
-.include "modules/led/main.asm"
-#endif
-#ifdef MODULES_LED_SIMPLE
-.include "modules/led_simple/main.asm"
-#endif
-#ifdef MODULES_COM
-  .include "modules/com2/defs.asm"
-  .include "modules/com2/main.asm"
-  .include "modules/com2/buffer.asm"
-  .include "modules/uart_bitbang/defs.asm"
-  .include "modules/uart_bitbang/main.asm"
-  .include "modules/uart_bitbang/bytelevel.asm"
-  .include "modules/uart_bitbang/packetlevel.asm"
-  #ifdef MODULES_COM_WITH_ADDR_PROTO
-    .include "modules/comproto/defs.asm"
-    .include "modules/comproto/main.asm"
-    .include "modules/comproto/addr.asm"
-    .include "modules/comproto/msg_recvstats.asm"
-    .include "modules/comproto/msg_sendstats.asm"
-    .include "modules/comproto/msg_sysstats.asm"
-    .include "modules/comproto/msg_memstats.asm"
-    .include "modules/comproto/msg_pong.asm"
-    .include "modules/comproto/msg_value.asm"
-    .include "modules/comproto/msg_device.asm"
-    .include "modules/comproto/msg_reboot.asm"
-  #endif
-  #ifdef MODULES_LCD
-    .include "modules/com2/screen.asm"
-    .include "modules/comproto/screen.asm"
-  #endif
-#endif
-#ifdef MODULES_TWI_MASTER
-  .include "modules/twimaster/main.asm"
-#endif
-#ifdef MODULES_OWI_MASTER
-  .include "modules/owimaster/main.asm"
-#endif
-#ifdef MODULES_LCD
-  .include "modules/lcd/main.asm"
-#endif
-#ifdef MODULES_SI7021
-  .include "modules/si7021/main.asm"
-#endif
-#ifdef MODULES_DS18B20
-  .include "modules/ds18b20/main.asm"
-#endif
-#ifdef MODULES_STATS
-  .include "modules/stats/main.asm"
-#endif
-#ifdef MODULES_CNY70
-  .include "modules/cny70/main.asm"
-#endif
-#ifdef MODULES_REED
-  .include "modules/reed/main.asm"
-#endif
-
-#ifdef MODULES_CCS811
-  .include "modules/ccs811/main.asm"
-#endif
-
-
-
-; ***************************************************************************
-; data in SRAM
-
-.dseg
-
-programRamBegin:
-#ifdef MODULES_LCD
-  screenCounter:               .byte 1
-#endif
-
-programRamEnd:
-
-
-
-#ifdef MODULES_LCD
-  sramTimerWriteStats:         .byte 2
-  sramTimerScreen:             .byte 2
-#endif
-sramTimerEnqueueValues:        .byte 2
-#ifdef MODULES_SI7021
-  sramTimerSI7021Measure:      .byte 2
-  sramTimerSI7021SendTemp:     .byte 2
-  sramTimerSI7021SendHumidity: .byte 2
-#endif
-#ifdef MODULES_CNY70
-  sramTimerCny70SendAdc:       .byte 2
-#endif
-#ifdef MODULES_LCD
-  sramPeriodicalLcdMark:       .byte 2
-#endif
-#ifdef MODULES_DS18B20
-  sramDs18b20Timer:            .byte 2
-  sramSendDs18b20TempTimer:    .byte 2
-#endif
-
-#ifdef MODULES_CCS811
-  sramCcs811Timer:             .byte 2
-#endif
-
-
-; ***************************************************************************
-; data in FLASH
-
-.cseg
-
-
-
-; ---------------------------------------------------------------------------
-; timer list
-
-
-timerList:
-;     SRAM variable/counter        routine                     flags                secs (0=don't start or restart)
-#ifdef MODULES_COM_WITH_ADDR_PROTO
-  .dw cproAddresModeTimer,         CPRO_Address_OnTimer,       0,                   0     ; (no restart)
-#endif
-#ifdef MODULES_STATS
-  .dw statsSendTimer,              Stats_Timer,                TIMER_FLAGS_IF_ADDR, 3000   ; every 5m
-#endif
-#ifdef MODULES_LCD
-;  .dw sramPeriodicalLcdMark,       periodicalLcdMark,          0,                    20   ; every 2s
-;  .dw sramTimerWriteStats,         writeStats,                 0,                   100
-  .dw sramTimerScreen,              printScreen,                TIMER_FLAGS_IF_ADDR,  50    ; every 5s
-#endif
-#ifdef MODULES_SI7021
-  .dw sramTimerSI7021Measure,      SI7021_OnTimer,             0,                   300    ; every 30s
-  .dw sramTimerSI7021SendTemp,     sendSI7021Temp,             TIMER_FLAGS_IF_ADDR, 600    ; every 60s
-  .dw sramTimerSI7021SendHumidity, sendSI7021Humidity,         TIMER_FLAGS_IF_ADDR, 600    ; every 60s
-#endif
-#ifdef MODULES_CNY70
-  .dw sramTimerCny70SendAdc,       CNY70_OnTimer,              TIMER_FLAGS_IF_ADDR, 50     ; every 5s
-#endif
-#ifdef MODULES_DS18B20
-  .dw sramDs18b20Timer,            Ds18b20_OnTimer,            0,                   300    ; every 30s
-  .dw sramSendDs18b20TempTimer,    sendDs18b20Temp,            TIMER_FLAGS_IF_ADDR, 600    ; every 60s
-#endif
-#ifdef MODULES_CCS811
-  .dw sramCcs811Timer,             CCS811_OnTimer,             0,                   10     ; every 1s
-#endif
-  .dw 0 ; end of list
-
-
-
-
-
-.include "main_all.asm"
-
-
-
-systemSetSpeed:
-.if clock == 8000000
-  ldi r16, (1<<CLKPCE)
-  ldi r17, 0
-  out CLKPR, r16
-  out CLKPR, r17
-.endif
-  ret
-
-
-systemSetBootSpeed:
-.if clock == 8000000
-  ldi r16, (1<<CLKPCE)
-  ldi r17, (1<<CLKPS1) | (1<<CLKPS0)
-  out CLKPR, r16
-  out CLKPR, r17
-.endif
-  ret
-
-
-
-; ---------------------------------------------------------------------------
-; Called on first time run, i.e. on system start. No arguments, no results.
-
-onSystemStart:
-  ldi xh, HIGH(programRamBegin)
-  ldi xl, LOW(programRamBegin)
-  clr r16
-  ldi r17, (programRamEnd-programRamBegin)
-  rcall Utils_FillSram
-  ret
-
-
-#ifdef MODULES_CCS811
-handleCcsTimer:
-  rjmp sendCcs811Data
-  
-  
-sendCcs811Data:
-  ldi r16, 0xff                      ; destination address
-  ldi r17, VALUE_ID_DEBUG            ; value id
-  ldi r22, 0
-;  lds r18, ccs811ResponseData       ; value
-  lds r18, ccs811Flags               ; value
-  lds r19, ccs811ResponseData        ; denominator
-  ldi r20, 1
-  clr r21
-
-  ldi xl, LOW(com2SendBuffer)
-  ldi xh, HIGH(com2SendBuffer)
-  rcall CPRO_WriteReportValue
-  rjmp COM2_SendPacket
-#endif
-
-
-#ifdef MODULES_LCD
-
-printScreen:
-  lds r16, screenCounter
-  tst r16
-  brne printScreen_l1
-  rcall CPRO_Screen
-  rjmp printScreen_counter
-printScreen_l1:
-  cpi r16, 1
-  brne printScreen_l2
-  rcall COM2_Screen_RecvStats
-  rjmp printScreen_counter
-printScreen_l2:
-;  cpi r16, 2
-;  brne printScreen_l3
-;  rcall COM2_Screen_SendStats
-;  rjmp printScreen_counter
-printScreen_l3:
-  ; add more screens here
-
-printScreen_counter:
-  lds r16, screenCounter
-  inc r16
-  cpi r16, 2 ; number of screens
-  brcs printScreen_store
-  clr r16
-printScreen_store:
-  sts screenCounter, r16
-printScreen_end:
-  ret
-
-
-;periodicalLcdMark:
-;  rcall printTimerMark
-;  ret
-
-
-;writeStats:
-;  rcall printSendStats
-;  ret
-#endif
-
-
-#ifdef MODULES_SI7021
-
-sendSI7021Humidity:
-  rcall SI7021_SendHumidity
-  brcs sendSI7021Humidity_okay
-  ; set timer to 1s to retry later
-  ldi xl, LOW(sramTimerSI7021SendHumidity)
-  ldi xh, HIGH(sramTimerSI7021SendHumidity)
-  rjmp Timer_SetValueTo1s
-sendSI7021Humidity_okay:
-  ret
-
-
-sendSI7021Temp:
-  rcall SI7021_SendTemp
-  brcs sendSI7021Temp_okay
-  ; set timer to 1s to retry later
-  ldi xl, LOW(sramTimerSI7021SendTemp)
-  ldi xh, HIGH(sramTimerSI7021SendTemp)
-  rjmp Timer_SetValueTo1s
-sendSI7021Temp_okay:
-  ret
-#endif
-
-
-#ifdef MODULES_DS18B20
-sendDs18b20Temp:
-  rcall Ds18b20_SendTemp
-  brcs sendDs18b20Temp_okay
-  ; set timer to 1s to retry later
-  ldi xl, LOW(sramSendDs18b20TempTimer)
-  ldi xh, HIGH(sramSendDs18b20TempTimer)
-  rjmp Timer_SetValueTo1s
-sendDs18b20Temp_okay:
-  ret
-#endif
-
-
-; ---------------------------------------------------------------------------
-; Called every 100ms. Add your routine calls here. No arguments, no results.
-
-onEvery100ms:
-#ifdef MODULES_LED
-  ; ticker for LED module
-  ldi zl, LOW(ledA3Flash)
-  ldi zh, HIGH(ledA3Flash)
-  ldi yl, LOW(ledA3Sram)
-  ldi yh, HIGH(ledA3Sram)
-  rcall Led_Tick
-#endif
-
-#ifdef MODULES_LED_SIMPLE
-  rcall LedSimple_Every100ms
-#endif
-
-#ifdef MODULES_REED
-  rcall REED_Every100ms
-#endif
-
-  ret
-
-
-
-; ---------------------------------------------------------------------------
-; @routine onPacketReceived:
-;
-; Called after a packet was received via COM module. Add your routine calls here.
-;
-; The packet will be released in any case after return from this call.
-;
-; @return CFLAG set if message handled, cleared otherwise
-; @param X  pointer to received buffer
-; @clobbers all
-
-onPacketReceived:
-  ; get msg code
-  adiw xh:xl, COM2_MSG_OFFS_CMD
-  ld r16, x
-  sbiw xh:xl, COM2_MSG_OFFS_CMD
-
-  cpi r16, CPRO_CMD_VALUE_SET
-  brne onPacketReceived_l1
-  ; msg code is CPRO_CMD_VALUE_SET
-  rjmp onSetValueReceived
-
-onPacketReceived_l1:
-  rjmp CPRO_OnPacketReceived
-; @end
-
-
-
-onSetValueReceived:
-  adiw xh:xl, CPRO_PACKET_VALUE_OFFS_VALUEID
-  ld r16, X
-  sbiw xh:xl, CPRO_PACKET_VALUE_OFFS_VALUEID
-  cpi r16, VALUE_ID_REED_CONF
-  brne onSetValueReceived_l1
-#ifdef MODULES_REED
-  rjmp onSetReedConf
-#else
-  ret
-#endif
-onSetValueReceived_l1:
-  clc
-  ret
-
-
-#ifdef MODULES_REED
-onSetReedConf:
-  ; get new value
-  adiw xh:xl, CPRO_PACKET_VALUE_OFFS_VALUE
-  ld r16, X
-  sbiw xh:xl, CPRO_PACKET_VALUE_OFFS_VALUE
-  ; set config
-  rcall REED_SetConfig
-  ; send ACK
-  ldi r16, CPRO_CMD_VALUE_SET_ACK
-  rcall CPRO_SendSetValueResponse
-  sec
-  ret
-#endif
-
-
-

avr/devices/n12/0BUILD

@@ -1,52 +0,0 @@
-<?xml?>
-
-<gwbuild>
-
-  <target type="AvrHexFile" name="n12_main" >
-
-    <includes type="avrasm" >
-      -I $(builddir)
-      -I $(srcdir)
-      -I $(topsrcdir)/avr
-      -I $(topbuilddir)/avr
-    </includes>
-
-
-    <sources type="avrasm" >
-      n12_main.asm
-    </sources>
-
-
-  </target>
-
-
-
-  <target type="AvrHexFile" name="n12_boot" >
-
-    <includes type="avrasm" >
-      -I $(builddir)
-      -I $(srcdir)
-      -I $(topsrcdir)/avr
-      -I $(topbuilddir)/avr
-    </includes>
-
-
-    <sources type="avrasm" >
-      n12_boot.asm
-    </sources>
-
-
-  </target>
-
-
-  <subdirs>
-  </subdirs>
-
-  <extradist>
-    n12_defs.asm
-  </extradist>
-  
-
-</gwbuild>
-
-

avr/devices/n12/n12_boot.asm

@@ -1,144 +0,0 @@
-; ***************************************************************************
-; Source file for base system node on AtTiny 84
-;
-; This is for the maintenance system (i.e. the flash loader).
-;
-; All definitions and changes should go into this file.
-;
-;
-; ***************************************************************************
-
-.equ clock=1000000 ; Define the clock frequency
-
-.nolist
-.include "include/tn84def.inc" ; Define device ATtiny84
-.list
-
-.include "n12_defs.asm"
-.include "defs_all.asm"
-
-
-
-; ***************************************************************************
-; defines
-
-; ---------------------------------------------------------------------------
-; generic
-
-.include "common/utils_wait.asm"
-.include "modules/com2/defs.asm"
-.include "modules/comproto/defs.asm"
-
-
-; ---------------------------------------------------------------------------
-; firmware settings
-
-.equ FIRMWARE_VERSION_MAJOR       = 0
-.equ FIRMWARE_VERSION_MINOR       = 0
-.equ FIRMWARE_VERSION_PATCHLEVEL  = 1
-
-
-; ---------------------------------------------------------------------------
-; LED
-
-.equ LED_DDR             = DDRA
-.equ LED_PORT            = PORTA
-.equ LED_PIN             = PINA
-.equ LED_PINNUM          = PORTA7
-
-
-
-; ***************************************************************************
-; code segment
-
-.cseg
-.org 0x0000
-
-
-
-; ---------------------------------------------------------------------------
-; Reset and interrupt vectors
-;  rjmp start ; Reset vector
-  rjmp main ; Reset vector
-  reti ; EXT_INT0
-  reti ; PCI0
-  reti ; PCI1
-  reti ; WATCHDOG
-  reti ; ICP1
-  reti ; OC1A
-  reti ; OC1B
-  reti ; OVF1
-  reti ; OC0A
-  reti ; OC0B
-  reti ; OVF0
-  reti ; ACI
-  reti ; ADCC
-  reti ; ERDY
-  reti ; USI_STR
-  reti ; USI_OVF
-
-
-devInfoBlock:        ; 12 bytes
-devInfoManufacturer: .db 'A', 'Q', 'U', 'A'
-devInfoId:           .db DEVICEINFO_ID, 0
-devInfoVersion:      .db DEVICEINFO_VERSION, DEVICEINFO_REVISION             ; version, revision
-firmwareVersion:     .db FIRMWARE_VARIANT_BOOT, FIRMWARE_VERSION_MAJOR
-                     .db FIRMWARE_VERSION_MINOR, FIRMWARE_VERSION_PATCHLEVEL
-
-firmwareStart:   rjmp main ; will be overwritten when flashing
-
-
-
-; ***************************************************************************
-; main code
-
-
-.org BOOTLOADER_ADDR
-
-
-main:
-  rjmp bootLoader ; this routine is in modules/flash/proto.asm
-
-
-
-
-; ***************************************************************************
-; includes
-
-.include "common/utils_wait_fixed.asm"
-.include "common/utils_copy_from_flash.asm"
-.include "common/utils_copy_sdram.asm"
-
-.include "modules/flash/defs.asm"
-.include "modules/flash/eeprom.asm"
-.include "modules/flash/io.asm"
-.include "modules/flash/io_attn.asm"
-.include "modules/flash/io_bitbang.asm"
-.include "modules/flash/flash1p.asm"
-.include "modules/flash/flashprocess.asm"
-.include "modules/flash/wait.asm"
-.include "modules/bootloader/main.asm"
-.include "modules/network/msg/defs.asm"
-.include "modules/network/msg/crc.asm"
-
-
-
-systemSetSpeed:
-.if clock == 8000000
-  ldi r16, (1<<CLKPCE)
-  ldi r17, 0
-  out CLKPR, r16
-  out CLKPR, r17
-.endif
-
-.if clock == 1000000
-  ldi r16, (1<<CLKPCE)
-  ldi r17, (1<<CLKPS1) | (1<<CLKPS0)
-  out CLKPR, r16
-  out CLKPR, r17
-.endif
-  ret
-
-
-
-

avr/devices/n12/n12_defs.asm

@@ -1,175 +0,0 @@
-; ***************************************************************************
-; copyright   : (C) 2024 by Martin Preuss
-; email       : martin@libchipcard.de
-;
-; ***************************************************************************
-; * This file is part of the project "AqHome".                              *
-; * Please see toplevel file COPYING of that project for license details.   *
-; ***************************************************************************
-
-; ***************************************************************************
-;
-;                                 AtTiny84
-;                                 --------
-;                            VCC  1     14  GND
-;          [PCINT8] REED_IN1 PB0  2     13  PA0  COM-DATA
-;          [PCINT9] REED_IN2 PB1  3     12  PA1  COM_ATTN [PCINT1]
-;                     /RESET PB3  4     11  PA2  TWI-SDA
-;                     [KEY1] PB2  5     10  PA3  TWI-SCL
-;                        LED PA7  6      9  PA4  [USCK/SCL]
-;              [DI/SDA/OC1A] PA6  7      8  PA5  REED_OUT [DO/OC1B]
-;                                 --------
-;
-; ***************************************************************************
-
-
-
-.equ BOOTLOADER_ADDR = 0xd00
-
-
-.equ FIRMWARE_VARIANT_BOOT        = 0
-.equ FIRMWARE_VARIANT_TEMP_WINDOW = 1
-
-.equ DEVICEINFO_ID       = 'N'
-.equ DEVICEINFO_VERSION  = 12
-.equ DEVICEINFO_REVISION = 0
-
-
-; ---------------------------------------------------------------------------
-; LED module
-
-.equ LED_SIMPLE_ONTIME  = 3
-.equ LED_SIMPLE_OFFTIME = 30
-.equ LED_SIMPLE_DDR     = DDRA
-.equ LED_SIMPLE_PORT    = PORTA
-.equ LED_SIMPLE_PINNUM  = PORTA7
-
-
-
-; ---------------------------------------------------------------------------
-; COM module
-
-.equ COM_BIT_LENGTH      = 52000 ; 104000ns=9600, 52000ns=19200, 26000ns=38400
-.equ COM_HALFBIT_LENGTH  = 26000 ; see https://de.wikipedia.org/wiki/Universal_Asynchronous_Receiver_Transmitter
-
-.equ COM_DATA_DDR       = DDRA
-.equ COM_DATA_OUTPUT    = PORTA
-.equ COM_DATA_INPUT     = PINA
-.equ COM_DATA_PIN       = PORTA0
-
-.equ COM_ATTN_DDR       = DDRA
-.equ COM_ATTN_INPUT     = PINA
-.equ COM_ATTN_OUTPUT    = PORTA
-.equ COM_ATTN_PIN       = PORTA1
-
-
-.equ COM_IRQ_ADDR_ATTN   = PCMSK0
-.equ COM_IRQ_BIT_ATTN    = 1              ; bit 1 in PCMSK0
-.equ COM_IRQ_GIFR_ATTN   = PCIF0
-.equ COM_IRQ_GIMSK_ATTN  = PCIE0
-
-
-; ---------------------------------------------------------------------------
-; TWI master module
-
-.equ TWI_BIT_LENGTH = 1 ; 100000 and 200000 works for display: 10000, 100000, 200000
-
-.equ TWI_DDR_SCL          = DDRA
-.equ TWI_PORT_SCL         = PORTA
-.equ TWI_PIN_SCL          = PINA
-.equ TWI_PINNUM_SCL       = PORTA3
-
-.equ TWI_DDR_SDA          = DDRA
-.equ TWI_PORT_SDA         = PORTA
-.equ TWI_PIN_SDA          = PINA
-.equ TWI_PINNUM_SDA       = PORTA2
-
-
-; ---------------------------------------------------------------------------
-; LCD module
-
-.equ LCD_TWI_ADDRESS      = 0x3c
-
-
-
-; ---------------------------------------------------------------------------
-; BMP 280
-
-.equ BMP280_ADDR          = 0x76
-
-
-
-; ---------------------------------------------------------------------------
-; SI 7021
-
-.equ SI7021_ADDR          = 0x40
-
-
-
-; ---------------------------------------------------------------------------
-; ADC/CNY70
-
-
-.equ CNY70_PORT_LED       = PORTB
-.equ CNY70_DDR_LED        = DDRB
-.equ CNY70_PINNUM_LED     = PORTB1
-
-.equ CNY70_PORT_ADC       = PORTA ; adc5
-.equ CNY70_DDR_ADC        = DDRB
-.equ CNY70_PINNUM_ADC     = PORTA5
-.equ CNY70_MUX_ADC        = MUX5
-.equ CNY70_ADCSRB_ADC     = ADC5D
-
-
-
-
-; ---------------------------------------------------------------------------
-; Reed
-;
-
-.equ REEDOUT1_DDR         = DDRA
-.equ REEDOUT1_PORT        = PORTA
-.equ REEDOUT1_PIN         = PINA
-.equ REEDOUT1_PINNUM      = PORTA5
-
-.equ REED1_DDR            = DDRB
-.equ REED1_PORT           = PORTB
-.equ REED1_PIN            = PINB
-.equ REED1_PINNUM         = PORTB0
-
-.equ REED2_DDR            = DDRB
-.equ REED2_PORT           = PORTB
-.equ REED2_PIN            = PINB
-.equ REED2_PINNUM         = PORTB1
-
-
-
-; ---------------------------------------------------------------------------
-; 1-Wire Master
-;
-
-.equ OWI_DDR     = DDRB
-.equ OWI_PORTOUT = PORTB
-.equ OWI_PORTIN  = PINB
-.equ OWI_PINNUM  = PORTB2
-
-
-; ---------------------------------------------------------------------------
-; SK6812
-
-.equ SK6812_DDR    = DDRA
-.equ SK6812_PORT   = PORTA
-.equ SK6812_PINNUM = PORTA5
-
-
-
-; ---------------------------------------------------------------------------
-; debug
-
-.equ DEBUG_LED_DDR      = DDRA
-.equ DEBUG_LED_PORT_OUT = PORTA
-.equ DEBUG_LED_PORT_IN  = PINA
-.equ DEBUG_LED_PINNUM   = PORTA5
-
-
-

avr/devices/n12/n12_main.asm

@@ -1,480 +0,0 @@
-; ***************************************************************************
-; copyright   : (C) 2023 by Martin Preuss
-; email       : martin@libchipcard.de
-;
-; ***************************************************************************
-; * This file is part of the project "AqHome".                              *
-; * Please see toplevel file COPYING of that project for license details.   *
-; ***************************************************************************
-
-
-; ***************************************************************************
-; Source file for temperature sensor node on AtTiny 84
-;
-; This is for the full system (i.e. not the boot loader).
-; ***************************************************************************
-
-.equ clock=8000000 ; Define the clock frequency
-
-
-
-.nolist
-.include "include/tn84def.inc" ; Define device ATtiny84
-.list
-
-.include "n12_defs.asm"
-.include "defs_all.asm"
-
-.include "common/utils_wait.asm" ; wait macro
-
-
-
-; ***************************************************************************
-; defines
-
-; ---------------------------------------------------------------------------
-; firmware settings including list of modules used
-
-.equ FIRMWARE_VERSION_MAJOR       = 0
-.equ FIRMWARE_VERSION_MINOR       = 0
-.equ FIRMWARE_VERSION_PATCHLEVEL  = 1
-
-
-#define MODULES_TIMER
-#define MODULES_COM
-#define MODULES_COM_WITH_ADDR_PROTO
-;#define MODULES_LED
-#define MODULES_LED_SIMPLE
-;#define MODULES_TWI_MASTER
-;#define MODULES_LCD
-;#define LCD_MINIMAL_FONT
-;#define MODULES_SI7021
-#define MODULES_STATS
-;#define MODULES_CNY70
-;#define MODULES_REED
-;#define MODULES_OWI_MASTER
-;#define MODULES_DS18B20
-#define MODULES_SK6812
-
-
-
-; ---------------------------------------------------------------------------
-; defines for modules
-
-.equ VALUE_ID_SI7021_TEMP    = 0x01
-.equ VALUE_ID_SI7021_HUM     = 0x02
-
-.equ VALUE_ID_ADC            = 0x03
-.equ VALUE_ID_REED1          = 0x04
-.equ VALUE_ID_REED2          = 0x05
-
-.equ VALUE_ID_REED_CONF      = 0x81
-.equ VALUE_ID_LED_NUMLEDS    = 0x82
-.equ VALUE_ID_LED_RGBW_VALUE = 0x83
-
-
-
-; ***************************************************************************
-; code segment
-
-.cseg
-.org 000000
-
-
-
-; ---------------------------------------------------------------------------
-; Reset and interrupt vectors
-
-;	rjmp main ; Reset vector
-        rjmp BOOTLOADER_ADDR ; Reset vector  ; use this for flashed system
-	reti ; EXT_INT0
-	rjmp uartBitbangIsrPcint0 ; PCI0
-	reti ; PCI1
-	reti ; WATCHDOG
-	reti ; ICP1
-	reti ; OC1A
-	reti ; OC1B
-	reti ; OVF1
-        rjmp baseTimerIrqOC0A ; OC0A
-	reti ; OC0B
-	reti ; OVF0
-	reti ; ACI
-        reti ; ADCC
-	reti ; ERDY
-	reti ; USI_STR
-	reti ; USI_OVF
-
-
-devInfoBlock:        ; 12 bytes
-devInfoManufacturer: .db 'A', 'Q', 'U', 'A'
-devInfoId:           .db DEVICEINFO_ID, 0
-devInfoVersion:      .db DEVICEINFO_VERSION, DEVICEINFO_REVISION             ; version, revision
-firmwareVersion:     .db FIRMWARE_VARIANT_TEMP_WINDOW, FIRMWARE_VERSION_MAJOR
-                     .db FIRMWARE_VERSION_MINOR, FIRMWARE_VERSION_PATCHLEVEL
-
-firmwareStart:   rjmp main
-
-
-; ***************************************************************************
-; includes
-
-.include "common/utils.asm"
-.include "common/utils_wait_fixed.asm"
-.include "common/utils_copy_from_flash.asm"
-.include "common/utils_copy_sdram.asm"
-.include "common/crc8.asm"
-
-.include "modules/basetimer/main.asm"
-
-#ifdef MODULES_TIMER
-  .include "modules/timer/main.asm"
-#endif
-#ifdef MODULES_LED
-.include "modules/led/main.asm"
-#endif
-#ifdef MODULES_LED_SIMPLE
-.include "modules/led_simple/main.asm"
-#endif
-#ifdef MODULES_COM
-  .include "modules/com2/defs.asm"
-  .include "modules/com2/main.asm"
-  .include "modules/com2/buffer.asm"
-  .include "modules/uart_bitbang/defs.asm"
-  .include "modules/uart_bitbang/main.asm"
-  .include "modules/uart_bitbang/bytelevel.asm"
-  .include "modules/uart_bitbang/packetlevel.asm"
-  #ifdef MODULES_COM_WITH_ADDR_PROTO
-    .include "modules/comproto/defs.asm"
-    .include "modules/comproto/main.asm"
-    .include "modules/comproto/addr.asm"
-    .include "modules/comproto/msg_recvstats.asm"
-    .include "modules/comproto/msg_sendstats.asm"
-    .include "modules/comproto/msg_sysstats.asm"
-    .include "modules/comproto/msg_memstats.asm"
-    .include "modules/comproto/msg_pong.asm"
-    .include "modules/comproto/msg_value.asm"
-    .include "modules/comproto/msg_device.asm"
-    .include "modules/comproto/msg_reboot.asm"
-  #endif
-#endif
-#ifdef MODULES_TWI_MASTER
-  .include "modules/twimaster/main.asm"
-#endif
-#ifdef MODULES_LCD
-  .include "modules/lcd/main.asm"
-#endif
-#ifdef MODULES_SI7021
-  .include "modules/si7021/main.asm"
-#endif
-#ifdef MODULES_STATS
-  .include "modules/stats/main.asm"
-#endif
-#ifdef MODULES_CNY70
-  .include "modules/cny70/main.asm"
-#endif
-#ifdef MODULES_REED
-  .include "modules/reed/main.asm"
-#endif
-#ifdef MODULES_OWI_MASTER
-  .include "modules/owimaster/main.asm"
-#endif
-#ifdef MODULES_DS18B20
-  .include "modules/ds18b20/main.asm"
-#endif
-#ifdef MODULES_SK6812
-  .include "modules/sk6812/main.asm"
-#endif
-
-
-; ***************************************************************************
-; data in SRAM
-
-.dseg
-
-
-#ifdef MODULES_LCD
-  sramTimerWriteStats:       .byte 2
-#endif
-sramTimerEnqueueValues:      .byte 2
-#ifdef MODULES_SI7021
-  sramTimerSI7021Measure:      .byte 2
-  sramTimerSI7021SendTemp:     .byte 2
-  sramTimerSI7021SendHumidity: .byte 2
-#endif
-#ifdef MODULES_CNY70
-  sramTimerCny70SendAdc:       .byte 2
-#endif
-#ifdef MODULES_LCD
-  sramPeriodicalLcdMark:       .byte 2
-#endif
-#ifdef MODULES_DS18B20
-  sramDs18b20Timer:            .byte 2
-  sramSendDs18b20TempTimer:    .byte 2
-#endif
-
-
-; ***************************************************************************
-; data in FLASH
-
-.cseg
-
-#ifdef MODULES_LED
-ledA3Flash:    .db DDRA+0x20, PORTA+0x20, PINA+0x20, (1<<PORTA3)
-blinkPattern:  .db 2, 50, 0xff, 0xff   ; 1 short blink, 5s pause, restart
-;blinkPattern2: .db 2, 2, 0xff, 0xff   ; 1 short blink, short pause, restart
-#endif
-
-
-
-; ---------------------------------------------------------------------------
-; timer list
-
-
-timerList:
-;     SRAM variable/counter        routine                     flags                secs (0=don't start or restart)
-#ifdef MODULES_COM_WITH_ADDR_PROTO
-  .dw cproAddresModeTimer,         CPRO_Address_OnTimer,       0,                   0     ; (no restart)
-#endif
-#ifdef MODULES_STATS
-  .dw statsSendTimer,              Stats_Timer,                TIMER_FLAGS_IF_ADDR, 3000   ; every 5m
-#endif
-#ifdef MODULES_LCD
-  .dw sramPeriodicalLcdMark,       periodicalLcdMark,          0,                    10    ; every sec
-  .dw sramTimerWriteStats,         writeStats,                 0,                   100
-#endif
-#ifdef MODULES_SI7021
-  .dw sramTimerSI7021Measure,      SI7021_OnTimer,             0,                   300    ; every 30s
-  .dw sramTimerSI7021SendTemp,     sendSI7021Temp,             TIMER_FLAGS_IF_ADDR, 600    ; every 60s
-  .dw sramTimerSI7021SendHumidity, sendSI7021Humidity,         TIMER_FLAGS_IF_ADDR, 600    ; every 60s
-#endif
-#ifdef MODULES_CNY70
-  .dw sramTimerCny70SendAdc,       CNY70_OnTimer,              TIMER_FLAGS_IF_ADDR, 50     ; every 5s
-#endif
-#ifdef MODULES_DS18B20
-  .dw sramDs18b20Timer,            Ds18b20_OnTimer,            0,                   300    ; every 30s
-  .dw sramSendDs18b20TempTimer,    sendDs18b20Temp,            TIMER_FLAGS_IF_ADDR, 600    ; every 60s
-#endif
-  .dw 0 ; end of list
-
-
-
-
-
-.include "main_all.asm"
-
-
-systemSetSpeed:
-.if clock == 1000000
-  ldi r16, (1<<CLKPCE)
-  ldi r17, (1<<CLKPS1) | (1<<CLKPS0)
-  out CLKPR, r16
-  out CLKPR, r17
-.endif
-
-.if clock == 8000000
-  ldi r16, (1<<CLKPCE)
-  ldi r17, 0
-  out CLKPR, r16
-  out CLKPR, r17
-.endif
-  ret
-
-
-systemSetBootSpeed:
-  ldi r16, (1<<CLKPCE)
-  ldi r17, (1<<CLKPS1) | (1<<CLKPS0)
-  out CLKPR, r16
-  out CLKPR, r17
-  ret
-
-
-; ---------------------------------------------------------------------------
-; Called on first time run, i.e. on system start. No arguments, no results.
-
-onSystemStart:
-  ret
-
-
-#ifdef MODULES_LCD
-periodicalLcdMark:
-  rcall printTimerMark
-  ret
-
-
-writeStats:
-  rcall printSendStats
-  ret
-#endif
-
-
-#ifdef MODULES_SI7021
-
-sendSI7021Humidity:
-  rcall SI7021_SendHumidity
-  brcs sendSI7021Humidity_okay
-  ; set timer to 1s to retry later
-  ldi xl, LOW(sramTimerSI7021SendHumidity)
-  ldi xh, HIGH(sramTimerSI7021SendHumidity)
-  rjmp Timer_SetValueTo1s
-sendSI7021Humidity_okay:
-  ret
-
-
-sendSI7021Temp:
-  rcall SI7021_SendTemp
-  brcs sendSI7021Temp_okay
-  ; set timer to 1s to retry later
-  ldi xl, LOW(sramTimerSI7021SendTemp)
-  ldi xh, HIGH(sramTimerSI7021SendTemp)
-  rjmp Timer_SetValueTo1s
-sendSI7021Temp_okay:
-  ret
-#endif
-
-
-#ifdef MODULES_DS18B20
-sendDs18b20Temp:
-  rcall Ds18b20_SendTemp
-  brcs sendDs18b20Temp_okay
-  ; set timer to 1s to retry later
-  ldi xl, LOW(sramSendDs18b20TempTimer)
-  ldi xh, HIGH(sramSendDs18b20TempTimer)
-  rjmp Timer_SetValueTo1s
-sendDs18b20Temp_okay:
-  ret
-#endif
-
-
-
-; ---------------------------------------------------------------------------
-; Called every 100ms. Add your routine calls here. No arguments, no results.
-
-onEvery100ms:
-#ifdef MODULES_LED
-  ; ticker for LED module
-  ldi zl, LOW(ledA3Flash)
-  ldi zh, HIGH(ledA3Flash)
-  ldi yl, LOW(ledA3Sram)
-  ldi yh, HIGH(ledA3Sram)
-  rcall Led_Tick
-#endif
-
-#ifdef MODULES_LED_SIMPLE
-  rcall LedSimple_Every100ms
-#endif
-
-
-#ifdef MODULES_REED
-  rcall REED_Every100ms
-#endif
-
-  ret
-
-
-
-; ---------------------------------------------------------------------------
-; @routine onPacketReceived:
-;
-; Called after a packet was received via COM module. Add your routine calls here.
-;
-; The packet will be released in any case after return from this call.
-;
-; @return CFLAG set if message handled, cleared otherwise
-; @param X  pointer to received buffer
-; @clobbers all
-
-onPacketReceived:
-  ; get msg code
-  adiw xh:xl, COM2_MSG_OFFS_CMD
-  ld r16, x
-  sbiw xh:xl, COM2_MSG_OFFS_CMD
-
-  cpi r16, CPRO_CMD_VALUE_SET
-  brne onPacketReceived_l1
-  ; msg code is CPRO_CMD_VALUE_SET
-  rjmp onSetValueReceived
-
-onPacketReceived_l1:
-  rjmp CPRO_OnPacketReceived
-; @end
-
-
-
-onSetValueReceived:
-  adiw xh:xl, CPRO_PACKET_VALUE_OFFS_VALUEID
-  ld r16, X
-  sbiw xh:xl, CPRO_PACKET_VALUE_OFFS_VALUEID
-  cpi r16, VALUE_ID_REED_CONF
-  brne onSetValueReceived_l1
-#ifdef MODULES_REED
-  rjmp onSetReedConf
-#else
-  ret
-#endif
-onSetValueReceived_l1:
-  cpi r16, VALUE_ID_LED_RGBW_VALUE
-  brne onSetValueReceived_l2
-#ifdef MODULES_SK6812
-  rjmp onSetRgbwValue
-#endif
-onSetValueReceived_l2:
-  cpi r16, VALUE_ID_LED_NUMLEDS
-  brne onSetValueReceived_l3
-#ifdef MODULES_SK6812
-  rjmp onSetNumLeds
-#endif
-onSetValueReceived_l3:
-  ldi r16, CPRO_CMD_VALUE_SET_NACK
-  rcall CPRO_SendSetValueResponse
-  clc
-  ret
-
-
-#ifdef MODULES_REED
-onSetReedConf:
-  ; get new value
-  adiw xh:xl, CPRO_PACKET_VALUE_OFFS_VALUE
-  ld r16, X
-  sbiw xh:xl, CPRO_PACKET_VALUE_OFFS_VALUE
-  ; set config
-  rcall REED_SetConfig
-  ; send ACK
-  ldi r16, CPRO_CMD_VALUE_SET_ACK
-  rcall CPRO_SendSetValueResponse
-  sec
-  ret
-#endif
-
-
-#ifdef MODULES_SK6812
-onSetRgbwValue:
-  ; get new value
-  adiw xh:xl, CPRO_PACKET_VALUE_OFFS_VALUE
-  ld r18, X+ ; R
-  ld r19, X+ ; G
-  ld r20, X+ ; B
-  ld r21, X+ ; W
-  sbiw xh:xl, CPRO_PACKET_VALUE_OFFS_VALUE+4
-  rcall SK6812_SetAllColor
-  ; send ACK
-  ldi r16, CPRO_CMD_VALUE_SET_ACK
-  rcall CPRO_SendSetValueResponse
-  sec
-  ret
-
-onSetNumLeds:
-  ; get new value
-  adiw xh:xl, CPRO_PACKET_VALUE_OFFS_VALUE
-  ld r16, X ; number of leds
-  sbiw xh:xl, CPRO_PACKET_VALUE_OFFS_VALUE
-  sts sk6812NumLeds, r16
-  ; send ACK
-  ldi r16, CPRO_CMD_VALUE_SET_ACK
-  rcall CPRO_SendSetValueResponse
-  sec
-  ret
-
-#endif
-
-
-

avr/devices/n14/aqua_n14.xml

@@ -15,14 +15,6 @@
     <value name="MALSOURCE1"   id="0x86" type="actor"  dataType="uint16" />
     <value name="MALSOURCE2"   id="0x87" type="actor"  dataType="uint16" />
 
-    <value name="stats_packets_in"       id="0xe0" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_packets_out"      id="0xe1" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_content_errors"   id="0xe2" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_io_errors"        id="0xe3" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_nobuf_errors"     id="0xe4" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_collision_errors" id="0xe5" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_busy_errors"      id="0xe6" type="sensor" dataType="uint16" denom="1" />
-
     <value name="LEDTIMING"    id="0x88" type="actor"  dataType="uint16" />
   </values>
 

avr/devices/n14/boot/boot.asm

@@ -19,6 +19,7 @@
 .include "devices/all/defs.asm"
 
 .include "common/calls.asm"
+.include "common/utils_io.asm"
 .include "common/utils_wait.asm"
 .include "modules/com2/defs.asm"
 .include "modules/comproto/defs.asm"
@@ -98,8 +99,7 @@ main:
 .include "modules/flash/defs.asm"
 .include "modules/flash/eeprom.asm"
 .include "modules/flash/io.asm"
-.include "modules/flash/io_attn.asm"
-.include "modules/flash/io_bitbang.asm"
+.include "modules/flash/io_com2w.asm"
 .include "modules/flash/flashxp.asm"
 .include "modules/flash/flash1p.asm"
 .include "modules/flash/flashprocess.asm"

avr/devices/n14/defs.asm

@@ -55,15 +55,15 @@
 .equ COM_DATA_OUTPUT    = PORTB
 .equ COM_DATA_PIN       = PORTB1
 
-.equ COM_ATTN_DDR       = DDRB
-.equ COM_ATTN_INPUT     = PINB
-.equ COM_ATTN_OUTPUT    = PORTB
-.equ COM_ATTN_PIN       = PORTB2
+.equ COM_CLK_DDR       = DDRB
+.equ COM_CLK_INPUT     = PINB
+.equ COM_CLK_OUTPUT    = PORTB
+.equ COM_CLK_PIN       = PORTB2
 
-.equ COM_IRQ_ADDR_ATTN   = PCMSK
-.equ COM_IRQ_BIT_ATTN    = PCINT2       ; bit 2 in PCMSK0 (PCINT2)
-.equ COM_IRQ_GIFR_ATTN   = PCIF
-.equ COM_IRQ_GIMSK_ATTN  = PCIE
+.equ COM_IRQ_ADDR_CLK   = PCMSK
+.equ COM_IRQ_BIT_CLK    = PCINT2       ; bit 2 in PCMSK0 (PCINT2)
+.equ COM_IRQ_GIFR_CLK   = PCIF
+.equ COM_IRQ_GIMSK_CLK  = PCIE
 
 
 

avr/devices/n14/main/main.asm

@@ -29,6 +29,7 @@
 .include "devices/all/defs.asm"
 
 .include "common/calls.asm"
+.include "common/utils_io.asm"
 .include "common/utils_wait.asm"
 
 
@@ -39,8 +40,9 @@
 ; ---------------------------------------------------------------------------
 ; generic
 
-.equ NET_BUFFERS_NUM            = 6
-.equ NET_BUFFERS_SIZE           = 32
+.equ NET_BUFFERS_NUM            =  6
+.equ NET_MSGNUMINBUF_SIZE       =  8 ; max buffer nums in ringbuffer (global incoming)
+.equ NET_IFACE_OUTMSGBUF_SIZE   =  8 ; max buffer nums in ringbuffer (per interface outbound)
 
 
 
@@ -50,7 +52,7 @@
 #define MODULES_CLOCK
 #define MODULES_LED_SIMPLE
 #define MODULES_NETWORK
-#define MODULES_UART_BITBANG
+#define MODULES_COM2W
 #define MODULES_OWI_MASTER
 #define MODULES_DS18B20
 #define MODULES_SK6812
@@ -98,7 +100,7 @@
 
         rjmp BOOTLOADER_ADDR ; Reset vector  ; use this for flashed system
 	reti ; EXT_INT0
-	rjmp UART_BitBang_PcintIsr ; PCI0
+        rjmp com2wPcintIsr         ; PCI0
 	reti ; OC1A
 	reti ; OVF1
 	reti ; OVF0
@@ -199,7 +201,7 @@ onEveryLoop:
 ; ---------------------------------------------------------------------------
 ; defines for network interface
 
-.equ netInterfaceData = uart_bitbang_iface
+.equ netInterfaceData = com2w_iface
 
 
 

avr/devices/n15/.gitignore

@@ -1,2 +0,0 @@
-*.eep.hex
-*.obj

avr/devices/n15/0BUILD

@@ -1,52 +0,0 @@
-<?xml?>
-
-<gwbuild>
-
-  <target type="AvrHexFile" name="n15_main" >
-
-    <includes type="avrasm" >
-      -I $(builddir)
-      -I $(srcdir)
-      -I $(topsrcdir)/avr
-      -I $(topbuilddir)/avr
-    </includes>
-
-
-    <sources type="avrasm" >
-      n15_main.asm
-    </sources>
-
-
-  </target>
-
-
-
-  <target type="AvrHexFile" name="n15_boot" >
-
-    <includes type="avrasm" >
-      -I $(builddir)
-      -I $(srcdir)
-      -I $(topsrcdir)/avr
-      -I $(topbuilddir)/avr
-    </includes>
-
-
-    <sources type="avrasm" >
-      n15_boot.asm
-    </sources>
-
-
-  </target>
-
-
-  <subdirs>
-  </subdirs>
-
-  <extradist>
-    n15_defs.asm
-  </extradist>
-  
-
-</gwbuild>
-
-

avr/devices/n15/n15_boot.asm

@@ -1,178 +0,0 @@
-; ***************************************************************************
-; Source file for base system node on AtTiny 84
-;
-; This is for the maintenance system (i.e. the flash loader).
-;
-; All definitions and changes should go into this file.
-; ***************************************************************************
-
-.equ clock=1000000 ; Define the clock frequency
-
-.nolist
-.include "include/tn84def.inc" ; Define device ATtiny84
-.list
-
-.include "n15_defs.asm"
-.include "defs_all.asm"
-
-
-
-; ***************************************************************************
-; defines
-
-; ---------------------------------------------------------------------------
-; generic
-
-.include "common/utils_wait.asm"
-.include "modules/com2/defs.asm"
-.include "modules/comproto/defs.asm"
-
-
-
-; ---------------------------------------------------------------------------
-; firmware settings
-
-.equ FIRMWARE_VERSION_MAJOR       = 0
-.equ FIRMWARE_VERSION_MINOR       = 0
-.equ FIRMWARE_VERSION_PATCHLEVEL  = 1
-
-
-
-; ---------------------------------------------------------------------------
-; LED
-
-.equ LED_DDR             = DDRA
-.equ LED_PORT            = PORTA
-.equ LED_PIN             = PINA
-.equ LED_PINNUM          = PORTA3
-
-
-; ***************************************************************************
-; code segment
-
-.cseg
-.org 0x0000
-
-
-
-; ---------------------------------------------------------------------------
-; Reset and interrupt vectors
-;  rjmp start ; Reset vector
-  rjmp main ; Reset vector
-  reti ; EXT_INT0
-  reti ; PCI0
-  reti ; PCI1
-  reti ; WATCHDOG
-  reti ; ICP1
-  reti ; OC1A
-  reti ; OC1B
-  reti ; OVF1
-  reti ; OC0A
-  reti ; OC0B
-  reti ; OVF0
-  reti ; ACI
-  reti ; ADCC
-  reti ; ERDY
-  reti ; USI_STR
-  reti ; USI_OVF
-
-
-devInfoBlock:        ; 12 bytes
-devInfoManufacturer: .db 'A', 'Q', 'U', 'A'
-devInfoId:           .db DEVICEINFO_ID, 0
-devInfoVersion:      .db DEVICEINFO_VERSION, DEVICEINFO_REVISION             ; version, revision
-firmwareVersion:     .db FIRMWARE_VARIANT_BOOT, FIRMWARE_VERSION_MAJOR
-                     .db FIRMWARE_VERSION_MINOR, FIRMWARE_VERSION_PATCHLEVEL
-
-firmwareStart:   rjmp main ; will be overwritten when flashing
-
-
-
-; ***************************************************************************
-; main code
-
-
-.org BOOTLOADER_ADDR
-
-
-main:
-  rjmp bootLoader ; this routine is in modules/flash/proto.asm
-
-
-
-
-; ***************************************************************************
-; includes
-
-.include "common/utils_wait_fixed.asm"
-.include "common/utils_copy_from_flash.asm"
-.include "common/utils_copy_sdram.asm"
-
-.include "modules/flash/defs.asm"
-.include "modules/flash/eeprom.asm"
-.include "modules/flash/io.asm"
-.include "modules/flash/io_attn.asm"
-.include "modules/flash/io_bitbang.asm"
-.include "modules/flash/flash1p.asm"
-.include "modules/flash/flashprocess.asm"
-.include "modules/flash/wait.asm"
-.include "modules/bootloader/main.asm"
-.include "modules/network/msg/defs.asm"
-.include "modules/network/msg/crc.asm"
-
-
-
-systemSetSpeed:
-.if clock == 8000000
-  ldi r16, (1<<CLKPCE)
-  ldi r17, 0
-  out CLKPR, r16
-  out CLKPR, r17
-.endif
-
-.if clock == 1000000
-  ldi r16, (1<<CLKPCE)
-  ldi r17, (1<<CLKPS1) | (1<<CLKPS0)
-  out CLKPR, r16
-  out CLKPR, r17
-.endif
-  ret
-
-
-#if 0
-debugStop:
-  cli
-  sbi LED_SIMPLE_DDR, LED_SIMPLE_PINNUM  ; out
-  cbi LED_SIMPLE_PORT, LED_SIMPLE_PINNUM ; on
-  
-  cbi COM_ATTN_DDR, COM_ATTN_PIN          ; set ATTN port as input
-  cbi COM_ATTN_OUTPUT, COM_ATTN_PIN       ; disable internal pullup for ATTN
-  
-  ldi r18, 0
-test_loop1:
-    ldi r16, 100
-test_loop2:
-      ldi r17, 100
-test_loop3:
-        Utils_WaitNanoSecs 10000, 0, r22
-        dec r17
-      brne test_loop3
-      dec r16
-    brne test_loop2
-    sbi LED_SIMPLE_PORTIN, LED_SIMPLE_PINNUM ; toggle
-    inc r18
-    mov r19, r18
-    andi r19, 1
-    brne test1
-    sbi COM_ATTN_DDR, COM_ATTN_PIN
-    cbi COM_ATTN_OUTPUT, COM_ATTN_PIN
-    rjmp test_loop1
-test1:
-    cbi COM_ATTN_DDR, COM_ATTN_PIN
-    cbi COM_ATTN_OUTPUT, COM_ATTN_PIN
-    
-  rjmp test_loop1
-#endif
-
-  
-

avr/devices/n15/n15_defs.asm

@@ -1,176 +0,0 @@
-; ***************************************************************************
-; copyright   : (C) 2023 by Martin Preuss
-; email       : martin@libchipcard.de
-;
-; ***************************************************************************
-; * This file is part of the project "AqHome".                              *
-; * Please see toplevel file COPYING of that project for license details.   *
-; ***************************************************************************
-
-
-; ***************************************************************************
-;
-;                                 AtTiny84
-;                                 --------
-;                            VCC  1     14  GND
-;                            PB0  2     13  PA0  REED_OUT
-;                  PIR       PB1  3     12  PA1  COM-DATA
-;                  /RESET    PB3  4     11  PA2  REED_IN1
-;                  [KEY1]    PB2  5     10  PA3  LED
-;                  COM_ATTN  PA7  6      9  PA4  TWI-SCL
-;                  TWI-SDA   PA6  7      8  PA5  REED_IN2
-;                                 --------
-;
-; ***************************************************************************
-
-
-
-.equ BOOTLOADER_ADDR = 0xd00
-
-.equ FIRMWARE_VARIANT_BOOT        = 0
-.equ FIRMWARE_VARIANT_TEMP_WINDOW = 1
-
-.equ DEVICEINFO_ID       = 'N'
-.equ DEVICEINFO_VERSION  = 15
-.equ DEVICEINFO_REVISION = 0
-
-
-
-; ---------------------------------------------------------------------------
-; LED module
-
-.equ LED_SIMPLE_ONTIME  = 2
-.equ LED_SIMPLE_OFFTIME = 30
-.equ LED_SIMPLE_DDR     = DDRA
-.equ LED_SIMPLE_PORT    = PORTA
-.equ LED_SIMPLE_PORTIN  = PINA
-.equ LED_SIMPLE_PINNUM  = PORTA3
-
-
-
-; ---------------------------------------------------------------------------
-; COM module
-
-.equ COM_BIT_LENGTH      = 52000 ; 104000ns=9600, 52000ns=19200, 26000ns=38400
-.equ COM_HALFBIT_LENGTH  = 26000 ; see https://de.wikipedia.org/wiki/Universal_Asynchronous_Receiver_Transmitter
-
-.equ COM_DATA_DDR       = DDRA
-.equ COM_DATA_INPUT     = PINA
-.equ COM_DATA_OUTPUT    = PORTA
-.equ COM_DATA_PIN       = PORTA1
-
-.equ COM_ATTN_DDR       = DDRA
-.equ COM_ATTN_INPUT     = PINA
-.equ COM_ATTN_OUTPUT    = PORTA
-.equ COM_ATTN_PIN       = PORTA7
-
-.equ COM_IRQ_ADDR_ATTN   = PCMSK0
-.equ COM_IRQ_BIT_ATTN    = PCINT7        ; bit 7 in PCMSK0
-.equ COM_IRQ_GIFR_ATTN   = PCIF0
-.equ COM_IRQ_GIMSK_ATTN  = PCIE0
-
-
-
-; ---------------------------------------------------------------------------
-; TWI master module
-
-;.equ TWI_BIT_LENGTH = 10000 ; 100000 and 200000 works for display: 10000, 100000, 200000
-.equ TWI_BIT_LENGTH = 1 ; 10, 100, 500, 100000 and 200000 works for display: 10000, 100000, 200000
-
-.equ TWI_DDR_SCL          = DDRA
-.equ TWI_PORT_SCL         = PORTA
-.equ TWI_PIN_SCL          = PINA
-.equ TWI_PINNUM_SCL       = PORTA4
-
-.equ TWI_DDR_SDA          = DDRA
-.equ TWI_PORT_SDA         = PORTA
-.equ TWI_PIN_SDA          = PINA
-.equ TWI_PINNUM_SDA       = PORTA6
-
-
-
-; ---------------------------------------------------------------------------
-; LCD module
-
-.equ LCD_TWI_ADDRESS      = 0x3c
-
-
-
-; ---------------------------------------------------------------------------
-; BMP 280
-
-.equ BMP280_ADDR          = 0x76
-
-
-
-; ---------------------------------------------------------------------------
-; SI 7021
-
-.equ SI7021_ADDR          = 0x40
-
-
-
-; ---------------------------------------------------------------------------
-; ADC/CNY70
-
-
-.equ CNY70_PORT_LED       = PORTB
-.equ CNY70_DDR_LED        = DDRB
-.equ CNY70_PINNUM_LED     = PORTB1
-
-.equ CNY70_PORT_ADC       = PORTA ; adc5
-.equ CNY70_DDR_ADC        = DDRA
-.equ CNY70_PINNUM_ADC     = PORTA5
-.equ CNY70_MUX_ADC        = MUX5
-.equ CNY70_ADCSRB_ADC     = ADC5D
-
-
-
-
-; ---------------------------------------------------------------------------
-; Reed
-;
-
-.equ REEDOUT1_DDR         = DDRA
-.equ REEDOUT1_PORT        = PORTA
-.equ REEDOUT1_PIN         = PINA
-.equ REEDOUT1_PINNUM      = PORTA0
-
-.equ REEDOUT2_DDR         = DDRB
-.equ REEDOUT2_PORT        = PORTB
-.equ REEDOUT2_PIN         = PINB
-.equ REEDOUT2_PINNUM      = PORTB0
-
-.equ REED1_DDR            = DDRA
-.equ REED1_PORT           = PORTA
-.equ REED1_PIN            = PINA
-.equ REED1_PINNUM         = PORTA2
-
-.equ REED2_DDR            = DDRA
-.equ REED2_PORT           = PORTA
-.equ REED2_PIN            = PINA
-.equ REED2_PINNUM         = PORTA5
-
-
-; ---------------------------------------------------------------------------
-; 1-Wire Master
-;
-
-.equ OWI_DDR     = DDRB
-.equ OWI_PORTOUT = PORTB
-.equ OWI_PORTIN  = PINB
-.equ OWI_PINNUM  = PORTB2
-
-
-
-; ---------------------------------------------------------------------------
-; Motion Sensor
-;
-
-.equ MOTION_DDR       = DDRB
-.equ MOTION_INPUT     = PINB
-.equ MOTION_OUTPUT    = PORTB
-.equ MOTION_PIN       = PORTB1
-
-
-

avr/devices/n15/n15_main.asm

@@ -1,462 +0,0 @@
-; ***************************************************************************
-; copyright   : (C) 2024 by Martin Preuss
-; email       : martin@libchipcard.de
-;
-; ***************************************************************************
-; * This file is part of the project "AqHome".                              *
-; * Please see toplevel file COPYING of that project for license details.   *
-; ***************************************************************************
-
-
-
-
-; ***************************************************************************
-; Source file for temperature sensor node on AtTiny 84
-;
-; This is for the full system (i.e. not the boot loader).
-;
-; All definitions and changes should go into this file.
-;
-;
-; ***************************************************************************
-
-
-.equ clock=1000000 ; Define the clock frequency
-;.equ clock=8000000 ; Define the clock frequency
-
-
-
-.nolist
-.include "include/tn84def.inc" ; Define device ATtiny84
-.list
-
-.include "n15_defs.asm"
-.include "defs_all.asm"
-
-
-
-; ***************************************************************************
-; defines
-
-; ---------------------------------------------------------------------------
-; generic
-
-
-.include "common/utils_wait.asm"
-
-
-; ---------------------------------------------------------------------------
-; firmware settings including list of modules used
-
-.equ FIRMWARE_VERSION_MAJOR       = 0
-.equ FIRMWARE_VERSION_MINOR       = 0
-.equ FIRMWARE_VERSION_PATCHLEVEL  = 1
-
-
-#define MODULES_TIMER
-#define MODULES_COM
-#define MODULES_COM_WITH_ADDR_PROTO
-;#define MODULES_LED
-#define MODULES_LED_SIMPLE
-#define MODULES_TWI_MASTER
-;#define MODULES_LCD
-#define LCD_MINIMAL_FONT
-#define MODULES_SI7021
-#define MODULES_STATS
-;#define MODULES_CNY70
-;#define MODULES_REED
-;#define MODULES_OWI_MASTER
-;#define MODULES_DS18B20
-#define MODULES_MOTION
-
-; ---------------------------------------------------------------------------
-; defines for values
-
-.equ VALUE_ID_SI7021_TEMP  = 0x01
-.equ VALUE_ID_SI7021_HUM   = 0x02
-
-.equ VALUE_ID_ADC          = 0x03
-.equ VALUE_ID_REED1        = 0x04
-.equ VALUE_ID_REED2        = 0x05
-.equ VALUE_ID_DS18B20_TEMP = 0x06
-.equ VALUE_ID_MOTION       = 0x07
-
-.equ VALUE_ID_REED_CONF    = 0x81
-
-
-
-; ***************************************************************************
-; code segment
-
-.cseg
-.org 000000
-
-
-
-; ---------------------------------------------------------------------------
-; Reset and interrupt vectors (will be removed as soon as we can flash data over COM)
-
-;	rjmp main ; Reset vector
-        rjmp BOOTLOADER_ADDR ; Reset vector  ; use this for flashed system
-	reti ; EXT_INT0
-	rjmp uartBitbangIsrPcint0 ; PCI0
-	reti ; PCI1
-	reti ; WATCHDOG
-	reti ; ICP1
-	reti ; OC1A
-	reti ; OC1B
-	reti ; OVF1
-        rjmp baseTimerIrqOC0A ; OC0A
-	reti ; OC0B
-	reti ; OVF0
-	reti ; ACI
-        reti ; ADCC
-	reti ; ERDY
-	reti ; USI_STR
-	reti ; USI_OVF
-
-
-devInfoBlock:        ; 12 bytes
-devInfoManufacturer: .db 'A', 'Q', 'U', 'A'
-devInfoId:           .db DEVICEINFO_ID, 0
-devInfoVersion:      .db DEVICEINFO_VERSION, DEVICEINFO_REVISION             ; version, revision
-firmwareVersion:     .db FIRMWARE_VARIANT_TEMP_WINDOW, FIRMWARE_VERSION_MAJOR
-                     .db FIRMWARE_VERSION_MINOR, FIRMWARE_VERSION_PATCHLEVEL
-
-firmwareStart:   rjmp main
-
-
-; ***************************************************************************
-; includes
-
-.include "common/utils.asm"
-.include "common/utils_wait_fixed.asm"
-.include "common/utils_copy_from_flash.asm"
-.include "common/utils_copy_sdram.asm"
-.include "common/crc8.asm"
-
-.include "modules/basetimer/main.asm"
-
-#ifdef MODULES_TIMER
-  .include "modules/timer/main.asm"
-#endif
-#ifdef MODULES_LED
-.include "modules/led/main.asm"
-#endif
-#ifdef MODULES_LED_SIMPLE
-.include "modules/led_simple/main.asm"
-#endif
-#ifdef MODULES_COM
-  .include "modules/com2/defs.asm"
-  .include "modules/com2/main.asm"
-  .include "modules/com2/buffer.asm"
-  .include "modules/uart_bitbang/defs.asm"
-  .include "modules/uart_bitbang/main.asm"
-  .include "modules/uart_bitbang/bytelevel.asm"
-  .include "modules/uart_bitbang/packetlevel.asm"
-  #ifdef MODULES_COM_WITH_ADDR_PROTO
-    .include "modules/comproto/defs.asm"
-    .include "modules/comproto/main.asm"
-    .include "modules/comproto/addr.asm"
-    .include "modules/comproto/msg_recvstats.asm"
-    .include "modules/comproto/msg_sendstats.asm"
-    .include "modules/comproto/msg_sysstats.asm"
-    .include "modules/comproto/msg_memstats.asm"
-    .include "modules/comproto/msg_pong.asm"
-    .include "modules/comproto/msg_value.asm"
-    .include "modules/comproto/msg_device.asm"
-    .include "modules/comproto/msg_reboot.asm"
-  #endif
-  #ifdef MODULES_LCD
-    .include "modules/com2/screen.asm"
-    .include "modules/comproto/screen.asm"
-  #endif
-#endif
-#ifdef MODULES_TWI_MASTER
-  .include "modules/twimaster/main.asm"
-#endif
-#ifdef MODULES_OWI_MASTER
-  .include "modules/owimaster/main.asm"
-#endif
-#ifdef MODULES_LCD
-  .include "modules/lcd/main.asm"
-#endif
-#ifdef MODULES_SI7021
-  .include "modules/si7021/main.asm"
-#endif
-#ifdef MODULES_DS18B20
-  .include "modules/ds18b20/main.asm"
-#endif
-#ifdef MODULES_STATS
-  .include "modules/stats/main.asm"
-#endif
-#ifdef MODULES_CNY70
-  .include "modules/cny70/main.asm"
-#endif
-#ifdef MODULES_REED
-  .include "modules/reed/main.asm"
-#endif
-
-#ifdef MODULES_MOTION
-  .include "modules/motion/main.asm"
-#endif
-
-; test
-;#include "modules/uart_irq/defs.asm"
-;#include "modules/uart_irq/iface.asm"
-;#include "modules/uart_irq/iface1.asm"
-
-
-; ***************************************************************************
-; data in SRAM
-
-.dseg
-
-programRamBegin:
-#ifdef MODULES_LCD
-  screenCounter:               .byte 1
-#endif
-
-programRamEnd:
-
-
-
-#ifdef MODULES_LCD
-  sramTimerWriteStats:         .byte 2
-  sramTimerScreen:             .byte 2
-#endif
-#ifdef MODULES_SI7021
-  sramTimerSI7021Measure:      .byte 2
-  sramTimerSI7021SendTemp:     .byte 2
-  sramTimerSI7021SendHumidity: .byte 2
-#endif
-#ifdef MODULES_CNY70
-  sramTimerCny70SendAdc:       .byte 2
-#endif
-#ifdef MODULES_LCD
-  sramPeriodicalLcdMark:       .byte 2
-#endif
-#ifdef MODULES_DS18B20
-  sramDs18b20Timer:            .byte 2
-  sramSendDs18b20TempTimer:    .byte 2
-#endif
-
-
-; ***************************************************************************
-; data in FLASH
-
-.cseg
-
-
-
-; ---------------------------------------------------------------------------
-; timer list
-
-
-timerList:
-;     SRAM variable/counter        routine                     flags                secs (0=don't start or restart)
-#ifdef MODULES_COM_WITH_ADDR_PROTO
-  .dw cproAddresModeTimer,         CPRO_Address_OnTimer,       0,                   0     ; (no restart)
-#endif
-#ifdef MODULES_STATS
-  .dw statsSendTimer,              Stats_Timer,                TIMER_FLAGS_IF_ADDR, 9000   ; every 15m
-#endif
-#ifdef MODULES_LCD
-;  .dw sramPeriodicalLcdMark,       periodicalLcdMark,          0,                    20   ; every 2s
-;  .dw sramTimerWriteStats,         writeStats,                 0,                   100
-  .dw sramTimerScreen,              printScreen,                TIMER_FLAGS_IF_ADDR,  50    ; every 5s
-#endif
-#ifdef MODULES_SI7021
-  .dw sramTimerSI7021Measure,      SI7021_OnTimer,             0,                   300    ; every 30s
-  .dw sramTimerSI7021SendTemp,     sendSI7021Temp,             TIMER_FLAGS_IF_ADDR, 600    ; every 60s
-  .dw sramTimerSI7021SendHumidity, sendSI7021Humidity,         TIMER_FLAGS_IF_ADDR, 600    ; every 60s
-#endif
-#ifdef MODULES_CNY70
-  .dw sramTimerCny70SendAdc,       CNY70_OnTimer,              TIMER_FLAGS_IF_ADDR, 50     ; every 5s
-#endif
-#ifdef MODULES_DS18B20
-  .dw sramDs18b20Timer,            Ds18b20_OnTimer,            0,                   300    ; every 30s
-  .dw sramSendDs18b20TempTimer,    sendDs18b20Temp,            TIMER_FLAGS_IF_ADDR, 600    ; every 60s
-#endif
-  .dw 0 ; end of list
-
-
-
-
-
-.include "main_all.asm"
-
-
-
-systemSetSpeed:
-.if clock == 8000000
-  ldi r16, (1<<CLKPCE)
-  ldi r17, 0
-  out CLKPR, r16
-  out CLKPR, r17
-.endif
-  ret
-
-
-systemSetBootSpeed:
-.if clock == 8000000
-  ldi r16, (1<<CLKPCE)
-  ldi r17, (1<<CLKPS1) | (1<<CLKPS0)
-  out CLKPR, r16
-  out CLKPR, r17
-.endif
-  ret
-
-
-
-; ---------------------------------------------------------------------------
-; Called on first time run, i.e. on system start. No arguments, no results.
-
-onSystemStart:
-  ldi xh, HIGH(programRamBegin)
-  ldi xl, LOW(programRamBegin)
-  clr r16
-  ldi r17, (programRamEnd-programRamBegin)
-  rcall Utils_FillSram
-  ret
-
-
-#ifdef MODULES_LCD
-
-printScreen:
-  lds r16, screenCounter
-  tst r16
-  brne printScreen_l1
-  rcall CPRO_Screen
-  rjmp printScreen_counter
-printScreen_l1:
-  cpi r16, 1
-  brne printScreen_l2
-  rcall COM2_Screen_RecvStats
-  rjmp printScreen_counter
-printScreen_l2:
-;  cpi r16, 2
-;  brne printScreen_l3
-;  rcall COM2_Screen_SendStats
-;  rjmp printScreen_counter
-printScreen_l3:
-  ; add more screens here
-
-printScreen_counter:
-  lds r16, screenCounter
-  inc r16
-  cpi r16, 2 ; number of screens
-  brcs printScreen_store
-  clr r16
-printScreen_store:
-  sts screenCounter, r16
-printScreen_end:
-  ret
-
-
-;periodicalLcdMark:
-;  rcall printTimerMark
-;  ret
-
-
-;writeStats:
-;  rcall printSendStats
-;  ret
-#endif
-
-
-#ifdef MODULES_SI7021
-
-sendSI7021Humidity:
-  rcall SI7021_SendHumidity
-  brcs sendSI7021Humidity_okay
-  ; set timer to 1s to retry later
-  ldi xl, LOW(sramTimerSI7021SendHumidity)
-  ldi xh, HIGH(sramTimerSI7021SendHumidity)
-  rjmp Timer_SetValueTo1s
-sendSI7021Humidity_okay:
-  ret
-
-
-sendSI7021Temp:
-  rcall SI7021_SendTemp
-  brcs sendSI7021Temp_okay
-  ; set timer to 1s to retry later
-  ldi xl, LOW(sramTimerSI7021SendTemp)
-  ldi xh, HIGH(sramTimerSI7021SendTemp)
-  rjmp Timer_SetValueTo1s
-sendSI7021Temp_okay:
-  ret
-#endif
-
-
-#ifdef MODULES_DS18B20
-sendDs18b20Temp:
-  rcall Ds18b20_SendTemp
-  brcs sendDs18b20Temp_okay
-  ; set timer to 1s to retry later
-  ldi xl, LOW(sramSendDs18b20TempTimer)
-  ldi xh, HIGH(sramSendDs18b20TempTimer)
-  rjmp Timer_SetValueTo1s
-sendDs18b20Temp_okay:
-  ret
-#endif
-
-
-; ---------------------------------------------------------------------------
-; Called every 100ms. Add your routine calls here. No arguments, no results.
-
-onEvery100ms:
-#ifdef MODULES_LED_SIMPLE
-  rcall LedSimple_Every100ms
-#endif
-
-#ifdef MODULES_REED
-  rcall REED_Every100ms
-#endif
-
-#ifdef MODULES_MOTION
-  rcall Motion_Every100ms
-#endif
-  ret
-
-
-
-; ---------------------------------------------------------------------------
-; @routine onPacketReceived:
-;
-; Called after a packet was received via COM module. Add your routine calls here.
-;
-; The packet will be released in any case after return from this call.
-;
-; @return CFLAG set if message handled, cleared otherwise
-; @param X  pointer to received buffer
-; @clobbers all
-
-onPacketReceived:
-#ifdef MODULES_MOTION_LIGHT
-  rcall MotionLight_OnPacketReceived
-  brcs onPacketReceived_end
-#endif
-
-#ifdef MODULES_SK6812
-  rcall SK6812_OnPacketReceived
-  brcs onPacketReceived_end
-#endif
-
-#ifdef MODULES_REED
-  rcall REED_OnPacketReceived
-  brcs onPacketReceived_end
-#endif
-
-#ifdef MODULES_COM
-  rcall CPRO_OnPacketReceived
-  brcs onPacketReceived_end
-#endif
-
-  clc
-onPacketReceived_end:
-  ret
-; @end
-
-

avr/devices/n16/0BUILD

@@ -7,6 +7,10 @@
     main
   </subdirs>
 
+  <data dist="true" install="$(datadir)/aqhome/devices/nodes">
+    aqua_n16.xml
+  </data>
+
   <extradist>
     defs.asm
     README

avr/devices/n16/aqua_n16.xml

@@ -0,0 +1,17 @@
+
+<device name="aqua_n16" driver="nodes">
+  <manufacturer>AQUA</manufacturer>
+  <devicetype>N</devicetype>
+  <deviceversion>16</deviceversion>
+  
+  <values>
+    <value name="SI7021_TEMP"            id="0x01" type="sensor" dataType="rational" modality="temperature" units="C" denom="100" />
+    <value name="SI7021_HUM"             id="0x02" type="sensor" dataType="rational" modality="humidity"    units="%" denom="1" />
+    <value name="MOTION"                 id="0x07" type="sensor" dataType="rational" modality="motion"                denom="1" />
+    <value name="DOOR"                   id="0x08" type="sensor" dataType="rational" modality="door"                  denom="1" />
+
+    <value name="LEDTIMING"              id="0x88" type="actor"  dataType="uint16" />
+    
+  </values>
+
+</device>

avr/devices/n16/boot/boot.asm

@@ -17,6 +17,7 @@
 .include "devices/all/defs.asm"
 
 .include "common/calls.asm"
+.include "common/utils_io.asm"
 .include "common/utils_wait.asm"
 ;.include "modules/com2/defs.asm"
 ;.include "modules/comproto/defs.asm"
@@ -99,8 +100,7 @@ main:
 .include "modules/flash/defs.asm"
 .include "modules/flash/eeprom.asm"
 .include "modules/flash/io.asm"
-.include "modules/flash/io_attn.asm"
-.include "modules/flash/io_bitbang.asm"
+.include "modules/flash/io_com2w.asm"
 .include "modules/flash/flash1p.asm"
 .include "modules/flash/flashxp.asm"
 .include "modules/flash/flashprocess.asm"

avr/devices/n16/defs.asm

@@ -17,7 +17,7 @@
 ;                  PIR       PB1  3     12  PA1  COM-DATA
 ;                  /RESET    PB3  4     11  PA2  TCRT1000_Input
 ;                            PB2  5     10  PA3  LED
-;                  COM_ATTN  PA7  6      9  PA4  TWI-SCL
+;                  COM_CLK   PA7  6      9  PA4  TWI-SCL
 ;                  TWI-SDA   PA6  7      8  PA5
 ;                                 --------
 ;
@@ -59,15 +59,15 @@
 .equ COM_DATA_OUTPUT    = PORTA
 .equ COM_DATA_PIN       = PORTA1
 
-.equ COM_ATTN_DDR       = DDRA
-.equ COM_ATTN_INPUT     = PINA
-.equ COM_ATTN_OUTPUT    = PORTA
-.equ COM_ATTN_PIN       = PORTA7
+.equ COM_CLK_DDR       = DDRA
+.equ COM_CLK_INPUT     = PINA
+.equ COM_CLK_OUTPUT    = PORTA
+.equ COM_CLK_PIN       = PORTA7
 
-.equ COM_IRQ_ADDR_ATTN   = PCMSK0
-.equ COM_IRQ_BIT_ATTN    = PCINT7        ; bit 7 in PCMSK0
-.equ COM_IRQ_GIFR_ATTN   = PCIF0
-.equ COM_IRQ_GIMSK_ATTN  = PCIE0
+.equ COM_IRQ_ADDR_CLK   = PCMSK0
+.equ COM_IRQ_BIT_CLK    = PCINT7        ; bit 7 in PCMSK0
+.equ COM_IRQ_GIFR_CLK   = PCIF0
+.equ COM_IRQ_GIMSK_CLK  = PCIE0
 
 
 

avr/devices/n16/main/main.asm

@@ -36,6 +36,7 @@
 .include "devices/all/defs.asm"
 
 .include "common/calls.asm"
+.include "common/utils_io.asm"
 .include "common/utils_wait.asm"
 
 
@@ -46,8 +47,9 @@
 ; ---------------------------------------------------------------------------
 ; generic
 
-.equ NET_BUFFERS_NUM            = 6
-.equ NET_BUFFERS_SIZE           = 32
+.equ NET_BUFFERS_NUM            =  6
+.equ NET_MSGNUMINBUF_SIZE       =  8 ; max buffer nums in ringbuffer (global incoming)
+.equ NET_IFACE_OUTMSGBUF_SIZE   =  8 ; max buffer nums in ringbuffer (per interface outbound)
 
 
 
@@ -57,7 +59,7 @@
 #define MODULES_CLOCK
 #define MODULES_LED_SIMPLE
 #define MODULES_NETWORK
-#define MODULES_UART_BITBANG
+#define MODULES_COM2W
 #define MODULES_TWI_MASTER
 ;#define MODULES_LCD
 ;#define LCD_MINIMAL_FONT
@@ -107,7 +109,7 @@
 ;	rjmp main ; Reset vector
         rjmp BOOTLOADER_ADDR ; Reset vector  ; use this for flashed system
 	reti ; EXT_INT0
-	rjmp UART_BitBang_PcintIsr ; PCI0
+        rjmp com2wPcintIsr         ; PCI0
 	reti ; PCI1
 	reti ; WATCHDOG
 	reti ; ICP1
@@ -202,7 +204,7 @@ onEveryLoop:
 ; ---------------------------------------------------------------------------
 ; defines for network interface
 
-.equ netInterfaceData = uart_bitbang_iface
+.equ netInterfaceData = com2w_iface
 
 
 

avr/devices/n17/.gitignore

@@ -1,2 +0,0 @@
-*.eep.hex
-*.obj

avr/devices/n17/0BUILD

@@ -1,52 +0,0 @@
-<?xml?>
-
-<gwbuild>
-
-  <target type="AvrHexFile" name="n17_main" >
-
-    <includes type="avrasm" >
-      -I $(builddir)
-      -I $(srcdir)
-      -I $(topsrcdir)/avr
-      -I $(topbuilddir)/avr
-    </includes>
-
-
-    <sources type="avrasm" >
-      n17_main.asm
-    </sources>
-
-
-  </target>
-
-
-
-  <target type="AvrHexFile" name="n17_boot" >
-
-    <includes type="avrasm" >
-      -I $(builddir)
-      -I $(srcdir)
-      -I $(topsrcdir)/avr
-      -I $(topbuilddir)/avr
-    </includes>
-
-
-    <sources type="avrasm" >
-      n17_boot.asm
-    </sources>
-
-
-  </target>
-
-
-  <subdirs>
-  </subdirs>
-
-  <extradist>
-    n17_defs.asm
-  </extradist>
-  
-
-</gwbuild>
-
-

avr/devices/n17/n17_boot.asm

@@ -1,178 +0,0 @@
-; ***************************************************************************
-; Source file for base system node on AtTiny 84
-;
-; This is for the maintenance system (i.e. the flash loader).
-;
-; All definitions and changes should go into this file.
-; ***************************************************************************
-
-.equ clock=1000000 ; Define the clock frequency
-
-.nolist
-.include "include/tn84def.inc" ; Define device ATtiny84
-.list
-
-.include "n17_defs.asm"
-.include "defs_all.asm"
-
-
-
-; ***************************************************************************
-; defines
-
-; ---------------------------------------------------------------------------
-; generic
-
-.include "common/utils_wait.asm"
-.include "modules/com2/defs.asm"
-.include "modules/comproto/defs.asm"
-
-
-
-; ---------------------------------------------------------------------------
-; firmware settings
-
-.equ FIRMWARE_VERSION_MAJOR       = 0
-.equ FIRMWARE_VERSION_MINOR       = 0
-.equ FIRMWARE_VERSION_PATCHLEVEL  = 1
-
-
-
-; ---------------------------------------------------------------------------
-; LED
-
-.equ LED_DDR             = DDRA
-.equ LED_PORT            = PORTA
-.equ LED_PIN             = PINA
-.equ LED_PINNUM          = PORTA3
-
-
-; ***************************************************************************
-; code segment
-
-.cseg
-.org 0x0000
-
-
-
-; ---------------------------------------------------------------------------
-; Reset and interrupt vectors
-;  rjmp start ; Reset vector
-  rjmp main ; Reset vector
-  reti ; EXT_INT0
-  reti ; PCI0
-  reti ; PCI1
-  reti ; WATCHDOG
-  reti ; ICP1
-  reti ; OC1A
-  reti ; OC1B
-  reti ; OVF1
-  reti ; OC0A
-  reti ; OC0B
-  reti ; OVF0
-  reti ; ACI
-  reti ; ADCC
-  reti ; ERDY
-  reti ; USI_STR
-  reti ; USI_OVF
-
-
-devInfoBlock:        ; 12 bytes
-devInfoManufacturer: .db 'A', 'Q', 'U', 'A'
-devInfoId:           .db DEVICEINFO_ID, 0
-devInfoVersion:      .db DEVICEINFO_VERSION, DEVICEINFO_REVISION             ; version, revision
-firmwareVersion:     .db FIRMWARE_VARIANT_BOOT, FIRMWARE_VERSION_MAJOR
-                     .db FIRMWARE_VERSION_MINOR, FIRMWARE_VERSION_PATCHLEVEL
-
-firmwareStart:   rjmp main ; will be overwritten when flashing
-
-
-
-; ***************************************************************************
-; main code
-
-
-.org BOOTLOADER_ADDR
-
-
-main:
-  rjmp bootLoader ; this routine is in modules/flash/proto.asm
-
-
-
-
-; ***************************************************************************
-; includes
-
-.include "common/utils_wait_fixed.asm"
-.include "common/utils_copy_from_flash.asm"
-.include "common/utils_copy_sdram.asm"
-
-.include "modules/flash/defs.asm"
-.include "modules/flash/eeprom.asm"
-.include "modules/flash/io.asm"
-.include "modules/flash/io_attn.asm"
-.include "modules/flash/io_bitbang.asm"
-.include "modules/flash/flash1p.asm"
-.include "modules/flash/flashprocess.asm"
-.include "modules/flash/wait.asm"
-.include "modules/bootloader/main.asm"
-.include "modules/network/msg/defs.asm"
-.include "modules/network/msg/crc.asm"
-
-
-
-systemSetSpeed:
-.if clock == 8000000
-  ldi r16, (1<<CLKPCE)
-  ldi r17, 0
-  out CLKPR, r16
-  out CLKPR, r17
-.endif
-
-.if clock == 1000000
-  ldi r16, (1<<CLKPCE)
-  ldi r17, (1<<CLKPS1) | (1<<CLKPS0)
-  out CLKPR, r16
-  out CLKPR, r17
-.endif
-  ret
-
-
-#if 0
-debugStop:
-  cli
-  sbi LED_SIMPLE_DDR, LED_SIMPLE_PINNUM  ; out
-  cbi LED_SIMPLE_PORT, LED_SIMPLE_PINNUM ; on
-  
-  cbi COM_ATTN_DDR, COM_ATTN_PIN          ; set ATTN port as input
-  cbi COM_ATTN_OUTPUT, COM_ATTN_PIN       ; disable internal pullup for ATTN
-  
-  ldi r18, 0
-test_loop1:
-    ldi r16, 100
-test_loop2:
-      ldi r17, 100
-test_loop3:
-        Utils_WaitNanoSecs 10000, 0, r22
-        dec r17
-      brne test_loop3
-      dec r16
-    brne test_loop2
-    sbi LED_SIMPLE_PORTIN, LED_SIMPLE_PINNUM ; toggle
-    inc r18
-    mov r19, r18
-    andi r19, 1
-    brne test1
-    sbi COM_ATTN_DDR, COM_ATTN_PIN
-    cbi COM_ATTN_OUTPUT, COM_ATTN_PIN
-    rjmp test_loop1
-test1:
-    cbi COM_ATTN_DDR, COM_ATTN_PIN
-    cbi COM_ATTN_OUTPUT, COM_ATTN_PIN
-    
-  rjmp test_loop1
-#endif
-
-  
-

avr/devices/n17/n17_defs.asm

@@ -1,127 +0,0 @@
-; ***************************************************************************
-; copyright   : (C) 2023 by Martin Preuss
-; email       : martin@libchipcard.de
-;
-; ***************************************************************************
-; * This file is part of the project "AqHome".                              *
-; * Please see toplevel file COPYING of that project for license details.   *
-; ***************************************************************************
-
-
-; ***************************************************************************
-;
-;                                 AtTiny84
-;                                 --------
-;                            VCC  1     14  GND
-;                            PB0  2     13  PA0  AUX-A0
-;                  PIR       PB1  3     12  PA1  COM-DATA
-;                  /RESET    PB3  4     11  PA2
-;                  AUX-B2    PB2  5     10  PA3  LED
-;                  COM_ATTN  PA7  6      9  PA4  TWI-SCL
-;                  TWI-SDA   PA6  7      8  PA5
-;                                 --------
-;
-; ***************************************************************************
-
-
-
-.equ BOOTLOADER_ADDR = 0xd00
-
-.equ FIRMWARE_VARIANT_BOOT        = 0
-.equ FIRMWARE_VARIANT_TEMP_WINDOW = 1
-
-.equ DEVICEINFO_ID       = 'N'
-.equ DEVICEINFO_VERSION  = 17
-.equ DEVICEINFO_REVISION = 0
-
-
-
-; ---------------------------------------------------------------------------
-; LED module
-
-.equ LED_SIMPLE_ONTIME  = 1     ; shorter
-.equ LED_SIMPLE_OFFTIME = 50    ; longer
-.equ LED_SIMPLE_DDR     = DDRA
-.equ LED_SIMPLE_PORT    = PORTA
-.equ LED_SIMPLE_PORTIN  = PINA
-.equ LED_SIMPLE_PINNUM  = PORTA3
-
-
-
-; ---------------------------------------------------------------------------
-; COM module
-
-.equ COM_BIT_LENGTH      = 52000 ; 104000ns=9600, 52000ns=19200, 26000ns=38400
-.equ COM_HALFBIT_LENGTH  = 26000 ; see https://de.wikipedia.org/wiki/Universal_Asynchronous_Receiver_Transmitter
-
-.equ COM_DATA_DDR       = DDRA
-.equ COM_DATA_INPUT     = PINA
-.equ COM_DATA_OUTPUT    = PORTA
-.equ COM_DATA_PIN       = PORTA1
-
-.equ COM_ATTN_DDR       = DDRA
-.equ COM_ATTN_INPUT     = PINA
-.equ COM_ATTN_OUTPUT    = PORTA
-.equ COM_ATTN_PIN       = PORTA7
-
-.equ COM_IRQ_ADDR_ATTN   = PCMSK0
-.equ COM_IRQ_BIT_ATTN    = PCINT7        ; bit 7 in PCMSK0
-.equ COM_IRQ_GIFR_ATTN   = PCIF0
-.equ COM_IRQ_GIMSK_ATTN  = PCIE0
-
-
-
-; ---------------------------------------------------------------------------
-; TWI master module
-
-;.equ TWI_BIT_LENGTH = 10000 ; 100000 and 200000 works for display: 10000, 100000, 200000
-.equ TWI_BIT_LENGTH = 1 ; 10, 100, 500, 100000 and 200000 works for display: 10000, 100000, 200000
-
-.equ TWI_DDR_SCL          = DDRA
-.equ TWI_PORT_SCL         = PORTA
-.equ TWI_PIN_SCL          = PINA
-.equ TWI_PINNUM_SCL       = PORTA4
-
-.equ TWI_DDR_SDA          = DDRA
-.equ TWI_PORT_SDA         = PORTA
-.equ TWI_PIN_SDA          = PINA
-.equ TWI_PINNUM_SDA       = PORTA6
-
-
-
-; ---------------------------------------------------------------------------
-; LCD module
-
-.equ LCD_TWI_ADDRESS      = 0x3c
-
-
-
-; ---------------------------------------------------------------------------
-; SI 7021
-
-.equ SI7021_ADDR          = 0x40
-
-
-
-; ---------------------------------------------------------------------------
-; 1-Wire Master
-;
-
-.equ OWI_DDR     = DDRB
-.equ OWI_PORTOUT = PORTB
-.equ OWI_PORTIN  = PINB
-.equ OWI_PINNUM  = PORTB2
-
-
-
-; ---------------------------------------------------------------------------
-; Motion Sensor
-;
-
-.equ MOTION_DDR       = DDRB
-.equ MOTION_INPUT     = PINB
-.equ MOTION_OUTPUT    = PORTB
-.equ MOTION_PIN       = PORTB1
-
-
-

avr/devices/n17/n17_main.asm

@@ -1,459 +0,0 @@
-; ***************************************************************************
-; copyright   : (C) 2024 by Martin Preuss
-; email       : martin@libchipcard.de
-;
-; ***************************************************************************
-; * This file is part of the project "AqHome".                              *
-; * Please see toplevel file COPYING of that project for license details.   *
-; ***************************************************************************
-
-
-
-
-; ***************************************************************************
-; Source file for temperature sensor node on AtTiny 84
-;
-; This is for the full system (i.e. not the boot loader).
-;
-; All definitions and changes should go into this file.
-;
-;
-; ***************************************************************************
-
-
-.equ clock=1000000 ; Define the clock frequency
-;.equ clock=8000000 ; Define the clock frequency
-
-
-
-.nolist
-.include "include/tn84def.inc" ; Define device ATtiny84
-.list
-
-.include "n17_defs.asm"
-.include "defs_all.asm"
-
-
-
-; ***************************************************************************
-; defines
-
-; ---------------------------------------------------------------------------
-; generic
-
-
-.include "common/utils_wait.asm"
-
-
-; ---------------------------------------------------------------------------
-; firmware settings including list of modules used
-
-.equ FIRMWARE_VERSION_MAJOR       = 0
-.equ FIRMWARE_VERSION_MINOR       = 0
-.equ FIRMWARE_VERSION_PATCHLEVEL  = 1
-
-
-#define MODULES_TIMER
-#define MODULES_COM
-#define MODULES_COM_WITH_ADDR_PROTO
-#define MODULES_LED_SIMPLE
-#define MODULES_TWI_MASTER
-;#define MODULES_LCD
-#define LCD_MINIMAL_FONT
-#define MODULES_SI7021
-#define MODULES_STATS
-;#define MODULES_OWI_MASTER
-;#define MODULES_DS18B20
-#define MODULES_MOTION
-
-; ---------------------------------------------------------------------------
-; defines for values
-
-.equ VALUE_ID_SI7021_TEMP  = 0x01
-.equ VALUE_ID_SI7021_HUM   = 0x02
-
-.equ VALUE_ID_ADC          = 0x03
-;.equ VALUE_ID_REED1        = 0x04
-;.equ VALUE_ID_REED2        = 0x05
-;.equ VALUE_ID_DS18B20_TEMP = 0x06
-.equ VALUE_ID_MOTION       = 0x07
-
-;.equ VALUE_ID_REED_CONF    = 0x81
-
-
-
-; ***************************************************************************
-; code segment
-
-.cseg
-.org 000000
-
-
-
-; ---------------------------------------------------------------------------
-; Reset and interrupt vectors (will be removed as soon as we can flash data over COM)
-
-;	rjmp main ; Reset vector
-        rjmp BOOTLOADER_ADDR ; Reset vector  ; use this for flashed system
-	reti ; EXT_INT0
-	rjmp uartBitbangIsrPcint0 ; PCI0
-	reti ; PCI1
-	reti ; WATCHDOG
-	reti ; ICP1
-	reti ; OC1A
-	reti ; OC1B
-	reti ; OVF1
-        rjmp baseTimerIrqOC0A ; OC0A
-	reti ; OC0B
-	reti ; OVF0
-	reti ; ACI
-        reti ; ADCC
-	reti ; ERDY
-	reti ; USI_STR
-	reti ; USI_OVF
-
-
-devInfoBlock:        ; 12 bytes
-devInfoManufacturer: .db 'A', 'Q', 'U', 'A'
-devInfoId:           .db DEVICEINFO_ID, 0
-devInfoVersion:      .db DEVICEINFO_VERSION, DEVICEINFO_REVISION             ; version, revision
-firmwareVersion:     .db FIRMWARE_VARIANT_TEMP_WINDOW, FIRMWARE_VERSION_MAJOR
-                     .db FIRMWARE_VERSION_MINOR, FIRMWARE_VERSION_PATCHLEVEL
-
-firmwareStart:   rjmp main
-
-
-; ***************************************************************************
-; includes
-
-.include "common/utils.asm"
-.include "common/utils_wait_fixed.asm"
-.include "common/utils_copy_from_flash.asm"
-.include "common/utils_copy_sdram.asm"
-.include "common/crc8.asm"
-
-.include "modules/basetimer/main.asm"
-
-#ifdef MODULES_TIMER
-  .include "modules/timer/main.asm"
-#endif
-#ifdef MODULES_LED
-.include "modules/led/main.asm"
-#endif
-#ifdef MODULES_LED_SIMPLE
-.include "modules/led_simple/main.asm"
-#endif
-#ifdef MODULES_COM
-  .include "modules/com2/defs.asm"
-  .include "modules/com2/main.asm"
-  .include "modules/com2/buffer.asm"
-  .include "modules/uart_bitbang/defs.asm"
-  .include "modules/uart_bitbang/main.asm"
-  .include "modules/uart_bitbang/bytelevel.asm"
-  .include "modules/uart_bitbang/packetlevel.asm"
-  #ifdef MODULES_COM_WITH_ADDR_PROTO
-    .include "modules/comproto/defs.asm"
-    .include "modules/comproto/main.asm"
-    .include "modules/comproto/addr.asm"
-    .include "modules/comproto/msg_recvstats.asm"
-    .include "modules/comproto/msg_sendstats.asm"
-    .include "modules/comproto/msg_sysstats.asm"
-    .include "modules/comproto/msg_memstats.asm"
-    .include "modules/comproto/msg_pong.asm"
-    .include "modules/comproto/msg_value.asm"
-    .include "modules/comproto/msg_device.asm"
-    .include "modules/comproto/msg_reboot.asm"
-  #endif
-  #ifdef MODULES_LCD
-    .include "modules/com2/screen.asm"
-    .include "modules/comproto/screen.asm"
-  #endif
-#endif
-#ifdef MODULES_TWI_MASTER
-  .include "modules/twimaster/main.asm"
-#endif
-#ifdef MODULES_OWI_MASTER
-  .include "modules/owimaster/main.asm"
-#endif
-#ifdef MODULES_LCD
-  .include "modules/lcd/main.asm"
-#endif
-#ifdef MODULES_SI7021
-  .include "modules/si7021/main.asm"
-#endif
-#ifdef MODULES_DS18B20
-  .include "modules/ds18b20/main.asm"
-#endif
-#ifdef MODULES_STATS
-  .include "modules/stats/main.asm"
-#endif
-#ifdef MODULES_CNY70
-  .include "modules/cny70/main.asm"
-#endif
-#ifdef MODULES_REED
-  .include "modules/reed/main.asm"
-#endif
-
-#ifdef MODULES_MOTION
-  .include "modules/motion/main.asm"
-#endif
-
-; test
-;#include "modules/uart_irq/defs.asm"
-;#include "modules/uart_irq/iface.asm"
-;#include "modules/uart_irq/iface1.asm"
-
-
-; ***************************************************************************
-; data in SRAM
-
-.dseg
-
-programRamBegin:
-#ifdef MODULES_LCD
-  screenCounter:               .byte 1
-#endif
-
-programRamEnd:
-
-
-
-#ifdef MODULES_LCD
-  sramTimerWriteStats:         .byte 2
-  sramTimerScreen:             .byte 2
-#endif
-#ifdef MODULES_SI7021
-  sramTimerSI7021Measure:      .byte 2
-  sramTimerSI7021SendTemp:     .byte 2
-  sramTimerSI7021SendHumidity: .byte 2
-#endif
-#ifdef MODULES_CNY70
-  sramTimerCny70SendAdc:       .byte 2
-#endif
-#ifdef MODULES_LCD
-  sramPeriodicalLcdMark:       .byte 2
-#endif
-#ifdef MODULES_DS18B20
-  sramDs18b20Timer:            .byte 2
-  sramSendDs18b20TempTimer:    .byte 2
-#endif
-
-
-; ***************************************************************************
-; data in FLASH
-
-.cseg
-
-
-
-; ---------------------------------------------------------------------------
-; timer list
-
-
-timerList:
-;     SRAM variable/counter        routine                     flags                secs (0=don't start or restart)
-#ifdef MODULES_COM_WITH_ADDR_PROTO
-  .dw cproAddresModeTimer,         CPRO_Address_OnTimer,       0,                   0     ; (no restart)
-#endif
-#ifdef MODULES_STATS
-  .dw statsSendTimer,              Stats_Timer,                TIMER_FLAGS_IF_ADDR, 9000   ; every 15m
-#endif
-#ifdef MODULES_LCD
-;  .dw sramPeriodicalLcdMark,       periodicalLcdMark,          0,                    20   ; every 2s
-;  .dw sramTimerWriteStats,         writeStats,                 0,                   100
-  .dw sramTimerScreen,              printScreen,                TIMER_FLAGS_IF_ADDR,  50    ; every 5s
-#endif
-#ifdef MODULES_SI7021
-  .dw sramTimerSI7021Measure,      SI7021_OnTimer,             0,                   300    ; every 30s
-  .dw sramTimerSI7021SendTemp,     sendSI7021Temp,             TIMER_FLAGS_IF_ADDR, 600    ; every 60s
-  .dw sramTimerSI7021SendHumidity, sendSI7021Humidity,         TIMER_FLAGS_IF_ADDR, 600    ; every 60s
-#endif
-#ifdef MODULES_CNY70
-  .dw sramTimerCny70SendAdc,       CNY70_OnTimer,              TIMER_FLAGS_IF_ADDR, 50     ; every 5s
-#endif
-#ifdef MODULES_DS18B20
-  .dw sramDs18b20Timer,            Ds18b20_OnTimer,            0,                   300    ; every 30s
-  .dw sramSendDs18b20TempTimer,    sendDs18b20Temp,            TIMER_FLAGS_IF_ADDR, 600    ; every 60s
-#endif
-  .dw 0 ; end of list
-
-
-
-
-
-.include "main_all.asm"
-
-
-
-systemSetSpeed:
-.if clock == 8000000
-  ldi r16, (1<<CLKPCE)
-  ldi r17, 0
-  out CLKPR, r16
-  out CLKPR, r17
-.endif
-  ret
-
-
-systemSetBootSpeed:
-.if clock == 8000000
-  ldi r16, (1<<CLKPCE)
-  ldi r17, (1<<CLKPS1) | (1<<CLKPS0)
-  out CLKPR, r16
-  out CLKPR, r17
-.endif
-  ret
-
-
-
-; ---------------------------------------------------------------------------
-; Called on first time run, i.e. on system start. No arguments, no results.
-
-onSystemStart:
-  ldi xh, HIGH(programRamBegin)
-  ldi xl, LOW(programRamBegin)
-  clr r16
-  ldi r17, (programRamEnd-programRamBegin)
-  rcall Utils_FillSram
-  ret
-
-
-#ifdef MODULES_LCD
-
-printScreen:
-  lds r16, screenCounter
-  tst r16
-  brne printScreen_l1
-  rcall CPRO_Screen
-  rjmp printScreen_counter
-printScreen_l1:
-  cpi r16, 1
-  brne printScreen_l2
-  rcall COM2_Screen_RecvStats
-  rjmp printScreen_counter
-printScreen_l2:
-;  cpi r16, 2
-;  brne printScreen_l3
-;  rcall COM2_Screen_SendStats
-;  rjmp printScreen_counter
-printScreen_l3:
-  ; add more screens here
-
-printScreen_counter:
-  lds r16, screenCounter
-  inc r16
-  cpi r16, 2 ; number of screens
-  brcs printScreen_store
-  clr r16
-printScreen_store:
-  sts screenCounter, r16
-printScreen_end:
-  ret
-
-
-;periodicalLcdMark:
-;  rcall printTimerMark
-;  ret
-
-
-;writeStats:
-;  rcall printSendStats
-;  ret
-#endif
-
-
-#ifdef MODULES_SI7021
-
-sendSI7021Humidity:
-  rcall SI7021_SendHumidity
-  brcs sendSI7021Humidity_okay
-  ; set timer to 1s to retry later
-  ldi xl, LOW(sramTimerSI7021SendHumidity)
-  ldi xh, HIGH(sramTimerSI7021SendHumidity)
-  rjmp Timer_SetValueTo1s
-sendSI7021Humidity_okay:
-  ret
-
-
-sendSI7021Temp:
-  rcall SI7021_SendTemp
-  brcs sendSI7021Temp_okay
-  ; set timer to 1s to retry later
-  ldi xl, LOW(sramTimerSI7021SendTemp)
-  ldi xh, HIGH(sramTimerSI7021SendTemp)
-  rjmp Timer_SetValueTo1s
-sendSI7021Temp_okay:
-  ret
-#endif
-
-
-#ifdef MODULES_DS18B20
-sendDs18b20Temp:
-  rcall Ds18b20_SendTemp
-  brcs sendDs18b20Temp_okay
-  ; set timer to 1s to retry later
-  ldi xl, LOW(sramSendDs18b20TempTimer)
-  ldi xh, HIGH(sramSendDs18b20TempTimer)
-  rjmp Timer_SetValueTo1s
-sendDs18b20Temp_okay:
-  ret
-#endif
-
-
-; ---------------------------------------------------------------------------
-; Called every 100ms. Add your routine calls here. No arguments, no results.
-
-onEvery100ms:
-#ifdef MODULES_LED_SIMPLE
-  rcall LedSimple_Every100ms
-#endif
-
-#ifdef MODULES_REED
-  rcall REED_Every100ms
-#endif
-
-#ifdef MODULES_MOTION
-  rcall Motion_Every100ms
-#endif
-  ret
-
-
-
-; ---------------------------------------------------------------------------
-; @routine onPacketReceived:
-;
-; Called after a packet was received via COM module. Add your routine calls here.
-;
-; The packet will be released in any case after return from this call.
-;
-; @return CFLAG set if message handled, cleared otherwise
-; @param X  pointer to received buffer
-; @clobbers all
-
-onPacketReceived:
-#ifdef MODULES_MOTION_LIGHT
-  rcall MotionLight_OnPacketReceived
-  brcs onPacketReceived_end
-#endif
-
-#ifdef MODULES_SK6812
-  rcall SK6812_OnPacketReceived
-  brcs onPacketReceived_end
-#endif
-
-#ifdef MODULES_REED
-  rcall REED_OnPacketReceived
-  brcs onPacketReceived_end
-#endif
-
-#ifdef MODULES_COM
-  rcall CPRO_OnPacketReceived
-  brcs onPacketReceived_end
-#endif
-
-  clc
-onPacketReceived_end:
-  ret
-; @end
-
-

avr/devices/n18/.gitignore

@@ -1,2 +0,0 @@
-*.eep.hex
-*.obj

avr/devices/n18/0BUILD

@@ -1,52 +0,0 @@
-<?xml?>
-
-<gwbuild>
-
-  <target type="AvrHexFile" name="firmware" >
-
-    <includes type="avrasm" >
-      -I $(builddir)
-      -I $(srcdir)
-      -I $(topsrcdir)/avr
-      -I $(topbuilddir)/avr
-    </includes>
-
-
-    <sources type="avrasm" >
-      main.asm
-    </sources>
-
-
-  </target>
-
-
-
-  <target type="AvrHexFile" name="boot" >
-
-    <includes type="avrasm" >
-      -I $(builddir)
-      -I $(srcdir)
-      -I $(topsrcdir)/avr
-      -I $(topbuilddir)/avr
-    </includes>
-
-
-    <sources type="avrasm" >
-      boot.asm
-    </sources>
-
-
-  </target>
-
-
-  <subdirs>
-  </subdirs>
-
-  <extradist>
-    defs.asm
-  </extradist>
-  
-
-</gwbuild>
-
-

avr/devices/n18/boot.asm

@@ -1,140 +0,0 @@
-; ***************************************************************************
-; Source file for base system node on AtTiny 85
-;
-; This is for the maintenance system (i.e. the flash loader).
-;
-; All definitions and changes should go into this file.
-;
-;
-; ***************************************************************************
-
-.equ clock=1000000 ; Define the clock frequency
-
-.nolist
-.include "include/tn85def.inc" ; Define device ATtiny85
-.list
-
-.include "./defs.asm"
-.include "defs_all.asm"
-
-
-
-; ***************************************************************************
-; defines
-
-; ---------------------------------------------------------------------------
-; generic
-
-.include "common/utils_wait.asm"
-.include "modules/com2/defs.asm"
-.include "modules/comproto/defs.asm"
-
-
-; ---------------------------------------------------------------------------
-; firmware settings
-
-.equ FIRMWARE_VERSION_MAJOR       = 0
-.equ FIRMWARE_VERSION_MINOR       = 0
-.equ FIRMWARE_VERSION_PATCHLEVEL  = 1
-
-
-; ---------------------------------------------------------------------------
-; LED
-
-.equ LED_DDR             = DDRB
-.equ LED_PORT            = PORTB
-.equ LED_PIN             = PINB
-.equ LED_PINNUM          = PORTB3
-
-
-
-; ***************************************************************************
-; code segment
-
-.cseg
-.org 0x0000
-
-
-
-; ---------------------------------------------------------------------------
-; Reset and interrupt vectors
-  rjmp main ; Reset vector
-  reti ; EXT_INT0
-  reti ; PCI0
-  reti ; OC1A
-  reti ; OVF1
-  reti ; OVF0
-  reti ; ERDY
-  reti ; ACI
-  reti ; ADCC
-  reti ; OC1B
-  reti ; OC0A
-  reti ; OC0B
-  reti ; WATCHDOG
-  reti ; USI_STR
-  reti ; USI_OVF
-
-devInfoBlock:        ; 12 bytes
-devInfoManufacturer: .db 'A', 'Q', 'U', 'A'
-devInfoId:           .db DEVICEINFO_ID, 0
-devInfoVersion:      .db DEVICEINFO_VERSION, DEVICEINFO_REVISION             ; version, revision
-firmwareVersion:     .db FIRMWARE_VARIANT_BOOT, FIRMWARE_VERSION_MAJOR
-                     .db FIRMWARE_VERSION_MINOR, FIRMWARE_VERSION_PATCHLEVEL
-
-firmwareStart:   rjmp main ; will be overwritten when flashing
-
-
-
-; ***************************************************************************
-; main code
-
-
-.org BOOTLOADER_ADDR
-
-
-main:
-  rjmp bootLoader ; this routine is in modules/flash/proto.asm
-
-
-
-
-; ***************************************************************************
-; includes
-
-.include "common/utils_wait_fixed.asm"
-.include "common/utils_copy_from_flash.asm"
-.include "common/utils_copy_sdram.asm"
-
-.include "modules/flash/defs.asm"
-.include "modules/flash/eeprom.asm"
-.include "modules/flash/io.asm"
-.include "modules/flash/io_attn.asm"
-.include "modules/flash/io_bitbang.asm"
-.include "modules/flash/flash1p.asm"
-.include "modules/flash/flashprocess.asm"
-.include "modules/flash/wait.asm"
-.include "modules/bootloader/main.asm"
-.include "modules/network/msg/defs.asm"
-.include "modules/network/msg/crc.asm"
-
-
-
-systemSetSpeed:
-.if clock == 8000000
-  ldi r16, (1<<CLKPCE)
-  ldi r17, 0
-  out CLKPR, r16
-  out CLKPR, r17
-.endif
-
-.if clock == 1000000
-  ldi r16, (1<<CLKPCE)
-  ldi r17, (1<<CLKPS1) | (1<<CLKPS0)
-  out CLKPR, r16
-  out CLKPR, r17
-.endif
-  ret
-
-
-
-

avr/devices/n18/defs.asm

@@ -1,103 +0,0 @@
-; ***************************************************************************
-; copyright   : (C) 2024 by Martin Preuss
-; email       : martin@libchipcard.de
-;
-; ***************************************************************************
-; * This file is part of the project "AqHome".                              *
-; * Please see toplevel file COPYING of that project for license details.   *
-; ***************************************************************************
-
-; ***************************************************************************
-;
-;                                 AtTiny85
-;                                 --------
-;                     /RESET PB5  1      8  VCC
-;                        LED PB3  2      7  PB2  TWI-SDA
-;                   COM-DATA PB4  3      6  PB1  TWI-SCL
-;                            GND  4      5  PB0  COM-ATTN [PCINT0]
-;                                 --------
-;
-; ***************************************************************************
-
-
-
-.equ BOOTLOADER_ADDR = 0xd00
-
-
-.equ FIRMWARE_VARIANT_BOOT        = 0
-.equ FIRMWARE_VARIANT_MAIN        = 1
-
-
-.equ DEVICEINFO_ID       = 'N'
-.equ DEVICEINFO_VERSION  = 18
-.equ DEVICEINFO_REVISION = 0
-
-
-; ---------------------------------------------------------------------------
-; LED module
-
-.equ LED_SIMPLE_ONTIME  = 2
-.equ LED_SIMPLE_OFFTIME = 50
-.equ LED_SIMPLE_DDR     = DDRB
-.equ LED_SIMPLE_PORT    = PORTB
-.equ LED_SIMPLE_PINNUM  = PORTB3
-
-
-
-; ---------------------------------------------------------------------------
-; COM module
-
-.equ COM_BIT_LENGTH      = 52000 ; 104000ns=9600, 52000ns=19200, 26000ns=38400
-.equ COM_HALFBIT_LENGTH  = 26000 ; see https://de.wikipedia.org/wiki/Universal_Asynchronous_Receiver_Transmitter
-
-.equ COM_DATA_DDR       = DDRB
-.equ COM_DATA_INPUT     = PINB
-.equ COM_DATA_OUTPUT    = PORTB
-.equ COM_DATA_PIN       = PORTB4
-
-.equ COM_ATTN_DDR       = DDRB
-.equ COM_ATTN_INPUT     = PINB
-.equ COM_ATTN_OUTPUT    = PORTB
-.equ COM_ATTN_PIN       = PORTB0
-
-.equ COM_IRQ_ADDR_ATTN   = PCMSK
-.equ COM_IRQ_BIT_ATTN    = PCINT0       ; bit 0 in PCMSK0 (PCINT0)
-.equ COM_IRQ_GIFR_ATTN   = PCIF
-.equ COM_IRQ_GIMSK_ATTN  = PCIE
-
-
-
-; ---------------------------------------------------------------------------
-; TWI master module
-
-;.equ TWI_BIT_LENGTH = 10000 ; 100000 and 200000 works for display: 10000, 100000, 200000
-.equ TWI_BIT_LENGTH = 1 ; 10, 100, 500, 100000 and 200000 works for display: 10000, 100000, 200000
-
-.equ TWI_DDR_SCL          = DDRB
-.equ TWI_PORT_SCL         = PORTB
-.equ TWI_PIN_SCL          = PINB
-.equ TWI_PINNUM_SCL       = PORTB1
-
-.equ TWI_DDR_SDA          = DDRB
-.equ TWI_PORT_SDA         = PORTB
-.equ TWI_PIN_SDA          = PINB
-.equ TWI_PINNUM_SDA       = PORTB2
-
-
-
-; ---------------------------------------------------------------------------
-; SI 7021
-
-.equ SI7021_ADDR          = 0x40
-
-
-
-; ---------------------------------------------------------------------------
-; CCS 811
-;
-
-.equ CCS811_ADDR = 0x5a ; or 0x5b
-
-
-
-

avr/devices/n18/main.asm

@@ -1,379 +0,0 @@
-; ***************************************************************************
-; copyright   : (C) 2024 by Martin Preuss
-; email       : martin@libchipcard.de
-;
-; ***************************************************************************
-; * This file is part of the project "AqHome".                              *
-; * Please see toplevel file COPYING of that project for license details.   *
-; ***************************************************************************
-
-
-; ***************************************************************************
-; Source file for LED controller node on AtTiny 85
-;
-; This is for the full system (i.e. not the boot loader).
-; ***************************************************************************
-
-.equ clock=1000000 ; Define the clock frequency
-
-
-
-.nolist
-.include "include/tn85def.inc" ; Define device ATtiny85
-.list
-
-.include "./defs.asm"
-.include "defs_all.asm"
-.include "common/utils_wait.asm" ; wait macro
-
-
-
-; ***************************************************************************
-; defines
-
-; ---------------------------------------------------------------------------
-; firmware settings including list of modules used
-
-.equ FIRMWARE_VERSION_MAJOR       = 0
-.equ FIRMWARE_VERSION_MINOR       = 0
-.equ FIRMWARE_VERSION_PATCHLEVEL  = 1
-
-
-#define MODULES_TIMER
-#define MODULES_COM
-#define MODULES_COM_WITH_ADDR_PROTO
-#define MODULES_LED_SIMPLE
-#define MODULES_TWI_MASTER
-#define MODULES_SI7021
-#define MODULES_STATS
-; #define MODULES_OWI_MASTER
-; #define MODULES_DS18B20
-; #define MODULES_SK6812
-; #define MODULES_MOTION_LIGHT
-
-; #define COM_ACCEPT_ALL_DEST
-#define MODULES_CCS811
-
-
-
-; ---------------------------------------------------------------------------
-; defines for modules
-
-.equ VALUE_ID_SI7021_TEMP  = 0x01
-.equ VALUE_ID_SI7021_HUM   = 0x02
-
-.equ VALUE_ID_CO2          = 0x07
-.equ VALUE_ID_TVOC         = 0x08
-
-.equ VALUE_ID_DEBUG        = 0x7f
-
-
-; ***************************************************************************
-; code segment
-
-.cseg
-.org 000000
-
-
-
-; ---------------------------------------------------------------------------
-; Reset and interrupt vectors
-
-        rjmp BOOTLOADER_ADDR ; Reset vector  ; use this for flashed system
-	reti ; EXT_INT0
-	rjmp uartBitbangIsrPcint0 ; PCI0
-	reti ; OC1A
-	reti ; OVF1
-	reti ; OVF0
-	reti ; ERDY
-	reti ; ACI
-        reti ; ADCC
-	reti ; OC1B
-        rjmp baseTimerIrqOC0A ; OC0A
-	reti ; OC0B
-	reti ; WATCHDOG
-	reti ; USI_STR
-	reti ; USI_OVF
-
-	
-devInfoBlock:        ; 12 bytes
-devInfoManufacturer: .db 'A', 'Q', 'U', 'A'
-devInfoId:           .db DEVICEINFO_ID, 0
-devInfoVersion:      .db DEVICEINFO_VERSION, DEVICEINFO_REVISION             ; version, revision
-firmwareVersion:     .db FIRMWARE_VARIANT_MAIN, FIRMWARE_VERSION_MAJOR
-                     .db FIRMWARE_VERSION_MINOR, FIRMWARE_VERSION_PATCHLEVEL
-
-firmwareStart:   rjmp main
-
-
-; ***************************************************************************
-; includes
-
-.include "common/utils.asm"
-.include "common/utils_wait_fixed.asm"
-.include "common/utils_copy_from_flash.asm"
-.include "common/utils_copy_sdram.asm"
-.include "common/crc8.asm"
-
-.include "modules/basetimer/main.asm"
-
-#ifdef MODULES_TIMER
-  .include "modules/timer/main.asm"
-#endif
-#ifdef MODULES_LED_SIMPLE
-.include "modules/led_simple/main.asm"
-#endif
-#ifdef MODULES_COM
-  .include "modules/com2/defs.asm"
-  .include "modules/com2/main.asm"
-  .include "modules/com2/buffer.asm"
-  #ifdef MODULES_STATS
-    .include "modules/comproto/msg_recvstats.asm"
-    .include "modules/comproto/msg_sendstats.asm"
-    .include "modules/comproto/msg_sysstats.asm"
-    .include "modules/comproto/msg_memstats.asm"
-  #endif
-  .include "modules/comproto/msg_pong.asm"
-  .include "modules/comproto/msg_value.asm"
-  .include "modules/comproto/msg_device.asm"
-  .include "modules/comproto/msg_reboot.asm"
-  .include "modules/uart_bitbang/defs.asm"
-  .include "modules/uart_bitbang/main.asm"
-  .include "modules/uart_bitbang/bytelevel.asm"
-  .include "modules/uart_bitbang/packetlevel.asm"
-  #ifdef MODULES_COM_WITH_ADDR_PROTO
-    .include "modules/comproto/defs.asm"
-    .include "modules/comproto/main.asm"
-    .include "modules/comproto/addr.asm"
-  #endif
-#endif
-#ifdef MODULES_STATS
-  .include "modules/stats/main.asm"
-#endif
-#ifdef MODULES_TWI_MASTER
-  .include "modules/twimaster/main.asm"
-#endif
-#ifdef MODULES_OWI_MASTER
-  .include "modules/owimaster/main.asm"
-#endif
-#ifdef MODULES_SI7021
-  .include "modules/si7021/main.asm"
-#endif
-#ifdef MODULES_DS18B20
-  .include "modules/ds18b20/main.asm"
-#endif
-#ifdef MODULES_SK6812
-  .include "modules/sk6812/main.asm"
-#endif
-#ifdef MODULES_MOTION_LIGHT
-  .include "modules/ma_light/main.asm"
-#endif
-
-#ifdef MODULES_CCS811
-  .include "modules/ccs811/main.asm"
-#endif
-
-
-; ***************************************************************************
-; data in SRAM
-
-.dseg
-
-
-#ifdef MODULES_SI7021
-  sramTimerSI7021Measure:      .byte 2
-  sramTimerSI7021SendTemp:     .byte 2
-  sramTimerSI7021SendHumidity: .byte 2
-#endif
-#ifdef MODULES_DS18B20
-  sramDs18b20Timer:            .byte 2
-  sramSendDs18b20TempTimer:    .byte 2
-#endif
-
-#ifdef MODULES_CCS811
-  sramCcs811Timer:             .byte 2
-#endif
-
-
-; ***************************************************************************
-; data in FLASH
-
-.cseg
-
-
-
-; ---------------------------------------------------------------------------
-; timer list
-
-
-timerList:
-;     SRAM variable/counter        routine                     flags                secs (0=don't start or restart)
-#ifdef MODULES_COM_WITH_ADDR_PROTO
-  .dw cproAddresModeTimer,         CPRO_Address_OnTimer,       0,                   0     ; (no restart)
-#endif
-#ifdef MODULES_STATS
-  .dw statsSendTimer,              Stats_Timer,                TIMER_FLAGS_IF_ADDR, 9000   ; every 15m
-#endif
-#ifdef MODULES_DS18B20
-  .dw sramDs18b20Timer,            Ds18b20_OnTimer,            0,                   300    ; every 30s
-  .dw sramSendDs18b20TempTimer,    sendDs18b20Temp,            TIMER_FLAGS_IF_ADDR, 600    ; every 60s
-#endif
-#ifdef MODULES_SI7021
-  .dw sramTimerSI7021Measure,      SI7021_OnTimer,             0,                   300    ; every 30s
-  .dw sramTimerSI7021SendTemp,     sendSI7021Temp,             TIMER_FLAGS_IF_ADDR, 600    ; every 60s
-  .dw sramTimerSI7021SendHumidity, sendSI7021Humidity,         TIMER_FLAGS_IF_ADDR, 600    ; every 60s
-#endif
-#ifdef MODULES_CCS811
-  .dw sramCcs811Timer,             CCS811_OnTimer,             0,                   10     ; every 1s
-#endif
-  .dw 0 ; end of list
-
-
-
-
-
-.include "main_all.asm"
-
-
-; ---------------------------------------------------------------------------
-; Called early on system startup. No arguments, no results.
-
-systemSetSpeed:
-.if clock == 1000000
-  ldi r16, (1<<CLKPCE)
-  ldi r17, (1<<CLKPS1) | (1<<CLKPS0)
-  out CLKPR, r16
-  out CLKPR, r17
-.endif
-
-.if clock == 8000000
-  ldi r16, (1<<CLKPCE)
-  ldi r17, 0
-  out CLKPR, r16
-  out CLKPR, r17
-.endif
-  ret
-
-
-
-; ---------------------------------------------------------------------------
-; Called just before rebooting to bootloader. No arguments, no results.
-
-systemSetBootSpeed:
-  ldi r16, (1<<CLKPCE)
-  ldi r17, (1<<CLKPS1) | (1<<CLKPS0)
-  out CLKPR, r16
-  out CLKPR, r17
-  ret
-
-
-
-; ---------------------------------------------------------------------------
-; Called on first time run, i.e. on system start. No arguments, no results.
-
-onSystemStart:
-  ret
-
-
-#ifdef MODULES_DS18B20
-sendDs18b20Temp:
-  rcall Ds18b20_SendTemp
-  brcs sendDs18b20Temp_okay
-  ; set timer to 1s to retry later
-  ldi xl, LOW(sramSendDs18b20TempTimer)
-  ldi xh, HIGH(sramSendDs18b20TempTimer)
-  rjmp Timer_SetValueTo1s
-sendDs18b20Temp_okay:
-  ret
-#endif
-
-
-
-; ---------------------------------------------------------------------------
-; Called every 100ms. Add your routine calls here. No arguments, no results.
-
-onEvery100ms:
-#ifdef MODULES_LED_SIMPLE
-  rcall LedSimple_Every100ms
-#endif
-
-#ifdef MODULES_REED
-  rcall REED_Every100ms
-#endif
-
-#ifdef MODULES_MOTION_LIGHT
-  rcall MotionLight_Every100ms
-#endif
-
-  ret
-
-
-
-; ---------------------------------------------------------------------------
-; @routine onPacketReceived:
-;
-; Called after a packet was received via COM module. Add your routine calls here.
-;
-; The packet will be released in any case after return from this call.
-;
-; @return CFLAG set if message handled, cleared otherwise
-; @param X  pointer to received buffer
-; @clobbers all
-
-onPacketReceived:
-  ; get msg code
-  adiw xh:xl, COM2_MSG_OFFS_CMD
-  ld r16, x
-  sbiw xh:xl, COM2_MSG_OFFS_CMD
-
-#ifdef MODULES_MOTION_LIGHT
-  rcall MotionLight_OnPacketReceived
-  brcs onPacketReceived_end
-#endif
-
-#ifdef MODULES_SK6812
-  rcall SK6812_OnPacketReceived
-  brcs onPacketReceived_end
-#endif
-
-#ifdef MODULES_REED
-  rcall REED_OnPacketReceived
-  brcs onPacketReceived_end
-#endif
-
-#ifdef MODULES_COM
-  rcall CPRO_OnPacketReceived
-  brcs onPacketReceived_end
-#endif
-
-  clc
-onPacketReceived_end:
-  ret
-; @end
-
-
-
-#ifdef MODULES_SI7021
-
-sendSI7021Humidity:
-  rcall SI7021_SendHumidity
-  brcs sendSI7021Humidity_okay
-  ; set timer to 1s to retry later
-  ldi xl, LOW(sramTimerSI7021SendHumidity)
-  ldi xh, HIGH(sramTimerSI7021SendHumidity)
-  rjmp Timer_SetValueTo1s
-sendSI7021Humidity_okay:
-  ret
-
-
-sendSI7021Temp:
-  rcall SI7021_SendTemp
-  brcs sendSI7021Temp_okay
-  ; set timer to 1s to retry later
-  ldi xl, LOW(sramTimerSI7021SendTemp)
-  ldi xh, HIGH(sramTimerSI7021SendTemp)
-  rjmp Timer_SetValueTo1s
-sendSI7021Temp_okay:
-  ret
-#endif
-

avr/devices/n19/.gitignore

@@ -1,2 +0,0 @@
-*.eep.hex
-*.obj

avr/devices/n19/boot/boot.asm

@@ -1,138 +0,0 @@
-; ***************************************************************************
-; Source file for base system node on AtTiny 85
-;
-; This is for the maintenance system (i.e. the flash loader).
-;
-; All definitions and changes should go into this file.
-;
-;
-; ***************************************************************************
-
-.equ clock=1000000 ; Define the clock frequency
-
-.nolist
-.include "include/tn85def.inc" ; Define device ATtiny85
-.list
-
-.include "../defs.asm"
-.include "devices/all/defs.asm"
-.include "common/calls.asm"
-.include "common/utils_wait.asm"
-
-
-
-; ***************************************************************************
-; defines
-
-; ---------------------------------------------------------------------------
-; generic
-
-
-; ---------------------------------------------------------------------------
-; firmware settings
-
-.equ FIRMWARE_VERSION_MAJOR       = 0
-.equ FIRMWARE_VERSION_MINOR       = 0
-.equ FIRMWARE_VERSION_PATCHLEVEL  = 1
-
-
-; ---------------------------------------------------------------------------
-; LED
-
-.equ LED_DDR             = DDRB
-.equ LED_PORT            = PORTB
-.equ LED_PIN             = PINB
-.equ LED_PINNUM          = PORTB3
-
-
-
-; ***************************************************************************
-; code segment
-
-.cseg
-.org 0x0000
-
-
-
-; ---------------------------------------------------------------------------
-; Reset and interrupt vectors
-  rjmp main ; Reset vector
-  reti ; EXT_INT0
-  reti ; PCI0
-  reti ; OC1A
-  reti ; OVF1
-  reti ; OVF0
-  reti ; ERDY
-  reti ; ACI
-  reti ; ADCC
-  reti ; OC1B
-  reti ; OC0A
-  reti ; OC0B
-  reti ; WATCHDOG
-  reti ; USI_STR
-  reti ; USI_OVF
-
-devInfoBlock:        ; 12 bytes
-devInfoManufacturer: .db 'A', 'Q', 'U', 'A'
-devInfoId:           .db DEVICEINFO_ID, 0
-devInfoVersion:      .db DEVICEINFO_VERSION, DEVICEINFO_REVISION             ; version, revision
-firmwareVersion:     .db FIRMWARE_VARIANT_BOOT, FIRMWARE_VERSION_MAJOR
-                     .db FIRMWARE_VERSION_MINOR, FIRMWARE_VERSION_PATCHLEVEL
-
-firmwareStart:   rjmp main ; will be overwritten when flashing
-
-
-
-; ***************************************************************************
-; main code
-
-
-.org BOOTLOADER_ADDR
-
-
-main:
-  rjmp bootLoader ; this routine is in modules/flash/proto.asm
-
-
-
-
-; ***************************************************************************
-; includes
-
-.include "common/utils_wait_fixed.asm"
-.include "common/utils_copy_from_flash.asm"
-.include "common/utils_copy_sdram.asm"
-
-.include "modules/flash/defs.asm"
-.include "modules/flash/eeprom.asm"
-.include "modules/flash/io.asm"
-.include "modules/flash/io_attn.asm"
-.include "modules/flash/io_bitbang.asm"
-.include "modules/flash/flash1p.asm"
-.include "modules/flash/flashprocess.asm"
-.include "modules/flash/wait.asm"
-.include "modules/bootloader/main.asm"
-.include "modules/network/msg/defs.asm"
-.include "modules/network/msg/crc.asm"
-
-
-
-systemSetSpeed:
-.if clock == 8000000
-  ldi r16, (1<<CLKPCE)
-  ldi r17, 0
-  out CLKPR, r16
-  out CLKPR, r17
-.endif
-
-.if clock == 1000000
-  ldi r16, (1<<CLKPCE)
-  ldi r17, (1<<CLKPS1) | (1<<CLKPS0)
-  out CLKPR, r16
-  out CLKPR, r17
-.endif
-  ret
-
-
-
-

avr/devices/n19/defs.asm

@@ -1,104 +0,0 @@
-; ***************************************************************************
-; copyright   : (C) 2024 by Martin Preuss
-; email       : martin@libchipcard.de
-;
-; ***************************************************************************
-; * This file is part of the project "AqHome".                              *
-; * Please see toplevel file COPYING of that project for license details.   *
-; ***************************************************************************
-
-; ***************************************************************************
-;
-;                                 AtTiny85
-;                                 --------
-;                     /RESET PB5  1      8  VCC
-;                        LED PB3  2      7  PB2  TWI-SDA
-;                   COM-DATA PB4  3      6  PB1  TWI-SCL
-;                            GND  4      5  PB0  COM-ATTN [PCINT0]
-;                                 --------
-;
-; ***************************************************************************
-
-
-
-.equ BOOTLOADER_ADDR = 0xd00
-
-
-.equ FIRMWARE_VARIANT_BOOT        = 0
-.equ FIRMWARE_VARIANT_MAIN        = 1
-
-
-.equ DEVICEINFO_ID       = 'N'
-.equ DEVICEINFO_VERSION  = 19
-.equ DEVICEINFO_REVISION = 0
-
-
-; ---------------------------------------------------------------------------
-; LED module
-
-.equ LED_SIMPLE_ONTIME  = 2
-.equ LED_SIMPLE_OFFTIME = 50
-.equ LED_SIMPLE_DDR     = DDRB
-.equ LED_SIMPLE_PORT    = PORTB
-.equ LED_SIMPLE_PORTIN  = PINB
-.equ LED_SIMPLE_PINNUM  = PORTB3
-
-
-
-; ---------------------------------------------------------------------------
-; COM module
-
-.equ COM_BIT_LENGTH      = 52000 ; 104000ns=9600, 52000ns=19200, 26000ns=38400
-.equ COM_HALFBIT_LENGTH  = 26000 ; see https://de.wikipedia.org/wiki/Universal_Asynchronous_Receiver_Transmitter
-
-.equ COM_DATA_DDR       = DDRB
-.equ COM_DATA_INPUT     = PINB
-.equ COM_DATA_OUTPUT    = PORTB
-.equ COM_DATA_PIN       = PORTB4
-
-.equ COM_ATTN_DDR       = DDRB
-.equ COM_ATTN_INPUT     = PINB
-.equ COM_ATTN_OUTPUT    = PORTB
-.equ COM_ATTN_PIN       = PORTB0
-
-.equ COM_IRQ_ADDR_ATTN   = PCMSK
-.equ COM_IRQ_BIT_ATTN    = PCINT0       ; bit 0 in PCMSK0 (PCINT0)
-.equ COM_IRQ_GIFR_ATTN   = PCIF
-.equ COM_IRQ_GIMSK_ATTN  = PCIE
-
-
-
-; ---------------------------------------------------------------------------
-; TWI master module
-
-;.equ TWI_BIT_LENGTH = 10000 ; 100000 and 200000 works for display: 10000, 100000, 200000
-.equ TWI_BIT_LENGTH = 1 ; 10, 100, 500, 100000 and 200000 works for display: 10000, 100000, 200000
-
-.equ TWI_DDR_SCL          = DDRB
-.equ TWI_PORT_SCL         = PORTB
-.equ TWI_PIN_SCL          = PINB
-.equ TWI_PINNUM_SCL       = PORTB1
-
-.equ TWI_DDR_SDA          = DDRB
-.equ TWI_PORT_SDA         = PORTB
-.equ TWI_PIN_SDA          = PINB
-.equ TWI_PINNUM_SDA       = PORTB2
-
-
-
-; ---------------------------------------------------------------------------
-; SI 7021
-
-.equ SI7021_ADDR          = 0x40
-
-
-
-; ---------------------------------------------------------------------------
-; CCS 811
-;
-
-.equ CCS811_ADDR = 0x5a ; or 0x5b
-
-
-
-

avr/devices/n19/main/main.asm

@@ -1,176 +0,0 @@
-; ***************************************************************************
-; copyright   : (C) 2025 by Martin Preuss
-; email       : martin@libchipcard.de
-;
-; ***************************************************************************
-; * This file is part of the project "AqHome".                              *
-; * Please see toplevel file COPYING of that project for license details.   *
-; ***************************************************************************
-
-
-; ***************************************************************************
-; Source file for LED controller node on AtTiny 85
-;
-; This is for the full system (i.e. not the boot loader).
-; ***************************************************************************
-
-.equ clock=1000000 ; Define the clock frequency
-
-
-
-.nolist
-.include "include/tn85def.inc" ; Define device ATtiny85
-.list
-
-.include "../defs.asm"
-.include "devices/all/defs.asm"
-.include "common/calls.asm"
-.include "common/utils_wait.asm" ; wait macro
-
-
-
-; ***************************************************************************
-; defines
-
-
-.equ NET_BUFFERS_NUM              = 6
-.equ NET_BUFFERS_SIZE             = 32
-
-
-; ---------------------------------------------------------------------------
-; firmware settings including list of modules used
-
-.equ FIRMWARE_VERSION_MAJOR       = 0
-.equ FIRMWARE_VERSION_MINOR       = 0
-.equ FIRMWARE_VERSION_PATCHLEVEL  = 1
-
-#define MODULES_CLOCK
-#define MODULES_LED_SIMPLE
-#define MODULES_NETWORK
-#define MODULES_UART_BITBANG
-#define MODULES_TWI_MASTER
-#define MODULES_SI7021
-#define MODULES_CCS811
-
-#define APPS_NETWORK
-#define APPS_REPORTSENSORS
-#define APPS_STATS
-
-
-
-; ---------------------------------------------------------------------------
-; defines for modules
-
-.equ VALUE_ID_SI7021_TEMP  = 0x01
-.equ VALUE_ID_SI7021_HUM   = 0x02
-
-.equ VALUE_ID_CO2          = 0x07
-.equ VALUE_ID_TVOC         = 0x08
-
-.equ VALUE_ID_DEBUG        = 0x7f
-
-.equ VALUE_ID_LEDSIMPLE_TIMING = 0x88
-
-
-; ***************************************************************************
-; code segment
-
-.cseg
-.org 000000
-
-
-
-; ---------------------------------------------------------------------------
-; Reset and interrupt vectors
-
-        rjmp BOOTLOADER_ADDR ; Reset vector  ; use this for flashed system
-	reti ; EXT_INT0
-	rjmp UART_BitBang_PcintIsr ; PCI0
-	reti ; OC1A
-	reti ; OVF1
-	reti ; OVF0
-	reti ; ERDY
-	reti ; ACI
-        reti ; ADCC
-	reti ; OC1B
-        rjmp baseTimerIrqOC0A ; OC0A
-	reti ; OC0B
-	reti ; WATCHDOG
-	reti ; USI_STR
-	reti ; USI_OVF
-
-	
-devInfoBlock:        ; 12 bytes
-devInfoManufacturer: .db 'A', 'Q', 'U', 'A'
-devInfoId:           .db DEVICEINFO_ID, 0
-devInfoVersion:      .db DEVICEINFO_VERSION, DEVICEINFO_REVISION             ; version, revision
-firmwareVersion:     .db FIRMWARE_VARIANT_MAIN, FIRMWARE_VERSION_MAJOR
-                     .db FIRMWARE_VERSION_MINOR, FIRMWARE_VERSION_PATCHLEVEL
-
-firmwareStart:
-  rjmp main
-
-
-
-; ---------------------------------------------------------------------------
-; @routine onSystemStart
-
-onSystemStart:
-  ret
-; @end
-
-
-
-; ---------------------------------------------------------------------------
-; @routine onMessageReceived
-;
-; Called on every message received
-
-onMessageReceived:
-  clc
-  ret
-; @end
-
-
-
-; ---------------------------------------------------------------------------
-; @routine onEvery100ms
-;
-; Called every 100ms. Add your routine calls here. No arguments, no results.
-
-onEvery100ms:
-onEverySecond:
-onEveryMinute:
-onEveryHour:
-onEveryDay:
-  ret
-; @end
-
-
-
-; ---------------------------------------------------------------------------
-; @routine onEveryLoop
-;
-; Called on every loop (i.e. after awakening from sleep).
-;
-onEveryLoop:
-  ret
-; @end
-
-
-
-; ***************************************************************************
-; includes
-
-.include "devices/all/hw_tn85.asm"
-.include "devices/all/includes.asm"
-
-
-
-; ---------------------------------------------------------------------------
-; defines for network interface
-
-.equ netInterfaceData = uart_bitbang_iface
-
-
-

avr/devices/n20/.gitignore

@@ -1,2 +0,0 @@
-*.eep.hex
-*.obj

avr/devices/n20/README

@@ -1,13 +0,0 @@
-
-N20
-===
-
-- Role: Air quality and climate sensors
-- MCU: AtTiny84
-- Connection: RJ45
-- Periphery:
-  - PIR sensor (AMN31112)
-  - TWI interface
-    - SI7021 temperature and humidity sensor
-    - CCS811 air quality sensor
-  

avr/devices/n21/aqua_n21.xml

@@ -11,14 +11,6 @@
     <value name="MOTION"       id="0x07" type="sensor" dataType="rational" modality="motion"                denom="1" />
     <value name="DOOR"         id="0x08" type="sensor" dataType="rational" modality="door"                  denom="1" />
 
-    <value name="stats_packets_in"       id="0xe0" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_packets_out"      id="0xe1" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_content_errors"   id="0xe2" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_io_errors"        id="0xe3" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_nobuf_errors"     id="0xe4" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_collision_errors" id="0xe5" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_busy_errors"      id="0xe6" type="sensor" dataType="uint16" denom="1" />
-
     <value name="LEDTIMING"    id="0x88" type="actor"  dataType="uint16" />
   </values>
 

avr/devices/n21/boot/boot.asm

@@ -17,6 +17,7 @@
 .include "devices/all/defs.asm"
 
 .include "common/calls.asm"
+.include "common/utils_io.asm"
 .include "common/utils_wait.asm"
 
 
@@ -98,8 +99,7 @@ main:
 .include "modules/flash/defs.asm"
 .include "modules/flash/eeprom.asm"
 .include "modules/flash/io.asm"
-.include "modules/flash/io_attn.asm"
-.include "modules/flash/io_bitbang.asm"
+.include "modules/flash/io_com2w.asm"
 .include "modules/flash/flash1p.asm"
 .include "modules/flash/flashxp.asm"
 .include "modules/flash/flashprocess.asm"

avr/devices/n21/defs.asm

@@ -17,7 +17,7 @@
 ;                  PIR       PB1  3     12  PA1  COM-DATA
 ;                  /RESET    PB3  4     11  PA2  TCRT1000_Input
 ;                  AUX-B2    PB2  5     10  PA3  LED
-;                  COM_ATTN  PA7  6      9  PA4  TWI-SCL
+;                  COM_CLK   PA7  6      9  PA4  TWI-SCL
 ;                  TWI-SDA   PA6  7      8  PA5
 ;                                 --------
 ;
@@ -48,6 +48,16 @@
 
 
 
+; ---------------------------------------------------------------------------
+; LED activity module
+
+.equ LED_ACTIVITY_DDR     = DDRA
+.equ LED_ACTIVITY_PORT    = PORTA
+.equ LED_ACTIVITY_PORTIN  = PINA
+.equ LED_ACTIVITY_PINNUM  = PORTA3
+
+
+
 ; ---------------------------------------------------------------------------
 ; COM module
 
@@ -59,15 +69,15 @@
 .equ COM_DATA_OUTPUT    = PORTA
 .equ COM_DATA_PIN       = PORTA1
 
-.equ COM_ATTN_DDR       = DDRA
-.equ COM_ATTN_INPUT     = PINA
-.equ COM_ATTN_OUTPUT    = PORTA
-.equ COM_ATTN_PIN       = PORTA7
+.equ COM_CLK_DDR       = DDRA
+.equ COM_CLK_INPUT     = PINA
+.equ COM_CLK_OUTPUT    = PORTA
+.equ COM_CLK_PIN       = PORTA7
 
-.equ COM_IRQ_ADDR_ATTN   = PCMSK0
-.equ COM_IRQ_BIT_ATTN    = PCINT7        ; bit 7 in PCMSK0
-.equ COM_IRQ_GIFR_ATTN   = PCIF0
-.equ COM_IRQ_GIMSK_ATTN  = PCIE0
+.equ COM_IRQ_ADDR_CLK   = PCMSK0
+.equ COM_IRQ_BIT_CLK    = PCINT7        ; bit 7 in PCMSK0
+.equ COM_IRQ_GIFR_CLK   = PCIF0
+.equ COM_IRQ_GIMSK_CLK  = PCIE0