Merge pull request #3326 from opentx/bsongis/passthrough_sport_to_lua

Bsongis/passthrough sport to lua

radio/src/cli.cpp

@@ -28,7 +28,7 @@
 
 OS_TID cliTaskId;
 TaskStack<CLI_STACK_SIZE> cliStack;
-Fifo<256> cliRxFifo;
+Fifo<uint8_t, 256> cliRxFifo;
 uint8_t cliTracesEnabled = true;
 // char cliLastLine[CLI_COMMAND_MAX_LEN+1];
 

radio/src/cli.h

@@ -27,7 +27,7 @@ extern uint8_t cliTracesEnabled;
 
 #ifdef __cplusplus
 #include "fifo.h"
-extern Fifo<256> cliRxFifo;
+extern Fifo<uint8_t, 256> cliRxFifo;
 #include "tasks_arm.h"
 #define CLI_STACK_SIZE                 1000
 extern TaskStack<CLI_STACK_SIZE> cliStack;

radio/src/fifo.h

@@ -1,27 +1,27 @@
-/*
+/*
- * Copyright (C) OpenTX
+ * Copyright (C) OpenTX
- *
+ *
- * Based on code named
+ * Based on code named
- *   th9x - http://code.google.com/p/th9x 
+ *   th9x - http://code.google.com/p/th9x 
- *   er9x - http://code.google.com/p/er9x
+ *   er9x - http://code.google.com/p/er9x
- *   gruvin9x - http://code.google.com/p/gruvin9x
+ *   gruvin9x - http://code.google.com/p/gruvin9x
- *
+ *
- * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html
+ * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html
- *
+ *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
+ * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
+ * published by the Free Software Foundation.
- *
+ *
- * This program is distributed in the hope that it will be useful,
+ * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * GNU General Public License for more details.
- */
+ */
-
-#ifndef _FIFO_H_
-#define _FIFO_H_
 
-template <int N>
+#ifndef _FIFO_H_
+#define _FIFO_H_
+
+template <class T, int N>
 class Fifo
 {
   public:
@@ -36,20 +36,20 @@ class Fifo
       widx = ridx = 0;
     }
 
-    void push(uint8_t byte) {
+    void push(T element) {
       uint32_t next = (widx+1) & (N-1);
       if (next != ridx) {
-        fifo[widx] = byte;
+        fifo[widx] = element;
         widx = next;
       }
     }
 
-    bool pop(uint8_t & byte) {
+    bool pop(T & element) {
       if (isEmpty()) {
         return false;
       }
       else {
-        byte = fifo[ridx];
+        element = fifo[ridx];
         ridx = (ridx+1) & (N-1);
         return true;
       }
@@ -69,9 +69,9 @@ class Fifo
     }
 
   protected:
-    uint8_t fifo[N];
+    T fifo[N];
     volatile uint32_t widx;
     volatile uint32_t ridx;
 };
 
-#endif // _FIFO_H_
+#endif // _FIFO_H_

radio/src/lua/api_general.cpp

@@ -326,6 +326,41 @@ bool luaFindFieldByName(const char * name, LuaField & field, unsigned int flags)
   return false;  // not found
 }
 
+static int luaTelemetryPop(lua_State *L)
+{
+  if (!luaInputTelemetryFifo) {
+    luaInputTelemetryFifo = new Fifo<LuaTelemetryValue, 16>();
+    if (!luaInputTelemetryFifo) {
+      return 0;
+    }
+  }
+
+  LuaTelemetryValue value;
+  if (luaInputTelemetryFifo->pop(value)) {
+    lua_pushnumber(L, value.id);
+    lua_pushunsigned(L, value.value);
+    return 2;
+  }
+
+  return 0;
+}
+
+static int luaTelemetryPush(lua_State *L)
+{
+  if (!luaOutputTelemetryFifo) {
+    luaOutputTelemetryFifo = new Fifo<LuaTelemetryValue, 16>();
+    if (!luaOutputTelemetryFifo) {
+      return 0;
+    }
+  }
+
+  unsigned int id = luaL_checkunsigned(L, 1);
+  unsigned int value = luaL_checkunsigned(L, 2);
+
+  luaOutputTelemetryFifo->push((LuaTelemetryValue){ id, value });
+  return 0;
+}
+
 /*luadoc
 @function getFieldInfo(name)
 
@@ -795,6 +830,8 @@ const luaL_Reg opentxLib[] = {
 #if !defined(COLORLCD)
   { "GREY", luaGrey },
 #endif
+  { "telemetryPop", luaTelemetryPop },
+  { "telemetryPush", luaTelemetryPush },
   { NULL, NULL }  /* sentinel */
 };
 

