Merge pull request #62 from raphaelcoeffic/nfs-horus

mikeller · web-flow · commit 8bbc53e6fb42 · 2017-11-14T11:56:19.000+13:00
draft horus version
diff --git a/src/SCRIPTS/BF/X12S/filters.lua b/src/SCRIPTS/BF/X12S/filters.lua
@@ -0,0 +1,45 @@
+
+return {
+    read              = 92, -- MSP_FILTER_CONFIG
+    write             = 93, -- MSP_SET_FILTER_CONFIG
+    eepromWrite       = true,
+    reboot            = false,
+    title             = "Filters",
+    minBytes          = 18,
+    text= {
+        { t = "LPF",           x = 38, y = 68  },
+        { t = "Gyro",          x = 12, y = 110 },
+        { t = "DTerm",         x = 12, y = 155 },
+        { t = "Yaw",           x = 12, y = 200 },
+        
+        { t = "Gyro 1",        x = 138, y = 68  },
+        { t = "Hz",            x = 132, y = 110 },
+        { t = "CO",            x = 132, y = 155 },
+
+        { t = "Gyro 2",        x = 244, y = 68  },
+        { t = "Hz",            x = 238, y = 110 },
+        { t = "CO",            x = 238, y = 155 },
+
+        { t = "DTerm",         x = 344, y = 68  },
+        { t = "Hz",            x = 338, y = 110 },
+        { t = "CO",            x = 338, y = 155 },
+
+        { t = "DTerm LP Type", x = 148, y = 200 },
+    },
+    fields = {
+        { x = 80,  y = 110, min = 0, max = 255,   vals = { 1 } },
+        { x = 80,  y = 155, min = 0, max = 16000, vals = { 2, 3 } },
+        { x = 80,  y = 200, min = 0, max = 500,   vals = { 4, 5 } },
+
+        { x = 172, y = 110, min = 0, max = 16000, vals = { 6, 7 } },
+        { x = 172, y = 155, min = 0, max = 16000, vals = { 8, 9 } },
+
+        { x = 278, y = 110, min = 0, max = 16000, vals = { 14, 15 } },
+        { x = 278, y = 155, min = 0, max = 16000, vals = { 16, 17 } },
+
+        { x = 378, y = 110, min = 0, max = 16000, vals = { 10, 11 } },
+        { x = 378, y = 155, min = 0, max = 16000, vals = { 12, 13 } },
+
+        { x = 288, y = 200,  min = 0, max = 2,    vals = { 18 }, table = { [0] = "PT1", [1] = "BIQUAD", [2] = "FIR" } },
+    }
+}
diff --git a/src/SCRIPTS/BF/X12S/pids.lua b/src/SCRIPTS/BF/X12S/pids.lua
@@ -0,0 +1,30 @@
+
+return {
+   read           = 112, -- MSP_PID
+   write          = 202, -- MSP_SET_PID
+   title          = "PIDs",
+   reboot         = false,
+   eepromWrite    = true,
+   minBytes       = 8,
+   text = {
+      { t = "P",      x = 142,  y =  48, to = MIDSIZE },
+      { t = "I",      x = 244,  y =  48, to = MIDSIZE },
+      { t = "D",      x = 342,  y =  48, to = MIDSIZE },
+      { t = "ROLL",   x =  28,  y = 100 },
+      { t = "PITCH",  x =  28,  y = 150 },
+      { t = "YAW",    x =  28,  y = 200 },
+   },
+   fields = {
+      -- P
+      { x = 140, y = 100, min = 0, max = 200, vals = { 1 } },
+      { x = 140, y = 150, min = 0, max = 200, vals = { 4 } },
+      { x = 140, y = 200, min = 0, max = 200, vals = { 7 } },
+      -- I
+      { x = 240, y = 100, min = 0, max = 200, vals = { 2 } },
+      { x = 240, y = 150, min = 0, max = 200, vals = { 5 } },
+      { x = 240, y = 200, min = 0, max = 200, vals = { 8 } },
+      -- D
+      { x = 340, y = 100, min = 0, max = 200, vals = { 3 } },
+      { x = 340, y = 150, min = 0, max = 200, vals = { 6 } },
+   },
+}
diff --git a/src/SCRIPTS/BF/X12S/pwm.lua b/src/SCRIPTS/BF/X12S/pwm.lua
@@ -0,0 +1,66 @@
+return {
+    read              = 90, -- MSP_ADVANCED_CONFIG
+    write             = 91, -- MSP_SET_ADVANCED_CONFIG
+    reboot            = true,
+    eepromWrite       = true,
+    title             = "PWM",
+    minBytes             = 9,
+    text= {
+        { t = "Protocol",    x = 36,  y = 68  },
+        { t = "32K",         x = 36,  y = 110 },
+        { t = "Gyro Rt",     x = 36,  y = 155 },
+        { t = "PID Rt",      x = 36,  y = 200 },
+        { t = "Unsynced",    x = 232, y = 110 },
+        { t = "PWM Rate",    x = 232, y = 155 },
+        { t = "Idle Offset", x = 232, y = 200 }
+    },
+    fields = {
+        { x = 130, y = 68,  vals = { 4 },    min = 0,   max = 9,
+          table = { [0] = "OFF", "ONESHOT125", "ONESHOT42",
+                          "MULTISHOT","BRUSHED",
+                          "DSHOT150", "DSHOT300", "DSHOT600","DSHOT1200",
+                          "PROSHOT1000" }
+        },
+        { x = 130, y = 110,  vals = { 9 },    min = 0,   max = 1,
+          table = { [0] = "OFF", "ON" },
+          upd = function(self) self.updateRateTables(self) end
+        },
+        { x = 130, y = 155, vals = { 1 },    min = 1,   max = 32,
+          upd = function(self) self.updatePidRateTable(self) end
+        },
+        { x = 130, y = 200, vals = { 2 },    min = 1,   max = 16 },
+        { x = 350, y = 110,  vals = { 3 },    min = 0,   max = 1,
+          table = { [0] = "OFF", "ON" } },
+        { x = 350, y = 155, vals = { 5, 6 }, min = 200, max = 32000 },
+        { x = 350, y = 200, vals = { 7, 8 }, min = 0,   max = 2000, scale = 100 },
+    },
+    calculateGyroRates = function(self, baseRate)
+        self.gyroRates = {}
+        self.fields[2].table = {}
+        for i=1, 32 do
+            self.gyroRates[i] = baseRate/i
+            local fmt = nil
+            self.fields[2].table[i] = string.format("%.2f",baseRate/i)
+        end
+    end,
+    calculatePidRates = function(self, baseRate)
+        self.fields[3].table = {}
+        for i=1, 16 do
+            self.fields[3].table[i] = string.format("%.2f",baseRate/i)
+        end
+    end,
+    updateRateTables = function(self)
+        if self.values[9] == 0 then
+            self.calculateGyroRates(self, 8)
+            self.calculatePidRates(self, 8)
+        elseif self.values[9] == 1 then
+            self.calculateGyroRates(self, 32)
+            self.calculatePidRates(self, 32)
+        end
+    end,
+    updatePidRateTable = function(self)
+        local newRateIdx = self.values[1]
+        local newRate = self.gyroRates[newRateIdx]
+        self.calculatePidRates(self, newRate)
+    end
+}
diff --git a/src/SCRIPTS/BF/X12S/rates1.lua b/src/SCRIPTS/BF/X12S/rates1.lua
@@ -0,0 +1,43 @@
+return {
+   read           = 111, -- MSP_RC_TUNING
+   write          = 204, -- MSP_SET_RC_TUNING
+   title          = "Rates (1/2)",
+   reboot         = false,
+   eepromWrite    = true,
+   minBytes       = 12,
+   text = {
+      { t = "RC",       x = 100, y = 52  },
+      { t = "Rate",     x = 94,  y = 70  },
+      { t = "Super",    x = 148, y = 52  },
+      { t = "Rate",     x = 152, y = 70  },
+      { t = "RC",       x = 214, y = 52  },
+      { t = "Expo",     x = 207, y = 70  },
+      { t = "Throttle", x = 288, y = 68  },
+      { t = "Mid",      x = 288, y = 100 },
+      { t = "Exp",      x = 288, y = 150 },
+      { t = "TPA",      x = 374, y = 68  },
+      { t = "Thr",      x = 374, y = 100 },
+      { t = "Brk",      x = 374, y = 150 },
+      { t = "ROLL",     x = 28,  y = 100 },
+      { t = "PITCH",    x = 28,  y = 150 },
+      { t = "YAW",      x = 28,  y = 200 },
+   },
+   fields = {
+      -- RC Rates
+      { x = 102,  y = 125,  vals = { 1 },  min = 0, max = 255, scale = 100 },
+      { x = 102,  y = 200,  vals = { 12 }, min = 0, max = 255, scale = 100 },
+      -- Super Rates
+      { x = 158,  y = 100,  vals = { 3 },  min = 0, max = 100, scale = 100 },
+      { x = 158,  y = 150,  vals = { 4 },  min = 0, max = 100, scale = 100 },
+      { x = 158,  y = 200,  vals = { 5 },  min = 0, max = 255, scale = 100 },
+      -- RC Expo
+      { x = 216,  y = 125,  vals = { 2 },  min = 0, max = 100, scale = 100 },
+      { x = 216,  y = 200,  vals = { 11 }, min = 0, max = 100, scale = 100 },
+      -- Throttle
+      { x = 330,  y = 100,  vals = { 7 },  min = 0, max = 100, scale = 100 },
+      { x = 330,  y = 150,  vals = { 8 },  min = 0, max = 100, scale = 100 },
+      -- TPA
+      { x = 416,  y = 100,  vals = { 6 } , min = 0, max = 100, scale = 100 },
+      { x = 416,  y = 150,  vals = { 9, 10 }, min = 1000, max = 2000 }
+   },
+}
diff --git a/src/SCRIPTS/BF/X12S/rates2.lua b/src/SCRIPTS/BF/X12S/rates2.lua
@@ -0,0 +1,30 @@
+
+return {
+   read           = 94, -- MSP_PID_ADVANCED
+   write          = 95, -- MSP_SET_PID_ADVANCED
+   title          = "Rates (2/2)",
+   reboot         = false,
+   eepromWrite    = true,
+   minBytes       = 23,
+   text = {
+      { t = "Anti-Gravity",       x =  28, y =  62 },
+      { t = "Gain",               x =  38, y = 100 },
+      { t = "Threshold",          x =  38, y = 142 },
+      { t = "Dterm Setpoint",     x = 232, y =  62 },
+      { t = "Weight",             x = 242, y = 100 },
+      { t = "Transition",         x = 242, y = 142 },
+      { t = "VBAT Compensation",  x =  28, y = 200 }
+   },
+   fields = {
+      --  GAIN
+      { x = 144, y = 100, min = 1000, max = 30000, vals = { 22, 23 }, scale = 1000, mult = 1000 },
+      --  THRESHOLD
+      { x = 144, y = 142, min = 20, max = 1000, vals = { 20, 21 } },
+      --  WEIGHT
+      { x = 348, y = 100, min = 0, max = 254, vals = { 10 }, scale = 100 },
+      --  TRANSITION
+      { x = 348, y = 142, min = 0, max = 100, vals = { 9 }, scale = 100 },
+      --  VBAT COMPENSATION
+      { x = 236, y = 200, min = 0, max = 1, vals = { 8 }, table = { [0]="OFF", "ON" } },
+   }
+}
diff --git a/src/SCRIPTS/BF/X12S/rx.lua b/src/SCRIPTS/BF/X12S/rx.lua
@@ -0,0 +1,25 @@
+return {
+	read           = 44, -- MSP_RX_CONFIG
+	write          = 45, -- MSP_SET_RX_CONFIG
+	title          = "RX",
+	reboot         = false,
+	eepromWrite    = true,
+	minBytes       = 23,
+	text= {
+		{ t = "Stick Min",  x = 50,   y = 68  },
+		{ t = "Stick Mid",  x = 50,   y = 110 },
+		{ t = "Stick Max",  x = 50,   y = 155 },
+		{ t = "Cam Angle",  x = 240,  y = 68  },
+		{ t = "Interp",     x = 240,  y = 110 },
+		{ t = "Interp Int", x = 240,  y = 155 }
+	},
+	fields = {
+		{ x =  152, y = 68,  min = 1000, max = 2000, vals = { 6, 7 } },
+		{ x =  152, y = 110, min = 1000, max = 2000, vals = { 4, 5 } },
+		{ x =  152, y = 155, min = 1000, max = 2000, vals = { 2, 3 } },
+		{ x =  362, y = 68,  min = 0,    max = 50,   vals = { 23 }   },
+		{ x =  362, y = 110, min = 0,    max = 3,    vals = { 13 },
+                  table={ [0]="Off", "Preset", "Auto", "Manual"} },
+		{ x =  362, y = 155, min = 1,    max = 50,   vals = { 14 }   }
+	},
+}
diff --git a/src/SCRIPTS/BF/X12S/vtx.lua b/src/SCRIPTS/BF/X12S/vtx.lua
@@ -0,0 +1,72 @@
+
+return {
+    read           = 88, -- MSP_VTX_CONFIG
+    write          = 89, -- MSP_VTX_SET_CONFIG
+    eepromWrite    = true,
+    reboot         = false,
+    saveMaxRetries = 2,
+    saveTimeout    = 300, -- 3s
+    title          = "VTX",
+    minBytes       = 5,
+    text= {
+        { t = "Band",    x = 50,  y =  50 },
+        { t = "Channel", x = 50,  y = 100 },
+        { t = "Power",   x = 50,  y = 150 },
+        { t = "Pit",     x = 50,  y = 200 },
+        { t = "Proto",   x = 240, y =  50 },
+        { t = "Freq",    x = 240, y = 100 },
+    },
+    fields = {
+        { x = 152,  y = 50, min=1, max=5, vals = { 2 },
+          table = { "A", "B", "E", "F", "R" },
+          upd = function(self) self.updateVTXFreq(self) end },
+        { x = 152,  y = 100, min=1, max=8, vals = { 3 },
+          upd =  function(self) self.updateVTXFreq(self) end },
+        { x = 152,  y = 150,  min=1, vals = { 4 },
+          upd = function(self) self.updatePowerTable(self) end },
+        { x = 152,  y = 200,  min=0, max=1, vals = { 5 },
+          table = { [0]="OFF", "ON" } },
+        { x = 332,  y =  50,  write = false, ro = true, vals = { 1 },
+          table = {[3]="SmartAudio",[4]="Tramp",[255]="None"} },
+        { x = 332,  y = 100,  min=5000, max=6000, ro=true },
+    },
+    freqLookup = {
+        { 5865, 5845, 5825, 5805, 5785, 5765, 5745, 5725 }, -- Boscam A
+        { 5733, 5752, 5771, 5790, 5809, 5828, 5847, 5866 }, -- Boscam B
+        { 5705, 5685, 5665, 5645, 5885, 5905, 5925, 5945 }, -- Boscam E
+        { 5740, 5760, 5780, 5800, 5820, 5840, 5860, 5880 }, -- FatShark
+        { 5658, 5695, 5732, 5769, 5806, 5843, 5880, 5917 }, -- RaceBand
+    },
+    postLoad = function (self)
+        if self.values[2] == 0 or self.values[3] == 0 or self.values[4] == 0 then
+            self.values = {}
+        end
+    end,
+    preSave = function(self)
+        local valsTemp = {}
+        local channel = (self.values[2]-1)*8 + self.values[3]-1
+        valsTemp[1] = bit32.band(channel,0xFF)
+        valsTemp[2] = bit32.rshift(channel,8)
+        valsTemp[3] = self.values[4]
+        valsTemp[4] = self.values[5]
+        return valsTemp
+    end,
+    updatePowerTable = function(self)
+        if self.values and not self.fields[3].table then
+            if self.values[1] == 3 then
+                self.fields[3].table = { 25, 200, 500, 800 }
+                self.fields[3].max = 4
+            elseif self.values[1] == 4 then
+                self.fields[3].table = { 25, 100, 200, 400, 600 }
+                self.fields[3].max = 5
+            end
+        end
+    end,
+    updateVTXFreq = function(self)
+        if (#(self.values) or 0) >= self.minBytes then
+            if (self.fields[2].value or 0) > 0 and (self.fields[3].value or 0) > 0 then
+                self.fields[6].value = self.freqLookup[self.values[2]][self.values[3]]
+            end
+        end
+    end
+}
diff --git a/src/SCRIPTS/BF/X12S/x12spre.lua b/src/SCRIPTS/BF/X12S/x12spre.lua
@@ -0,0 +1,18 @@
+PageFiles =
+{
+    "pids.lua",
+    "rates1.lua",
+    "rates2.lua",
+    "filters.lua",
+    "pwm.lua",
+    "rx.lua",
+    "vtx.lua"
+}
+
+backgroundFill = TEXT_BGCOLOR
+foregroundColor = LINE_COLOR
+globalTextOptions = TEXT_COLOR
+
+MenuBox = { x=120, y=90, w=210, x_offset=40, h_line=30, h_offset=20 }
+SaveBox = { x=120, y=100, w=210, x_offset=12, h=150, h_offset=12 }
+NoTelem = {   192,   LCD_H - 28, "No Telemetry", TEXT_COLOR + INVERS + BLINK }
diff --git a/src/SCRIPTS/BF/radios.lua b/src/SCRIPTS/BF/radios.lua
@@ -1,3 +1,10 @@
+lcdResolution =
+{
+    low = 0,
+    high = 1
+}
+
+
 local supportedRadios =
 {
     ["x7"] =
@@ -14,7 +21,19 @@ local supportedRadios =
     {
         templateHome    = SCRIPT_HOME.."/X9/",
         preLoad         = SCRIPT_HOME.."/X9/x9pre.lua"
-    }
+    },
+    ["x10"] =
+    {
+        templateHome=SCRIPT_HOME.."/X12S/",
+        preLoad=SCRIPT_HOME.."/X12S/x12spre.lua",
+        resolution      = lcdResolution.high
+    },
+    ["x12s"] =
+    {
+        templateHome=SCRIPT_HOME.."/X12S/",
+        preLoad=SCRIPT_HOME.."/X12S/x12spre.lua",
+        resolution      = lcdResolution.high
+    },
 }
 
 local ver, rad, maj, min, rev = getVersion()
diff --git a/src/SCRIPTS/BF/ui.lua b/src/SCRIPTS/BF/ui.lua