radio/src/sbus.cpp

@@ -33,7 +33,7 @@
 
 #define SBUS_CH_CENTER        0x3E0
 
-Fifo<32> sbusFifo;
+Fifo<uint8_t, 32> sbusFifo;
 uint8_t SbusFrame[SBUS_MAX_FRAME_SIZE];
 uint16_t SbusTimer ;
 uint8_t SbusIndex = 0 ;

radio/src/targets/horus/serial2_driver.cpp

@@ -1,29 +1,29 @@
-/*
+/*
- * Copyright (C) OpenTX
+ * Copyright (C) OpenTX
- *
+ *
- * Based on code named
+ * Based on code named
- *   th9x - http://code.google.com/p/th9x 
+ *   th9x - http://code.google.com/p/th9x 
- *   er9x - http://code.google.com/p/er9x
+ *   er9x - http://code.google.com/p/er9x
- *   gruvin9x - http://code.google.com/p/gruvin9x
+ *   gruvin9x - http://code.google.com/p/gruvin9x
- *
+ *
- * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html
+ * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html
- *
+ *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
+ * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
+ * published by the Free Software Foundation.
- *
+ *
- * This program is distributed in the hope that it will be useful,
+ * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * GNU General Public License for more details.
- */
+ */
-
+
-#include "../../opentx.h"
+#include "opentx.h"
 
 uint8_t serial2Mode = 0;
-Fifo<512> serial2TxFifo;
+Fifo<uint8_t, 512> serial2TxFifo;
-extern Fifo<512> telemetryFifo;
+extern Fifo<uint8_t, 512> telemetryFifo;
-extern Fifo<32> sbusFifo;
+extern Fifo<uint8_t, 32> sbusFifo;
 
 void uart3Setup(unsigned int baudrate)
 {

radio/src/targets/horus/telemetry_driver.cpp

@@ -20,7 +20,7 @@
 
 #include "../../opentx.h"
 
-extern Fifo<512> telemetryFifo;
+extern Fifo<uint8_t, 512> telemetryFifo;
 
 void telemetryPortInit(uint32_t baudrate)
 {

radio/src/targets/horus/trainer_driver.cpp

@@ -18,9 +18,9 @@
  * GNU General Public License for more details.
  */
 
-#include "../../opentx.h"
+#include "opentx.h"
 
-extern Fifo<32> sbusFifo;
+extern Fifo<uint8_t, 32> sbusFifo;
 
 #define setupTrainerPulses() setupPulsesPPM(TRAINER_MODULE)
 

radio/src/targets/sky9x/serial2_driver.cpp

@@ -28,7 +28,7 @@
 /** Pins description corresponding to Rxd,Txd, (UART pins) */
 #define SECOND_SERIAL_PINS        {PINS_UART}
 
-Fifo<512> serial2RxFifo;
+Fifo<uint8_t, 512> serial2RxFifo;
 
 #if !defined(SIMU)
 /*

radio/src/targets/taranis/bluetooth_driver.cpp

@@ -20,8 +20,8 @@
 
 #include "../../opentx.h"
 
-Fifo<64> btTxFifo;
+Fifo<uint8_t, 64> btTxFifo;
-Fifo<64> btRxFifo;
+Fifo<uint8_t, 64> btRxFifo;
 
 enum BluetoothState
 {

radio/src/targets/taranis/serial2_driver.cpp

@@ -21,9 +21,9 @@
 #include "../../opentx.h"
 
 uint8_t serial2Mode = 0;
-Fifo<512> serial2TxFifo;
+Fifo<uint8_t, 512> serial2TxFifo;
-extern Fifo<512> telemetryFifo;
+extern Fifo<uint8_t, 512> telemetryFifo;
-extern Fifo<32> sbusFifo;
+extern Fifo<uint8_t, 32> sbusFifo;
 
 void uart3Setup(unsigned int baudrate)
 {

radio/src/targets/taranis/telemetry_driver.cpp

@@ -20,7 +20,7 @@
 
 #include "../../opentx.h"
 
-extern Fifo<512> telemetryFifo;
+extern Fifo<uint8_t, 512> telemetryFifo;
 
 void telemetryPortInit(uint32_t baudrate)
 {

radio/src/targets/taranis/trainer_driver.cpp

@@ -20,7 +20,7 @@
 
 #include "../../opentx.h"
 
-extern Fifo<32> sbusFifo;
+extern Fifo<uint8_t, 32> sbusFifo;
 
 #define setupTrainerPulses() setupPulsesPPM(TRAINER_MODULE)
 

radio/src/telemetry/frsky.cpp

@@ -44,7 +44,7 @@ uint8_t telemetryState = TELEMETRY_INIT;
 #endif
 
 #if defined(PCBTARANIS) || defined(PCBFLAMENCO) || defined(PCBHORUS)
-Fifo<512> telemetryFifo; // TODO should be in the driver
+Fifo<uint8_t, 512> telemetryFifo; // TODO should be in the driver
 #endif
 
 uint8_t frskyRxBufferCount = 0;
@@ -665,3 +665,8 @@ NOINLINE uint8_t getRssiAlarmValue(uint8_t alarm)
 {
   return (45 - 3*alarm + g_model.frsky.rssiAlarms[alarm].value);
 }
+
+#if defined(LUA)
+Fifo<LuaTelemetryValue, 16> * luaInputTelemetryFifo = NULL;
+Fifo<LuaTelemetryValue, 16> * luaOutputTelemetryFifo = NULL;
+#endif

radio/src/telemetry/frsky.h

@@ -139,6 +139,8 @@
 #define POWERBOX_STATE_LAST_ID    0x0b2f
 #define POWERBOX_CNSP_FIRST_ID    0x0b30
 #define POWERBOX_CNSP_LAST_ID     0x0b3f
+#define DIY_FIRST_ID              0x5000
+#define DIY_LAST_ID               0x50ff
 #define RSSI_ID                   0xf101
 #define ADC1_ID                   0xf102
 #define ADC2_ID                   0xf103
@@ -344,7 +346,6 @@ struct FrskyData {
 };
 #endif
 
-
 #if defined(PCBTARANIS) && defined(REVPLUS)
   #define IS_VALID_XJT_VERSION()      (frskyData.xjtVersion != 0 && frskyData.xjtVersion != 0xff)
 #else
@@ -553,4 +554,15 @@ void processSerialData(uint8_t data);
   #define MODEL_TELEMETRY_PROTOCOL() g_model.telemetryProtocol
 #endif
 
+#if defined(LUA)
+struct LuaTelemetryValue
+{
+  uint8_t id;
+  uint32_t value;
+};
+
+extern Fifo<LuaTelemetryValue, 16> * luaInputTelemetryFifo;
+extern Fifo<LuaTelemetryValue, 16> * luaOutputTelemetryFifo;
+#endif
+
 #endif // _FRSKY_H_

radio/src/telemetry/frsky_sport.cpp

@@ -269,6 +269,13 @@ void processSportPacket(uint8_t * packet)
           processSportPacket(id, 6, instance, bool(data & 0x2000000));
           processSportPacket(id, 7, instance, bool(data & 0x4000000));
         }
+        else if (id >= DIY_FIRST_ID && id <= DIY_LAST_ID) {
+#if defined(LUA)
+          if (luaInputTelemetryFifo) {
+            luaInputTelemetryFifo->push((LuaTelemetryValue){(uint8_t)id, data});
+          }
+#endif
+        }
         else {
           processSportPacket(id, 0, instance, data);
         }

radio/src/telemetry/telemetry.h

@@ -21,7 +21,7 @@
 #ifndef _TELEMETRY_H_
 #define _TELEMETRY_H_
 
-extern Fifo<512> telemetryFifo;
+extern Fifo<uint8_t, 512> telemetryFifo;
 
 enum TelemetryProtocol
 {