diff --git a/HORUS/SD/SCRIPTS/TOOLS/Yaapu Config.lua b/HORUS/SD/SCRIPTS/TOOLS/Yaapu Config.lua index b527b7d8..1d877a43 100644 --- a/HORUS/SD/SCRIPTS/TOOLS/Yaapu Config.lua +++ b/HORUS/SD/SCRIPTS/TOOLS/Yaapu Config.lua @@ -3,7 +3,9 @@ -- -- Copyright (C) 2018-2019. Alessandro Apostoli -- https://github.com/yaapu --- +-- OlliW MavSDK additions by Risto Kõiva +-- https://github.com/rotorman +-- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by -- the Free Software Foundation; either version 3 of the License, or @@ -36,6 +38,7 @@ --------------------- -- enable splash screen for no telemetry data --#define SPLASH +-- enable battery percentage based on voltage -- enable code to draw a compass rose vs a compass ribbon --#define COMPASS_ROSE @@ -54,14 +57,15 @@ --#define TESTMODE -- enable debug of generated hash or short hash string --#define HASHDEBUG - +-- enable MESSAGES DEBUG +--#define DEBUG_MESSAGES --------------------- -- DEBUG REFRESH RATES --------------------- -- calc and show hud refresh rate --#define HUDRATE -- calc and show telemetry process rate ---#define BGTELERATE +-- #define BGTELERATE --------------------- -- SENSOR IDS @@ -95,24 +99,7 @@ -- CONF REFRESH GV --------------------------------- ---------------------------------- --- ALARMS ---------------------------------- ---[[ - ALARM_TYPE_MIN needs arming (min has to be reached first), value below level for grace, once armed is periodic, reset on landing - ALARM_TYPE_MAX no arming, value above level for grace, once armed is periodic, reset on landing - ALARM_TYPE_TIMER no arming, fired periodically, spoken time, reset on landing - ALARM_TYPE_BATT needs arming (min has to be reached first), value below level for grace, no reset on landing -{ - 1 = notified, - 2 = alarm start, - 3 = armed, - 4 = type(0=min,1=max,2=timer,3=batt), - 5 = grace duration - 6 = ready - 7 = last alarm -} ---]]-- +-- -- -- @@ -125,7 +112,9 @@ --#define HUD_ALGO1 -- enable optimized hor bars HUD drawing --#define HUD_ALGO2 --- enable hor bars HUD drawing +-- enable hor bars HUD drawing, 2 px resolution +-- enable hor bars HUD drawing, 1 px resolution +--#define HUD_ALGO4 @@ -151,9 +140,6 @@ local unitLongLabel = getGeneralSettings().imperial == 0 and "km" or "mi" -- offsets are: 1 celm, 4 batt, 7 curr, 10 mah, 13 cap, indexing starts at 1 -- ------------------------ --- LIBRARY LOADING ------------------------ ---------------------- --- COLORS @@ -176,13 +162,6 @@ local unitLongLabel = getGeneralSettings().imperial == 0 and "km" or "mi" -------------------------- - - - - - - - ------------------------------------- -- UNITS Scales from Ardupilot OSD code /ardupilot/libraries/AP_OSD/AP_OSD_Screen.cpp ------------------------------------- @@ -219,48 +198,53 @@ local unitLongLabel = getGeneralSettings().imperial == 0 and "km" or "mi" 0.000539957, //DISTANCE_LONG Nm 1.0, //TEMPERATURE C }; ---]]--[[ - -TYPEVALUE - menu option to select a numeric value -{description, type,name,default value,min,max,uit of measure,precision,increment step, , } -example {"batt alert level 1:", TYPEVALUE, "V1", 375, 0,5000,"V",PREC2,5,"L2",350 }, +--]] +-- +local menuItems = { + {"voice language:", "L1", 1, { "english", "italian", "french", "german" } , {"en","it","fr","de"} }, + {"batt alert level 1:", "V1", 375, 0,5000,"V",PREC2,5 }, + {"batt alert level 2:", "V2", 350, 0,5000,"V",PREC2,5 }, + {"batt[1] capacity override:", "B1", 0, 0,5000,"Ah",PREC2,10 }, + {"batt[2] capacity override:", "B2", 0, 0,5000,"Ah",PREC2,10 }, + {"batt[1] cell count override:", "CC", 0, 0,12," cells",0,1 }, + {"batt[2] cell count override:", "CC2", 0, 0,12," cells",0,1 }, + {"dual battery config:", "BC", 1, { "parallel", "series", "dual with alert on B1", "dual with alert on B2", "volts on B1, curr on B2", "volts on B2, curr on B1" }, { 1, 2, 3, 4, 5, 6 } }, + {"enable battery % by voltage:", "BPBV", 1, { "no", "yes" }, { false, true } }, + {"default voltage source:", "VS", 1, { "auto", "FLVSS", "fc" }, { nil, "vs", "fc" } }, + {"disable all sounds:", "S1", 1, { "no", "yes" }, { false, true } }, + {"disable incoming msg beep:", "S2", 1, { "no", "only for INF severity", "always" }, { 1, 2, 3 } }, + {"enable haptic:", "VIBR", 1, { "no", "yes" }, { false, true } }, + {"timer alert every:", "T1", 0, 0,600,"min",PREC1,5 }, + {"min altitude alert:", "A1", 0, 0,500,"m",PREC1,5 }, + {"max altitude alert:", "A2", 0, 0,10000,"m",0,1 }, + {"max distance alert:", "D1", 0, 0,100000,"m",0,10 }, + {"repeat alerts every:", "T2", 10, 5,600,"sec",0,5 }, + {"rangefinder max:", "RM", 0, 0,10000," cm",0,10 }, + {"air/groundspeed unit:", "HSPD", 1, { "m/s", "km/h", "mph", "kn" }, { 1, 3.6, 2.23694, 1.94384} }, + {"vertical speed unit:", "VSPD", 1, { "m/s", "ft/s", "ft/min" }, { 1, 3.28084, 196.85} }, + {"widget layout:", "WL", 1, { "default","legacy"}, { 1, 2 } }, + {"center panel:", "CPANE", 1, { "option 1","option 2","option 3","option 4" }, { 1, 2, 3, 4 } }, + {"right panel:", "RPANE", 1, { "option 1","option 2","option 3","option 4","option 5","option 6" }, { 1, 2, 3, 4, 5, 6 } }, + {"left panel:", "LPANE", 1, { "option 1","option 2","option 3","option 4" }, { 1 , 2, 3, 4 } }, + {"enable PX4 flightmodes:", "PX4", 1, { "no", "yes" }, { false, true } }, + {"enable CRSF support:", "CRSF", 1, { "no", "yes" }, { false, true } }, + {"enable OlliW MavSDK support:", "MAVSDK", 1, { "no", "yes" }, { false, true } }, + {"emulated page channel:", "STC", 0, 0, 32,nil,0,1 }, + {"emulated wheel channel:", "SWC", 0, 0, 32,nil,0,1 }, + {"GPS coordinates format:", "GPS", 1, { "DMS", "decimal" }, { 1, 2 } }, + {"map provider:", "MAPP", 1, { "GMapCatcher", "Google" }, { 1, 2 } }, + {"map type:", "MAPT", 1, { "satellite", "map", "terrain" }, { "sat_tiles", "tiles", "ter_tiles" } }, + {"map min zoom level:", "MAPmZ", -2, -2, 17,nil,0,1 }, + {"map max zoom level:", "MAPMZ", 17, -2, 17,nil,0,1 }, + {"map grid lines:", "MAPG", 1, { "yes", "no" }, { true, false } }, + {"use radio GPS for home:", "TXGPS", 1, { "no", "yes" }, { false, true } }, +} -TYPECOMBO - menu option to select a value from a list -{description, type, name, default, label list, value list, , } -example {"center pane layout:", TYPECOMBO, "CPANE", 1, { "hud","radar" }, { 1, 2 },"CPANE",1 }, +local menuItemsByName = {} ---]]-- -local menuItems = { - {"voice language:", 1, "L1", 1, { "english", "italian", "french", "german" } , {"en","it","fr","de"} }, - {"batt alert level 1:", 0, "V1", 375, 0,5000,"V",PREC2,5 }, - {"batt alert level 2:", 0, "V2", 350, 0,5000,"V",PREC2,5 }, - {"batt[1] capacity override:", 0, "B1", 0, 0,5000,"Ah",PREC2,10 }, - {"batt[2] capacity override:", 0, "B2", 0, 0,5000,"Ah",PREC2,10 }, - {"disable all sounds:", 1, "S1", 1, { "no", "yes" }, { false, true } }, - {"disable msg beep:", 1, "S2", 1, { "no", "info", "all" }, { 1, 2, 3 } }, - {"enable haptic:", 1, "VIBR", 1, { "no", "yes" }, { false, true } }, - {"default voltage source:", 1, "VS", 1, { "auto", "FLVSS", "fc" }, { nil, "vs", "fc" } }, - {"timer alert every:", 0, "T1", 0, 0,600,"min",PREC1,5 }, - {"min altitude alert:", 0, "A1", 0, 0,500,"m",PREC1,5 }, - {"max altitude alert:", 0, "A2", 0, 0,10000,"m",0,1 }, - {"max distance alert:", 0, "D1", 0, 0,100000,"m",0,10 }, - {"repeat alerts every:", 0, "T2", 10, 5,600,"sec",0,5 }, - {"dual battery config:", 1, "BC", 1, { "par", "ser", "other" }, { 1, 2, 3 } }, - {"batt[1] cell count override:", 0, "CC", 0, 0,12," cells",0,1 }, - {"batt[2] cell count override:", 0, "CC2", 0, 0,12," cells",0,1 }, - {"rangefinder max:", 0, "RM", 0, 0,10000," cm",0,10 }, - {"air/groundspeed unit:", 1, "HSPD", 1, { "m/s", "km/h", "mph", "kn" }, { 1, 3.6, 2.23694, 1.94384} }, - {"vertical speed unit:", 1, "VSPD", 1, { "m/s", "ft/s", "ft/min" }, { 1, 3.28084, 196.85} }, - {"widget layout:", 1, "WL", 1, { "default","legacy"}, { 1, 2 } }, - {"center panel:", 1, "CPANE", 1, { "option 1","option 2","option 3","option 4" }, { 1, 2, 3, 4 } }, - {"right panel:", 1, "RPANE", 1, { "option 1","option 2","option 3","option 4" }, { 1, 2, 3, 4 } }, - {"left panel:", 1, "LPANE", 1, { "option 1","option 2","option 3","option 4" }, { 1 , 2, 3, 4 } }, - {"enable px4 flightmodes:", 1, "PX4", 1, { "no", "yes" }, { false, true } }, - {"screen toggle channel:", 0, "STC", 0, 0, 32,nil,0,1 }, - {"map zoom level:", 0, "MAPZ", -2, -2, 17,nil,0,1 }, - {"map type:", 1, "MAPT", 1, { "satellite", "map", "terrain" }, { "sat_tiles", "tiles", "ter_tiles" } }, - {"map grid lines:", 1, "MAPG", 1, { "yes", "no" }, { true, false } }, - {"map zoom channel:", 0, "ZTC", 0, 0, 32,nil,0,1 }, +-- map from NEW to OLD settings +local mapNewToOldItemCfg = { + ["SWC"] = "ZTC" -- ZTC was replaced by SWC } local menu = { @@ -284,20 +268,18 @@ local leftPanelFiles = {} -- returns item's VALUE,LABEL,IDX ------------------------------------------ local function getMenuItemByName(items,name) - for idx=1,#items - do - -- items[idx][3] is the menu item's name as it appears in the config file - if items[idx][3] == name then - if items[idx][2] == 1 then - -- return item's value, label, index - return items[idx][6][items[idx][4]], items[idx][5][items[idx][4]], idx - else - -- return item's value, label, index - return items[idx][4], name, idx - end - end + local itemIdx = menuItemsByName[name] + local item = items[itemIdx] + if item == nil then + return nil + end + if type(item[4]) == "table" then + -- return item's value, label, index + return item[5][item[3]], item[4][item[3]], itemIdx + else + -- return item's value, label, index + return item[3], name, itemIdx end - return nil end local function updateMenuItems() @@ -307,60 +289,62 @@ local function updateMenuItems() --------------------- -- large hud layout --------------------- + value, name, idx = getMenuItemByName(menuItems,"CPANE") - menuItems[idx][5] = { "default"}; - menuItems[idx][6] = { 1 }; + menuItems[idx][4] = { "default" }; + menuItems[idx][5] = { 1 }; - if menuItems[idx][4] > #menuItems[idx][5] then - menuItems[idx][4] = 1 + if menuItems[idx][3] > #menuItems[idx][4] then + menuItems[idx][3] = 1 end value, name, idx = getMenuItemByName(menuItems,"RPANE") - menuItems[idx][5] = { "default" }; - menuItems[idx][6] = { 1 }; + menuItems[idx][4] = { "default", "batt% by voltage", "tether", "hybrid"}; + menuItems[idx][5] = { 1, 2, 3, 4 }; - if menuItems[idx][4] > #menuItems[idx][5] then - menuItems[idx][4] = 1 + if menuItems[idx][3] > #menuItems[idx][4] then + menuItems[idx][3] = 1 end value, name, idx = getMenuItemByName(menuItems,"LPANE") - menuItems[idx][5] = { "default","mav2passthru" }; - menuItems[idx][6] = { 1, 2 }; + menuItems[idx][4] = { "default", "MavSDK/Mav2PT" }; + menuItems[idx][5] = { 1, 2 }; - if menuItems[idx][4] > #menuItems[idx][5] then - menuItems[idx][4] = 1 + if menuItems[idx][3] > #menuItems[idx][4] then + menuItems[idx][3] = 1 end - centerPanelFiles = {"hud_1", "hud_nav_1" } - rightPanelFiles = {"right_1" } - leftPanelFiles = {"left_1", "left_m2f_1" } + centerPanelFiles = { "hud_1" } + rightPanelFiles = { "right_1", "right_battperc_1", "right_tether_1", "right_hybrid_1" } + leftPanelFiles = { "left_1", "left_m2f_1" } elseif value == 2 then --------------------- -- legacy layout --------------------- + value, name, idx = getMenuItemByName(menuItems,"CPANE") - menuItems[idx][5] = { "default", "russian hud", "compact hud" }; - menuItems[idx][6] = { 1, 2, 3 }; + menuItems[idx][4] = { "default", "russian hud", "compact hud " }; + menuItems[idx][5] = { 1, 2, 3 }; - if menuItems[idx][4] > #menuItems[idx][5] then - menuItems[idx][4] = 1 + if menuItems[idx][3] > #menuItems[idx][4] then + menuItems[idx][3] = 1 end value, name, idx = getMenuItemByName(menuItems,"RPANE") - menuItems[idx][5] = { "default", "custom sensors" }; - menuItems[idx][6] = { 1, 2 }; + menuItems[idx][4] = { "default", "custom sensors" }; + menuItems[idx][5] = { 1, 2 }; - if menuItems[idx][4] > #menuItems[idx][5] then - menuItems[idx][4] = 1 + if menuItems[idx][3] > #menuItems[idx][4] then + menuItems[idx][3] = 1 end value, name, idx = getMenuItemByName(menuItems,"LPANE") - menuItems[idx][5] = { "default","mav2passthru" }; - menuItems[idx][6] = { 1, 2 }; + menuItems[idx][4] = { "default", "MavSDK/Mav2PT" }; + menuItems[idx][5] = { 1, 2 }; - if menuItems[idx][4] > #menuItems[idx][5] then - menuItems[idx][4] = 1 + if menuItems[idx][3] > #menuItems[idx][4] then + menuItems[idx][3] = 1 end centerPanelFiles = {"hud_2", "hud_russian_2", "hud_small_2" } @@ -368,14 +352,67 @@ local function updateMenuItems() leftPanelFiles = {"left_2", "left_m2f_2" } end + value, name, idx = getMenuItemByName(menuItems,"MAPP") + + if value == nil then + return + end + + local value2, name2, idx2 = getMenuItemByName(menuItems,"MAPT") + + if value2 ~= nil then + if value == 1 then --GMapCatcher + menuItems[idx2][4] = { "satellite", "map", "terrain" } + menuItems[idx2][5] = { "sat_tiles", "tiles", "ter_tiles" } + elseif value == 2 then -- Google + menuItems[idx2][4] = { "GoogleSatelliteMap", "GoogleHybridMap", "GoogleMap", "GoogleTerrainMap" } + menuItems[idx2][5] = { "GoogleSatelliteMap", "GoogleHybridMap", "GoogleMap", "GoogleTerrainMap" } + end + end + + value2, name2, idx2 = getMenuItemByName(menuItems,"MAPmZ") + + if value2 ~= nil then + if value == 1 then -- GMapCatcher + menuItems[idx2][4] = -2 + menuItems[idx2][5] = 17 + else -- Google + menuItems[idx2][4] = 1 + menuItems[idx2][5] = 20 + end + -- check that the selected value is in range of the appropriate map product + if menuItems[idx2][3] < menuItems[idx2][4] then + menuItems[idx2][3] = menuItems[idx2][4] + end + if menuItems[idx2][3] > menuItems[idx2][5] then + menuItems[idx2][3] = menuItems[idx2][5] + end + end + + value2, name2, idx2 = getMenuItemByName(menuItems,"MAPMZ") + + if value2 ~= nil then + if value == 1 then -- GMapCatcher + menuItems[idx2][4] = -2 + menuItems[idx2][5] = 17 + else -- Google + menuItems[idx2][4] = 1 + menuItems[idx2][5] = 20 + end + -- check that the selected value is in range of the appropriate map product + if menuItems[idx2][3] < menuItems[idx2][4] then + menuItems[idx2][3] = menuItems[idx2][4] + end + if menuItems[idx2][3] > menuItems[idx2][5] then + menuItems[idx2][3] = menuItems[idx2][5] + end + end + menu.updated = false - collectgarbage() - collectgarbage() end end -local -function getConfigFilename() +local function getConfigFilename() local info = model.getInfo() return "/SCRIPTS/YAAPU/CFG/" .. string.lower(string.gsub(info.name, "[%c%p%s%z]", "")..".cfg") end @@ -416,56 +453,76 @@ local function applyConfigValues(conf) conf.leftPanel = getMenuItemByName(menuItems,"LPANE") conf.leftPanelFilename = leftPanelFiles[conf.leftPanel] - conf.enablePX4Modes = getMenuItemByName(menuItems,"PX4") + conf.enableCRSF = getMenuItemByName(menuItems,"CRSF") + conf.enableMavSDK = getMenuItemByName(menuItems,"MAVSDK") + + conf.mapZoomMin = getMenuItemByName(menuItems,"MAPmZ") + conf.mapZoomMax = getMenuItemByName(menuItems,"MAPMZ") - conf.mapZoomLevel = getMenuItemByName(menuItems,"MAPZ") conf.mapType = getMenuItemByName(menuItems,"MAPT") local chInfo = getFieldInfo("ch"..getMenuItemByName(menuItems,"STC")) conf.screenToggleChannelId = (chInfo == nil and -1 or chInfo['id']) - chInfo = getFieldInfo("ch"..getMenuItemByName(menuItems,"ZTC")) - conf.mapToggleChannelId = (chInfo == nil and -1 or chInfo['id']) + chInfo = getFieldInfo("ch"..getMenuItemByName(menuItems,"SWC")) + conf.screenWheelChannelId = (chInfo == nil and -1 or chInfo['id']) conf.enableMapGrid = getMenuItemByName(menuItems,"MAPG") + conf.mapProvider = getMenuItemByName(menuItems,"MAPP") -- set default voltage source if getMenuItemByName(menuItems,"VS") ~= nil then conf.defaultBattSource = getMenuItemByName(menuItems,"VS") end + conf.gpsFormat = getMenuItemByName(menuItems,"GPS") + conf.enableBattPercByVoltage = getMenuItemByName(menuItems,"BPBV") + conf.enableTxGPS = getMenuItemByName(menuItems,"TXGPS") menu.editSelected = false - collectgarbage() - collectgarbage() end local function loadConfig(conf) + local cfg_found = false + local cfg_string local cfg = io.open(getConfigFilename(),"r") + if cfg ~= nil then - local str = io.read(cfg,500) + cfg_string = io.read(cfg,500) io.close(cfg) - if string.len(str) > 0 then - for i=1,#menuItems - do - local value = string.match(str, menuItems[i][3]..":([-%d]+)") - collectgarbage() - if value ~= nil then - menuItems[i][4] = tonumber(value) - -- check if the value read from file is compatible with available options - if menuItems[i][2] == 1 and tonumber(value) > #menuItems[i][5] then - --if not force default - menuItems[i][4] = 1 - end + if string.len(cfg_string) > 0 then + cfg_found = true + end + end + + for i=1,#menuItems + do + menuItemsByName[tostring(menuItems[i][2])] = i + if cfg_found then + local value = string.match(cfg_string, menuItems[i][2]..":([-%d]+)") + if value == nil then + -- check if it was replaced by an older settings + local oldCfg = mapNewToOldItemCfg[menuItems[i][2]] + if oldCfg ~= nil then + value = string.match(cfg_string, oldCfg..":([-%d]+)") + end + end + if value ~= nil then + menuItems[i][3] = tonumber(value) + -- check if the value read from file is compatible with available options + if type(menuItems[i][4]) == "table" and tonumber(value) > #menuItems[i][4] then + --if not force default + menuItems[i][3] = 1 end end end end - -- menu was loaded apply required changes - menu.updated = true + -- when run standalone there's nothing to update :-) if conf ~= nil then applyConfigValues(conf) + -- menu was loaded apply required changes + menu.updated = true end end @@ -473,7 +530,7 @@ local function saveConfig(conf) local myConfig = "" for i=1,#menuItems do - myConfig = myConfig..menuItems[i][3]..":"..menuItems[i][4] + myConfig = myConfig..menuItems[i][2]..":"..menuItems[i][3] if i < #menuItems then myConfig = myConfig.."," end @@ -484,8 +541,6 @@ local function saveConfig(conf) io.close(cfg) end myConfig = nil - collectgarbage() - collectgarbage() -- when run standalone there's nothing to update :-) if conf ~= nil then applyConfigValues(conf) @@ -501,52 +556,52 @@ local function drawConfigMenuBars() lcd.drawFilledRectangle(0,LCD_H-20, LCD_W, 20, CUSTOM_COLOR) lcd.drawRectangle(0, LCD_H-20, LCD_W, 20, CUSTOM_COLOR) lcd.setColor(CUSTOM_COLOR,0xFFFF) - lcd.drawText(2,0,"Yaapu Telemetry Widget 1.8.1",CUSTOM_COLOR) + lcd.drawText(2,0,"Yaapu v1.9.3b4 (OlliW MavSDK support by Risto)",CUSTOM_COLOR) lcd.drawText(2,LCD_H-20+1,getConfigFilename(),CUSTOM_COLOR) lcd.drawText(LCD_W,LCD_H-20+1,itemIdx,CUSTOM_COLOR+RIGHT) end local function incMenuItem(idx) - if menuItems[idx][2] == 0 then - menuItems[idx][4] = menuItems[idx][4] + menuItems[idx][9] - if menuItems[idx][4] > menuItems[idx][6] then - menuItems[idx][4] = menuItems[idx][6] + if type(menuItems[idx][4]) == "table" then + menuItems[idx][3] = menuItems[idx][3] + 1 + if menuItems[idx][3] > #menuItems[idx][4] then + menuItems[idx][3] = 1 end else - menuItems[idx][4] = menuItems[idx][4] + 1 - if menuItems[idx][4] > #menuItems[idx][5] then - menuItems[idx][4] = 1 + menuItems[idx][3] = menuItems[idx][3] + menuItems[idx][8] + if menuItems[idx][3] > menuItems[idx][5] then + menuItems[idx][3] = menuItems[idx][5] end end end local function decMenuItem(idx) - if menuItems[idx][2] == 0 then - menuItems[idx][4] = menuItems[idx][4] - menuItems[idx][9] - if menuItems[idx][4] < menuItems[idx][5] then - menuItems[idx][4] = menuItems[idx][5] + if type(menuItems[idx][4]) == "table" then + menuItems[idx][3] = menuItems[idx][3] - 1 + if menuItems[idx][3] < 1 then + menuItems[idx][3] = #menuItems[idx][4] end else - menuItems[idx][4] = menuItems[idx][4] - 1 - if menuItems[idx][4] < 1 then - menuItems[idx][4] = #menuItems[idx][5] + menuItems[idx][3] = menuItems[idx][3] - menuItems[idx][8] + if menuItems[idx][3] < menuItems[idx][4] then + menuItems[idx][3] = menuItems[idx][4] end end end local function drawItem(idx,flags) lcd.setColor(CUSTOM_COLOR,0xFFFF) - if menuItems[idx][2] == 0 then - if menuItems[idx][4] == 0 and menuItems[idx][5] >= 0 then - lcd.drawText(300,25 + (idx-menu.offset-1)*20, "---",flags+CUSTOM_COLOR) + if type(menuItems[idx][4]) == "table" then + lcd.drawText(280,25 + (idx-menu.offset-1)*20, menuItems[idx][4][menuItems[idx][3]],flags+CUSTOM_COLOR) + else + if menuItems[idx][3] == 0 and menuItems[idx][4] >= 0 then + lcd.drawText(280,25 + (idx-menu.offset-1)*20, "---",flags+CUSTOM_COLOR) else - lcd.drawNumber(300,25 + (idx-menu.offset-1)*20, menuItems[idx][4],flags+menuItems[idx][8]+CUSTOM_COLOR) - if menuItems[idx][7] ~= nil then - lcd.drawText(300 + 50,25 + (idx-menu.offset-1)*20, menuItems[idx][7],flags+CUSTOM_COLOR) + lcd.drawNumber(280,25 + (idx-menu.offset-1)*20, menuItems[idx][3],flags+menuItems[idx][7]+CUSTOM_COLOR) + if menuItems[idx][6] ~= nil then + lcd.drawText(280 + 50,25 + (idx-menu.offset-1)*20, menuItems[idx][6],flags+CUSTOM_COLOR) end end - else - lcd.drawText(300,25 + (idx-menu.offset-1)*20, menuItems[idx][5][menuItems[idx][4]],flags+CUSTOM_COLOR) end end diff --git a/HORUS/SD/SCRIPTS/TOOLS/Yaapu Debug.lua b/HORUS/SD/SCRIPTS/TOOLS/Yaapu Debug.lua index 3bb7db4a..5eaff39c 100644 --- a/HORUS/SD/SCRIPTS/TOOLS/Yaapu Debug.lua +++ b/HORUS/SD/SCRIPTS/TOOLS/Yaapu Debug.lua @@ -71,4 +71,3 @@ end return {run=run, init=init} - diff --git a/HORUS/SD/SCRIPTS/YAAPU/IMAGES/fuelgauge_75x75.png b/HORUS/SD/SCRIPTS/YAAPU/IMAGES/fuelgauge_75x75.png new file mode 100644 index 00000000..6ea271be Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/IMAGES/fuelgauge_75x75.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/IMAGES/minircradioorange.png b/HORUS/SD/SCRIPTS/YAAPU/IMAGES/minircradioorange.png new file mode 100644 index 00000000..c2fa0201 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/IMAGES/minircradioorange.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/IMAGES/minircradiored.png b/HORUS/SD/SCRIPTS/YAAPU/IMAGES/minircradiored.png new file mode 100644 index 00000000..4b4d7e35 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/IMAGES/minircradiored.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/IMAGES/rcradioorange.png b/HORUS/SD/SCRIPTS/YAAPU/IMAGES/rcradioorange.png new file mode 100644 index 00000000..7211960a Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/IMAGES/rcradioorange.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/IMAGES/rcradiored.png b/HORUS/SD/SCRIPTS/YAAPU/IMAGES/rcradiored.png new file mode 100644 index 00000000..b660e7fe Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/IMAGES/rcradiored.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/IMAGES/rssi.png b/HORUS/SD/SCRIPTS/YAAPU/IMAGES/rssi.png new file mode 100644 index 00000000..7cfb860e Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/IMAGES/rssi.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/LIB/copter.luac b/HORUS/SD/SCRIPTS/YAAPU/LIB/copter.luac index f517670b..44ef7dad 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/LIB/copter.luac and b/HORUS/SD/SCRIPTS/YAAPU/LIB/copter.luac differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/LIB/copter_px4.luac b/HORUS/SD/SCRIPTS/YAAPU/LIB/copter_px4.luac index 13dccdaa..be235e96 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/LIB/copter_px4.luac and b/HORUS/SD/SCRIPTS/YAAPU/LIB/copter_px4.luac differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/LIB/draw.luac b/HORUS/SD/SCRIPTS/YAAPU/LIB/draw.luac index c76d9618..ac7e74e2 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/LIB/draw.luac and b/HORUS/SD/SCRIPTS/YAAPU/LIB/draw.luac differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/LIB/hud_1.luac b/HORUS/SD/SCRIPTS/YAAPU/LIB/hud_1.luac index a6d28528..f26e9200 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/LIB/hud_1.luac and b/HORUS/SD/SCRIPTS/YAAPU/LIB/hud_1.luac differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/LIB/hud_2.luac b/HORUS/SD/SCRIPTS/YAAPU/LIB/hud_2.luac index 45e4ba5e..d7b93f4d 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/LIB/hud_2.luac and b/HORUS/SD/SCRIPTS/YAAPU/LIB/hud_2.luac differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/LIB/hud_russian_2.luac b/HORUS/SD/SCRIPTS/YAAPU/LIB/hud_russian_2.luac index edfecb3b..b15660d7 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/LIB/hud_russian_2.luac and b/HORUS/SD/SCRIPTS/YAAPU/LIB/hud_russian_2.luac differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/LIB/hud_small_2.luac b/HORUS/SD/SCRIPTS/YAAPU/LIB/hud_small_2.luac index 7c525945..b8f62f10 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/LIB/hud_small_2.luac and b/HORUS/SD/SCRIPTS/YAAPU/LIB/hud_small_2.luac differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/LIB/layout_1.luac b/HORUS/SD/SCRIPTS/YAAPU/LIB/layout_1.luac index fb6a79b1..9ef69dad 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/LIB/layout_1.luac and b/HORUS/SD/SCRIPTS/YAAPU/LIB/layout_1.luac differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/LIB/layout_2.luac b/HORUS/SD/SCRIPTS/YAAPU/LIB/layout_2.luac index 0527e0f5..7f67ff58 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/LIB/layout_2.luac and b/HORUS/SD/SCRIPTS/YAAPU/LIB/layout_2.luac differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/LIB/layout_map.luac b/HORUS/SD/SCRIPTS/YAAPU/LIB/layout_map.luac index 61d2765b..d2766947 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/LIB/layout_map.luac and b/HORUS/SD/SCRIPTS/YAAPU/LIB/layout_map.luac differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/LIB/left_1.luac b/HORUS/SD/SCRIPTS/YAAPU/LIB/left_1.luac index 31d0388e..5ed7aa56 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/LIB/left_1.luac and b/HORUS/SD/SCRIPTS/YAAPU/LIB/left_1.luac differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/LIB/left_2.luac b/HORUS/SD/SCRIPTS/YAAPU/LIB/left_2.luac index 8c7fd426..a0faca1e 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/LIB/left_2.luac and b/HORUS/SD/SCRIPTS/YAAPU/LIB/left_2.luac differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/LIB/left_m2f_1.luac b/HORUS/SD/SCRIPTS/YAAPU/LIB/left_m2f_1.luac index 4347c370..108e215e 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/LIB/left_m2f_1.luac and b/HORUS/SD/SCRIPTS/YAAPU/LIB/left_m2f_1.luac differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/LIB/left_m2f_2.luac b/HORUS/SD/SCRIPTS/YAAPU/LIB/left_m2f_2.luac index 18239450..090deae1 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/LIB/left_m2f_2.luac and b/HORUS/SD/SCRIPTS/YAAPU/LIB/left_m2f_2.luac differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/LIB/plane.luac b/HORUS/SD/SCRIPTS/YAAPU/LIB/plane.luac index bd67a7c3..ccd5dffa 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/LIB/plane.luac and b/HORUS/SD/SCRIPTS/YAAPU/LIB/plane.luac differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/LIB/plane_px4.luac b/HORUS/SD/SCRIPTS/YAAPU/LIB/plane_px4.luac index 13dccdaa..be235e96 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/LIB/plane_px4.luac and b/HORUS/SD/SCRIPTS/YAAPU/LIB/plane_px4.luac differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/LIB/reset.luac b/HORUS/SD/SCRIPTS/YAAPU/LIB/reset.luac deleted file mode 100644 index 391bbff6..00000000 Binary files a/HORUS/SD/SCRIPTS/YAAPU/LIB/reset.luac and /dev/null differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/LIB/right_1.luac b/HORUS/SD/SCRIPTS/YAAPU/LIB/right_1.luac index d56e82df..bb0d5669 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/LIB/right_1.luac and b/HORUS/SD/SCRIPTS/YAAPU/LIB/right_1.luac differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/LIB/right_2.luac b/HORUS/SD/SCRIPTS/YAAPU/LIB/right_2.luac index 9f76602d..879dec09 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/LIB/right_2.luac and b/HORUS/SD/SCRIPTS/YAAPU/LIB/right_2.luac differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/LIB/right_battperc_1.luac b/HORUS/SD/SCRIPTS/YAAPU/LIB/right_battperc_1.luac new file mode 100644 index 00000000..025e3835 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/LIB/right_battperc_1.luac differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/LIB/right_custom_2.luac b/HORUS/SD/SCRIPTS/YAAPU/LIB/right_custom_2.luac index 95d2e25c..647b24df 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/LIB/right_custom_2.luac and b/HORUS/SD/SCRIPTS/YAAPU/LIB/right_custom_2.luac differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/LIB/right_hybrid_1.luac b/HORUS/SD/SCRIPTS/YAAPU/LIB/right_hybrid_1.luac new file mode 100644 index 00000000..646be45d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/LIB/right_hybrid_1.luac differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/LIB/right_tether_1.luac b/HORUS/SD/SCRIPTS/YAAPU/LIB/right_tether_1.luac new file mode 100644 index 00000000..d0d30a63 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/LIB/right_tether_1.luac differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/10/619/s_936.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/10/619/s_936.jpg new file mode 100644 index 00000000..e0011b01 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/10/619/s_936.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/11/1239/s_1872.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/11/1239/s_1872.jpg new file mode 100644 index 00000000..06a52aa9 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/11/1239/s_1872.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/12/2478/s_3745.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/12/2478/s_3745.jpg new file mode 100644 index 00000000..f6e1362f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/12/2478/s_3745.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/13/4957/s_7490.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/13/4957/s_7490.jpg new file mode 100644 index 00000000..86b2a20f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/13/4957/s_7490.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/14/9914/s_14980.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/14/9914/s_14980.jpg new file mode 100644 index 00000000..f0c44d88 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/14/9914/s_14980.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/14/9914/s_14981.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/14/9914/s_14981.jpg new file mode 100644 index 00000000..682a6822 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/14/9914/s_14981.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/15/19828/s_29960.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/15/19828/s_29960.jpg new file mode 100644 index 00000000..40b8e99a Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/15/19828/s_29960.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/15/19828/s_29961.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/15/19828/s_29961.jpg new file mode 100644 index 00000000..dce7614c Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/15/19828/s_29961.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/15/19828/s_29962.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/15/19828/s_29962.jpg new file mode 100644 index 00000000..bea04695 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/15/19828/s_29962.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/15/19829/s_29960.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/15/19829/s_29960.jpg new file mode 100644 index 00000000..275ad2dd Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/15/19829/s_29960.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/15/19829/s_29961.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/15/19829/s_29961.jpg new file mode 100644 index 00000000..67b5e48d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/15/19829/s_29961.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/15/19829/s_29962.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/15/19829/s_29962.jpg new file mode 100644 index 00000000..7cff2482 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/15/19829/s_29962.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/16/39657/s_59921.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/16/39657/s_59921.jpg new file mode 100644 index 00000000..41716dfe Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/16/39657/s_59921.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/16/39657/s_59922.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/16/39657/s_59922.jpg new file mode 100644 index 00000000..eefc8328 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/16/39657/s_59922.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/16/39657/s_59923.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/16/39657/s_59923.jpg new file mode 100644 index 00000000..4c508685 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/16/39657/s_59923.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/16/39657/s_59924.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/16/39657/s_59924.jpg new file mode 100644 index 00000000..b75dd448 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/16/39657/s_59924.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/16/39658/s_59921.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/16/39658/s_59921.jpg new file mode 100644 index 00000000..eed7e23b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/16/39658/s_59921.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/16/39658/s_59922.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/16/39658/s_59922.jpg new file mode 100644 index 00000000..84666676 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/16/39658/s_59922.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/16/39658/s_59923.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/16/39658/s_59923.jpg new file mode 100644 index 00000000..83c849fc Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/16/39658/s_59923.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/16/39658/s_59924.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/16/39658/s_59924.jpg new file mode 100644 index 00000000..b0d798fd Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/16/39658/s_59924.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/17/79315/s_119842.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/17/79315/s_119842.jpg new file mode 100644 index 00000000..92c7c0b1 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/17/79315/s_119842.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/17/79315/s_119843.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/17/79315/s_119843.jpg new file mode 100644 index 00000000..c5f433e6 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/17/79315/s_119843.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/17/79315/s_119844.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/17/79315/s_119844.jpg new file mode 100644 index 00000000..f52fb4c8 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/17/79315/s_119844.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/17/79315/s_119845.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/17/79315/s_119845.jpg new file mode 100644 index 00000000..4a0a8191 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/17/79315/s_119845.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/17/79315/s_119846.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/17/79315/s_119846.jpg new file mode 100644 index 00000000..e091cf31 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/17/79315/s_119846.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/17/79315/s_119847.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/17/79315/s_119847.jpg new file mode 100644 index 00000000..6d0d6325 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/17/79315/s_119847.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/17/79315/s_119848.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/17/79315/s_119848.jpg new file mode 100644 index 00000000..c586e04f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/17/79315/s_119848.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/17/79316/s_119842.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/17/79316/s_119842.jpg new file mode 100644 index 00000000..54b61d83 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/17/79316/s_119842.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/17/79316/s_119843.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/17/79316/s_119843.jpg new file mode 100644 index 00000000..411eddfe Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/17/79316/s_119843.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/17/79316/s_119844.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/17/79316/s_119844.jpg new file mode 100644 index 00000000..00af71a1 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/17/79316/s_119844.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/17/79316/s_119845.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/17/79316/s_119845.jpg new file mode 100644 index 00000000..969a01b1 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/17/79316/s_119845.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/17/79316/s_119846.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/17/79316/s_119846.jpg new file mode 100644 index 00000000..b9914589 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/17/79316/s_119846.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/17/79316/s_119847.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/17/79316/s_119847.jpg new file mode 100644 index 00000000..37eb43b0 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/17/79316/s_119847.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/17/79316/s_119848.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/17/79316/s_119848.jpg new file mode 100644 index 00000000..beef6e70 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/17/79316/s_119848.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/17/79317/s_119842.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/17/79317/s_119842.jpg new file mode 100644 index 00000000..e99ecf55 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/17/79317/s_119842.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/17/79317/s_119843.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/17/79317/s_119843.jpg new file mode 100644 index 00000000..25f459d5 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/17/79317/s_119843.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/17/79317/s_119844.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/17/79317/s_119844.jpg new file mode 100644 index 00000000..accb6d35 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/17/79317/s_119844.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/17/79317/s_119845.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/17/79317/s_119845.jpg new file mode 100644 index 00000000..b247f64a Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/17/79317/s_119845.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/17/79317/s_119846.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/17/79317/s_119846.jpg new file mode 100644 index 00000000..6890373b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/17/79317/s_119846.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/17/79317/s_119847.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/17/79317/s_119847.jpg new file mode 100644 index 00000000..8461644e Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/17/79317/s_119847.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/17/79317/s_119848.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/17/79317/s_119848.jpg new file mode 100644 index 00000000..16b8f5ad Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/17/79317/s_119848.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158630/s_239685.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158630/s_239685.jpg new file mode 100644 index 00000000..3ea3a838 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158630/s_239685.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158630/s_239686.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158630/s_239686.jpg new file mode 100644 index 00000000..37ec5eaf Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158630/s_239686.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158630/s_239687.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158630/s_239687.jpg new file mode 100644 index 00000000..e3789637 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158630/s_239687.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158630/s_239688.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158630/s_239688.jpg new file mode 100644 index 00000000..d0858b60 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158630/s_239688.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158630/s_239689.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158630/s_239689.jpg new file mode 100644 index 00000000..c120213f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158630/s_239689.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158630/s_239690.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158630/s_239690.jpg new file mode 100644 index 00000000..06dbb4f8 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158630/s_239690.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158630/s_239691.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158630/s_239691.jpg new file mode 100644 index 00000000..be1d6cab Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158630/s_239691.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158630/s_239692.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158630/s_239692.jpg new file mode 100644 index 00000000..0fb3b95b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158630/s_239692.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158630/s_239693.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158630/s_239693.jpg new file mode 100644 index 00000000..f6373ce8 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158630/s_239693.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158630/s_239694.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158630/s_239694.jpg new file mode 100644 index 00000000..d6e5ce14 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158630/s_239694.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158630/s_239695.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158630/s_239695.jpg new file mode 100644 index 00000000..9b928f0b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158630/s_239695.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158630/s_239696.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158630/s_239696.jpg new file mode 100644 index 00000000..a0a9f011 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158630/s_239696.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158631/s_239685.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158631/s_239685.jpg new file mode 100644 index 00000000..591091f9 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158631/s_239685.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158631/s_239686.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158631/s_239686.jpg new file mode 100644 index 00000000..e1617261 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158631/s_239686.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158631/s_239687.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158631/s_239687.jpg new file mode 100644 index 00000000..67b1d3a6 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158631/s_239687.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158631/s_239688.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158631/s_239688.jpg new file mode 100644 index 00000000..76f30d82 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158631/s_239688.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158631/s_239689.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158631/s_239689.jpg new file mode 100644 index 00000000..ea551152 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158631/s_239689.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158631/s_239690.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158631/s_239690.jpg new file mode 100644 index 00000000..5671506d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158631/s_239690.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158631/s_239691.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158631/s_239691.jpg new file mode 100644 index 00000000..e034489b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158631/s_239691.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158631/s_239692.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158631/s_239692.jpg new file mode 100644 index 00000000..6df12906 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158631/s_239692.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158631/s_239693.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158631/s_239693.jpg new file mode 100644 index 00000000..da6047ad Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158631/s_239693.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158631/s_239694.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158631/s_239694.jpg new file mode 100644 index 00000000..e3f53c2c Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158631/s_239694.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158631/s_239695.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158631/s_239695.jpg new file mode 100644 index 00000000..00440526 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158631/s_239695.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158631/s_239696.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158631/s_239696.jpg new file mode 100644 index 00000000..71199bc5 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158631/s_239696.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158632/s_239685.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158632/s_239685.jpg new file mode 100644 index 00000000..058d436f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158632/s_239685.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158632/s_239686.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158632/s_239686.jpg new file mode 100644 index 00000000..e0b0581c Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158632/s_239686.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158632/s_239687.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158632/s_239687.jpg new file mode 100644 index 00000000..303dbef2 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158632/s_239687.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158632/s_239688.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158632/s_239688.jpg new file mode 100644 index 00000000..19dbf261 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158632/s_239688.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158632/s_239689.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158632/s_239689.jpg new file mode 100644 index 00000000..44ecb24b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158632/s_239689.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158632/s_239690.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158632/s_239690.jpg new file mode 100644 index 00000000..5fe72cb7 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158632/s_239690.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158632/s_239691.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158632/s_239691.jpg new file mode 100644 index 00000000..cc76cf2a Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158632/s_239691.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158632/s_239692.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158632/s_239692.jpg new file mode 100644 index 00000000..8ee7a0ee Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158632/s_239692.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158632/s_239693.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158632/s_239693.jpg new file mode 100644 index 00000000..d321465f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158632/s_239693.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158632/s_239694.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158632/s_239694.jpg new file mode 100644 index 00000000..348166f5 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158632/s_239694.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158632/s_239695.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158632/s_239695.jpg new file mode 100644 index 00000000..f8779ce7 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158632/s_239695.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158632/s_239696.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158632/s_239696.jpg new file mode 100644 index 00000000..21e0a926 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158632/s_239696.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158633/s_239685.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158633/s_239685.jpg new file mode 100644 index 00000000..4e353c97 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158633/s_239685.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158633/s_239686.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158633/s_239686.jpg new file mode 100644 index 00000000..381e080a Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158633/s_239686.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158633/s_239687.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158633/s_239687.jpg new file mode 100644 index 00000000..b6e2e98c Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158633/s_239687.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158633/s_239688.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158633/s_239688.jpg new file mode 100644 index 00000000..eaeb7406 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158633/s_239688.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158633/s_239689.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158633/s_239689.jpg new file mode 100644 index 00000000..de75f593 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158633/s_239689.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158633/s_239690.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158633/s_239690.jpg new file mode 100644 index 00000000..3475c501 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158633/s_239690.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158633/s_239691.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158633/s_239691.jpg new file mode 100644 index 00000000..66d68c3d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158633/s_239691.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158633/s_239692.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158633/s_239692.jpg new file mode 100644 index 00000000..b8583166 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158633/s_239692.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158633/s_239693.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158633/s_239693.jpg new file mode 100644 index 00000000..0f8f6f23 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158633/s_239693.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158633/s_239694.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158633/s_239694.jpg new file mode 100644 index 00000000..b6062658 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158633/s_239694.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158633/s_239695.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158633/s_239695.jpg new file mode 100644 index 00000000..98c0aa9b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158633/s_239695.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158633/s_239696.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158633/s_239696.jpg new file mode 100644 index 00000000..cdd1dd73 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158633/s_239696.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158634/s_239685.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158634/s_239685.jpg new file mode 100644 index 00000000..8119fba0 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158634/s_239685.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158634/s_239686.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158634/s_239686.jpg new file mode 100644 index 00000000..2449e110 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158634/s_239686.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158634/s_239687.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158634/s_239687.jpg new file mode 100644 index 00000000..2034291d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158634/s_239687.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158634/s_239688.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158634/s_239688.jpg new file mode 100644 index 00000000..7b37f94f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158634/s_239688.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158634/s_239689.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158634/s_239689.jpg new file mode 100644 index 00000000..21704a96 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158634/s_239689.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158634/s_239690.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158634/s_239690.jpg new file mode 100644 index 00000000..70ded053 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158634/s_239690.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158634/s_239691.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158634/s_239691.jpg new file mode 100644 index 00000000..42734277 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158634/s_239691.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158634/s_239692.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158634/s_239692.jpg new file mode 100644 index 00000000..4ad348ec Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158634/s_239692.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158634/s_239693.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158634/s_239693.jpg new file mode 100644 index 00000000..e8b8b656 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158634/s_239693.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158634/s_239694.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158634/s_239694.jpg new file mode 100644 index 00000000..95bdc498 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158634/s_239694.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158634/s_239695.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158634/s_239695.jpg new file mode 100644 index 00000000..78326ec7 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158634/s_239695.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158634/s_239696.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158634/s_239696.jpg new file mode 100644 index 00000000..1a8e9e68 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158634/s_239696.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158635/s_239685.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158635/s_239685.jpg new file mode 100644 index 00000000..749c4530 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158635/s_239685.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158635/s_239686.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158635/s_239686.jpg new file mode 100644 index 00000000..e434c757 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158635/s_239686.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158635/s_239687.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158635/s_239687.jpg new file mode 100644 index 00000000..5a3b0cb6 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158635/s_239687.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158635/s_239688.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158635/s_239688.jpg new file mode 100644 index 00000000..5b282558 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158635/s_239688.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158635/s_239689.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158635/s_239689.jpg new file mode 100644 index 00000000..da830f32 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158635/s_239689.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158635/s_239690.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158635/s_239690.jpg new file mode 100644 index 00000000..b2529067 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158635/s_239690.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158635/s_239691.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158635/s_239691.jpg new file mode 100644 index 00000000..3d0cd06f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158635/s_239691.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158635/s_239692.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158635/s_239692.jpg new file mode 100644 index 00000000..3eb4e9d6 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158635/s_239692.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158635/s_239693.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158635/s_239693.jpg new file mode 100644 index 00000000..c97fc634 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158635/s_239693.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158635/s_239694.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158635/s_239694.jpg new file mode 100644 index 00000000..9a7b4148 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158635/s_239694.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158635/s_239695.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158635/s_239695.jpg new file mode 100644 index 00000000..f9701c73 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158635/s_239695.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158635/s_239696.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158635/s_239696.jpg new file mode 100644 index 00000000..9aa1da36 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/18/158635/s_239696.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317261/s_479371.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317261/s_479371.jpg new file mode 100644 index 00000000..dbbe0172 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317261/s_479371.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317261/s_479372.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317261/s_479372.jpg new file mode 100644 index 00000000..b5828a25 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317261/s_479372.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317261/s_479373.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317261/s_479373.jpg new file mode 100644 index 00000000..ae5fa258 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317261/s_479373.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317261/s_479374.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317261/s_479374.jpg new file mode 100644 index 00000000..d73799e2 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317261/s_479374.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317261/s_479375.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317261/s_479375.jpg new file mode 100644 index 00000000..9a8e7570 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317261/s_479375.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317261/s_479376.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317261/s_479376.jpg new file mode 100644 index 00000000..4219fed0 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317261/s_479376.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317261/s_479377.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317261/s_479377.jpg new file mode 100644 index 00000000..b4e16377 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317261/s_479377.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317261/s_479378.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317261/s_479378.jpg new file mode 100644 index 00000000..798e7e4d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317261/s_479378.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317261/s_479379.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317261/s_479379.jpg new file mode 100644 index 00000000..a34e192b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317261/s_479379.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317261/s_479380.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317261/s_479380.jpg new file mode 100644 index 00000000..c6baebab Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317261/s_479380.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317261/s_479381.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317261/s_479381.jpg new file mode 100644 index 00000000..462775e1 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317261/s_479381.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317261/s_479382.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317261/s_479382.jpg new file mode 100644 index 00000000..1204e1b0 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317261/s_479382.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317261/s_479383.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317261/s_479383.jpg new file mode 100644 index 00000000..99fb3c2a Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317261/s_479383.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317261/s_479384.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317261/s_479384.jpg new file mode 100644 index 00000000..bf265514 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317261/s_479384.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317261/s_479385.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317261/s_479385.jpg new file mode 100644 index 00000000..290825d4 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317261/s_479385.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317261/s_479386.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317261/s_479386.jpg new file mode 100644 index 00000000..acbb2cb9 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317261/s_479386.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317261/s_479387.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317261/s_479387.jpg new file mode 100644 index 00000000..fa3d04bb Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317261/s_479387.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317261/s_479388.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317261/s_479388.jpg new file mode 100644 index 00000000..ecae6e1d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317261/s_479388.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317261/s_479389.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317261/s_479389.jpg new file mode 100644 index 00000000..fe07847d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317261/s_479389.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317261/s_479390.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317261/s_479390.jpg new file mode 100644 index 00000000..ac001e1a Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317261/s_479390.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317261/s_479391.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317261/s_479391.jpg new file mode 100644 index 00000000..5d708555 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317261/s_479391.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317261/s_479392.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317261/s_479392.jpg new file mode 100644 index 00000000..b395fffc Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317261/s_479392.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317262/s_479371.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317262/s_479371.jpg new file mode 100644 index 00000000..45773bfc Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317262/s_479371.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317262/s_479372.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317262/s_479372.jpg new file mode 100644 index 00000000..b28afec8 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317262/s_479372.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317262/s_479373.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317262/s_479373.jpg new file mode 100644 index 00000000..4960fd11 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317262/s_479373.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317262/s_479374.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317262/s_479374.jpg new file mode 100644 index 00000000..0937f333 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317262/s_479374.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317262/s_479375.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317262/s_479375.jpg new file mode 100644 index 00000000..adb90782 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317262/s_479375.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317262/s_479376.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317262/s_479376.jpg new file mode 100644 index 00000000..92fff89e Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317262/s_479376.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317262/s_479377.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317262/s_479377.jpg new file mode 100644 index 00000000..b42912a5 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317262/s_479377.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317262/s_479378.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317262/s_479378.jpg new file mode 100644 index 00000000..3c908570 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317262/s_479378.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317262/s_479379.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317262/s_479379.jpg new file mode 100644 index 00000000..85ecc15e Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317262/s_479379.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317262/s_479380.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317262/s_479380.jpg new file mode 100644 index 00000000..3638a748 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317262/s_479380.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317262/s_479381.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317262/s_479381.jpg new file mode 100644 index 00000000..1086ccc3 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317262/s_479381.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317262/s_479382.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317262/s_479382.jpg new file mode 100644 index 00000000..fe3c63f5 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317262/s_479382.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317262/s_479383.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317262/s_479383.jpg new file mode 100644 index 00000000..4b950541 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317262/s_479383.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317262/s_479384.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317262/s_479384.jpg new file mode 100644 index 00000000..1ab3950c Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317262/s_479384.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317262/s_479385.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317262/s_479385.jpg new file mode 100644 index 00000000..2b263f0a Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317262/s_479385.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317262/s_479386.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317262/s_479386.jpg new file mode 100644 index 00000000..daff565c Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317262/s_479386.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317262/s_479387.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317262/s_479387.jpg new file mode 100644 index 00000000..2613b2c6 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317262/s_479387.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317262/s_479388.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317262/s_479388.jpg new file mode 100644 index 00000000..407bcb8d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317262/s_479388.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317262/s_479389.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317262/s_479389.jpg new file mode 100644 index 00000000..f5469588 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317262/s_479389.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317262/s_479390.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317262/s_479390.jpg new file mode 100644 index 00000000..ee607043 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317262/s_479390.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317262/s_479391.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317262/s_479391.jpg new file mode 100644 index 00000000..76b773f4 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317262/s_479391.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317262/s_479392.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317262/s_479392.jpg new file mode 100644 index 00000000..943fdce6 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317262/s_479392.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317263/s_479371.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317263/s_479371.jpg new file mode 100644 index 00000000..3ab7a363 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317263/s_479371.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317263/s_479372.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317263/s_479372.jpg new file mode 100644 index 00000000..7b8fe8e4 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317263/s_479372.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317263/s_479373.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317263/s_479373.jpg new file mode 100644 index 00000000..a25fe11e Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317263/s_479373.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317263/s_479374.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317263/s_479374.jpg new file mode 100644 index 00000000..015aaed6 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317263/s_479374.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317263/s_479375.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317263/s_479375.jpg new file mode 100644 index 00000000..f06c97f1 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317263/s_479375.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317263/s_479376.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317263/s_479376.jpg new file mode 100644 index 00000000..5f0808d4 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317263/s_479376.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317263/s_479377.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317263/s_479377.jpg new file mode 100644 index 00000000..38de08ec Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317263/s_479377.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317263/s_479378.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317263/s_479378.jpg new file mode 100644 index 00000000..1fb004d9 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317263/s_479378.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317263/s_479379.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317263/s_479379.jpg new file mode 100644 index 00000000..5c9ecfa5 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317263/s_479379.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317263/s_479380.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317263/s_479380.jpg new file mode 100644 index 00000000..77033209 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317263/s_479380.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317263/s_479381.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317263/s_479381.jpg new file mode 100644 index 00000000..24586f71 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317263/s_479381.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317263/s_479382.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317263/s_479382.jpg new file mode 100644 index 00000000..90e5640d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317263/s_479382.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317263/s_479383.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317263/s_479383.jpg new file mode 100644 index 00000000..5603009c Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317263/s_479383.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317263/s_479384.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317263/s_479384.jpg new file mode 100644 index 00000000..eb1ecd5f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317263/s_479384.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317263/s_479385.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317263/s_479385.jpg new file mode 100644 index 00000000..5c16e759 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317263/s_479385.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317263/s_479386.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317263/s_479386.jpg new file mode 100644 index 00000000..9ab8c339 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317263/s_479386.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317263/s_479387.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317263/s_479387.jpg new file mode 100644 index 00000000..1f549f2d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317263/s_479387.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317263/s_479388.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317263/s_479388.jpg new file mode 100644 index 00000000..3159013c Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317263/s_479388.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317263/s_479389.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317263/s_479389.jpg new file mode 100644 index 00000000..0b0a778c Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317263/s_479389.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317263/s_479390.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317263/s_479390.jpg new file mode 100644 index 00000000..1d175d15 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317263/s_479390.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317263/s_479391.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317263/s_479391.jpg new file mode 100644 index 00000000..ce51527e Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317263/s_479391.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317263/s_479392.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317263/s_479392.jpg new file mode 100644 index 00000000..d9aab4d9 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317263/s_479392.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317264/s_479371.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317264/s_479371.jpg new file mode 100644 index 00000000..75ca4330 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317264/s_479371.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317264/s_479372.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317264/s_479372.jpg new file mode 100644 index 00000000..f4c151a2 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317264/s_479372.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317264/s_479373.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317264/s_479373.jpg new file mode 100644 index 00000000..493ec2bf Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317264/s_479373.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317264/s_479374.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317264/s_479374.jpg new file mode 100644 index 00000000..7b4d47f5 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317264/s_479374.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317264/s_479375.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317264/s_479375.jpg new file mode 100644 index 00000000..2712e186 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317264/s_479375.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317264/s_479376.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317264/s_479376.jpg new file mode 100644 index 00000000..d968eff1 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317264/s_479376.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317264/s_479377.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317264/s_479377.jpg new file mode 100644 index 00000000..4e139e17 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317264/s_479377.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317264/s_479378.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317264/s_479378.jpg new file mode 100644 index 00000000..f18d366a Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317264/s_479378.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317264/s_479379.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317264/s_479379.jpg new file mode 100644 index 00000000..e39f7209 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317264/s_479379.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317264/s_479380.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317264/s_479380.jpg new file mode 100644 index 00000000..011a03a1 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317264/s_479380.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317264/s_479381.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317264/s_479381.jpg new file mode 100644 index 00000000..4a441924 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317264/s_479381.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317264/s_479382.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317264/s_479382.jpg new file mode 100644 index 00000000..659e2a37 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317264/s_479382.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317264/s_479383.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317264/s_479383.jpg new file mode 100644 index 00000000..578abd5d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317264/s_479383.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317264/s_479384.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317264/s_479384.jpg new file mode 100644 index 00000000..1dd3832f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317264/s_479384.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317264/s_479385.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317264/s_479385.jpg new file mode 100644 index 00000000..1b4743bc Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317264/s_479385.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317264/s_479386.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317264/s_479386.jpg new file mode 100644 index 00000000..16206b8f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317264/s_479386.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317264/s_479387.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317264/s_479387.jpg new file mode 100644 index 00000000..223c5d7a Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317264/s_479387.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317264/s_479388.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317264/s_479388.jpg new file mode 100644 index 00000000..ee3999a5 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317264/s_479388.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317264/s_479389.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317264/s_479389.jpg new file mode 100644 index 00000000..ce588cc9 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317264/s_479389.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317264/s_479390.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317264/s_479390.jpg new file mode 100644 index 00000000..c1f55ffa Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317264/s_479390.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317264/s_479391.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317264/s_479391.jpg new file mode 100644 index 00000000..47c83beb Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317264/s_479391.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317264/s_479392.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317264/s_479392.jpg new file mode 100644 index 00000000..b511f7a1 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317264/s_479392.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317265/s_479371.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317265/s_479371.jpg new file mode 100644 index 00000000..5e3b9060 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317265/s_479371.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317265/s_479372.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317265/s_479372.jpg new file mode 100644 index 00000000..2fa34d6d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317265/s_479372.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317265/s_479373.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317265/s_479373.jpg new file mode 100644 index 00000000..051f1565 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317265/s_479373.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317265/s_479374.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317265/s_479374.jpg new file mode 100644 index 00000000..ad9702a6 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317265/s_479374.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317265/s_479375.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317265/s_479375.jpg new file mode 100644 index 00000000..eaf2bc91 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317265/s_479375.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317265/s_479376.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317265/s_479376.jpg new file mode 100644 index 00000000..0b621c79 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317265/s_479376.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317265/s_479377.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317265/s_479377.jpg new file mode 100644 index 00000000..ca68c6bd Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317265/s_479377.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317265/s_479378.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317265/s_479378.jpg new file mode 100644 index 00000000..730c3144 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317265/s_479378.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317265/s_479379.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317265/s_479379.jpg new file mode 100644 index 00000000..b08742b7 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317265/s_479379.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317265/s_479380.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317265/s_479380.jpg new file mode 100644 index 00000000..6b7f5ca0 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317265/s_479380.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317265/s_479381.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317265/s_479381.jpg new file mode 100644 index 00000000..9423fe10 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317265/s_479381.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317265/s_479382.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317265/s_479382.jpg new file mode 100644 index 00000000..77b554eb Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317265/s_479382.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317265/s_479383.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317265/s_479383.jpg new file mode 100644 index 00000000..8046eb4b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317265/s_479383.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317265/s_479384.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317265/s_479384.jpg new file mode 100644 index 00000000..6436f508 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317265/s_479384.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317265/s_479385.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317265/s_479385.jpg new file mode 100644 index 00000000..1ff4ff39 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317265/s_479385.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317265/s_479386.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317265/s_479386.jpg new file mode 100644 index 00000000..5acdde29 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317265/s_479386.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317265/s_479387.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317265/s_479387.jpg new file mode 100644 index 00000000..89e6dee0 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317265/s_479387.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317265/s_479388.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317265/s_479388.jpg new file mode 100644 index 00000000..4ee37b82 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317265/s_479388.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317265/s_479389.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317265/s_479389.jpg new file mode 100644 index 00000000..478ce787 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317265/s_479389.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317265/s_479390.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317265/s_479390.jpg new file mode 100644 index 00000000..578e1b71 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317265/s_479390.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317265/s_479391.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317265/s_479391.jpg new file mode 100644 index 00000000..b4714632 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317265/s_479391.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317265/s_479392.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317265/s_479392.jpg new file mode 100644 index 00000000..19945a90 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317265/s_479392.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317266/s_479371.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317266/s_479371.jpg new file mode 100644 index 00000000..58f02c3a Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317266/s_479371.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317266/s_479372.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317266/s_479372.jpg new file mode 100644 index 00000000..9277ada6 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317266/s_479372.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317266/s_479373.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317266/s_479373.jpg new file mode 100644 index 00000000..15abb2aa Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317266/s_479373.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317266/s_479374.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317266/s_479374.jpg new file mode 100644 index 00000000..ddefa6c0 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317266/s_479374.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317266/s_479375.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317266/s_479375.jpg new file mode 100644 index 00000000..62b2f87d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317266/s_479375.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317266/s_479376.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317266/s_479376.jpg new file mode 100644 index 00000000..340982f9 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317266/s_479376.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317266/s_479377.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317266/s_479377.jpg new file mode 100644 index 00000000..7e7218a6 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317266/s_479377.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317266/s_479378.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317266/s_479378.jpg new file mode 100644 index 00000000..f01bfb91 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317266/s_479378.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317266/s_479379.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317266/s_479379.jpg new file mode 100644 index 00000000..8bcfc83c Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317266/s_479379.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317266/s_479380.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317266/s_479380.jpg new file mode 100644 index 00000000..f9058ab0 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317266/s_479380.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317266/s_479381.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317266/s_479381.jpg new file mode 100644 index 00000000..e726a822 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317266/s_479381.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317266/s_479382.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317266/s_479382.jpg new file mode 100644 index 00000000..7c8a3f91 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317266/s_479382.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317266/s_479383.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317266/s_479383.jpg new file mode 100644 index 00000000..9241798b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317266/s_479383.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317266/s_479384.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317266/s_479384.jpg new file mode 100644 index 00000000..51da43fa Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317266/s_479384.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317266/s_479385.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317266/s_479385.jpg new file mode 100644 index 00000000..6e1905d3 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317266/s_479385.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317266/s_479386.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317266/s_479386.jpg new file mode 100644 index 00000000..09faabe9 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317266/s_479386.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317266/s_479387.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317266/s_479387.jpg new file mode 100644 index 00000000..4ac950b7 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317266/s_479387.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317266/s_479388.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317266/s_479388.jpg new file mode 100644 index 00000000..d7f3101a Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317266/s_479388.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317266/s_479389.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317266/s_479389.jpg new file mode 100644 index 00000000..60fed18b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317266/s_479389.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317266/s_479390.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317266/s_479390.jpg new file mode 100644 index 00000000..bf5df708 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317266/s_479390.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317266/s_479391.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317266/s_479391.jpg new file mode 100644 index 00000000..f5f46829 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317266/s_479391.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317266/s_479392.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317266/s_479392.jpg new file mode 100644 index 00000000..450f0289 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317266/s_479392.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317267/s_479371.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317267/s_479371.jpg new file mode 100644 index 00000000..2e5128d1 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317267/s_479371.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317267/s_479372.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317267/s_479372.jpg new file mode 100644 index 00000000..8542b731 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317267/s_479372.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317267/s_479373.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317267/s_479373.jpg new file mode 100644 index 00000000..4fba7ccd Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317267/s_479373.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317267/s_479374.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317267/s_479374.jpg new file mode 100644 index 00000000..51cff89b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317267/s_479374.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317267/s_479375.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317267/s_479375.jpg new file mode 100644 index 00000000..f8103312 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317267/s_479375.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317267/s_479376.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317267/s_479376.jpg new file mode 100644 index 00000000..24ae8df7 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317267/s_479376.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317267/s_479377.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317267/s_479377.jpg new file mode 100644 index 00000000..40faa4f1 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317267/s_479377.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317267/s_479378.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317267/s_479378.jpg new file mode 100644 index 00000000..30a1e44e Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317267/s_479378.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317267/s_479379.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317267/s_479379.jpg new file mode 100644 index 00000000..a7bc17d8 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317267/s_479379.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317267/s_479380.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317267/s_479380.jpg new file mode 100644 index 00000000..4f72efe8 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317267/s_479380.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317267/s_479381.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317267/s_479381.jpg new file mode 100644 index 00000000..d924c351 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317267/s_479381.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317267/s_479382.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317267/s_479382.jpg new file mode 100644 index 00000000..f3c2ad09 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317267/s_479382.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317267/s_479383.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317267/s_479383.jpg new file mode 100644 index 00000000..ff90d34c Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317267/s_479383.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317267/s_479384.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317267/s_479384.jpg new file mode 100644 index 00000000..c7752393 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317267/s_479384.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317267/s_479385.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317267/s_479385.jpg new file mode 100644 index 00000000..a35fd35b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317267/s_479385.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317267/s_479386.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317267/s_479386.jpg new file mode 100644 index 00000000..436a41c5 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317267/s_479386.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317267/s_479387.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317267/s_479387.jpg new file mode 100644 index 00000000..7fbe24ff Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317267/s_479387.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317267/s_479388.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317267/s_479388.jpg new file mode 100644 index 00000000..d879213e Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317267/s_479388.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317267/s_479389.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317267/s_479389.jpg new file mode 100644 index 00000000..d58d62a9 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317267/s_479389.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317267/s_479390.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317267/s_479390.jpg new file mode 100644 index 00000000..e93e3d88 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317267/s_479390.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317267/s_479391.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317267/s_479391.jpg new file mode 100644 index 00000000..5f944d20 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317267/s_479391.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317267/s_479392.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317267/s_479392.jpg new file mode 100644 index 00000000..ee3545b3 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317267/s_479392.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317268/s_479371.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317268/s_479371.jpg new file mode 100644 index 00000000..523c4699 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317268/s_479371.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317268/s_479372.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317268/s_479372.jpg new file mode 100644 index 00000000..bb8fb611 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317268/s_479372.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317268/s_479373.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317268/s_479373.jpg new file mode 100644 index 00000000..9427a012 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317268/s_479373.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317268/s_479374.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317268/s_479374.jpg new file mode 100644 index 00000000..d25c5439 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317268/s_479374.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317268/s_479375.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317268/s_479375.jpg new file mode 100644 index 00000000..3e773fe1 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317268/s_479375.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317268/s_479376.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317268/s_479376.jpg new file mode 100644 index 00000000..29a6d311 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317268/s_479376.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317268/s_479377.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317268/s_479377.jpg new file mode 100644 index 00000000..71f385b1 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317268/s_479377.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317268/s_479378.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317268/s_479378.jpg new file mode 100644 index 00000000..b961c103 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317268/s_479378.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317268/s_479379.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317268/s_479379.jpg new file mode 100644 index 00000000..d69088b8 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317268/s_479379.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317268/s_479380.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317268/s_479380.jpg new file mode 100644 index 00000000..76c6d437 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317268/s_479380.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317268/s_479381.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317268/s_479381.jpg new file mode 100644 index 00000000..8ecd640f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317268/s_479381.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317268/s_479382.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317268/s_479382.jpg new file mode 100644 index 00000000..fdc8ef6f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317268/s_479382.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317268/s_479383.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317268/s_479383.jpg new file mode 100644 index 00000000..9087745d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317268/s_479383.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317268/s_479384.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317268/s_479384.jpg new file mode 100644 index 00000000..b956c088 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317268/s_479384.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317268/s_479385.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317268/s_479385.jpg new file mode 100644 index 00000000..a81069b6 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317268/s_479385.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317268/s_479386.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317268/s_479386.jpg new file mode 100644 index 00000000..01d5a304 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317268/s_479386.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317268/s_479387.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317268/s_479387.jpg new file mode 100644 index 00000000..cd1c0a12 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317268/s_479387.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317268/s_479388.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317268/s_479388.jpg new file mode 100644 index 00000000..429c6512 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317268/s_479388.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317268/s_479389.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317268/s_479389.jpg new file mode 100644 index 00000000..f0b7f49d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317268/s_479389.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317268/s_479390.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317268/s_479390.jpg new file mode 100644 index 00000000..05f95a3f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317268/s_479390.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317268/s_479391.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317268/s_479391.jpg new file mode 100644 index 00000000..0a934f35 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317268/s_479391.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317268/s_479392.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317268/s_479392.jpg new file mode 100644 index 00000000..63798d3e Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317268/s_479392.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317269/s_479371.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317269/s_479371.jpg new file mode 100644 index 00000000..5b0ec21d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317269/s_479371.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317269/s_479372.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317269/s_479372.jpg new file mode 100644 index 00000000..e2208859 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317269/s_479372.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317269/s_479373.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317269/s_479373.jpg new file mode 100644 index 00000000..e363d77c Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317269/s_479373.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317269/s_479374.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317269/s_479374.jpg new file mode 100644 index 00000000..93d5dee6 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317269/s_479374.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317269/s_479375.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317269/s_479375.jpg new file mode 100644 index 00000000..17d315a0 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317269/s_479375.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317269/s_479376.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317269/s_479376.jpg new file mode 100644 index 00000000..66a8c487 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317269/s_479376.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317269/s_479377.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317269/s_479377.jpg new file mode 100644 index 00000000..0c8ae272 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317269/s_479377.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317269/s_479378.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317269/s_479378.jpg new file mode 100644 index 00000000..71fc6632 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317269/s_479378.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317269/s_479379.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317269/s_479379.jpg new file mode 100644 index 00000000..e0ee4a1f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317269/s_479379.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317269/s_479380.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317269/s_479380.jpg new file mode 100644 index 00000000..7a7998e6 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317269/s_479380.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317269/s_479381.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317269/s_479381.jpg new file mode 100644 index 00000000..e3373bc1 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317269/s_479381.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317269/s_479382.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317269/s_479382.jpg new file mode 100644 index 00000000..5c18e196 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317269/s_479382.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317269/s_479383.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317269/s_479383.jpg new file mode 100644 index 00000000..fbf3f819 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317269/s_479383.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317269/s_479384.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317269/s_479384.jpg new file mode 100644 index 00000000..10ab54f9 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317269/s_479384.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317269/s_479385.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317269/s_479385.jpg new file mode 100644 index 00000000..f7a7afe5 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317269/s_479385.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317269/s_479386.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317269/s_479386.jpg new file mode 100644 index 00000000..c80b3fa2 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317269/s_479386.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317269/s_479387.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317269/s_479387.jpg new file mode 100644 index 00000000..b5418445 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317269/s_479387.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317269/s_479388.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317269/s_479388.jpg new file mode 100644 index 00000000..ac9fb678 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317269/s_479388.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317269/s_479389.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317269/s_479389.jpg new file mode 100644 index 00000000..64666c90 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317269/s_479389.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317269/s_479390.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317269/s_479390.jpg new file mode 100644 index 00000000..1dbe7b24 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317269/s_479390.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317269/s_479391.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317269/s_479391.jpg new file mode 100644 index 00000000..b4eea48b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317269/s_479391.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317269/s_479392.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317269/s_479392.jpg new file mode 100644 index 00000000..157893cd Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317269/s_479392.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317270/s_479371.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317270/s_479371.jpg new file mode 100644 index 00000000..0157ee0d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317270/s_479371.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317270/s_479372.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317270/s_479372.jpg new file mode 100644 index 00000000..3a247a3f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317270/s_479372.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317270/s_479373.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317270/s_479373.jpg new file mode 100644 index 00000000..2c94b693 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317270/s_479373.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317270/s_479374.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317270/s_479374.jpg new file mode 100644 index 00000000..7c544381 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317270/s_479374.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317270/s_479375.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317270/s_479375.jpg new file mode 100644 index 00000000..d732ea59 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317270/s_479375.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317270/s_479376.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317270/s_479376.jpg new file mode 100644 index 00000000..8fab5f56 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317270/s_479376.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317270/s_479377.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317270/s_479377.jpg new file mode 100644 index 00000000..fd18628f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317270/s_479377.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317270/s_479378.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317270/s_479378.jpg new file mode 100644 index 00000000..75b0e152 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317270/s_479378.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317270/s_479379.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317270/s_479379.jpg new file mode 100644 index 00000000..272b65ba Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317270/s_479379.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317270/s_479380.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317270/s_479380.jpg new file mode 100644 index 00000000..32809e56 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317270/s_479380.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317270/s_479381.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317270/s_479381.jpg new file mode 100644 index 00000000..c40c749d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317270/s_479381.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317270/s_479382.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317270/s_479382.jpg new file mode 100644 index 00000000..0f52bb07 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317270/s_479382.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317270/s_479383.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317270/s_479383.jpg new file mode 100644 index 00000000..1190fcf8 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317270/s_479383.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317270/s_479384.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317270/s_479384.jpg new file mode 100644 index 00000000..f5b94482 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317270/s_479384.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317270/s_479385.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317270/s_479385.jpg new file mode 100644 index 00000000..33a92adc Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317270/s_479385.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317270/s_479386.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317270/s_479386.jpg new file mode 100644 index 00000000..a1478a30 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317270/s_479386.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317270/s_479387.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317270/s_479387.jpg new file mode 100644 index 00000000..9c7ef3a4 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317270/s_479387.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317270/s_479388.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317270/s_479388.jpg new file mode 100644 index 00000000..3ebbf15d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317270/s_479388.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317270/s_479389.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317270/s_479389.jpg new file mode 100644 index 00000000..2e7f9011 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317270/s_479389.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317270/s_479390.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317270/s_479390.jpg new file mode 100644 index 00000000..cd4f913f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317270/s_479390.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317270/s_479391.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317270/s_479391.jpg new file mode 100644 index 00000000..13441a98 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317270/s_479391.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317270/s_479392.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317270/s_479392.jpg new file mode 100644 index 00000000..95b9dcf9 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/19/317270/s_479392.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/2/2/s_3.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/2/2/s_3.jpg new file mode 100644 index 00000000..462f1f0e Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/2/2/s_3.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958742.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958742.jpg new file mode 100644 index 00000000..ff618b8e Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958742.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958743.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958743.jpg new file mode 100644 index 00000000..948f64aa Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958743.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958744.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958744.jpg new file mode 100644 index 00000000..116f0814 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958744.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958745.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958745.jpg new file mode 100644 index 00000000..8609494d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958745.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958746.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958746.jpg new file mode 100644 index 00000000..6724f140 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958746.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958747.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958747.jpg new file mode 100644 index 00000000..23c1bb7a Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958747.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958748.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958748.jpg new file mode 100644 index 00000000..ae523433 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958748.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958749.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958749.jpg new file mode 100644 index 00000000..305b0a2b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958749.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958750.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958750.jpg new file mode 100644 index 00000000..efe4452e Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958750.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958751.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958751.jpg new file mode 100644 index 00000000..65c0de73 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958751.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958752.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958752.jpg new file mode 100644 index 00000000..3e47f4de Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958752.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958753.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958753.jpg new file mode 100644 index 00000000..c3e073c3 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958753.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958754.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958754.jpg new file mode 100644 index 00000000..71a15961 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958754.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958755.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958755.jpg new file mode 100644 index 00000000..63c97c1e Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958755.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958756.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958756.jpg new file mode 100644 index 00000000..c7c92f3c Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958756.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958757.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958757.jpg new file mode 100644 index 00000000..b1f4f253 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958757.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958758.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958758.jpg new file mode 100644 index 00000000..185c7c69 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958758.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958759.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958759.jpg new file mode 100644 index 00000000..28580881 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958759.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958760.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958760.jpg new file mode 100644 index 00000000..922aad38 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958760.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958761.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958761.jpg new file mode 100644 index 00000000..03774308 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958761.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958762.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958762.jpg new file mode 100644 index 00000000..c003c788 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958762.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958763.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958763.jpg new file mode 100644 index 00000000..03b43a8c Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958763.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958764.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958764.jpg new file mode 100644 index 00000000..de7e1aa3 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958764.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958765.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958765.jpg new file mode 100644 index 00000000..19587484 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958765.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958766.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958766.jpg new file mode 100644 index 00000000..924b5364 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958766.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958767.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958767.jpg new file mode 100644 index 00000000..8b9d29d7 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958767.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958768.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958768.jpg new file mode 100644 index 00000000..af9529d2 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958768.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958769.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958769.jpg new file mode 100644 index 00000000..ebe899db Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958769.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958770.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958770.jpg new file mode 100644 index 00000000..62a98399 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958770.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958771.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958771.jpg new file mode 100644 index 00000000..386acf1d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958771.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958772.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958772.jpg new file mode 100644 index 00000000..b16e5b15 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958772.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958773.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958773.jpg new file mode 100644 index 00000000..6ca2631e Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958773.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958774.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958774.jpg new file mode 100644 index 00000000..bb9b7b0b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958774.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958775.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958775.jpg new file mode 100644 index 00000000..b9872755 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958775.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958776.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958776.jpg new file mode 100644 index 00000000..1a435707 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958776.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958777.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958777.jpg new file mode 100644 index 00000000..71bfd38e Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958777.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958778.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958778.jpg new file mode 100644 index 00000000..4c83d7a2 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958778.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958779.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958779.jpg new file mode 100644 index 00000000..e94284c0 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958779.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958780.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958780.jpg new file mode 100644 index 00000000..88b473b8 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958780.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958781.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958781.jpg new file mode 100644 index 00000000..fee3886b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958781.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958782.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958782.jpg new file mode 100644 index 00000000..485e1ff4 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958782.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958783.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958783.jpg new file mode 100644 index 00000000..0910306d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958783.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958784.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958784.jpg new file mode 100644 index 00000000..8eba7691 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634522/s_958784.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958742.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958742.jpg new file mode 100644 index 00000000..ae2244df Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958742.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958743.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958743.jpg new file mode 100644 index 00000000..afb91849 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958743.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958744.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958744.jpg new file mode 100644 index 00000000..e3977975 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958744.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958745.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958745.jpg new file mode 100644 index 00000000..3739516a Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958745.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958746.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958746.jpg new file mode 100644 index 00000000..2bf3fd9b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958746.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958747.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958747.jpg new file mode 100644 index 00000000..c454e0a7 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958747.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958748.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958748.jpg new file mode 100644 index 00000000..138ccb46 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958748.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958749.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958749.jpg new file mode 100644 index 00000000..40464223 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958749.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958750.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958750.jpg new file mode 100644 index 00000000..6f19d40b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958750.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958751.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958751.jpg new file mode 100644 index 00000000..0e755bba Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958751.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958752.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958752.jpg new file mode 100644 index 00000000..f04bf2b6 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958752.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958753.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958753.jpg new file mode 100644 index 00000000..feac7df2 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958753.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958754.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958754.jpg new file mode 100644 index 00000000..b375f75a Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958754.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958755.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958755.jpg new file mode 100644 index 00000000..3c5bcd7d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958755.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958756.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958756.jpg new file mode 100644 index 00000000..5d3ab96b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958756.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958757.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958757.jpg new file mode 100644 index 00000000..2960a9bb Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958757.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958758.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958758.jpg new file mode 100644 index 00000000..0554120e Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958758.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958759.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958759.jpg new file mode 100644 index 00000000..69ea0532 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958759.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958760.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958760.jpg new file mode 100644 index 00000000..4b3b73a6 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958760.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958761.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958761.jpg new file mode 100644 index 00000000..bc0488f1 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958761.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958762.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958762.jpg new file mode 100644 index 00000000..e2a17009 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958762.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958763.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958763.jpg new file mode 100644 index 00000000..2a7dcc17 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958763.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958764.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958764.jpg new file mode 100644 index 00000000..1a49a649 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958764.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958765.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958765.jpg new file mode 100644 index 00000000..4aca41dd Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958765.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958766.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958766.jpg new file mode 100644 index 00000000..5510344d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958766.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958767.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958767.jpg new file mode 100644 index 00000000..e90725ef Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958767.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958768.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958768.jpg new file mode 100644 index 00000000..5de1bf9d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958768.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958769.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958769.jpg new file mode 100644 index 00000000..489a5d87 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958769.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958770.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958770.jpg new file mode 100644 index 00000000..ea33ba91 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958770.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958771.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958771.jpg new file mode 100644 index 00000000..d9dd07da Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958771.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958772.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958772.jpg new file mode 100644 index 00000000..28b56d76 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958772.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958773.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958773.jpg new file mode 100644 index 00000000..53087ff9 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958773.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958774.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958774.jpg new file mode 100644 index 00000000..5ec265f3 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958774.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958775.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958775.jpg new file mode 100644 index 00000000..56f367db Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958775.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958776.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958776.jpg new file mode 100644 index 00000000..91e44117 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958776.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958777.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958777.jpg new file mode 100644 index 00000000..5ce97eed Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958777.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958778.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958778.jpg new file mode 100644 index 00000000..61910166 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958778.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958779.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958779.jpg new file mode 100644 index 00000000..01294d0c Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958779.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958780.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958780.jpg new file mode 100644 index 00000000..b5ca390d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958780.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958781.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958781.jpg new file mode 100644 index 00000000..5771fc97 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958781.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958782.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958782.jpg new file mode 100644 index 00000000..9c4e782e Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958782.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958783.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958783.jpg new file mode 100644 index 00000000..fafeed26 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958783.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958784.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958784.jpg new file mode 100644 index 00000000..573a130f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634523/s_958784.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958742.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958742.jpg new file mode 100644 index 00000000..447a1244 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958742.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958743.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958743.jpg new file mode 100644 index 00000000..a0886d8e Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958743.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958744.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958744.jpg new file mode 100644 index 00000000..190d84a2 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958744.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958745.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958745.jpg new file mode 100644 index 00000000..edc41f8e Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958745.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958746.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958746.jpg new file mode 100644 index 00000000..b4747019 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958746.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958747.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958747.jpg new file mode 100644 index 00000000..a77abd24 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958747.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958748.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958748.jpg new file mode 100644 index 00000000..634af158 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958748.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958749.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958749.jpg new file mode 100644 index 00000000..8a7d12a6 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958749.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958750.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958750.jpg new file mode 100644 index 00000000..169b0b66 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958750.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958751.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958751.jpg new file mode 100644 index 00000000..ec72b871 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958751.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958752.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958752.jpg new file mode 100644 index 00000000..ff5482a6 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958752.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958753.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958753.jpg new file mode 100644 index 00000000..86cf3581 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958753.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958754.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958754.jpg new file mode 100644 index 00000000..a20ae27b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958754.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958755.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958755.jpg new file mode 100644 index 00000000..fce6b4c8 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958755.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958756.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958756.jpg new file mode 100644 index 00000000..3d466694 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958756.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958757.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958757.jpg new file mode 100644 index 00000000..76002363 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958757.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958758.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958758.jpg new file mode 100644 index 00000000..c48962a5 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958758.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958759.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958759.jpg new file mode 100644 index 00000000..99b17ecb Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958759.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958760.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958760.jpg new file mode 100644 index 00000000..22d8c2ca Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958760.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958761.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958761.jpg new file mode 100644 index 00000000..4d485ac9 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958761.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958762.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958762.jpg new file mode 100644 index 00000000..57f24f18 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958762.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958763.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958763.jpg new file mode 100644 index 00000000..0df70185 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958763.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958764.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958764.jpg new file mode 100644 index 00000000..e538890e Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958764.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958765.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958765.jpg new file mode 100644 index 00000000..d6f38b66 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958765.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958766.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958766.jpg new file mode 100644 index 00000000..f72ba707 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958766.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958767.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958767.jpg new file mode 100644 index 00000000..9d7e6f24 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958767.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958768.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958768.jpg new file mode 100644 index 00000000..b6cf43b0 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958768.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958769.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958769.jpg new file mode 100644 index 00000000..f9ecd7c7 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958769.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958770.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958770.jpg new file mode 100644 index 00000000..9ddfd482 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958770.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958771.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958771.jpg new file mode 100644 index 00000000..496bdab8 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958771.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958772.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958772.jpg new file mode 100644 index 00000000..34e22356 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958772.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958773.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958773.jpg new file mode 100644 index 00000000..269f309d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958773.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958774.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958774.jpg new file mode 100644 index 00000000..22a3b468 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958774.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958775.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958775.jpg new file mode 100644 index 00000000..6a09665f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958775.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958776.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958776.jpg new file mode 100644 index 00000000..81061cb5 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958776.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958777.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958777.jpg new file mode 100644 index 00000000..cdb5439f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958777.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958778.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958778.jpg new file mode 100644 index 00000000..3a7dc5ba Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958778.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958779.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958779.jpg new file mode 100644 index 00000000..70aa1279 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958779.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958780.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958780.jpg new file mode 100644 index 00000000..1c9e4261 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958780.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958781.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958781.jpg new file mode 100644 index 00000000..012ea589 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958781.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958782.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958782.jpg new file mode 100644 index 00000000..30c60760 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958782.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958783.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958783.jpg new file mode 100644 index 00000000..fbaad84a Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958783.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958784.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958784.jpg new file mode 100644 index 00000000..ace72690 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634524/s_958784.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958742.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958742.jpg new file mode 100644 index 00000000..844874b0 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958742.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958743.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958743.jpg new file mode 100644 index 00000000..3d589654 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958743.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958744.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958744.jpg new file mode 100644 index 00000000..26f24eca Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958744.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958745.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958745.jpg new file mode 100644 index 00000000..d57fa708 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958745.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958746.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958746.jpg new file mode 100644 index 00000000..9de699b4 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958746.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958747.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958747.jpg new file mode 100644 index 00000000..9f554952 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958747.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958748.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958748.jpg new file mode 100644 index 00000000..83a9ad31 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958748.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958749.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958749.jpg new file mode 100644 index 00000000..5acb67d1 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958749.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958750.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958750.jpg new file mode 100644 index 00000000..c384e248 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958750.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958751.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958751.jpg new file mode 100644 index 00000000..ea52ff7c Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958751.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958752.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958752.jpg new file mode 100644 index 00000000..1b436452 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958752.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958753.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958753.jpg new file mode 100644 index 00000000..9f05385a Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958753.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958754.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958754.jpg new file mode 100644 index 00000000..c785fdb1 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958754.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958755.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958755.jpg new file mode 100644 index 00000000..fd7a8e8e Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958755.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958756.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958756.jpg new file mode 100644 index 00000000..a02c853c Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958756.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958757.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958757.jpg new file mode 100644 index 00000000..9c17a608 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958757.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958758.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958758.jpg new file mode 100644 index 00000000..bae58d11 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958758.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958759.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958759.jpg new file mode 100644 index 00000000..da956efa Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958759.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958760.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958760.jpg new file mode 100644 index 00000000..aae0d432 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958760.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958761.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958761.jpg new file mode 100644 index 00000000..50a9b55f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958761.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958762.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958762.jpg new file mode 100644 index 00000000..2dbf39b5 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958762.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958763.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958763.jpg new file mode 100644 index 00000000..f86e35a2 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958763.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958764.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958764.jpg new file mode 100644 index 00000000..1a2a8c79 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958764.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958765.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958765.jpg new file mode 100644 index 00000000..4809f25a Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958765.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958766.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958766.jpg new file mode 100644 index 00000000..ff30140d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958766.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958767.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958767.jpg new file mode 100644 index 00000000..b6a36b2a Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958767.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958768.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958768.jpg new file mode 100644 index 00000000..2dc46d5c Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958768.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958769.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958769.jpg new file mode 100644 index 00000000..10ac8f12 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958769.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958770.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958770.jpg new file mode 100644 index 00000000..3b58a2bb Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958770.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958771.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958771.jpg new file mode 100644 index 00000000..c1334ae9 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958771.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958772.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958772.jpg new file mode 100644 index 00000000..bbc691ed Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958772.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958773.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958773.jpg new file mode 100644 index 00000000..ec5631f5 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958773.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958774.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958774.jpg new file mode 100644 index 00000000..a9a871c8 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958774.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958775.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958775.jpg new file mode 100644 index 00000000..0ea4dcaa Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958775.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958776.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958776.jpg new file mode 100644 index 00000000..ad8f38f8 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958776.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958777.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958777.jpg new file mode 100644 index 00000000..e38a9c10 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958777.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958778.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958778.jpg new file mode 100644 index 00000000..50d77830 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958778.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958779.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958779.jpg new file mode 100644 index 00000000..803097b3 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958779.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958780.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958780.jpg new file mode 100644 index 00000000..296e6234 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958780.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958781.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958781.jpg new file mode 100644 index 00000000..0ea71ee2 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958781.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958782.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958782.jpg new file mode 100644 index 00000000..5a71fb6f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958782.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958783.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958783.jpg new file mode 100644 index 00000000..c5877001 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958783.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958784.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958784.jpg new file mode 100644 index 00000000..3f54be64 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634525/s_958784.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958742.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958742.jpg new file mode 100644 index 00000000..a2e1c576 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958742.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958743.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958743.jpg new file mode 100644 index 00000000..463d436b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958743.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958744.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958744.jpg new file mode 100644 index 00000000..f3918d5c Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958744.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958745.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958745.jpg new file mode 100644 index 00000000..036d484d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958745.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958746.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958746.jpg new file mode 100644 index 00000000..6487d199 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958746.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958747.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958747.jpg new file mode 100644 index 00000000..071b7290 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958747.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958748.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958748.jpg new file mode 100644 index 00000000..3cc41167 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958748.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958749.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958749.jpg new file mode 100644 index 00000000..e1c56eda Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958749.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958750.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958750.jpg new file mode 100644 index 00000000..7d1cdf8e Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958750.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958751.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958751.jpg new file mode 100644 index 00000000..a5645424 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958751.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958752.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958752.jpg new file mode 100644 index 00000000..57298de3 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958752.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958753.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958753.jpg new file mode 100644 index 00000000..e078245f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958753.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958754.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958754.jpg new file mode 100644 index 00000000..22d9dc20 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958754.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958755.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958755.jpg new file mode 100644 index 00000000..2342a179 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958755.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958756.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958756.jpg new file mode 100644 index 00000000..4f8121c1 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958756.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958757.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958757.jpg new file mode 100644 index 00000000..d7ecedd3 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958757.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958758.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958758.jpg new file mode 100644 index 00000000..265a04e7 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958758.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958759.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958759.jpg new file mode 100644 index 00000000..56be80cb Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958759.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958760.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958760.jpg new file mode 100644 index 00000000..7f660cb7 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958760.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958761.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958761.jpg new file mode 100644 index 00000000..5d16d3af Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958761.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958762.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958762.jpg new file mode 100644 index 00000000..f5d7e981 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958762.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958763.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958763.jpg new file mode 100644 index 00000000..9ae62b55 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958763.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958764.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958764.jpg new file mode 100644 index 00000000..787a4ce2 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958764.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958765.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958765.jpg new file mode 100644 index 00000000..48ee94a3 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958765.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958766.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958766.jpg new file mode 100644 index 00000000..72f3cc46 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958766.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958767.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958767.jpg new file mode 100644 index 00000000..a57eb3f1 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958767.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958768.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958768.jpg new file mode 100644 index 00000000..10460adf Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958768.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958769.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958769.jpg new file mode 100644 index 00000000..f252a245 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958769.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958770.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958770.jpg new file mode 100644 index 00000000..a7d12257 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958770.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958771.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958771.jpg new file mode 100644 index 00000000..054af1f6 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958771.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958772.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958772.jpg new file mode 100644 index 00000000..cc659533 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958772.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958773.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958773.jpg new file mode 100644 index 00000000..bf902ec2 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958773.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958774.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958774.jpg new file mode 100644 index 00000000..f4ef0b5e Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958774.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958775.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958775.jpg new file mode 100644 index 00000000..a87b2078 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958775.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958776.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958776.jpg new file mode 100644 index 00000000..93a295dd Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958776.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958777.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958777.jpg new file mode 100644 index 00000000..dab0eef0 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958777.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958778.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958778.jpg new file mode 100644 index 00000000..9e25d171 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958778.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958779.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958779.jpg new file mode 100644 index 00000000..fe37c75d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958779.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958780.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958780.jpg new file mode 100644 index 00000000..bce6c9f1 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958780.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958781.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958781.jpg new file mode 100644 index 00000000..9326582b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958781.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958782.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958782.jpg new file mode 100644 index 00000000..74e3d9a8 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958782.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958783.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958783.jpg new file mode 100644 index 00000000..bd28070b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958783.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958784.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958784.jpg new file mode 100644 index 00000000..7382070f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634526/s_958784.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958742.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958742.jpg new file mode 100644 index 00000000..e494ac58 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958742.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958743.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958743.jpg new file mode 100644 index 00000000..b3719c8f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958743.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958744.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958744.jpg new file mode 100644 index 00000000..082f990c Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958744.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958745.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958745.jpg new file mode 100644 index 00000000..8343d43d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958745.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958746.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958746.jpg new file mode 100644 index 00000000..3496d4c2 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958746.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958747.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958747.jpg new file mode 100644 index 00000000..0f7689dc Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958747.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958748.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958748.jpg new file mode 100644 index 00000000..932cc3a9 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958748.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958749.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958749.jpg new file mode 100644 index 00000000..81b9ab3a Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958749.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958750.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958750.jpg new file mode 100644 index 00000000..1c4cf36e Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958750.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958751.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958751.jpg new file mode 100644 index 00000000..2135b8ad Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958751.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958752.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958752.jpg new file mode 100644 index 00000000..1ae9b7b7 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958752.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958753.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958753.jpg new file mode 100644 index 00000000..5c4d3495 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958753.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958754.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958754.jpg new file mode 100644 index 00000000..a5675da9 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958754.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958755.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958755.jpg new file mode 100644 index 00000000..eec63ada Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958755.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958756.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958756.jpg new file mode 100644 index 00000000..e3a69942 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958756.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958757.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958757.jpg new file mode 100644 index 00000000..afdf239d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958757.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958758.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958758.jpg new file mode 100644 index 00000000..453a0ca8 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958758.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958759.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958759.jpg new file mode 100644 index 00000000..a9088dfe Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958759.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958760.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958760.jpg new file mode 100644 index 00000000..50ac7aa6 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958760.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958761.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958761.jpg new file mode 100644 index 00000000..dd7bcab5 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958761.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958762.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958762.jpg new file mode 100644 index 00000000..dfe78aa1 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958762.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958763.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958763.jpg new file mode 100644 index 00000000..ec3d296a Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958763.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958764.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958764.jpg new file mode 100644 index 00000000..8927fd01 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958764.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958765.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958765.jpg new file mode 100644 index 00000000..290386a0 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958765.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958766.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958766.jpg new file mode 100644 index 00000000..f3d908f0 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958766.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958767.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958767.jpg new file mode 100644 index 00000000..9b350662 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958767.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958768.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958768.jpg new file mode 100644 index 00000000..18e1d2cd Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958768.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958769.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958769.jpg new file mode 100644 index 00000000..2feffc3d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958769.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958770.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958770.jpg new file mode 100644 index 00000000..1b9dea4c Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958770.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958771.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958771.jpg new file mode 100644 index 00000000..327baac8 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958771.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958772.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958772.jpg new file mode 100644 index 00000000..7e1d56b6 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958772.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958773.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958773.jpg new file mode 100644 index 00000000..93c64945 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958773.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958774.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958774.jpg new file mode 100644 index 00000000..2c49ea82 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958774.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958775.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958775.jpg new file mode 100644 index 00000000..97dc4df0 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958775.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958776.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958776.jpg new file mode 100644 index 00000000..a795dc39 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958776.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958777.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958777.jpg new file mode 100644 index 00000000..2b12a537 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958777.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958778.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958778.jpg new file mode 100644 index 00000000..07fb5563 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958778.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958779.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958779.jpg new file mode 100644 index 00000000..1e6cc162 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958779.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958780.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958780.jpg new file mode 100644 index 00000000..7b8a3332 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958780.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958781.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958781.jpg new file mode 100644 index 00000000..1ea48e16 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958781.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958782.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958782.jpg new file mode 100644 index 00000000..a238b892 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958782.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958783.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958783.jpg new file mode 100644 index 00000000..db335d60 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958783.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958784.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958784.jpg new file mode 100644 index 00000000..bb07d591 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634527/s_958784.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958742.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958742.jpg new file mode 100644 index 00000000..98035682 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958742.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958743.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958743.jpg new file mode 100644 index 00000000..352f91f3 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958743.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958744.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958744.jpg new file mode 100644 index 00000000..92b0f3d8 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958744.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958745.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958745.jpg new file mode 100644 index 00000000..0a92528b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958745.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958746.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958746.jpg new file mode 100644 index 00000000..1034d1bb Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958746.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958747.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958747.jpg new file mode 100644 index 00000000..95b68bf4 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958747.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958748.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958748.jpg new file mode 100644 index 00000000..daaf235e Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958748.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958749.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958749.jpg new file mode 100644 index 00000000..37a6cfff Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958749.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958750.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958750.jpg new file mode 100644 index 00000000..4b28b357 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958750.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958751.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958751.jpg new file mode 100644 index 00000000..226e9e66 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958751.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958752.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958752.jpg new file mode 100644 index 00000000..3d820aa1 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958752.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958753.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958753.jpg new file mode 100644 index 00000000..6be6f927 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958753.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958754.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958754.jpg new file mode 100644 index 00000000..41d0a2c4 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958754.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958755.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958755.jpg new file mode 100644 index 00000000..8ae5c1dc Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958755.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958756.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958756.jpg new file mode 100644 index 00000000..adefa1c6 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958756.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958757.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958757.jpg new file mode 100644 index 00000000..030064e5 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958757.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958758.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958758.jpg new file mode 100644 index 00000000..924bca32 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958758.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958759.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958759.jpg new file mode 100644 index 00000000..203eda6c Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958759.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958760.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958760.jpg new file mode 100644 index 00000000..3407a499 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958760.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958761.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958761.jpg new file mode 100644 index 00000000..4b545394 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958761.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958762.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958762.jpg new file mode 100644 index 00000000..a1d7cab5 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958762.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958763.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958763.jpg new file mode 100644 index 00000000..1b493302 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958763.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958764.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958764.jpg new file mode 100644 index 00000000..8e1e04ed Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958764.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958765.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958765.jpg new file mode 100644 index 00000000..c313c4eb Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958765.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958766.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958766.jpg new file mode 100644 index 00000000..c2ec6303 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958766.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958767.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958767.jpg new file mode 100644 index 00000000..d37db0ea Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958767.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958768.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958768.jpg new file mode 100644 index 00000000..abdec135 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958768.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958769.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958769.jpg new file mode 100644 index 00000000..2b29587a Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958769.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958770.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958770.jpg new file mode 100644 index 00000000..f2b67953 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958770.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958771.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958771.jpg new file mode 100644 index 00000000..7207fded Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958771.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958772.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958772.jpg new file mode 100644 index 00000000..d4743ce4 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958772.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958773.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958773.jpg new file mode 100644 index 00000000..2f6755ea Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958773.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958774.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958774.jpg new file mode 100644 index 00000000..a0f9a28d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958774.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958775.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958775.jpg new file mode 100644 index 00000000..16fe05f9 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958775.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958776.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958776.jpg new file mode 100644 index 00000000..21862d43 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958776.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958777.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958777.jpg new file mode 100644 index 00000000..adc4191a Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958777.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958778.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958778.jpg new file mode 100644 index 00000000..3e8b1239 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958778.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958779.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958779.jpg new file mode 100644 index 00000000..6d1eaacb Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958779.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958780.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958780.jpg new file mode 100644 index 00000000..5b7d407c Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958780.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958781.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958781.jpg new file mode 100644 index 00000000..0f5bded5 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958781.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958782.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958782.jpg new file mode 100644 index 00000000..555519be Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958782.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958783.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958783.jpg new file mode 100644 index 00000000..b8ec7f9d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958783.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958784.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958784.jpg new file mode 100644 index 00000000..e1e6a8ae Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634528/s_958784.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958742.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958742.jpg new file mode 100644 index 00000000..d82b74ea Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958742.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958743.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958743.jpg new file mode 100644 index 00000000..45737856 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958743.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958744.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958744.jpg new file mode 100644 index 00000000..71254430 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958744.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958745.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958745.jpg new file mode 100644 index 00000000..36ad4458 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958745.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958746.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958746.jpg new file mode 100644 index 00000000..45f8db5f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958746.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958747.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958747.jpg new file mode 100644 index 00000000..1d08a355 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958747.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958748.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958748.jpg new file mode 100644 index 00000000..19f7b0a6 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958748.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958749.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958749.jpg new file mode 100644 index 00000000..e2566b18 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958749.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958750.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958750.jpg new file mode 100644 index 00000000..28480f0c Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958750.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958751.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958751.jpg new file mode 100644 index 00000000..7bf739cd Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958751.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958752.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958752.jpg new file mode 100644 index 00000000..a410742e Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958752.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958753.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958753.jpg new file mode 100644 index 00000000..a629f6e6 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958753.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958754.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958754.jpg new file mode 100644 index 00000000..7ed87584 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958754.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958755.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958755.jpg new file mode 100644 index 00000000..38045251 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958755.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958756.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958756.jpg new file mode 100644 index 00000000..d862316b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958756.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958757.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958757.jpg new file mode 100644 index 00000000..cf96af4a Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958757.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958758.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958758.jpg new file mode 100644 index 00000000..c2809416 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958758.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958759.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958759.jpg new file mode 100644 index 00000000..a548dfc0 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958759.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958760.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958760.jpg new file mode 100644 index 00000000..01a2bf2a Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958760.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958761.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958761.jpg new file mode 100644 index 00000000..e9c4b3d4 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958761.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958762.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958762.jpg new file mode 100644 index 00000000..34130152 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958762.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958763.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958763.jpg new file mode 100644 index 00000000..9f76c500 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958763.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958764.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958764.jpg new file mode 100644 index 00000000..4a983cae Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958764.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958765.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958765.jpg new file mode 100644 index 00000000..ce27c291 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958765.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958766.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958766.jpg new file mode 100644 index 00000000..52f63260 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958766.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958767.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958767.jpg new file mode 100644 index 00000000..51898b3f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958767.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958768.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958768.jpg new file mode 100644 index 00000000..23bc37ae Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958768.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958769.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958769.jpg new file mode 100644 index 00000000..299ff761 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958769.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958770.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958770.jpg new file mode 100644 index 00000000..143c8648 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958770.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958771.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958771.jpg new file mode 100644 index 00000000..1e32eb41 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958771.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958772.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958772.jpg new file mode 100644 index 00000000..198a09fc Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958772.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958773.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958773.jpg new file mode 100644 index 00000000..dc30dbac Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958773.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958774.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958774.jpg new file mode 100644 index 00000000..624a5ce4 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958774.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958775.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958775.jpg new file mode 100644 index 00000000..985ea24a Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958775.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958776.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958776.jpg new file mode 100644 index 00000000..a4aa8c19 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958776.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958777.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958777.jpg new file mode 100644 index 00000000..e8651477 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958777.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958778.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958778.jpg new file mode 100644 index 00000000..45ca2bea Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958778.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958779.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958779.jpg new file mode 100644 index 00000000..83f35e40 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958779.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958780.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958780.jpg new file mode 100644 index 00000000..ec69b58c Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958780.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958781.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958781.jpg new file mode 100644 index 00000000..2bb7b174 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958781.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958782.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958782.jpg new file mode 100644 index 00000000..5be1dcbf Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958782.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958783.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958783.jpg new file mode 100644 index 00000000..f5990210 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958783.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958784.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958784.jpg new file mode 100644 index 00000000..6cf921ad Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634529/s_958784.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958742.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958742.jpg new file mode 100644 index 00000000..ce69bd10 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958742.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958743.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958743.jpg new file mode 100644 index 00000000..26233758 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958743.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958744.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958744.jpg new file mode 100644 index 00000000..7282504b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958744.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958745.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958745.jpg new file mode 100644 index 00000000..f42c57c5 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958745.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958746.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958746.jpg new file mode 100644 index 00000000..63ffc596 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958746.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958747.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958747.jpg new file mode 100644 index 00000000..01fb5b25 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958747.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958748.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958748.jpg new file mode 100644 index 00000000..5be491d9 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958748.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958749.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958749.jpg new file mode 100644 index 00000000..d5c22872 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958749.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958750.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958750.jpg new file mode 100644 index 00000000..a5de120b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958750.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958751.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958751.jpg new file mode 100644 index 00000000..13c59810 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958751.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958752.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958752.jpg new file mode 100644 index 00000000..b39ae202 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958752.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958753.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958753.jpg new file mode 100644 index 00000000..42bbf669 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958753.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958754.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958754.jpg new file mode 100644 index 00000000..1a6d609f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958754.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958755.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958755.jpg new file mode 100644 index 00000000..937f4e2d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958755.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958756.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958756.jpg new file mode 100644 index 00000000..b9d86ac3 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958756.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958757.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958757.jpg new file mode 100644 index 00000000..ad3e5829 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958757.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958758.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958758.jpg new file mode 100644 index 00000000..79802a01 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958758.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958759.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958759.jpg new file mode 100644 index 00000000..18ef044a Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958759.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958760.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958760.jpg new file mode 100644 index 00000000..6a2005c9 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958760.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958761.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958761.jpg new file mode 100644 index 00000000..b703d748 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958761.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958762.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958762.jpg new file mode 100644 index 00000000..1743c934 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958762.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958763.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958763.jpg new file mode 100644 index 00000000..9808e02d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958763.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958764.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958764.jpg new file mode 100644 index 00000000..2866bdbc Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958764.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958765.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958765.jpg new file mode 100644 index 00000000..42c91543 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958765.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958766.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958766.jpg new file mode 100644 index 00000000..e331fd51 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958766.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958767.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958767.jpg new file mode 100644 index 00000000..a21fcf89 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958767.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958768.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958768.jpg new file mode 100644 index 00000000..ae5e287c Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958768.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958769.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958769.jpg new file mode 100644 index 00000000..83d4d6ee Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958769.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958770.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958770.jpg new file mode 100644 index 00000000..302db9a4 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958770.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958771.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958771.jpg new file mode 100644 index 00000000..5101d172 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958771.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958772.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958772.jpg new file mode 100644 index 00000000..673fdfe7 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958772.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958773.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958773.jpg new file mode 100644 index 00000000..0b13e41a Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958773.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958774.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958774.jpg new file mode 100644 index 00000000..b782d161 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958774.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958775.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958775.jpg new file mode 100644 index 00000000..d09cede9 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958775.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958776.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958776.jpg new file mode 100644 index 00000000..5cbcfe61 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958776.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958777.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958777.jpg new file mode 100644 index 00000000..c079cc5a Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958777.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958778.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958778.jpg new file mode 100644 index 00000000..08088167 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958778.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958779.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958779.jpg new file mode 100644 index 00000000..080795ce Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958779.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958780.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958780.jpg new file mode 100644 index 00000000..7f8ee286 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958780.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958781.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958781.jpg new file mode 100644 index 00000000..84ca345c Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958781.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958782.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958782.jpg new file mode 100644 index 00000000..ec61702a Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958782.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958783.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958783.jpg new file mode 100644 index 00000000..31bb883e Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958783.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958784.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958784.jpg new file mode 100644 index 00000000..8ad34489 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634530/s_958784.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958742.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958742.jpg new file mode 100644 index 00000000..fadcbb5b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958742.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958743.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958743.jpg new file mode 100644 index 00000000..ca225bf2 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958743.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958744.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958744.jpg new file mode 100644 index 00000000..35e30b9f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958744.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958745.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958745.jpg new file mode 100644 index 00000000..be67ad59 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958745.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958746.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958746.jpg new file mode 100644 index 00000000..348458d1 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958746.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958747.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958747.jpg new file mode 100644 index 00000000..7cd3bd18 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958747.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958748.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958748.jpg new file mode 100644 index 00000000..48ceadac Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958748.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958749.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958749.jpg new file mode 100644 index 00000000..c6e54a56 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958749.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958750.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958750.jpg new file mode 100644 index 00000000..2c0f9f72 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958750.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958751.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958751.jpg new file mode 100644 index 00000000..e1ee37ed Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958751.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958752.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958752.jpg new file mode 100644 index 00000000..e4abc2b1 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958752.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958753.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958753.jpg new file mode 100644 index 00000000..25b1d0aa Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958753.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958754.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958754.jpg new file mode 100644 index 00000000..2a4df31f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958754.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958755.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958755.jpg new file mode 100644 index 00000000..2d1c4543 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958755.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958756.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958756.jpg new file mode 100644 index 00000000..c4f92eec Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958756.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958757.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958757.jpg new file mode 100644 index 00000000..7d9336ee Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958757.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958758.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958758.jpg new file mode 100644 index 00000000..02ce3853 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958758.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958759.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958759.jpg new file mode 100644 index 00000000..2341b954 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958759.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958760.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958760.jpg new file mode 100644 index 00000000..07ddfa6b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958760.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958761.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958761.jpg new file mode 100644 index 00000000..a6b7c285 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958761.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958762.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958762.jpg new file mode 100644 index 00000000..397c9948 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958762.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958763.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958763.jpg new file mode 100644 index 00000000..20f7688f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958763.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958764.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958764.jpg new file mode 100644 index 00000000..b7b17d38 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958764.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958765.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958765.jpg new file mode 100644 index 00000000..24f06482 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958765.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958766.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958766.jpg new file mode 100644 index 00000000..87862fcd Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958766.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958767.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958767.jpg new file mode 100644 index 00000000..96146295 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958767.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958768.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958768.jpg new file mode 100644 index 00000000..62851fa6 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958768.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958769.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958769.jpg new file mode 100644 index 00000000..62a99c14 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958769.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958770.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958770.jpg new file mode 100644 index 00000000..dd1cdda7 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958770.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958771.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958771.jpg new file mode 100644 index 00000000..cd5fdfbe Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958771.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958772.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958772.jpg new file mode 100644 index 00000000..8243881e Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958772.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958773.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958773.jpg new file mode 100644 index 00000000..b96e37a3 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958773.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958774.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958774.jpg new file mode 100644 index 00000000..d92dd0d5 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958774.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958775.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958775.jpg new file mode 100644 index 00000000..8a8c9600 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958775.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958776.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958776.jpg new file mode 100644 index 00000000..67de49e7 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958776.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958777.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958777.jpg new file mode 100644 index 00000000..78c6e829 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958777.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958778.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958778.jpg new file mode 100644 index 00000000..4ea449d2 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958778.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958779.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958779.jpg new file mode 100644 index 00000000..9caf6997 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958779.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958780.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958780.jpg new file mode 100644 index 00000000..cb0a9dc6 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958780.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958781.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958781.jpg new file mode 100644 index 00000000..8b214cde Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958781.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958782.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958782.jpg new file mode 100644 index 00000000..a01bff0f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958782.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958783.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958783.jpg new file mode 100644 index 00000000..bc93399f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958783.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958784.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958784.jpg new file mode 100644 index 00000000..26055b16 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634531/s_958784.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958742.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958742.jpg new file mode 100644 index 00000000..e025c8d7 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958742.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958743.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958743.jpg new file mode 100644 index 00000000..5b4a2eb6 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958743.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958744.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958744.jpg new file mode 100644 index 00000000..6731beca Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958744.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958745.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958745.jpg new file mode 100644 index 00000000..60fcaa66 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958745.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958746.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958746.jpg new file mode 100644 index 00000000..4f5bde5b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958746.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958747.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958747.jpg new file mode 100644 index 00000000..5e1bb608 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958747.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958748.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958748.jpg new file mode 100644 index 00000000..06f9ca31 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958748.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958749.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958749.jpg new file mode 100644 index 00000000..1ad87cf7 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958749.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958750.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958750.jpg new file mode 100644 index 00000000..2939a3d5 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958750.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958751.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958751.jpg new file mode 100644 index 00000000..7244b951 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958751.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958752.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958752.jpg new file mode 100644 index 00000000..90701772 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958752.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958753.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958753.jpg new file mode 100644 index 00000000..2c19f89d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958753.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958754.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958754.jpg new file mode 100644 index 00000000..dc51fa6f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958754.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958755.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958755.jpg new file mode 100644 index 00000000..14155c0f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958755.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958756.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958756.jpg new file mode 100644 index 00000000..e2927103 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958756.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958757.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958757.jpg new file mode 100644 index 00000000..abc32672 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958757.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958758.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958758.jpg new file mode 100644 index 00000000..ac5cf6a1 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958758.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958759.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958759.jpg new file mode 100644 index 00000000..da37dd24 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958759.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958760.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958760.jpg new file mode 100644 index 00000000..46a80c2b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958760.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958761.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958761.jpg new file mode 100644 index 00000000..170ba5fe Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958761.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958762.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958762.jpg new file mode 100644 index 00000000..d43418fe Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958762.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958763.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958763.jpg new file mode 100644 index 00000000..408dcf2f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958763.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958764.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958764.jpg new file mode 100644 index 00000000..1093d6d3 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958764.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958765.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958765.jpg new file mode 100644 index 00000000..79ce0dc7 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958765.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958766.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958766.jpg new file mode 100644 index 00000000..118b4a7f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958766.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958767.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958767.jpg new file mode 100644 index 00000000..895d8e6c Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958767.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958768.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958768.jpg new file mode 100644 index 00000000..d480faed Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958768.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958769.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958769.jpg new file mode 100644 index 00000000..03ea0f88 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958769.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958770.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958770.jpg new file mode 100644 index 00000000..17e2cc75 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958770.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958771.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958771.jpg new file mode 100644 index 00000000..57fb51af Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958771.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958772.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958772.jpg new file mode 100644 index 00000000..5db4bc98 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958772.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958773.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958773.jpg new file mode 100644 index 00000000..534c1195 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958773.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958774.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958774.jpg new file mode 100644 index 00000000..f46d0af8 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958774.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958775.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958775.jpg new file mode 100644 index 00000000..7c18f7a1 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958775.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958776.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958776.jpg new file mode 100644 index 00000000..d9e9c5ed Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958776.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958777.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958777.jpg new file mode 100644 index 00000000..4fb82127 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958777.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958778.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958778.jpg new file mode 100644 index 00000000..6eb92b2a Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958778.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958779.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958779.jpg new file mode 100644 index 00000000..de3408b8 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958779.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958780.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958780.jpg new file mode 100644 index 00000000..552e1787 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958780.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958781.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958781.jpg new file mode 100644 index 00000000..f8333ac5 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958781.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958782.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958782.jpg new file mode 100644 index 00000000..bd8403e4 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958782.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958783.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958783.jpg new file mode 100644 index 00000000..7e126219 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958783.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958784.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958784.jpg new file mode 100644 index 00000000..8d000b8d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634532/s_958784.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958742.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958742.jpg new file mode 100644 index 00000000..b19f77b9 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958742.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958743.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958743.jpg new file mode 100644 index 00000000..3e5eed27 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958743.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958744.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958744.jpg new file mode 100644 index 00000000..ed51b9d2 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958744.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958745.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958745.jpg new file mode 100644 index 00000000..89b01e45 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958745.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958746.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958746.jpg new file mode 100644 index 00000000..2518962d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958746.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958747.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958747.jpg new file mode 100644 index 00000000..80099f52 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958747.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958748.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958748.jpg new file mode 100644 index 00000000..167ccb1c Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958748.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958749.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958749.jpg new file mode 100644 index 00000000..32d6134a Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958749.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958750.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958750.jpg new file mode 100644 index 00000000..b5c8e7ee Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958750.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958751.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958751.jpg new file mode 100644 index 00000000..5da54aed Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958751.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958752.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958752.jpg new file mode 100644 index 00000000..835f7df7 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958752.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958753.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958753.jpg new file mode 100644 index 00000000..46098dd1 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958753.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958754.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958754.jpg new file mode 100644 index 00000000..e843e3f3 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958754.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958755.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958755.jpg new file mode 100644 index 00000000..48de5e13 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958755.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958756.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958756.jpg new file mode 100644 index 00000000..925c4287 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958756.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958757.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958757.jpg new file mode 100644 index 00000000..6c327926 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958757.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958758.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958758.jpg new file mode 100644 index 00000000..f057ca5a Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958758.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958759.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958759.jpg new file mode 100644 index 00000000..7dec59a0 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958759.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958760.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958760.jpg new file mode 100644 index 00000000..119900c7 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958760.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958761.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958761.jpg new file mode 100644 index 00000000..2e936d87 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958761.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958762.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958762.jpg new file mode 100644 index 00000000..067e9fae Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958762.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958763.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958763.jpg new file mode 100644 index 00000000..bc162b3c Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958763.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958764.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958764.jpg new file mode 100644 index 00000000..c03f7b9b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958764.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958765.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958765.jpg new file mode 100644 index 00000000..b173c563 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958765.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958766.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958766.jpg new file mode 100644 index 00000000..a033f826 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958766.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958767.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958767.jpg new file mode 100644 index 00000000..4a7a65ee Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958767.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958768.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958768.jpg new file mode 100644 index 00000000..1b5a5099 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958768.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958769.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958769.jpg new file mode 100644 index 00000000..10126513 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958769.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958770.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958770.jpg new file mode 100644 index 00000000..f23fec29 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958770.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958771.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958771.jpg new file mode 100644 index 00000000..c7b48197 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958771.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958772.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958772.jpg new file mode 100644 index 00000000..245c9e68 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958772.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958773.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958773.jpg new file mode 100644 index 00000000..c9bdee8e Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958773.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958774.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958774.jpg new file mode 100644 index 00000000..dce88764 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958774.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958775.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958775.jpg new file mode 100644 index 00000000..36a0ea03 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958775.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958776.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958776.jpg new file mode 100644 index 00000000..0b096e2b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958776.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958777.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958777.jpg new file mode 100644 index 00000000..92076606 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958777.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958778.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958778.jpg new file mode 100644 index 00000000..2f4bdb42 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958778.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958779.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958779.jpg new file mode 100644 index 00000000..24bb4f64 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958779.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958780.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958780.jpg new file mode 100644 index 00000000..7f025dcc Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958780.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958781.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958781.jpg new file mode 100644 index 00000000..4c8130cf Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958781.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958782.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958782.jpg new file mode 100644 index 00000000..37550288 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958782.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958783.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958783.jpg new file mode 100644 index 00000000..11caf95c Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958783.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958784.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958784.jpg new file mode 100644 index 00000000..197e4525 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634533/s_958784.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958742.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958742.jpg new file mode 100644 index 00000000..ca3a02b6 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958742.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958743.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958743.jpg new file mode 100644 index 00000000..5fd21425 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958743.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958744.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958744.jpg new file mode 100644 index 00000000..c522860a Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958744.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958745.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958745.jpg new file mode 100644 index 00000000..9bfd7b79 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958745.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958746.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958746.jpg new file mode 100644 index 00000000..cfa93451 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958746.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958747.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958747.jpg new file mode 100644 index 00000000..433ae553 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958747.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958748.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958748.jpg new file mode 100644 index 00000000..11e956b9 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958748.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958749.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958749.jpg new file mode 100644 index 00000000..4f34df17 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958749.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958750.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958750.jpg new file mode 100644 index 00000000..e14d734b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958750.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958751.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958751.jpg new file mode 100644 index 00000000..3c799047 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958751.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958752.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958752.jpg new file mode 100644 index 00000000..c828b0b0 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958752.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958753.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958753.jpg new file mode 100644 index 00000000..efb2a12d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958753.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958754.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958754.jpg new file mode 100644 index 00000000..51d771fe Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958754.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958755.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958755.jpg new file mode 100644 index 00000000..7a15e262 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958755.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958756.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958756.jpg new file mode 100644 index 00000000..e3db11f1 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958756.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958757.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958757.jpg new file mode 100644 index 00000000..f70a1bb2 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958757.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958758.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958758.jpg new file mode 100644 index 00000000..e9871bd9 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958758.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958759.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958759.jpg new file mode 100644 index 00000000..7056f4a7 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958759.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958760.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958760.jpg new file mode 100644 index 00000000..15473e3c Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958760.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958761.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958761.jpg new file mode 100644 index 00000000..bd33172a Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958761.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958762.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958762.jpg new file mode 100644 index 00000000..92c53e5e Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958762.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958763.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958763.jpg new file mode 100644 index 00000000..5ee58f2d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958763.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958764.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958764.jpg new file mode 100644 index 00000000..ced827a0 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958764.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958765.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958765.jpg new file mode 100644 index 00000000..965aa0cc Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958765.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958766.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958766.jpg new file mode 100644 index 00000000..ece0b985 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958766.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958767.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958767.jpg new file mode 100644 index 00000000..ef1bdba1 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958767.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958768.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958768.jpg new file mode 100644 index 00000000..6c9c743c Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958768.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958769.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958769.jpg new file mode 100644 index 00000000..2a138e7b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958769.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958770.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958770.jpg new file mode 100644 index 00000000..52508877 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958770.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958771.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958771.jpg new file mode 100644 index 00000000..4c372587 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958771.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958772.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958772.jpg new file mode 100644 index 00000000..c5250580 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958772.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958773.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958773.jpg new file mode 100644 index 00000000..eedb031f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958773.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958774.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958774.jpg new file mode 100644 index 00000000..aad89890 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958774.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958775.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958775.jpg new file mode 100644 index 00000000..c523b5ad Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958775.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958776.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958776.jpg new file mode 100644 index 00000000..8d1ae490 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958776.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958777.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958777.jpg new file mode 100644 index 00000000..b2ca82f3 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958777.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958778.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958778.jpg new file mode 100644 index 00000000..9e5fb350 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958778.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958779.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958779.jpg new file mode 100644 index 00000000..6c6ce0a5 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958779.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958780.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958780.jpg new file mode 100644 index 00000000..d942c7fc Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958780.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958781.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958781.jpg new file mode 100644 index 00000000..58250a34 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958781.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958782.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958782.jpg new file mode 100644 index 00000000..25dd9864 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958782.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958783.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958783.jpg new file mode 100644 index 00000000..d59303f4 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958783.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958784.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958784.jpg new file mode 100644 index 00000000..bbc61b5f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634534/s_958784.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958742.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958742.jpg new file mode 100644 index 00000000..53c08842 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958742.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958743.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958743.jpg new file mode 100644 index 00000000..d05968cb Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958743.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958744.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958744.jpg new file mode 100644 index 00000000..30aa808d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958744.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958745.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958745.jpg new file mode 100644 index 00000000..77129d05 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958745.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958746.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958746.jpg new file mode 100644 index 00000000..f51fb083 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958746.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958747.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958747.jpg new file mode 100644 index 00000000..b5dcb601 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958747.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958748.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958748.jpg new file mode 100644 index 00000000..32d44ed5 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958748.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958749.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958749.jpg new file mode 100644 index 00000000..e7f95f1c Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958749.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958750.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958750.jpg new file mode 100644 index 00000000..712cfb98 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958750.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958751.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958751.jpg new file mode 100644 index 00000000..d484710f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958751.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958752.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958752.jpg new file mode 100644 index 00000000..f86c066f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958752.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958753.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958753.jpg new file mode 100644 index 00000000..e69a9b54 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958753.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958754.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958754.jpg new file mode 100644 index 00000000..90b97c61 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958754.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958755.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958755.jpg new file mode 100644 index 00000000..75f26e75 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958755.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958756.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958756.jpg new file mode 100644 index 00000000..0dd8a686 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958756.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958757.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958757.jpg new file mode 100644 index 00000000..b9e8f5fb Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958757.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958758.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958758.jpg new file mode 100644 index 00000000..95ae8d5f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958758.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958759.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958759.jpg new file mode 100644 index 00000000..bfe24ec0 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958759.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958760.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958760.jpg new file mode 100644 index 00000000..58392432 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958760.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958761.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958761.jpg new file mode 100644 index 00000000..f126c399 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958761.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958762.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958762.jpg new file mode 100644 index 00000000..26802021 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958762.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958763.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958763.jpg new file mode 100644 index 00000000..fa720e5f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958763.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958764.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958764.jpg new file mode 100644 index 00000000..cd98ad7f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958764.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958765.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958765.jpg new file mode 100644 index 00000000..f1572857 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958765.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958766.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958766.jpg new file mode 100644 index 00000000..bdf434ca Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958766.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958767.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958767.jpg new file mode 100644 index 00000000..04f008bf Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958767.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958768.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958768.jpg new file mode 100644 index 00000000..39213176 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958768.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958769.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958769.jpg new file mode 100644 index 00000000..adfa954b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958769.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958770.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958770.jpg new file mode 100644 index 00000000..2cb064e6 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958770.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958771.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958771.jpg new file mode 100644 index 00000000..056d6660 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958771.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958772.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958772.jpg new file mode 100644 index 00000000..3da43afb Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958772.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958773.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958773.jpg new file mode 100644 index 00000000..a16ecfe6 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958773.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958774.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958774.jpg new file mode 100644 index 00000000..50d90ae6 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958774.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958775.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958775.jpg new file mode 100644 index 00000000..6f226e88 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958775.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958776.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958776.jpg new file mode 100644 index 00000000..c46a0532 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958776.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958777.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958777.jpg new file mode 100644 index 00000000..deb2f1f2 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958777.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958778.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958778.jpg new file mode 100644 index 00000000..216ca60e Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958778.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958779.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958779.jpg new file mode 100644 index 00000000..d7566f69 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958779.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958780.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958780.jpg new file mode 100644 index 00000000..376a2cb8 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958780.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958781.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958781.jpg new file mode 100644 index 00000000..a0ff0731 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958781.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958782.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958782.jpg new file mode 100644 index 00000000..29d572f4 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958782.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958783.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958783.jpg new file mode 100644 index 00000000..8a665022 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958783.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958784.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958784.jpg new file mode 100644 index 00000000..b3e9b9b4 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634535/s_958784.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958742.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958742.jpg new file mode 100644 index 00000000..fa197ce5 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958742.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958743.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958743.jpg new file mode 100644 index 00000000..635b32bc Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958743.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958744.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958744.jpg new file mode 100644 index 00000000..e4285fd8 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958744.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958745.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958745.jpg new file mode 100644 index 00000000..db0914e2 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958745.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958746.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958746.jpg new file mode 100644 index 00000000..ec575d00 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958746.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958747.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958747.jpg new file mode 100644 index 00000000..d359a9e1 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958747.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958748.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958748.jpg new file mode 100644 index 00000000..0695bcc3 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958748.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958749.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958749.jpg new file mode 100644 index 00000000..98fec2ec Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958749.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958750.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958750.jpg new file mode 100644 index 00000000..4011df05 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958750.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958751.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958751.jpg new file mode 100644 index 00000000..31f3152e Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958751.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958752.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958752.jpg new file mode 100644 index 00000000..57affbfc Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958752.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958753.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958753.jpg new file mode 100644 index 00000000..d56c1819 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958753.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958754.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958754.jpg new file mode 100644 index 00000000..5f1c2a1b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958754.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958755.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958755.jpg new file mode 100644 index 00000000..f6cd98c5 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958755.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958756.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958756.jpg new file mode 100644 index 00000000..9e037fa6 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958756.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958757.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958757.jpg new file mode 100644 index 00000000..cead35d2 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958757.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958758.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958758.jpg new file mode 100644 index 00000000..226bc37f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958758.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958759.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958759.jpg new file mode 100644 index 00000000..03b045d4 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958759.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958760.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958760.jpg new file mode 100644 index 00000000..057ec63f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958760.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958761.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958761.jpg new file mode 100644 index 00000000..351e2dd1 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958761.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958762.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958762.jpg new file mode 100644 index 00000000..a1b7e837 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958762.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958763.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958763.jpg new file mode 100644 index 00000000..26dab77e Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958763.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958764.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958764.jpg new file mode 100644 index 00000000..03c7f4a4 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958764.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958765.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958765.jpg new file mode 100644 index 00000000..43d7be8e Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958765.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958766.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958766.jpg new file mode 100644 index 00000000..35be6cec Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958766.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958767.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958767.jpg new file mode 100644 index 00000000..5da7aeac Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958767.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958768.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958768.jpg new file mode 100644 index 00000000..87b6cf21 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958768.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958769.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958769.jpg new file mode 100644 index 00000000..4bc5c39b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958769.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958770.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958770.jpg new file mode 100644 index 00000000..0fddffbe Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958770.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958771.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958771.jpg new file mode 100644 index 00000000..a2936ee3 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958771.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958772.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958772.jpg new file mode 100644 index 00000000..813dd9fe Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958772.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958773.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958773.jpg new file mode 100644 index 00000000..bf946f23 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958773.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958774.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958774.jpg new file mode 100644 index 00000000..0bd7c6fc Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958774.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958775.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958775.jpg new file mode 100644 index 00000000..70de4b41 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958775.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958776.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958776.jpg new file mode 100644 index 00000000..c0ba22f5 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958776.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958777.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958777.jpg new file mode 100644 index 00000000..bdb3a414 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958777.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958778.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958778.jpg new file mode 100644 index 00000000..147db70c Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958778.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958779.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958779.jpg new file mode 100644 index 00000000..95b219c1 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958779.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958780.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958780.jpg new file mode 100644 index 00000000..f1413342 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958780.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958781.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958781.jpg new file mode 100644 index 00000000..58ce3f8e Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958781.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958782.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958782.jpg new file mode 100644 index 00000000..5e9e30dc Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958782.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958783.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958783.jpg new file mode 100644 index 00000000..6377eecc Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958783.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958784.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958784.jpg new file mode 100644 index 00000000..206e2e99 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634536/s_958784.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958742.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958742.jpg new file mode 100644 index 00000000..ed8518ba Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958742.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958743.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958743.jpg new file mode 100644 index 00000000..bd9084b3 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958743.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958744.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958744.jpg new file mode 100644 index 00000000..2a9c656d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958744.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958745.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958745.jpg new file mode 100644 index 00000000..eab2dc09 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958745.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958746.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958746.jpg new file mode 100644 index 00000000..9547e660 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958746.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958747.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958747.jpg new file mode 100644 index 00000000..18ec2a8e Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958747.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958748.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958748.jpg new file mode 100644 index 00000000..e6f7491f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958748.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958749.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958749.jpg new file mode 100644 index 00000000..ea990fe4 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958749.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958750.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958750.jpg new file mode 100644 index 00000000..5958cc23 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958750.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958751.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958751.jpg new file mode 100644 index 00000000..261f4b7f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958751.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958752.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958752.jpg new file mode 100644 index 00000000..6d5b4842 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958752.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958753.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958753.jpg new file mode 100644 index 00000000..ee815ba3 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958753.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958754.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958754.jpg new file mode 100644 index 00000000..2511ade4 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958754.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958755.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958755.jpg new file mode 100644 index 00000000..6d340be7 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958755.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958756.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958756.jpg new file mode 100644 index 00000000..d4d9750d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958756.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958757.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958757.jpg new file mode 100644 index 00000000..d026c6c7 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958757.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958758.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958758.jpg new file mode 100644 index 00000000..4e5dce83 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958758.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958759.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958759.jpg new file mode 100644 index 00000000..cbcc18d5 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958759.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958760.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958760.jpg new file mode 100644 index 00000000..d5ada33a Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958760.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958761.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958761.jpg new file mode 100644 index 00000000..23cbf049 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958761.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958762.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958762.jpg new file mode 100644 index 00000000..d3bdc290 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958762.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958763.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958763.jpg new file mode 100644 index 00000000..69c20647 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958763.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958764.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958764.jpg new file mode 100644 index 00000000..17c15f47 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958764.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958765.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958765.jpg new file mode 100644 index 00000000..da4a1d16 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958765.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958766.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958766.jpg new file mode 100644 index 00000000..de5b1fed Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958766.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958767.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958767.jpg new file mode 100644 index 00000000..21636118 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958767.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958768.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958768.jpg new file mode 100644 index 00000000..9dc35ffd Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958768.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958769.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958769.jpg new file mode 100644 index 00000000..15bc7386 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958769.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958770.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958770.jpg new file mode 100644 index 00000000..ef4b7918 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958770.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958771.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958771.jpg new file mode 100644 index 00000000..069e3dc2 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958771.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958772.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958772.jpg new file mode 100644 index 00000000..8dd68eb0 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958772.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958773.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958773.jpg new file mode 100644 index 00000000..f2e2b7dc Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958773.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958774.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958774.jpg new file mode 100644 index 00000000..e72dc279 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958774.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958775.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958775.jpg new file mode 100644 index 00000000..31694add Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958775.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958776.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958776.jpg new file mode 100644 index 00000000..9a81a178 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958776.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958777.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958777.jpg new file mode 100644 index 00000000..b9f12824 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958777.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958778.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958778.jpg new file mode 100644 index 00000000..213c28cd Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958778.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958779.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958779.jpg new file mode 100644 index 00000000..c103c70b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958779.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958780.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958780.jpg new file mode 100644 index 00000000..b771c1f3 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958780.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958781.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958781.jpg new file mode 100644 index 00000000..e983bac4 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958781.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958782.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958782.jpg new file mode 100644 index 00000000..b10b08b2 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958782.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958783.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958783.jpg new file mode 100644 index 00000000..08fadc0e Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958783.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958784.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958784.jpg new file mode 100644 index 00000000..bb1acc93 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634537/s_958784.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958742.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958742.jpg new file mode 100644 index 00000000..874f469f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958742.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958743.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958743.jpg new file mode 100644 index 00000000..49db851c Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958743.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958744.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958744.jpg new file mode 100644 index 00000000..e17b870a Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958744.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958745.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958745.jpg new file mode 100644 index 00000000..2ee3c14d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958745.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958746.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958746.jpg new file mode 100644 index 00000000..e93f79fd Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958746.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958747.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958747.jpg new file mode 100644 index 00000000..34cd9166 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958747.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958748.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958748.jpg new file mode 100644 index 00000000..1b5cda06 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958748.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958749.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958749.jpg new file mode 100644 index 00000000..551e896b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958749.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958750.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958750.jpg new file mode 100644 index 00000000..d25205ed Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958750.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958751.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958751.jpg new file mode 100644 index 00000000..a3930a7b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958751.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958752.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958752.jpg new file mode 100644 index 00000000..a89ce9c9 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958752.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958753.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958753.jpg new file mode 100644 index 00000000..c0f952db Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958753.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958754.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958754.jpg new file mode 100644 index 00000000..41fc968e Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958754.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958755.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958755.jpg new file mode 100644 index 00000000..431fd76d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958755.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958756.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958756.jpg new file mode 100644 index 00000000..aa531294 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958756.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958757.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958757.jpg new file mode 100644 index 00000000..1d2fc454 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958757.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958758.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958758.jpg new file mode 100644 index 00000000..dc0ac1cd Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958758.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958759.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958759.jpg new file mode 100644 index 00000000..12224dfa Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958759.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958760.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958760.jpg new file mode 100644 index 00000000..13f0f273 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958760.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958761.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958761.jpg new file mode 100644 index 00000000..ed6010ed Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958761.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958762.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958762.jpg new file mode 100644 index 00000000..1ef51756 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958762.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958763.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958763.jpg new file mode 100644 index 00000000..e6cd087f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958763.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958764.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958764.jpg new file mode 100644 index 00000000..b8d1be43 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958764.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958765.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958765.jpg new file mode 100644 index 00000000..31da6b3e Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958765.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958766.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958766.jpg new file mode 100644 index 00000000..1ef2ad28 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958766.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958767.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958767.jpg new file mode 100644 index 00000000..cb87769b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958767.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958768.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958768.jpg new file mode 100644 index 00000000..5e64942e Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958768.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958769.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958769.jpg new file mode 100644 index 00000000..96f89a8a Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958769.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958770.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958770.jpg new file mode 100644 index 00000000..c487afa6 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958770.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958771.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958771.jpg new file mode 100644 index 00000000..1a24d031 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958771.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958772.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958772.jpg new file mode 100644 index 00000000..6985f2c7 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958772.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958773.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958773.jpg new file mode 100644 index 00000000..aeba7e53 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958773.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958774.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958774.jpg new file mode 100644 index 00000000..a061426c Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958774.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958775.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958775.jpg new file mode 100644 index 00000000..8838c3a8 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958775.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958776.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958776.jpg new file mode 100644 index 00000000..b13a9bfb Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958776.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958777.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958777.jpg new file mode 100644 index 00000000..fd7f5ea2 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958777.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958778.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958778.jpg new file mode 100644 index 00000000..1f1c5987 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958778.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958779.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958779.jpg new file mode 100644 index 00000000..86f55b60 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958779.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958780.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958780.jpg new file mode 100644 index 00000000..00f4dc97 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958780.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958781.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958781.jpg new file mode 100644 index 00000000..948c5d2d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958781.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958782.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958782.jpg new file mode 100644 index 00000000..6b032284 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958782.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958783.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958783.jpg new file mode 100644 index 00000000..c2a23da1 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958783.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958784.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958784.jpg new file mode 100644 index 00000000..12719507 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634538/s_958784.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958742.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958742.jpg new file mode 100644 index 00000000..8d740119 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958742.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958743.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958743.jpg new file mode 100644 index 00000000..8fca5649 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958743.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958744.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958744.jpg new file mode 100644 index 00000000..73924e38 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958744.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958745.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958745.jpg new file mode 100644 index 00000000..c31d28b7 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958745.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958746.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958746.jpg new file mode 100644 index 00000000..29ad7334 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958746.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958747.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958747.jpg new file mode 100644 index 00000000..b5ff159d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958747.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958748.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958748.jpg new file mode 100644 index 00000000..28c2ba96 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958748.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958749.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958749.jpg new file mode 100644 index 00000000..3eab6e32 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958749.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958750.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958750.jpg new file mode 100644 index 00000000..80dc8f82 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958750.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958751.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958751.jpg new file mode 100644 index 00000000..49748837 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958751.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958752.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958752.jpg new file mode 100644 index 00000000..ae4dd659 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958752.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958753.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958753.jpg new file mode 100644 index 00000000..2652f984 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958753.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958754.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958754.jpg new file mode 100644 index 00000000..4283baf4 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958754.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958755.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958755.jpg new file mode 100644 index 00000000..7c8cb0a8 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958755.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958756.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958756.jpg new file mode 100644 index 00000000..5d7c267c Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958756.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958757.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958757.jpg new file mode 100644 index 00000000..3857f554 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958757.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958758.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958758.jpg new file mode 100644 index 00000000..57a1d649 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958758.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958759.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958759.jpg new file mode 100644 index 00000000..48c0237f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958759.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958760.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958760.jpg new file mode 100644 index 00000000..2f906803 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958760.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958761.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958761.jpg new file mode 100644 index 00000000..990df032 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958761.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958762.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958762.jpg new file mode 100644 index 00000000..9e5643cf Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958762.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958763.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958763.jpg new file mode 100644 index 00000000..ac7b6203 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958763.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958764.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958764.jpg new file mode 100644 index 00000000..b8c68f01 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958764.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958765.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958765.jpg new file mode 100644 index 00000000..bec73882 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958765.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958766.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958766.jpg new file mode 100644 index 00000000..14e51069 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958766.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958767.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958767.jpg new file mode 100644 index 00000000..0551d3ae Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958767.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958768.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958768.jpg new file mode 100644 index 00000000..7cbf2d49 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958768.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958769.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958769.jpg new file mode 100644 index 00000000..dea02288 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958769.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958770.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958770.jpg new file mode 100644 index 00000000..a5d2ff12 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958770.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958771.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958771.jpg new file mode 100644 index 00000000..60a61a7f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958771.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958772.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958772.jpg new file mode 100644 index 00000000..5b104f9d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958772.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958773.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958773.jpg new file mode 100644 index 00000000..d0d3e4d0 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958773.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958774.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958774.jpg new file mode 100644 index 00000000..0411b681 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958774.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958775.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958775.jpg new file mode 100644 index 00000000..68999bbf Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958775.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958776.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958776.jpg new file mode 100644 index 00000000..5d9b814d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958776.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958777.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958777.jpg new file mode 100644 index 00000000..b50364e2 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958777.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958778.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958778.jpg new file mode 100644 index 00000000..ff0d20e9 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958778.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958779.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958779.jpg new file mode 100644 index 00000000..debfc877 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958779.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958780.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958780.jpg new file mode 100644 index 00000000..7154c041 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958780.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958781.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958781.jpg new file mode 100644 index 00000000..ab0e0dc5 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958781.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958782.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958782.jpg new file mode 100644 index 00000000..d2803222 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958782.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958783.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958783.jpg new file mode 100644 index 00000000..5ef6715a Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958783.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958784.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958784.jpg new file mode 100644 index 00000000..a99ebac9 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634539/s_958784.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958742.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958742.jpg new file mode 100644 index 00000000..a182b922 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958742.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958743.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958743.jpg new file mode 100644 index 00000000..27aab716 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958743.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958744.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958744.jpg new file mode 100644 index 00000000..68caa386 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958744.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958745.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958745.jpg new file mode 100644 index 00000000..2e862dea Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958745.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958746.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958746.jpg new file mode 100644 index 00000000..776e94ab Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958746.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958747.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958747.jpg new file mode 100644 index 00000000..5bd8ed2a Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958747.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958748.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958748.jpg new file mode 100644 index 00000000..de6570db Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958748.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958749.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958749.jpg new file mode 100644 index 00000000..882231b6 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958749.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958750.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958750.jpg new file mode 100644 index 00000000..9cb6b0cb Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958750.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958751.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958751.jpg new file mode 100644 index 00000000..87a520a0 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958751.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958752.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958752.jpg new file mode 100644 index 00000000..4fc8c32a Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958752.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958753.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958753.jpg new file mode 100644 index 00000000..4e5409c8 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958753.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958754.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958754.jpg new file mode 100644 index 00000000..0f065cfc Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958754.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958755.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958755.jpg new file mode 100644 index 00000000..6abb6e75 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958755.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958756.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958756.jpg new file mode 100644 index 00000000..df16bbb6 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958756.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958757.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958757.jpg new file mode 100644 index 00000000..72336fda Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958757.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958758.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958758.jpg new file mode 100644 index 00000000..f9adb373 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958758.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958759.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958759.jpg new file mode 100644 index 00000000..b88f7bf9 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958759.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958760.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958760.jpg new file mode 100644 index 00000000..111759ce Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958760.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958761.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958761.jpg new file mode 100644 index 00000000..1588992a Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958761.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958762.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958762.jpg new file mode 100644 index 00000000..43cb0b3e Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958762.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958763.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958763.jpg new file mode 100644 index 00000000..ca65fa2e Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958763.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958764.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958764.jpg new file mode 100644 index 00000000..b3fc71a5 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958764.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958765.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958765.jpg new file mode 100644 index 00000000..b0aa031f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958765.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958766.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958766.jpg new file mode 100644 index 00000000..ad7fb295 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958766.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958767.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958767.jpg new file mode 100644 index 00000000..8e64d829 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958767.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958768.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958768.jpg new file mode 100644 index 00000000..1d254e34 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958768.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958769.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958769.jpg new file mode 100644 index 00000000..023b425c Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958769.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958770.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958770.jpg new file mode 100644 index 00000000..41a615cb Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958770.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958771.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958771.jpg new file mode 100644 index 00000000..d4c27655 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958771.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958772.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958772.jpg new file mode 100644 index 00000000..3d20ea5c Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958772.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958773.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958773.jpg new file mode 100644 index 00000000..f77d6510 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958773.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958774.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958774.jpg new file mode 100644 index 00000000..c09fc3af Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958774.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958775.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958775.jpg new file mode 100644 index 00000000..afbc4a28 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958775.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958776.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958776.jpg new file mode 100644 index 00000000..020666ae Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958776.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958777.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958777.jpg new file mode 100644 index 00000000..7e200a31 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958777.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958778.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958778.jpg new file mode 100644 index 00000000..e7030b67 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958778.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958779.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958779.jpg new file mode 100644 index 00000000..abc7cb0f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958779.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958780.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958780.jpg new file mode 100644 index 00000000..19bd3cbc Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958780.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958781.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958781.jpg new file mode 100644 index 00000000..b51067be Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958781.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958782.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958782.jpg new file mode 100644 index 00000000..6e712518 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958782.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958783.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958783.jpg new file mode 100644 index 00000000..9029f6a4 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958783.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958784.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958784.jpg new file mode 100644 index 00000000..db560ea5 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/20/634540/s_958784.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/3/4/s_7.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/3/4/s_7.jpg new file mode 100644 index 00000000..31ad6b22 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/3/4/s_7.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/4/9/s_14.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/4/9/s_14.jpg new file mode 100644 index 00000000..60bca742 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/4/9/s_14.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/5/19/s_29.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/5/19/s_29.jpg new file mode 100644 index 00000000..54934076 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/5/19/s_29.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/6/38/s_58.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/6/38/s_58.jpg new file mode 100644 index 00000000..a2aaca5b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/6/38/s_58.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/7/77/s_117.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/7/77/s_117.jpg new file mode 100644 index 00000000..b4406cfc Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/7/77/s_117.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/8/154/s_234.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/8/154/s_234.jpg new file mode 100644 index 00000000..86bfcfef Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/8/154/s_234.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/9/309/s_468.jpg b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/9/309/s_468.jpg new file mode 100644 index 00000000..17dc16e7 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/GoogleSatelliteMap/9/309/s_468.jpg differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/mktiles.cmd b/HORUS/SD/SCRIPTS/YAAPU/MAPS/mktiles.cmd deleted file mode 100644 index a4d46a9f..00000000 --- a/HORUS/SD/SCRIPTS/YAAPU/MAPS/mktiles.cmd +++ /dev/null @@ -1,26 +0,0 @@ -@echo off -set MAGICK="%ProgramFiles%\ImageMagick-7.0.8-Q16\magick.exe" -set MAGICK_OPTS=-resize 100x100 -posterize 35 -define png:compression-filter=5 -define png:compression-level=9 -define png:compression-strategy=1 -define png:exclude-chunk=all -interlace none -colorspace sRGB -strip -if not exist %MAGICK% ( - echo: - echo ERROR: Cannot find ImageMagick at path: %MAGICK% - goto end -) -set /A COUNTER=0 -set /A SCOUNTER=0 -for /R %%I in (*.png) do ( - echo %%~nxI | findstr /b /r "[0-9]*\.png" >nul 2>&1 - if errorlevel 1 ( - echo skipping %%I - set /A SCOUNTER=SCOUNTER+1 - ) else ( - echo processing %%I - %MAGICK% convert "%%I" %MAGICK_OPTS% "%%~dI%%~pIs_%%~nxI" - del /q "%%I" - set /A COUNTER=COUNTER+1 - ) -) -echo: -echo DONE: %COUNTER% images resized, %SCOUNTER% skipped -:end -pause \ No newline at end of file diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/67/154/s_928.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/67/154/s_928.png new file mode 100644 index 00000000..44894d67 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/67/154/s_928.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/67/154/s_929.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/67/154/s_929.png new file mode 100644 index 00000000..ad80fa7f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/67/154/s_929.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/67/154/s_930.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/67/154/s_930.png new file mode 100644 index 00000000..2078dd25 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/67/154/s_930.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/67/154/s_931.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/67/154/s_931.png index a3db75be..f52d4fe8 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/67/154/s_931.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/67/154/s_931.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/67/154/s_932.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/67/154/s_932.png index a7c77445..88b194f5 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/67/154/s_932.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/67/154/s_932.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/67/154/s_933.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/67/154/s_933.png index 92870c25..7099c057 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/67/154/s_933.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/67/154/s_933.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/67/154/s_934.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/67/154/s_934.png index b95496a3..40c9e7ea 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/67/154/s_934.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/67/154/s_934.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/67/154/s_935.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/67/154/s_935.png index 320b97aa..f70ff88a 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/67/154/s_935.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/67/154/s_935.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/67/154/s_936.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/67/154/s_936.png index d7164c6d..1592196c 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/67/154/s_936.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/67/154/s_936.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/67/154/s_937.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/67/154/s_937.png index 0fb0876f..d1714214 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/67/154/s_937.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/67/154/s_937.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/67/154/s_938.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/67/154/s_938.png index 18feb5cb..0a2323bc 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/67/154/s_938.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/67/154/s_938.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/67/154/s_939.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/67/154/s_939.png index 0b70614a..7343b084 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/67/154/s_939.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/67/154/s_939.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/67/154/s_940.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/67/154/s_940.png index d4a24b12..4072d771 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/67/154/s_940.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/67/154/s_940.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/67/154/s_941.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/67/154/s_941.png index cbb22e62..21a649a3 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/67/154/s_941.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/67/154/s_941.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/67/154/s_942.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/67/154/s_942.png new file mode 100644 index 00000000..b7ecd1fb Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/67/154/s_942.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/67/154/s_943.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/67/154/s_943.png new file mode 100644 index 00000000..d63a2482 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/67/154/s_943.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/67/154/s_944.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/67/154/s_944.png new file mode 100644 index 00000000..1d027e5c Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/67/154/s_944.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/68/154/s_928.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/68/154/s_928.png new file mode 100644 index 00000000..07c8052e Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/68/154/s_928.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/68/154/s_929.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/68/154/s_929.png new file mode 100644 index 00000000..013ceb34 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/68/154/s_929.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/68/154/s_930.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/68/154/s_930.png new file mode 100644 index 00000000..51680163 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/68/154/s_930.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/68/154/s_931.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/68/154/s_931.png index f5bc6288..cf9c7249 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/68/154/s_931.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/68/154/s_931.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/68/154/s_932.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/68/154/s_932.png index 1c842b56..e5f8948c 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/68/154/s_932.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/68/154/s_932.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/68/154/s_933.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/68/154/s_933.png index 3105cf4c..680c42a1 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/68/154/s_933.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/68/154/s_933.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/68/154/s_934.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/68/154/s_934.png index 28a93002..cf788b23 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/68/154/s_934.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/68/154/s_934.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/68/154/s_935.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/68/154/s_935.png index a25be725..875d3567 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/68/154/s_935.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/68/154/s_935.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/68/154/s_936.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/68/154/s_936.png index f0d37fab..462ea9f5 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/68/154/s_936.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/68/154/s_936.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/68/154/s_937.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/68/154/s_937.png index 904deb80..39e09ced 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/68/154/s_937.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/68/154/s_937.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/68/154/s_938.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/68/154/s_938.png index 918166da..dc4dfbd1 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/68/154/s_938.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/68/154/s_938.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/68/154/s_939.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/68/154/s_939.png index 9af370ed..71a11809 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/68/154/s_939.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/68/154/s_939.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/68/154/s_940.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/68/154/s_940.png index 3d9e7ea1..3ef35880 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/68/154/s_940.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/68/154/s_940.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/68/154/s_941.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/68/154/s_941.png index caff2065..89aa3076 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/68/154/s_941.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/68/154/s_941.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/68/154/s_942.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/68/154/s_942.png new file mode 100644 index 00000000..19cb1810 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/68/154/s_942.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/68/154/s_943.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/68/154/s_943.png new file mode 100644 index 00000000..1e48bae0 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/68/154/s_943.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/68/154/s_944.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/68/154/s_944.png new file mode 100644 index 00000000..dac76fa8 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/68/154/s_944.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/69/154/s_928.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/69/154/s_928.png new file mode 100644 index 00000000..31958641 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/69/154/s_928.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/69/154/s_929.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/69/154/s_929.png new file mode 100644 index 00000000..f119922c Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/69/154/s_929.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/69/154/s_930.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/69/154/s_930.png new file mode 100644 index 00000000..42a2c383 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/69/154/s_930.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/69/154/s_931.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/69/154/s_931.png index 59dd4e71..835b791f 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/69/154/s_931.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/69/154/s_931.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/69/154/s_932.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/69/154/s_932.png index 380f54f1..61ef2fad 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/69/154/s_932.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/69/154/s_932.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/69/154/s_933.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/69/154/s_933.png index 77a66f1f..cd9ccd52 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/69/154/s_933.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/69/154/s_933.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/69/154/s_934.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/69/154/s_934.png index 6a1ad3fe..8b5c8292 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/69/154/s_934.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/69/154/s_934.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/69/154/s_935.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/69/154/s_935.png index d38ada5e..5eb1301d 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/69/154/s_935.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/69/154/s_935.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/69/154/s_936.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/69/154/s_936.png index 68e6a2eb..d04b0d06 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/69/154/s_936.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/69/154/s_936.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/69/154/s_937.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/69/154/s_937.png index 59fcbfee..31fe1c80 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/69/154/s_937.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/69/154/s_937.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/69/154/s_938.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/69/154/s_938.png index dd318841..bf37642b 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/69/154/s_938.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/69/154/s_938.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/69/154/s_939.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/69/154/s_939.png index b1d29ce9..63a23c28 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/69/154/s_939.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/69/154/s_939.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/69/154/s_940.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/69/154/s_940.png index 072b9802..0fa83ac3 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/69/154/s_940.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/69/154/s_940.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/69/154/s_941.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/69/154/s_941.png index fb13d183..452c5840 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/69/154/s_941.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/69/154/s_941.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/69/154/s_942.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/69/154/s_942.png new file mode 100644 index 00000000..087cbf91 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/69/154/s_942.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/69/154/s_943.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/69/154/s_943.png new file mode 100644 index 00000000..7fcc5c0d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/69/154/s_943.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/69/154/s_944.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/69/154/s_944.png new file mode 100644 index 00000000..77505cf5 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/69/154/s_944.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/70/154/s_928.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/70/154/s_928.png new file mode 100644 index 00000000..b699a8f3 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/70/154/s_928.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/70/154/s_929.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/70/154/s_929.png new file mode 100644 index 00000000..935eb15a Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/70/154/s_929.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/70/154/s_930.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/70/154/s_930.png new file mode 100644 index 00000000..4d15ab96 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/70/154/s_930.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/70/154/s_931.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/70/154/s_931.png index e82564bd..e2e7adce 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/70/154/s_931.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/70/154/s_931.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/70/154/s_932.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/70/154/s_932.png index 2feaf2de..24a220ba 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/70/154/s_932.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/70/154/s_932.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/70/154/s_933.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/70/154/s_933.png index 2c0b2c7a..d75d34cb 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/70/154/s_933.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/70/154/s_933.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/70/154/s_934.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/70/154/s_934.png index c9589c52..f9cfdbea 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/70/154/s_934.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/70/154/s_934.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/70/154/s_935.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/70/154/s_935.png index 8264d294..88902bde 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/70/154/s_935.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/70/154/s_935.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/70/154/s_936.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/70/154/s_936.png index 16222ec9..253f335d 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/70/154/s_936.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/70/154/s_936.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/70/154/s_937.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/70/154/s_937.png index 27cd4ce5..1e5c45c1 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/70/154/s_937.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/70/154/s_937.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/70/154/s_938.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/70/154/s_938.png index 8bc10bf0..0dce5e02 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/70/154/s_938.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/70/154/s_938.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/70/154/s_939.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/70/154/s_939.png index 3f5301ea..1e181949 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/70/154/s_939.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/70/154/s_939.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/70/154/s_940.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/70/154/s_940.png index f5c9a23c..6cd38357 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/70/154/s_940.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/70/154/s_940.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/70/154/s_941.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/70/154/s_941.png index 68165304..56de6095 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/70/154/s_941.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/70/154/s_941.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/70/154/s_942.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/70/154/s_942.png new file mode 100644 index 00000000..24cbe6da Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/70/154/s_942.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/70/154/s_943.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/70/154/s_943.png new file mode 100644 index 00000000..e4d152cb Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/70/154/s_943.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/70/154/s_944.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/70/154/s_944.png new file mode 100644 index 00000000..71274ac7 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/70/154/s_944.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_928.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_928.png new file mode 100644 index 00000000..718ffcb7 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_928.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_929.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_929.png new file mode 100644 index 00000000..fa5e48ea Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_929.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_930.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_930.png new file mode 100644 index 00000000..7121b27f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_930.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_931.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_931.png index ab5d7fa1..26b548c3 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_931.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_931.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_932.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_932.png index c85403a6..c651dd5f 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_932.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_932.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_933.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_933.png index 0ccb3351..262c9d3b 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_933.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_933.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_933_0.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_933_0.png new file mode 100644 index 00000000..85bf762a Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_933_0.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_933_1.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_933_1.png new file mode 100644 index 00000000..6fe22bca Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_933_1.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_933_2.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_933_2.png new file mode 100644 index 00000000..dd58aa15 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_933_2.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_933_3.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_933_3.png new file mode 100644 index 00000000..d29bc0bd Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_933_3.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_934.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_934.png index 85ac97dc..3926bf64 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_934.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_934.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_934_0.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_934_0.png new file mode 100644 index 00000000..c495c8a7 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_934_0.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_934_1.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_934_1.png new file mode 100644 index 00000000..c0efc108 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_934_1.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_934_2.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_934_2.png new file mode 100644 index 00000000..6882b08b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_934_2.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_934_3.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_934_3.png new file mode 100644 index 00000000..fffb0175 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_934_3.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_935.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_935.png index 26db21ca..d31396bd 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_935.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_935.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_935_0.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_935_0.png new file mode 100644 index 00000000..fc277cb9 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_935_0.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_935_1.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_935_1.png new file mode 100644 index 00000000..63376b7b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_935_1.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_935_2.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_935_2.png new file mode 100644 index 00000000..44c6c313 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_935_2.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_935_3.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_935_3.png new file mode 100644 index 00000000..54116315 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_935_3.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_936.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_936.png index 22ecf88f..43b3b5f3 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_936.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_936.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_936_0.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_936_0.png new file mode 100644 index 00000000..8d302c0a Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_936_0.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_936_1.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_936_1.png new file mode 100644 index 00000000..9d99c4aa Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_936_1.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_936_2.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_936_2.png new file mode 100644 index 00000000..d6e8b19b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_936_2.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_936_3.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_936_3.png new file mode 100644 index 00000000..d7a680c1 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_936_3.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_937.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_937.png index d6218d99..0353e396 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_937.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_937.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_937_0.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_937_0.png new file mode 100644 index 00000000..6f6f07a6 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_937_0.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_937_1.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_937_1.png new file mode 100644 index 00000000..6630fba2 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_937_1.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_937_2.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_937_2.png new file mode 100644 index 00000000..04f8eb32 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_937_2.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_937_3.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_937_3.png new file mode 100644 index 00000000..f23d143d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_937_3.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_938.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_938.png index add2054a..4d488093 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_938.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_938.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_938_0.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_938_0.png new file mode 100644 index 00000000..e76d073b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_938_0.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_938_1.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_938_1.png new file mode 100644 index 00000000..005f2f76 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_938_1.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_938_2.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_938_2.png new file mode 100644 index 00000000..7c443a71 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_938_2.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_938_3.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_938_3.png new file mode 100644 index 00000000..fa55771e Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_938_3.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_939.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_939.png index 32f57f43..cefd2991 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_939.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_939.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_940.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_940.png index dfdfcd3f..d566e40f 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_940.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_940.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_941.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_941.png index 36b9728e..53e7be69 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_941.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_941.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_942.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_942.png new file mode 100644 index 00000000..51125412 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_942.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_943.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_943.png new file mode 100644 index 00000000..57850baf Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_943.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_944.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_944.png new file mode 100644 index 00000000..47fa92c8 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/71/154/s_944.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_928.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_928.png new file mode 100644 index 00000000..2d3256ae Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_928.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_929.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_929.png new file mode 100644 index 00000000..2a7ffb0c Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_929.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_930.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_930.png new file mode 100644 index 00000000..ac0aface Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_930.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_931.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_931.png index 95e07f8a..55f508cf 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_931.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_931.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_932.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_932.png index f1f454c4..d0f58876 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_932.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_932.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_933.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_933.png index d857df9b..f4edc061 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_933.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_933.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_933_0.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_933_0.png new file mode 100644 index 00000000..222786e7 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_933_0.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_933_1.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_933_1.png new file mode 100644 index 00000000..4942d757 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_933_1.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_933_2.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_933_2.png new file mode 100644 index 00000000..62e3ab8e Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_933_2.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_933_3.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_933_3.png new file mode 100644 index 00000000..a228dfdc Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_933_3.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_934.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_934.png index f90ee3bf..160f8c62 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_934.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_934.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_934_0.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_934_0.png new file mode 100644 index 00000000..29dbc4d5 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_934_0.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_934_1.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_934_1.png new file mode 100644 index 00000000..fc630bdc Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_934_1.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_934_2.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_934_2.png new file mode 100644 index 00000000..a7b63ce0 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_934_2.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_934_3.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_934_3.png new file mode 100644 index 00000000..56aae697 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_934_3.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_935.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_935.png index f27af888..50b20cf2 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_935.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_935.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_935_0.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_935_0.png new file mode 100644 index 00000000..df183fe0 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_935_0.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_935_1.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_935_1.png new file mode 100644 index 00000000..e1ba21f5 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_935_1.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_935_2.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_935_2.png new file mode 100644 index 00000000..bc1f5536 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_935_2.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_935_3.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_935_3.png new file mode 100644 index 00000000..5fabf6b2 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_935_3.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_936.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_936.png index 3cf29086..6211fb51 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_936.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_936.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_936_0.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_936_0.png new file mode 100644 index 00000000..2652e61a Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_936_0.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_936_1.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_936_1.png new file mode 100644 index 00000000..123026fc Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_936_1.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_936_2.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_936_2.png new file mode 100644 index 00000000..00b23e25 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_936_2.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_936_3.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_936_3.png new file mode 100644 index 00000000..c9a7993b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_936_3.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_937.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_937.png index 9047a57a..fef4f5ce 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_937.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_937.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_937_0.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_937_0.png new file mode 100644 index 00000000..fcfc9053 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_937_0.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_937_1.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_937_1.png new file mode 100644 index 00000000..f0bcfb81 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_937_1.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_937_2.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_937_2.png new file mode 100644 index 00000000..acbc4674 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_937_2.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_937_3.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_937_3.png new file mode 100644 index 00000000..70ecc471 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_937_3.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_938.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_938.png index 8bbaa39b..d04810cc 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_938.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_938.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_938_0.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_938_0.png new file mode 100644 index 00000000..d0a4184f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_938_0.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_938_1.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_938_1.png new file mode 100644 index 00000000..6ad33d21 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_938_1.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_938_2.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_938_2.png new file mode 100644 index 00000000..82fe6806 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_938_2.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_938_3.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_938_3.png new file mode 100644 index 00000000..b8b250ee Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_938_3.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_939.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_939.png index 15ecf931..e0c9bb6b 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_939.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_939.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_940.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_940.png index 4eb63041..eb1971ad 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_940.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_940.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_941.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_941.png index b4d695f0..e44688e3 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_941.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_941.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_942.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_942.png new file mode 100644 index 00000000..8eabf7f4 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_942.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_943.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_943.png new file mode 100644 index 00000000..253c5dd1 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_943.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_944.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_944.png new file mode 100644 index 00000000..9f399f0c Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/72/154/s_944.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_928.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_928.png new file mode 100644 index 00000000..ecf2a5ca Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_928.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_929.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_929.png new file mode 100644 index 00000000..7861f0ca Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_929.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_930.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_930.png new file mode 100644 index 00000000..05a094fe Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_930.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_931.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_931.png index b584ea40..7fba220a 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_931.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_931.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_932.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_932.png index 56072079..cc9472a3 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_932.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_932.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_933.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_933.png index 29408603..af7db3b6 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_933.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_933.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_933_0.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_933_0.png new file mode 100644 index 00000000..45017937 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_933_0.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_933_1.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_933_1.png new file mode 100644 index 00000000..55b6d2d0 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_933_1.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_933_2.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_933_2.png new file mode 100644 index 00000000..7d71f24e Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_933_2.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_933_3.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_933_3.png new file mode 100644 index 00000000..35d51aa1 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_933_3.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_934.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_934.png index e77d58b3..90de8a2e 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_934.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_934.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_934_0.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_934_0.png new file mode 100644 index 00000000..5a4ea67a Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_934_0.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_934_1.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_934_1.png new file mode 100644 index 00000000..47e90a08 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_934_1.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_934_2.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_934_2.png new file mode 100644 index 00000000..23422849 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_934_2.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_934_3.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_934_3.png new file mode 100644 index 00000000..042d668f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_934_3.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_935.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_935.png index f37beb98..c109a8ee 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_935.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_935.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_935_0.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_935_0.png new file mode 100644 index 00000000..fe79b965 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_935_0.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_935_1.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_935_1.png new file mode 100644 index 00000000..2bf97d4b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_935_1.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_935_2.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_935_2.png new file mode 100644 index 00000000..2e529bb0 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_935_2.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_935_3.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_935_3.png new file mode 100644 index 00000000..79cc0097 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_935_3.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_936.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_936.png index 7fb6f349..0ed1f16e 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_936.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_936.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_936_0.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_936_0.png new file mode 100644 index 00000000..1a845f5f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_936_0.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_936_1.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_936_1.png new file mode 100644 index 00000000..7eec8e6b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_936_1.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_936_2.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_936_2.png new file mode 100644 index 00000000..4ceb7467 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_936_2.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_936_3.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_936_3.png new file mode 100644 index 00000000..eac36d0e Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_936_3.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_937.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_937.png index 0b6a50f6..3eacf845 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_937.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_937.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_937_0.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_937_0.png new file mode 100644 index 00000000..bc0fe2a9 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_937_0.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_937_1.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_937_1.png new file mode 100644 index 00000000..d02e85b2 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_937_1.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_937_2.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_937_2.png new file mode 100644 index 00000000..cfd41652 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_937_2.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_937_3.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_937_3.png new file mode 100644 index 00000000..9b5d1fc4 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_937_3.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_938.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_938.png index 957fc2e2..bfccfaa3 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_938.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_938.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_938_0.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_938_0.png new file mode 100644 index 00000000..ee8f80f4 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_938_0.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_938_1.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_938_1.png new file mode 100644 index 00000000..1eb413d9 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_938_1.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_938_2.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_938_2.png new file mode 100644 index 00000000..86ece28a Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_938_2.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_938_3.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_938_3.png new file mode 100644 index 00000000..364234c0 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_938_3.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_939.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_939.png index cbb9378b..1db42fe9 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_939.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_939.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_940.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_940.png index 926ffeaa..6b4b59b4 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_940.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_940.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_941.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_941.png index 89aab4ca..977ff5b6 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_941.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_941.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_942.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_942.png new file mode 100644 index 00000000..0458bf79 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_942.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_943.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_943.png new file mode 100644 index 00000000..dbb934ed Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_943.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_944.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_944.png new file mode 100644 index 00000000..48dbb6df Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/73/154/s_944.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_928.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_928.png new file mode 100644 index 00000000..47170d47 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_928.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_929.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_929.png new file mode 100644 index 00000000..63e64a9b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_929.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_930.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_930.png new file mode 100644 index 00000000..c0f7de7e Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_930.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_931.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_931.png index 692b9138..a05ceb31 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_931.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_931.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_932.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_932.png index 121e7656..0417c629 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_932.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_932.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_933.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_933.png index 3422a74c..ffcf0949 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_933.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_933.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_933_0.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_933_0.png new file mode 100644 index 00000000..9e5a4402 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_933_0.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_933_1.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_933_1.png new file mode 100644 index 00000000..35521f3e Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_933_1.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_933_2.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_933_2.png new file mode 100644 index 00000000..e42293d4 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_933_2.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_933_3.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_933_3.png new file mode 100644 index 00000000..71a0dd44 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_933_3.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_934.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_934.png index 585aef22..1f3bf74b 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_934.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_934.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_934_0.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_934_0.png new file mode 100644 index 00000000..e52a46e6 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_934_0.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_934_1.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_934_1.png new file mode 100644 index 00000000..488243a0 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_934_1.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_934_2.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_934_2.png new file mode 100644 index 00000000..633ece4b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_934_2.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_934_3.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_934_3.png new file mode 100644 index 00000000..bc5c7893 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_934_3.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_935.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_935.png index b3223012..7c168196 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_935.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_935.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_935_0.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_935_0.png new file mode 100644 index 00000000..0ba2a942 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_935_0.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_935_1.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_935_1.png new file mode 100644 index 00000000..63eab475 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_935_1.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_935_2.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_935_2.png new file mode 100644 index 00000000..70ec88f7 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_935_2.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_935_3.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_935_3.png new file mode 100644 index 00000000..5e5a1244 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_935_3.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_936.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_936.png index c4c579be..ca53c126 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_936.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_936.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_936_0.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_936_0.png new file mode 100644 index 00000000..7edec87e Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_936_0.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_936_1.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_936_1.png new file mode 100644 index 00000000..43adf08d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_936_1.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_936_2.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_936_2.png new file mode 100644 index 00000000..d48e76bd Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_936_2.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_936_3.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_936_3.png new file mode 100644 index 00000000..f5d0c152 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_936_3.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_937.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_937.png index 4edf7e09..047bee64 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_937.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_937.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_937_0.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_937_0.png new file mode 100644 index 00000000..b5701c0c Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_937_0.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_937_1.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_937_1.png new file mode 100644 index 00000000..b4c6d8d1 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_937_1.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_937_2.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_937_2.png new file mode 100644 index 00000000..9270ba1b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_937_2.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_937_3.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_937_3.png new file mode 100644 index 00000000..23e3c546 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_937_3.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_938.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_938.png index dad85d04..41712e3d 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_938.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_938.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_938_0.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_938_0.png new file mode 100644 index 00000000..bef97a20 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_938_0.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_938_1.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_938_1.png new file mode 100644 index 00000000..32dbc397 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_938_1.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_938_2.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_938_2.png new file mode 100644 index 00000000..9500742e Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_938_2.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_938_3.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_938_3.png new file mode 100644 index 00000000..f6cb05b3 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_938_3.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_939.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_939.png index c250e028..d273b6f2 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_939.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_939.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_940.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_940.png index 5d33f720..3faae819 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_940.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_940.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_941.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_941.png index ba6f8dec..fbf7f586 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_941.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_941.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_942.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_942.png new file mode 100644 index 00000000..c02bef9f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_942.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_943.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_943.png new file mode 100644 index 00000000..2cc9dd82 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_943.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_944.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_944.png new file mode 100644 index 00000000..f8145257 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/74/154/s_944.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_928.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_928.png new file mode 100644 index 00000000..461adf84 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_928.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_929.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_929.png new file mode 100644 index 00000000..61c76a64 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_929.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_930.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_930.png new file mode 100644 index 00000000..31295af0 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_930.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_931.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_931.png index a1c89ffc..52db9341 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_931.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_931.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_932.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_932.png index 7d08b714..93148760 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_932.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_932.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_933.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_933.png index b388a366..407376a1 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_933.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_933.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_933_0.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_933_0.png new file mode 100644 index 00000000..e3ab5460 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_933_0.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_933_1.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_933_1.png new file mode 100644 index 00000000..fbb39514 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_933_1.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_933_2.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_933_2.png new file mode 100644 index 00000000..61ad523f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_933_2.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_933_3.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_933_3.png new file mode 100644 index 00000000..ee02aae0 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_933_3.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_934.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_934.png index 62c7713a..bf035189 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_934.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_934.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_934_0.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_934_0.png new file mode 100644 index 00000000..85c7b486 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_934_0.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_934_1.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_934_1.png new file mode 100644 index 00000000..00790522 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_934_1.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_934_2.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_934_2.png new file mode 100644 index 00000000..9fee188e Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_934_2.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_934_3.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_934_3.png new file mode 100644 index 00000000..1d36d25c Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_934_3.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_935.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_935.png index ebfb7b88..a864d40d 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_935.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_935.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_935_0.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_935_0.png new file mode 100644 index 00000000..019b8f4d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_935_0.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_935_1.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_935_1.png new file mode 100644 index 00000000..715680b5 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_935_1.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_935_2.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_935_2.png new file mode 100644 index 00000000..aba8d5a9 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_935_2.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_935_3.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_935_3.png new file mode 100644 index 00000000..9ea14112 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_935_3.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_936.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_936.png index a4916ceb..cc61781e 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_936.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_936.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_936_0.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_936_0.png new file mode 100644 index 00000000..aa96cb0c Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_936_0.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_936_1.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_936_1.png new file mode 100644 index 00000000..2c9c0ba6 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_936_1.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_936_2.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_936_2.png new file mode 100644 index 00000000..58c3bfcc Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_936_2.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_936_3.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_936_3.png new file mode 100644 index 00000000..3fb3851b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_936_3.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_937.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_937.png index c38b3363..85fd075e 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_937.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_937.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_937_0.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_937_0.png new file mode 100644 index 00000000..1c214d36 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_937_0.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_937_1.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_937_1.png new file mode 100644 index 00000000..0bdd84d0 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_937_1.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_937_2.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_937_2.png new file mode 100644 index 00000000..7fa136a7 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_937_2.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_937_3.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_937_3.png new file mode 100644 index 00000000..9c1e180c Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_937_3.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_938.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_938.png index 96f426ae..6dbf8526 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_938.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_938.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_938_0.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_938_0.png new file mode 100644 index 00000000..ec24a25a Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_938_0.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_938_1.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_938_1.png new file mode 100644 index 00000000..78b11500 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_938_1.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_938_2.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_938_2.png new file mode 100644 index 00000000..25179490 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_938_2.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_938_3.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_938_3.png new file mode 100644 index 00000000..1224c15c Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_938_3.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_939.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_939.png index b5d7724f..767ef5f8 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_939.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_939.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_940.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_940.png index ff022caf..5fdd2fac 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_940.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_940.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_941.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_941.png index af7a2f87..b387ac3b 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_941.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_941.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_942.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_942.png new file mode 100644 index 00000000..07b4b975 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_942.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_943.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_943.png new file mode 100644 index 00000000..47823fb6 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_943.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_944.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_944.png new file mode 100644 index 00000000..7f522b7a Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/75/154/s_944.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_928.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_928.png new file mode 100644 index 00000000..ec8e2be6 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_928.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_929.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_929.png new file mode 100644 index 00000000..f976863f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_929.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_930.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_930.png new file mode 100644 index 00000000..afa0e83f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_930.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_931.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_931.png index 9e28c723..ffc1286a 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_931.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_931.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_932.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_932.png index e4ad9a77..07f1f2ea 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_932.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_932.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_933.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_933.png index 432a576f..0c744dde 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_933.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_933.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_933_0.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_933_0.png new file mode 100644 index 00000000..de138d15 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_933_0.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_933_1.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_933_1.png new file mode 100644 index 00000000..b4d27e8b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_933_1.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_933_2.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_933_2.png new file mode 100644 index 00000000..2e70fe84 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_933_2.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_933_3.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_933_3.png new file mode 100644 index 00000000..8f4b91ec Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_933_3.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_934.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_934.png index dd158a1b..78e08034 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_934.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_934.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_934_0.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_934_0.png new file mode 100644 index 00000000..df6996e7 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_934_0.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_934_1.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_934_1.png new file mode 100644 index 00000000..7d37c882 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_934_1.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_934_2.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_934_2.png new file mode 100644 index 00000000..128331d7 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_934_2.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_934_3.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_934_3.png new file mode 100644 index 00000000..1f255dae Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_934_3.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_935.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_935.png index bbdc25c3..82bd0be0 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_935.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_935.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_935_0.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_935_0.png new file mode 100644 index 00000000..8f645811 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_935_0.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_935_1.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_935_1.png new file mode 100644 index 00000000..359fbb3f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_935_1.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_935_2.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_935_2.png new file mode 100644 index 00000000..664fda25 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_935_2.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_935_3.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_935_3.png new file mode 100644 index 00000000..58ebaf59 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_935_3.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_936.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_936.png index 434cd5f3..faaafd65 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_936.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_936.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_936_0.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_936_0.png new file mode 100644 index 00000000..d77937d0 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_936_0.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_936_1.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_936_1.png new file mode 100644 index 00000000..1737ad53 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_936_1.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_936_2.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_936_2.png new file mode 100644 index 00000000..5dee7495 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_936_2.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_936_3.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_936_3.png new file mode 100644 index 00000000..aa139ca9 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_936_3.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_937.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_937.png index 97a3105d..bbd892f0 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_937.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_937.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_937_0.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_937_0.png new file mode 100644 index 00000000..3a57f95c Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_937_0.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_937_1.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_937_1.png new file mode 100644 index 00000000..9981c7d1 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_937_1.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_937_2.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_937_2.png new file mode 100644 index 00000000..a48f9314 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_937_2.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_937_3.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_937_3.png new file mode 100644 index 00000000..63d0a306 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_937_3.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_938.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_938.png index d3efd0c3..339d3567 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_938.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_938.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_938_0.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_938_0.png new file mode 100644 index 00000000..57e7bb94 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_938_0.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_938_1.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_938_1.png new file mode 100644 index 00000000..7a3a0855 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_938_1.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_938_2.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_938_2.png new file mode 100644 index 00000000..6c263b3f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_938_2.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_938_3.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_938_3.png new file mode 100644 index 00000000..4d6b0fb8 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_938_3.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_939.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_939.png index 3954ebe1..788a53f4 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_939.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_939.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_940.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_940.png index 437ce8ce..4ff988b2 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_940.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_940.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_941.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_941.png index f0127e3a..00f99a26 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_941.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_941.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_942.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_942.png new file mode 100644 index 00000000..eb5ae505 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_942.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_943.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_943.png new file mode 100644 index 00000000..87f7d011 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_943.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_944.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_944.png new file mode 100644 index 00000000..79ac86ba Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/76/154/s_944.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_928.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_928.png new file mode 100644 index 00000000..1d1d510b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_928.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_929.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_929.png new file mode 100644 index 00000000..3805b897 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_929.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_930.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_930.png new file mode 100644 index 00000000..4ca28d94 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_930.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_931.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_931.png index 33647844..e58cc1e6 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_931.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_931.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_932.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_932.png index 8e510f77..0edc1d48 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_932.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_932.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_933.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_933.png index 4a3f5326..a78f48e2 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_933.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_933.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_933_0.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_933_0.png new file mode 100644 index 00000000..20f9bcc8 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_933_0.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_933_1.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_933_1.png new file mode 100644 index 00000000..439aea61 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_933_1.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_933_2.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_933_2.png new file mode 100644 index 00000000..b0896360 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_933_2.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_933_3.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_933_3.png new file mode 100644 index 00000000..825d4054 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_933_3.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_934.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_934.png index d93c86a7..c7d9caa1 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_934.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_934.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_934_0.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_934_0.png new file mode 100644 index 00000000..b8ca215d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_934_0.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_934_1.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_934_1.png new file mode 100644 index 00000000..4d63dfeb Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_934_1.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_934_2.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_934_2.png new file mode 100644 index 00000000..222f0182 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_934_2.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_934_3.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_934_3.png new file mode 100644 index 00000000..4a518bcd Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_934_3.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_935.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_935.png index 4a3aebf6..ab924f10 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_935.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_935.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_935_0.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_935_0.png new file mode 100644 index 00000000..b48ab31c Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_935_0.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_935_1.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_935_1.png new file mode 100644 index 00000000..26604817 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_935_1.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_935_2.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_935_2.png new file mode 100644 index 00000000..57f2cbf1 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_935_2.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_935_3.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_935_3.png new file mode 100644 index 00000000..3635937c Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_935_3.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_936.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_936.png index 34bd91ba..33d4b6a6 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_936.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_936.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_936_0.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_936_0.png new file mode 100644 index 00000000..73b94abb Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_936_0.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_936_1.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_936_1.png new file mode 100644 index 00000000..549bbc4f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_936_1.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_936_2.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_936_2.png new file mode 100644 index 00000000..84fd59bd Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_936_2.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_936_3.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_936_3.png new file mode 100644 index 00000000..81af6426 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_936_3.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_937.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_937.png index 35c90581..e78ecabc 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_937.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_937.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_937_0.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_937_0.png new file mode 100644 index 00000000..49c29b86 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_937_0.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_937_1.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_937_1.png new file mode 100644 index 00000000..dedf3707 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_937_1.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_937_2.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_937_2.png new file mode 100644 index 00000000..1a33a003 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_937_2.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_937_3.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_937_3.png new file mode 100644 index 00000000..c4ef44eb Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_937_3.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_938.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_938.png index 53793262..fbe267d1 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_938.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_938.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_938_0.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_938_0.png new file mode 100644 index 00000000..a7b0af5a Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_938_0.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_938_1.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_938_1.png new file mode 100644 index 00000000..5955bdf2 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_938_1.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_938_2.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_938_2.png new file mode 100644 index 00000000..4471fbc0 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_938_2.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_938_3.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_938_3.png new file mode 100644 index 00000000..a9475f24 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_938_3.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_939.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_939.png index 9452036f..1e9fc24b 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_939.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_939.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_940.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_940.png index 88f06eb6..74e2e28b 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_940.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_940.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_941.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_941.png index fb287f8f..974a9ee2 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_941.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_941.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_942.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_942.png new file mode 100644 index 00000000..6eea1e58 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_942.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_943.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_943.png new file mode 100644 index 00000000..3c402873 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_943.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_944.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_944.png new file mode 100644 index 00000000..3f130d39 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/77/154/s_944.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_928.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_928.png new file mode 100644 index 00000000..f1aa1bff Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_928.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_929.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_929.png new file mode 100644 index 00000000..8db8a288 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_929.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_930.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_930.png new file mode 100644 index 00000000..1b49859e Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_930.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_931.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_931.png index 9abb4a1b..576acd03 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_931.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_931.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_932.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_932.png index 2955404f..ecf3e603 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_932.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_932.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_933.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_933.png index 8882ad26..050ae71f 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_933.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_933.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_933_0.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_933_0.png new file mode 100644 index 00000000..df492422 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_933_0.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_933_1.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_933_1.png new file mode 100644 index 00000000..d817082d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_933_1.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_933_2.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_933_2.png new file mode 100644 index 00000000..08a2d881 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_933_2.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_933_3.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_933_3.png new file mode 100644 index 00000000..7c279f03 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_933_3.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_934.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_934.png index 5a77e180..855a7ae3 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_934.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_934.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_934_0.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_934_0.png new file mode 100644 index 00000000..f4496d15 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_934_0.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_934_1.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_934_1.png new file mode 100644 index 00000000..82e3fdde Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_934_1.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_934_2.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_934_2.png new file mode 100644 index 00000000..c9a2da59 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_934_2.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_934_3.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_934_3.png new file mode 100644 index 00000000..6531a20d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_934_3.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_935.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_935.png index 8806544c..80274762 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_935.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_935.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_935_0.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_935_0.png new file mode 100644 index 00000000..7c633859 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_935_0.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_935_1.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_935_1.png new file mode 100644 index 00000000..def61600 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_935_1.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_935_2.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_935_2.png new file mode 100644 index 00000000..dcde4233 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_935_2.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_935_3.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_935_3.png new file mode 100644 index 00000000..3c6bd153 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_935_3.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_936.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_936.png index 6c70434b..5f929ebf 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_936.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_936.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_936_0.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_936_0.png new file mode 100644 index 00000000..231e543d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_936_0.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_936_1.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_936_1.png new file mode 100644 index 00000000..a3ac68c8 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_936_1.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_936_2.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_936_2.png new file mode 100644 index 00000000..da4ecd12 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_936_2.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_936_3.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_936_3.png new file mode 100644 index 00000000..af2c6b5f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_936_3.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_937.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_937.png index d0217224..481d8e93 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_937.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_937.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_937_0.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_937_0.png new file mode 100644 index 00000000..41478d51 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_937_0.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_937_1.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_937_1.png new file mode 100644 index 00000000..56258f47 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_937_1.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_937_2.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_937_2.png new file mode 100644 index 00000000..5e2f221d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_937_2.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_937_3.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_937_3.png new file mode 100644 index 00000000..e07651ac Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_937_3.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_938.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_938.png index 9c3d0bec..bd4b9a01 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_938.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_938.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_938_0.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_938_0.png new file mode 100644 index 00000000..1f392059 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_938_0.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_938_1.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_938_1.png new file mode 100644 index 00000000..0e4b11a1 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_938_1.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_938_2.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_938_2.png new file mode 100644 index 00000000..96be6d45 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_938_2.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_938_3.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_938_3.png new file mode 100644 index 00000000..05aa56e9 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_938_3.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_939.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_939.png index d4e69e0e..ea9cfd37 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_939.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_939.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_940.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_940.png index 1db09ee1..6804aff0 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_940.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_940.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_941.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_941.png index 2dbc7f8b..6cbf06b1 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_941.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_941.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_942.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_942.png new file mode 100644 index 00000000..c34a0432 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_942.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_943.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_943.png new file mode 100644 index 00000000..b38ac05a Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_943.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_944.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_944.png new file mode 100644 index 00000000..b7aa222d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/78/154/s_944.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/79/154/s_928.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/79/154/s_928.png new file mode 100644 index 00000000..11a63703 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/79/154/s_928.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/79/154/s_929.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/79/154/s_929.png new file mode 100644 index 00000000..4a092e9a Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/79/154/s_929.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/79/154/s_930.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/79/154/s_930.png new file mode 100644 index 00000000..4a7d5a95 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/79/154/s_930.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/79/154/s_931.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/79/154/s_931.png index 06aa655a..095b564e 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/79/154/s_931.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/79/154/s_931.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/79/154/s_932.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/79/154/s_932.png index e189f100..c5efe6bc 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/79/154/s_932.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/79/154/s_932.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/79/154/s_933.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/79/154/s_933.png index 7cd5740f..ddd82072 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/79/154/s_933.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/79/154/s_933.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/79/154/s_934.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/79/154/s_934.png index 27b4bc82..6387c703 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/79/154/s_934.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/79/154/s_934.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/79/154/s_935.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/79/154/s_935.png index 7252864c..897a2320 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/79/154/s_935.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/79/154/s_935.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/79/154/s_936.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/79/154/s_936.png index a103201c..241472ca 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/79/154/s_936.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/79/154/s_936.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/79/154/s_937.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/79/154/s_937.png index cd544308..275226cb 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/79/154/s_937.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/79/154/s_937.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/79/154/s_938.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/79/154/s_938.png index 33fcaa43..43a291fb 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/79/154/s_938.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/79/154/s_938.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/79/154/s_939.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/79/154/s_939.png index 3a1d1051..81d00324 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/79/154/s_939.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/79/154/s_939.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/79/154/s_940.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/79/154/s_940.png index fd583868..3ee99537 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/79/154/s_940.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/79/154/s_940.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/79/154/s_941.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/79/154/s_941.png index a27031e4..02aad516 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/79/154/s_941.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/79/154/s_941.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/79/154/s_942.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/79/154/s_942.png new file mode 100644 index 00000000..532f02ff Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/79/154/s_942.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/79/154/s_943.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/79/154/s_943.png new file mode 100644 index 00000000..a51ddfb6 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/79/154/s_943.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/79/154/s_944.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/79/154/s_944.png new file mode 100644 index 00000000..894bde18 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/79/154/s_944.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/80/154/s_928.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/80/154/s_928.png new file mode 100644 index 00000000..ba3692d1 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/80/154/s_928.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/80/154/s_929.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/80/154/s_929.png new file mode 100644 index 00000000..cab010e5 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/80/154/s_929.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/80/154/s_930.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/80/154/s_930.png new file mode 100644 index 00000000..47d4bd86 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/80/154/s_930.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/80/154/s_931.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/80/154/s_931.png index 3a22cef7..eda36c03 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/80/154/s_931.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/80/154/s_931.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/80/154/s_932.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/80/154/s_932.png index af2f9bfb..c78c9c72 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/80/154/s_932.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/80/154/s_932.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/80/154/s_933.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/80/154/s_933.png index 95a90d91..0db7c8fb 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/80/154/s_933.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/80/154/s_933.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/80/154/s_934.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/80/154/s_934.png index 3baeca44..2ad2e53f 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/80/154/s_934.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/80/154/s_934.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/80/154/s_935.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/80/154/s_935.png index 77868032..8d10e1d7 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/80/154/s_935.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/80/154/s_935.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/80/154/s_936.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/80/154/s_936.png index 1f71cdc9..475b7c16 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/80/154/s_936.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/80/154/s_936.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/80/154/s_937.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/80/154/s_937.png index 43920e4e..02abe6f4 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/80/154/s_937.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/80/154/s_937.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/80/154/s_938.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/80/154/s_938.png index 3dbe25c1..20a87aa9 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/80/154/s_938.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/80/154/s_938.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/80/154/s_939.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/80/154/s_939.png index 2e959148..66814818 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/80/154/s_939.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/80/154/s_939.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/80/154/s_940.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/80/154/s_940.png index 25b985c0..8be9a96e 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/80/154/s_940.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/80/154/s_940.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/80/154/s_941.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/80/154/s_941.png index be501ec5..105dfe89 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/80/154/s_941.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/80/154/s_941.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/80/154/s_942.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/80/154/s_942.png new file mode 100644 index 00000000..90c8b3f4 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/80/154/s_942.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/80/154/s_943.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/80/154/s_943.png new file mode 100644 index 00000000..d3972c62 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/80/154/s_943.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/80/154/s_944.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/80/154/s_944.png new file mode 100644 index 00000000..5dbe1578 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/80/154/s_944.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/81/154/s_928.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/81/154/s_928.png new file mode 100644 index 00000000..97c76d77 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/81/154/s_928.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/81/154/s_929.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/81/154/s_929.png new file mode 100644 index 00000000..6a953097 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/81/154/s_929.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/81/154/s_930.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/81/154/s_930.png new file mode 100644 index 00000000..5a7fab22 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/81/154/s_930.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/81/154/s_931.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/81/154/s_931.png index 465715b8..1253b1ad 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/81/154/s_931.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/81/154/s_931.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/81/154/s_932.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/81/154/s_932.png index a5fba04e..d1cde033 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/81/154/s_932.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/81/154/s_932.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/81/154/s_933.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/81/154/s_933.png index 27c0a5da..caac395f 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/81/154/s_933.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/81/154/s_933.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/81/154/s_934.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/81/154/s_934.png index 870e7ee8..c01b0450 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/81/154/s_934.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/81/154/s_934.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/81/154/s_935.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/81/154/s_935.png index 38be63b2..1c2c02a4 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/81/154/s_935.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/81/154/s_935.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/81/154/s_936.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/81/154/s_936.png index 4dda6de9..8d4d6c53 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/81/154/s_936.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/81/154/s_936.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/81/154/s_937.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/81/154/s_937.png index e4d6f5fa..ee86906d 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/81/154/s_937.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/81/154/s_937.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/81/154/s_938.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/81/154/s_938.png index 14863be7..a1925781 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/81/154/s_938.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/81/154/s_938.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/81/154/s_939.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/81/154/s_939.png index 41bde130..ffec1852 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/81/154/s_939.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/81/154/s_939.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/81/154/s_940.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/81/154/s_940.png index 81ed8ca8..190fbd18 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/81/154/s_940.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/81/154/s_940.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/81/154/s_941.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/81/154/s_941.png index 967b9505..b425902c 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/81/154/s_941.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/81/154/s_941.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/81/154/s_942.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/81/154/s_942.png new file mode 100644 index 00000000..91dac6dd Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/81/154/s_942.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/81/154/s_943.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/81/154/s_943.png new file mode 100644 index 00000000..4e52e9ff Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/81/154/s_943.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/81/154/s_944.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/81/154/s_944.png new file mode 100644 index 00000000..9ac74d7c Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/81/154/s_944.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/82/154/s_928.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/82/154/s_928.png new file mode 100644 index 00000000..e5e91284 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/82/154/s_928.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/82/154/s_929.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/82/154/s_929.png new file mode 100644 index 00000000..1fbfef4e Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/82/154/s_929.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/82/154/s_930.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/82/154/s_930.png new file mode 100644 index 00000000..a71c8cc2 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/82/154/s_930.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/82/154/s_931.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/82/154/s_931.png index 6164deeb..668017e9 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/82/154/s_931.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/82/154/s_931.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/82/154/s_932.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/82/154/s_932.png index 0d35376c..a7752688 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/82/154/s_932.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/82/154/s_932.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/82/154/s_933.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/82/154/s_933.png index 0b38350b..d24757bf 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/82/154/s_933.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/82/154/s_933.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/82/154/s_934.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/82/154/s_934.png index 90e8bce2..206adf51 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/82/154/s_934.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/82/154/s_934.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/82/154/s_935.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/82/154/s_935.png index 42daa35d..97cd2b23 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/82/154/s_935.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/82/154/s_935.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/82/154/s_936.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/82/154/s_936.png index 7671d6a8..da97228b 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/82/154/s_936.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/82/154/s_936.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/82/154/s_937.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/82/154/s_937.png index b850cc35..69a54ef7 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/82/154/s_937.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/82/154/s_937.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/82/154/s_938.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/82/154/s_938.png index ca1a9e56..139bebb1 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/82/154/s_938.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/82/154/s_938.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/82/154/s_939.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/82/154/s_939.png index e0d4e783..25071119 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/82/154/s_939.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/82/154/s_939.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/82/154/s_940.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/82/154/s_940.png index 8984c6f5..fd25f6e7 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/82/154/s_940.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/82/154/s_940.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/82/154/s_941.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/82/154/s_941.png index 8f18eeec..a464425a 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/82/154/s_941.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/82/154/s_941.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/82/154/s_942.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/82/154/s_942.png new file mode 100644 index 00000000..ce6c82e1 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/82/154/s_942.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/82/154/s_943.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/82/154/s_943.png new file mode 100644 index 00000000..81239c08 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/82/154/s_943.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/82/154/s_944.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/82/154/s_944.png new file mode 100644 index 00000000..167d26e9 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/82/154/s_944.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/83/154/s_928.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/83/154/s_928.png new file mode 100644 index 00000000..80555ddb Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/83/154/s_928.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/83/154/s_929.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/83/154/s_929.png new file mode 100644 index 00000000..86d411aa Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/83/154/s_929.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/83/154/s_930.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/83/154/s_930.png new file mode 100644 index 00000000..4103783c Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/83/154/s_930.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/83/154/s_931.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/83/154/s_931.png new file mode 100644 index 00000000..99eea97d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/83/154/s_931.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/83/154/s_932.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/83/154/s_932.png new file mode 100644 index 00000000..ad40000e Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/83/154/s_932.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/83/154/s_933.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/83/154/s_933.png new file mode 100644 index 00000000..b7a9b779 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/83/154/s_933.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/83/154/s_934.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/83/154/s_934.png new file mode 100644 index 00000000..e3e3e715 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/83/154/s_934.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/83/154/s_935.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/83/154/s_935.png new file mode 100644 index 00000000..53448384 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/83/154/s_935.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/83/154/s_936.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/83/154/s_936.png new file mode 100644 index 00000000..59961abf Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/83/154/s_936.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/83/154/s_937.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/83/154/s_937.png new file mode 100644 index 00000000..93173a2e Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/83/154/s_937.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/83/154/s_938.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/83/154/s_938.png new file mode 100644 index 00000000..9988cb19 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/83/154/s_938.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/83/154/s_939.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/83/154/s_939.png new file mode 100644 index 00000000..cdb7d304 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/83/154/s_939.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/83/154/s_940.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/83/154/s_940.png new file mode 100644 index 00000000..9c0dd707 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/83/154/s_940.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/83/154/s_941.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/83/154/s_941.png new file mode 100644 index 00000000..5ca748c9 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/83/154/s_941.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/83/154/s_942.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/83/154/s_942.png new file mode 100644 index 00000000..8341cc0f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/83/154/s_942.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/83/154/s_943.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/83/154/s_943.png new file mode 100644 index 00000000..992f10ec Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/83/154/s_943.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/83/154/s_944.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/83/154/s_944.png new file mode 100644 index 00000000..59f9b9ce Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/234/83/154/s_944.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/847/93/s_963.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/847/93/s_963.png new file mode 100644 index 00000000..a31797a6 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/847/93/s_963.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/847/93/s_964.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/847/93/s_964.png new file mode 100644 index 00000000..4d5fa4b4 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/847/93/s_964.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/847/93/s_965.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/847/93/s_965.png new file mode 100644 index 00000000..7a12595a Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/847/93/s_965.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/847/93/s_966.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/847/93/s_966.png new file mode 100644 index 00000000..18050de5 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/847/93/s_966.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/847/93/s_967.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/847/93/s_967.png new file mode 100644 index 00000000..43213f76 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/847/93/s_967.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/847/93/s_968.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/847/93/s_968.png new file mode 100644 index 00000000..7e3da69f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/847/93/s_968.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/848/93/s_963.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/848/93/s_963.png new file mode 100644 index 00000000..258757e9 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/848/93/s_963.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/848/93/s_964.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/848/93/s_964.png new file mode 100644 index 00000000..94b75df1 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/848/93/s_964.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/848/93/s_965.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/848/93/s_965.png new file mode 100644 index 00000000..a593cefe Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/848/93/s_965.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/848/93/s_966.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/848/93/s_966.png new file mode 100644 index 00000000..10acb45f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/848/93/s_966.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/848/93/s_967.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/848/93/s_967.png new file mode 100644 index 00000000..3c5b3fa6 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/848/93/s_967.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/848/93/s_968.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/848/93/s_968.png new file mode 100644 index 00000000..44a56024 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/848/93/s_968.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/849/93/s_963.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/849/93/s_963.png new file mode 100644 index 00000000..c1638954 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/849/93/s_963.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/849/93/s_964.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/849/93/s_964.png new file mode 100644 index 00000000..782859f0 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/849/93/s_964.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/849/93/s_965.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/849/93/s_965.png new file mode 100644 index 00000000..298cc96e Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/849/93/s_965.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/849/93/s_966.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/849/93/s_966.png new file mode 100644 index 00000000..ccd046e2 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/849/93/s_966.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/849/93/s_967.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/849/93/s_967.png new file mode 100644 index 00000000..14875b02 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/849/93/s_967.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/849/93/s_968.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/849/93/s_968.png new file mode 100644 index 00000000..33dd326d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/849/93/s_968.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/850/93/s_963.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/850/93/s_963.png new file mode 100644 index 00000000..8d4efe89 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/850/93/s_963.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/850/93/s_964.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/850/93/s_964.png new file mode 100644 index 00000000..ca547408 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/850/93/s_964.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/850/93/s_965.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/850/93/s_965.png new file mode 100644 index 00000000..8c7abc3f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/850/93/s_965.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/850/93/s_966.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/850/93/s_966.png new file mode 100644 index 00000000..dd486a11 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/850/93/s_966.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/850/93/s_967.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/850/93/s_967.png new file mode 100644 index 00000000..781237ea Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/850/93/s_967.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/850/93/s_968.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/850/93/s_968.png new file mode 100644 index 00000000..d29761a0 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/850/93/s_968.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/851/93/s_963.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/851/93/s_963.png new file mode 100644 index 00000000..b5cfff39 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/851/93/s_963.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/851/93/s_964.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/851/93/s_964.png new file mode 100644 index 00000000..2307b0bc Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/851/93/s_964.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/851/93/s_965.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/851/93/s_965.png new file mode 100644 index 00000000..42af57ba Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/851/93/s_965.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/851/93/s_966.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/851/93/s_966.png new file mode 100644 index 00000000..f9deb3f7 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/851/93/s_966.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/851/93/s_967.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/851/93/s_967.png new file mode 100644 index 00000000..d9912da1 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/851/93/s_967.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/851/93/s_968.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/851/93/s_968.png new file mode 100644 index 00000000..fefdf773 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-1/72/851/93/s_968.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/671/187/s_903.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/671/187/s_903.png new file mode 100644 index 00000000..236dd401 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/671/187/s_903.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/671/187/s_904.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/671/187/s_904.png new file mode 100644 index 00000000..f67494ed Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/671/187/s_904.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/671/187/s_905.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/671/187/s_905.png new file mode 100644 index 00000000..3cb93568 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/671/187/s_905.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/671/187/s_906.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/671/187/s_906.png new file mode 100644 index 00000000..84ff3ad0 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/671/187/s_906.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/671/187/s_907.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/671/187/s_907.png new file mode 100644 index 00000000..18fa6b30 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/671/187/s_907.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/671/187/s_908.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/671/187/s_908.png new file mode 100644 index 00000000..9c79b206 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/671/187/s_908.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/671/187/s_909.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/671/187/s_909.png new file mode 100644 index 00000000..07e31f1b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/671/187/s_909.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/671/187/s_910.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/671/187/s_910.png new file mode 100644 index 00000000..57f83788 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/671/187/s_910.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/671/187/s_911.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/671/187/s_911.png new file mode 100644 index 00000000..0619d37b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/671/187/s_911.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/671/187/s_912.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/671/187/s_912.png new file mode 100644 index 00000000..b94ca9a0 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/671/187/s_912.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/672/187/s_903.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/672/187/s_903.png new file mode 100644 index 00000000..dcb5f384 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/672/187/s_903.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/672/187/s_904.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/672/187/s_904.png new file mode 100644 index 00000000..96eca237 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/672/187/s_904.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/672/187/s_905.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/672/187/s_905.png new file mode 100644 index 00000000..8e693838 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/672/187/s_905.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/672/187/s_906.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/672/187/s_906.png new file mode 100644 index 00000000..adcb9ae1 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/672/187/s_906.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/672/187/s_907.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/672/187/s_907.png new file mode 100644 index 00000000..d4479703 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/672/187/s_907.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/672/187/s_908.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/672/187/s_908.png new file mode 100644 index 00000000..a1fceb8a Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/672/187/s_908.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/672/187/s_909.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/672/187/s_909.png new file mode 100644 index 00000000..d8f05758 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/672/187/s_909.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/672/187/s_910.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/672/187/s_910.png new file mode 100644 index 00000000..50a60a66 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/672/187/s_910.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/672/187/s_911.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/672/187/s_911.png new file mode 100644 index 00000000..f3e2e670 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/672/187/s_911.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/672/187/s_912.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/672/187/s_912.png new file mode 100644 index 00000000..4bec3178 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/672/187/s_912.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/673/187/s_903.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/673/187/s_903.png new file mode 100644 index 00000000..3b4a7856 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/673/187/s_903.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/673/187/s_904.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/673/187/s_904.png new file mode 100644 index 00000000..412d5176 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/673/187/s_904.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/673/187/s_905.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/673/187/s_905.png new file mode 100644 index 00000000..84f2f767 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/673/187/s_905.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/673/187/s_906.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/673/187/s_906.png new file mode 100644 index 00000000..fadefb2b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/673/187/s_906.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/673/187/s_907.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/673/187/s_907.png new file mode 100644 index 00000000..5fa7f606 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/673/187/s_907.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/673/187/s_908.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/673/187/s_908.png new file mode 100644 index 00000000..b8bac33a Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/673/187/s_908.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/673/187/s_909.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/673/187/s_909.png new file mode 100644 index 00000000..ede12c55 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/673/187/s_909.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/673/187/s_910.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/673/187/s_910.png new file mode 100644 index 00000000..0fa36e26 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/673/187/s_910.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/673/187/s_911.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/673/187/s_911.png new file mode 100644 index 00000000..e164f39e Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/673/187/s_911.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/673/187/s_912.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/673/187/s_912.png new file mode 100644 index 00000000..24ca6072 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/673/187/s_912.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/674/187/s_903.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/674/187/s_903.png new file mode 100644 index 00000000..17e1ef23 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/674/187/s_903.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/674/187/s_904.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/674/187/s_904.png new file mode 100644 index 00000000..f04a30e9 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/674/187/s_904.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/674/187/s_905.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/674/187/s_905.png new file mode 100644 index 00000000..b3736496 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/674/187/s_905.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/674/187/s_906.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/674/187/s_906.png new file mode 100644 index 00000000..e4395f17 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/674/187/s_906.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/674/187/s_907.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/674/187/s_907.png new file mode 100644 index 00000000..45a6020d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/674/187/s_907.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/674/187/s_908.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/674/187/s_908.png new file mode 100644 index 00000000..0ea3d192 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/674/187/s_908.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/674/187/s_909.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/674/187/s_909.png new file mode 100644 index 00000000..d1cfdba6 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/674/187/s_909.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/674/187/s_910.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/674/187/s_910.png new file mode 100644 index 00000000..025bfc6a Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/674/187/s_910.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/674/187/s_911.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/674/187/s_911.png new file mode 100644 index 00000000..9afd5150 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/674/187/s_911.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/674/187/s_912.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/674/187/s_912.png new file mode 100644 index 00000000..5cae9bc8 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/674/187/s_912.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/675/187/s_903.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/675/187/s_903.png new file mode 100644 index 00000000..ff6556ee Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/675/187/s_903.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/675/187/s_904.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/675/187/s_904.png new file mode 100644 index 00000000..05cb90bd Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/675/187/s_904.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/675/187/s_905.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/675/187/s_905.png new file mode 100644 index 00000000..c6194ecf Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/675/187/s_905.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/675/187/s_906.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/675/187/s_906.png new file mode 100644 index 00000000..b84ca06d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/675/187/s_906.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/675/187/s_907.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/675/187/s_907.png new file mode 100644 index 00000000..7d01abb5 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/675/187/s_907.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/675/187/s_908.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/675/187/s_908.png new file mode 100644 index 00000000..18e758ad Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/675/187/s_908.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/675/187/s_909.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/675/187/s_909.png new file mode 100644 index 00000000..94823e88 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/675/187/s_909.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/675/187/s_910.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/675/187/s_910.png new file mode 100644 index 00000000..9a77c7bf Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/675/187/s_910.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/675/187/s_911.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/675/187/s_911.png new file mode 100644 index 00000000..5e2ede39 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/675/187/s_911.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/675/187/s_912.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/675/187/s_912.png new file mode 100644 index 00000000..bfab9209 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/675/187/s_912.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/676/187/s_903.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/676/187/s_903.png new file mode 100644 index 00000000..c98b73a1 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/676/187/s_903.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/676/187/s_904.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/676/187/s_904.png new file mode 100644 index 00000000..71798bd1 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/676/187/s_904.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/676/187/s_905.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/676/187/s_905.png new file mode 100644 index 00000000..eb02109e Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/676/187/s_905.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/676/187/s_906.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/676/187/s_906.png new file mode 100644 index 00000000..5f6717db Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/676/187/s_906.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/676/187/s_907.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/676/187/s_907.png new file mode 100644 index 00000000..17bc4971 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/676/187/s_907.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/676/187/s_908.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/676/187/s_908.png new file mode 100644 index 00000000..276aefad Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/676/187/s_908.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/676/187/s_909.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/676/187/s_909.png new file mode 100644 index 00000000..4db22819 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/676/187/s_909.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/676/187/s_910.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/676/187/s_910.png new file mode 100644 index 00000000..a71f50f1 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/676/187/s_910.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/676/187/s_911.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/676/187/s_911.png new file mode 100644 index 00000000..22f4241e Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/676/187/s_911.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/676/187/s_912.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/676/187/s_912.png new file mode 100644 index 00000000..2becc38f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/676/187/s_912.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/677/187/s_903.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/677/187/s_903.png new file mode 100644 index 00000000..f448f9bc Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/677/187/s_903.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/677/187/s_904.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/677/187/s_904.png new file mode 100644 index 00000000..baefc943 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/677/187/s_904.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/677/187/s_905.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/677/187/s_905.png new file mode 100644 index 00000000..bd9b8a67 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/677/187/s_905.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/677/187/s_906.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/677/187/s_906.png new file mode 100644 index 00000000..eaaf3d99 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/677/187/s_906.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/677/187/s_907.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/677/187/s_907.png new file mode 100644 index 00000000..59fcbfc3 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/677/187/s_907.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/677/187/s_908.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/677/187/s_908.png new file mode 100644 index 00000000..09bb4dff Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/677/187/s_908.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/677/187/s_909.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/677/187/s_909.png new file mode 100644 index 00000000..a6ce5d5f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/677/187/s_909.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/677/187/s_910.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/677/187/s_910.png new file mode 100644 index 00000000..5c3d08ec Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/677/187/s_910.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/677/187/s_911.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/677/187/s_911.png new file mode 100644 index 00000000..6855016f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/677/187/s_911.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/677/187/s_912.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/677/187/s_912.png new file mode 100644 index 00000000..1379cb3e Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/677/187/s_912.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/678/187/s_903.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/678/187/s_903.png new file mode 100644 index 00000000..2ec6f27c Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/678/187/s_903.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/678/187/s_904.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/678/187/s_904.png new file mode 100644 index 00000000..49274e71 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/678/187/s_904.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/678/187/s_905.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/678/187/s_905.png new file mode 100644 index 00000000..81c25c40 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/678/187/s_905.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/678/187/s_906.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/678/187/s_906.png new file mode 100644 index 00000000..4efdd9d4 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/678/187/s_906.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/678/187/s_907.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/678/187/s_907.png new file mode 100644 index 00000000..2b068255 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/678/187/s_907.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/678/187/s_908.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/678/187/s_908.png new file mode 100644 index 00000000..f1ca0583 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/678/187/s_908.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/678/187/s_909.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/678/187/s_909.png new file mode 100644 index 00000000..c9242dec Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/678/187/s_909.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/678/187/s_910.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/678/187/s_910.png new file mode 100644 index 00000000..1a82f5f0 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/678/187/s_910.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/678/187/s_911.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/678/187/s_911.png new file mode 100644 index 00000000..7b8e636b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/678/187/s_911.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/678/187/s_912.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/678/187/s_912.png new file mode 100644 index 00000000..522ca534 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/678/187/s_912.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/679/187/s_903.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/679/187/s_903.png new file mode 100644 index 00000000..b3b599a1 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/679/187/s_903.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/679/187/s_904.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/679/187/s_904.png new file mode 100644 index 00000000..ec7f70ea Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/679/187/s_904.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/679/187/s_905.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/679/187/s_905.png new file mode 100644 index 00000000..0bc3a70d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/679/187/s_905.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/679/187/s_906.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/679/187/s_906.png new file mode 100644 index 00000000..4a1d7666 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/679/187/s_906.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/679/187/s_907.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/679/187/s_907.png new file mode 100644 index 00000000..c4b4a630 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/679/187/s_907.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/679/187/s_908.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/679/187/s_908.png new file mode 100644 index 00000000..4f5c56dd Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/679/187/s_908.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/679/187/s_909.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/679/187/s_909.png new file mode 100644 index 00000000..9948d290 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/679/187/s_909.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/679/187/s_910.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/679/187/s_910.png new file mode 100644 index 00000000..60b42c86 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/679/187/s_910.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/679/187/s_911.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/679/187/s_911.png new file mode 100644 index 00000000..6b32157e Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/679/187/s_911.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/679/187/s_912.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/679/187/s_912.png new file mode 100644 index 00000000..f4c2dc6a Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/145/679/187/s_912.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_832.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_832.png new file mode 100644 index 00000000..dbd36e37 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_832.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_833.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_833.png new file mode 100644 index 00000000..8943cd36 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_833.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_834.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_834.png new file mode 100644 index 00000000..67ce4e95 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_834.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_835.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_835.png new file mode 100644 index 00000000..e8012c0e Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_835.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_836.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_836.png new file mode 100644 index 00000000..c8d27845 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_836.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_837.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_837.png new file mode 100644 index 00000000..ceb0ac28 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_837.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_838.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_838.png new file mode 100644 index 00000000..28eda90b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_838.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_839.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_839.png index 1493af22..8406829a 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_839.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_839.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_840.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_840.png index ae8a3a2b..8b76b797 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_840.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_840.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_841.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_841.png index d32c23b5..d4bae300 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_841.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_841.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_842.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_842.png index a0168c8c..44ac6e7a 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_842.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_842.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_843.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_843.png index 6e472578..33d8eb0e 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_843.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_843.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_844.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_844.png index 67524f91..8f27be2f 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_844.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_844.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_845.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_845.png index 62a1d055..4f3fa67e 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_845.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_845.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_846.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_846.png index 4bbf9667..3e915a0e 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_846.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_846.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_847.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_847.png index 8b65adf0..5b2b6224 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_847.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_847.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_848.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_848.png index 1e971cf9..15101bd0 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_848.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_848.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_849.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_849.png index ac3bde97..fa94817f 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_849.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_849.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_850.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_850.png index ccc64323..765837c4 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_850.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_850.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_851.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_851.png index 4d0b3af1..0746b020 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_851.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_851.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_852.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_852.png index 321687e2..2fb2af12 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_852.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_852.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_853.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_853.png index 2c232ed9..88e1e699 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_853.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_853.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_854.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_854.png index f3bf3147..3a1e685b 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_854.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_854.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_855.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_855.png index 5d622c68..bd07c402 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_855.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_855.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_856.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_856.png index f24746f3..7d6313a7 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_856.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_856.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_857.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_857.png index 6173b539..6eb6f021 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_857.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_857.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_858.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_858.png index 65df68d2..f2ae0bc2 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_858.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_858.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_859.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_859.png new file mode 100644 index 00000000..f288785a Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_859.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_860.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_860.png new file mode 100644 index 00000000..647f9dfd Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_860.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_861.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_861.png new file mode 100644 index 00000000..c07ccefd Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_861.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_862.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_862.png new file mode 100644 index 00000000..a1c5fae0 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_862.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_863.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_863.png new file mode 100644 index 00000000..e45a83e5 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_863.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_864.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_864.png new file mode 100644 index 00000000..6aa7c598 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/134/309/s_864.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_832.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_832.png new file mode 100644 index 00000000..23b08c46 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_832.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_833.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_833.png new file mode 100644 index 00000000..73b512cb Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_833.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_834.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_834.png new file mode 100644 index 00000000..20412df6 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_834.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_835.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_835.png new file mode 100644 index 00000000..ea708887 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_835.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_836.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_836.png new file mode 100644 index 00000000..09ad7a5d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_836.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_837.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_837.png new file mode 100644 index 00000000..341253c8 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_837.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_838.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_838.png new file mode 100644 index 00000000..1d4b023b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_838.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_839.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_839.png index f4e678f0..9c53fc37 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_839.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_839.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_840.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_840.png index e55d41ad..49a9e4c0 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_840.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_840.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_841.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_841.png index bd595abd..7a62ccda 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_841.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_841.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_842.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_842.png index ba83638c..93464a34 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_842.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_842.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_843.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_843.png index 5836830f..28816bb4 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_843.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_843.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_844.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_844.png index 6db75589..f9f34975 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_844.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_844.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_845.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_845.png index 641540e4..444cc9f7 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_845.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_845.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_846.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_846.png index a0b5aa09..94f42464 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_846.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_846.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_847.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_847.png index b416c594..6710a88b 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_847.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_847.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_848.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_848.png index 5a4f6ae1..38031a39 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_848.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_848.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_849.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_849.png index e09b9c15..5b9caa99 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_849.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_849.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_850.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_850.png index 5cbf5d08..81e8a974 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_850.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_850.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_851.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_851.png index a7a54293..e9167cc1 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_851.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_851.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_852.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_852.png index f883cc8f..6e52b1f9 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_852.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_852.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_853.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_853.png index 9699a072..8ec3e530 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_853.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_853.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_854.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_854.png index 4dbcc9d0..bfd95f1f 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_854.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_854.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_855.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_855.png index 0f4ee265..66e7a764 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_855.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_855.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_856.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_856.png index a0706eb8..5bb6a0ce 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_856.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_856.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_857.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_857.png index cc4b92cb..67fd1408 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_857.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_857.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_858.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_858.png index 38b4c8fa..85d29b82 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_858.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_858.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_859.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_859.png new file mode 100644 index 00000000..01b9155c Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_859.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_860.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_860.png new file mode 100644 index 00000000..8b886607 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_860.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_861.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_861.png new file mode 100644 index 00000000..960d388f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_861.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_862.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_862.png new file mode 100644 index 00000000..d723546d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_862.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_863.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_863.png new file mode 100644 index 00000000..7ee30944 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_863.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_864.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_864.png new file mode 100644 index 00000000..5d98f3b0 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/135/309/s_864.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_832.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_832.png new file mode 100644 index 00000000..8103e088 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_832.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_833.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_833.png new file mode 100644 index 00000000..6db14ad5 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_833.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_834.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_834.png new file mode 100644 index 00000000..dc681327 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_834.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_835.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_835.png new file mode 100644 index 00000000..b9c3e4e1 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_835.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_836.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_836.png new file mode 100644 index 00000000..1c3dc6bc Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_836.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_837.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_837.png new file mode 100644 index 00000000..dcba63f7 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_837.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_838.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_838.png new file mode 100644 index 00000000..75a5c0f2 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_838.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_839.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_839.png index 14f945a2..326f6e2a 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_839.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_839.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_840.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_840.png index e71f4aed..41a67914 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_840.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_840.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_841.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_841.png index 585a99ba..cb9257ba 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_841.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_841.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_842.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_842.png index 561856b6..438214f9 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_842.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_842.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_843.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_843.png index e2cd5be5..ec6c7d61 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_843.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_843.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_844.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_844.png index a820b39a..ac5348d8 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_844.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_844.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_845.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_845.png index ee4be191..29d271eb 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_845.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_845.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_846.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_846.png index 3ce607b8..8bb8c805 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_846.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_846.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_847.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_847.png index e89b1c88..f580cb30 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_847.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_847.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_848.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_848.png index 7899166b..5cfbcf8a 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_848.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_848.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_849.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_849.png index bf15cd14..2c4ad64a 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_849.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_849.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_850.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_850.png index bcb48034..2a462e6b 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_850.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_850.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_851.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_851.png index dd92bde8..0805d6a9 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_851.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_851.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_852.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_852.png index 08bb871c..86af4de4 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_852.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_852.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_853.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_853.png index 7dce9ccf..b3a0421b 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_853.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_853.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_854.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_854.png index c4dced83..c2bc0027 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_854.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_854.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_855.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_855.png index 52a82332..6984be1c 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_855.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_855.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_856.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_856.png index 7224425d..199d9903 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_856.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_856.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_857.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_857.png index 84902e80..aeab0888 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_857.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_857.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_858.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_858.png index 20057ae3..36b56437 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_858.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_858.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_859.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_859.png new file mode 100644 index 00000000..fd7300ac Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_859.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_860.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_860.png new file mode 100644 index 00000000..d8ccb6f8 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_860.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_861.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_861.png new file mode 100644 index 00000000..2d40e967 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_861.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_862.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_862.png new file mode 100644 index 00000000..cf65ede3 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_862.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_863.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_863.png new file mode 100644 index 00000000..ae7db78d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_863.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_864.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_864.png new file mode 100644 index 00000000..b70be253 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/136/309/s_864.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_832.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_832.png new file mode 100644 index 00000000..38b38f30 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_832.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_833.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_833.png new file mode 100644 index 00000000..4e225a30 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_833.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_834.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_834.png new file mode 100644 index 00000000..ea976741 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_834.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_835.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_835.png new file mode 100644 index 00000000..c08fcc1b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_835.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_836.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_836.png new file mode 100644 index 00000000..3b2f9f3c Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_836.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_837.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_837.png new file mode 100644 index 00000000..9acfc346 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_837.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_838.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_838.png new file mode 100644 index 00000000..7b18557f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_838.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_839.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_839.png index 9b9d21df..472b60a6 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_839.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_839.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_840.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_840.png index a6bf5f5d..b31bf9a5 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_840.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_840.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_841.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_841.png index f143eedf..4b6254b7 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_841.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_841.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_842.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_842.png index 31401acf..0bb0fdc1 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_842.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_842.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_843.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_843.png index 825609c3..47176161 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_843.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_843.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_844.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_844.png index c2d11211..b18289d3 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_844.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_844.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_845.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_845.png index 7c9b1723..e1226410 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_845.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_845.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_846.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_846.png index 9e6568b3..8a609e9c 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_846.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_846.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_847.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_847.png index e0e1a42e..3356b832 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_847.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_847.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_848.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_848.png index a24e8842..75c077ab 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_848.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_848.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_849.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_849.png index 60c9fb73..913c6b2c 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_849.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_849.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_850.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_850.png index cc2d52bb..a6f97436 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_850.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_850.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_851.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_851.png index ffceb481..0751895a 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_851.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_851.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_852.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_852.png index 4a5a14ba..e7801bda 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_852.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_852.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_853.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_853.png index 5e52970c..295827da 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_853.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_853.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_854.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_854.png index b7e1ac9b..4257efd6 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_854.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_854.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_855.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_855.png index 01ba4318..65c2f598 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_855.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_855.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_856.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_856.png index 5dfc62fa..17b0cfb3 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_856.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_856.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_857.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_857.png index c7786d15..9ba90d11 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_857.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_857.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_858.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_858.png index 46d3f1fa..41f9a130 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_858.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_858.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_859.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_859.png new file mode 100644 index 00000000..1f99971b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_859.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_860.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_860.png new file mode 100644 index 00000000..0b4b6e03 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_860.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_861.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_861.png new file mode 100644 index 00000000..0edea9f9 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_861.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_862.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_862.png new file mode 100644 index 00000000..558e5d54 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_862.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_863.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_863.png new file mode 100644 index 00000000..53cab76d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_863.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_864.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_864.png new file mode 100644 index 00000000..223d496d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/137/309/s_864.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_832.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_832.png new file mode 100644 index 00000000..1e6da616 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_832.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_833.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_833.png new file mode 100644 index 00000000..d2534055 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_833.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_834.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_834.png new file mode 100644 index 00000000..d2353385 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_834.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_835.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_835.png new file mode 100644 index 00000000..d7fc052a Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_835.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_836.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_836.png new file mode 100644 index 00000000..89e243a1 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_836.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_837.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_837.png new file mode 100644 index 00000000..7191fabb Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_837.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_838.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_838.png new file mode 100644 index 00000000..36029d14 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_838.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_839.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_839.png index 442c3d1d..9114beec 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_839.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_839.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_840.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_840.png index 7a1f8f92..6df4ce14 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_840.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_840.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_841.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_841.png index f7da12a6..eaaa477f 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_841.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_841.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_842.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_842.png index 9f182ddb..d12a637d 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_842.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_842.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_843.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_843.png index 017ac49c..ca3d4345 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_843.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_843.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_844.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_844.png index 139d5a08..12f06e41 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_844.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_844.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_845.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_845.png index 1a9723fa..fc1b12d9 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_845.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_845.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_846.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_846.png index 9e181ed1..59301c88 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_846.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_846.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_847.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_847.png index cf4f0dfb..546add91 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_847.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_847.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_848.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_848.png index 08290650..17ed124d 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_848.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_848.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_849.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_849.png index 745130ad..ffa3b491 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_849.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_849.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_850.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_850.png index f949210a..c4c0331f 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_850.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_850.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_851.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_851.png index 8bbd8071..40c84392 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_851.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_851.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_852.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_852.png index 25ff768f..7b90851d 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_852.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_852.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_853.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_853.png index 13fd9370..b6bf044d 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_853.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_853.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_854.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_854.png index b4ffdb19..5a56d2d2 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_854.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_854.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_855.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_855.png index e8870373..65350068 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_855.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_855.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_856.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_856.png index 830c7e7a..2fb0aaa0 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_856.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_856.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_857.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_857.png index 4001e482..eae56cd6 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_857.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_857.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_858.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_858.png index 296be208..a17304e7 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_858.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_858.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_859.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_859.png new file mode 100644 index 00000000..e9b2f24f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_859.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_860.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_860.png new file mode 100644 index 00000000..0345e208 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_860.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_861.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_861.png new file mode 100644 index 00000000..c50e9517 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_861.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_862.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_862.png new file mode 100644 index 00000000..607f754a Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_862.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_863.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_863.png new file mode 100644 index 00000000..f7c51b41 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_863.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_864.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_864.png new file mode 100644 index 00000000..ca7b1696 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/138/309/s_864.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_832.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_832.png new file mode 100644 index 00000000..32cbe178 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_832.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_833.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_833.png new file mode 100644 index 00000000..089a406c Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_833.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_834.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_834.png new file mode 100644 index 00000000..1c1db7ed Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_834.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_835.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_835.png new file mode 100644 index 00000000..ec958978 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_835.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_836.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_836.png new file mode 100644 index 00000000..9d40be04 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_836.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_837.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_837.png new file mode 100644 index 00000000..ad668b93 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_837.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_838.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_838.png new file mode 100644 index 00000000..0102fb8e Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_838.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_839.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_839.png index a819705e..819a4809 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_839.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_839.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_840.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_840.png index 6890f396..3c4ead04 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_840.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_840.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_841.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_841.png index 49dc72a7..d5258472 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_841.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_841.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_842.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_842.png index 50b54223..18e88793 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_842.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_842.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_843.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_843.png index 60fa1d36..192ce940 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_843.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_843.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_844.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_844.png index 210a00a5..a3b23bc4 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_844.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_844.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_845.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_845.png index 6ad62db1..f51b2dd9 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_845.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_845.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_846.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_846.png index e331394d..8fa12b23 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_846.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_846.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_847.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_847.png index 7889a9e4..0b37c0e8 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_847.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_847.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_848.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_848.png index eb122ce7..c2932261 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_848.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_848.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_849.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_849.png index c07ea02b..c0341a3a 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_849.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_849.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_850.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_850.png index ae06c77a..f8a74e3c 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_850.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_850.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_851.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_851.png index c207d5fa..7576f699 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_851.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_851.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_852.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_852.png index af966ddc..7d5efe7d 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_852.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_852.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_853.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_853.png index 687eb570..fcc40bfa 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_853.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_853.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_854.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_854.png index 8ad30bf4..94b62e2a 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_854.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_854.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_855.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_855.png index 7361e25c..33855853 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_855.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_855.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_856.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_856.png index a4052328..8198ba8e 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_856.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_856.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_857.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_857.png index 1edfd4d1..2ae2e290 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_857.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_857.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_858.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_858.png index 6d7ad335..683036e6 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_858.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_858.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_859.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_859.png new file mode 100644 index 00000000..8e3bda57 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_859.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_860.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_860.png new file mode 100644 index 00000000..6e79e563 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_860.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_861.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_861.png new file mode 100644 index 00000000..855a0d21 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_861.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_862.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_862.png new file mode 100644 index 00000000..52ad0808 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_862.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_863.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_863.png new file mode 100644 index 00000000..b519b601 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_863.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_864.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_864.png new file mode 100644 index 00000000..a7b22f6b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/139/309/s_864.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_832.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_832.png new file mode 100644 index 00000000..4896c82e Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_832.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_833.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_833.png new file mode 100644 index 00000000..62aa40a1 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_833.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_834.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_834.png new file mode 100644 index 00000000..8df4cf68 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_834.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_835.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_835.png new file mode 100644 index 00000000..81ed6df0 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_835.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_836.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_836.png new file mode 100644 index 00000000..38bc16dd Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_836.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_837.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_837.png new file mode 100644 index 00000000..b0eb8359 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_837.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_838.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_838.png new file mode 100644 index 00000000..49d0f3ff Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_838.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_839.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_839.png index 5860e045..d3812680 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_839.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_839.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_840.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_840.png index 9fe4846e..fe3ea612 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_840.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_840.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_841.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_841.png index 07060f0b..fd101239 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_841.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_841.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_842.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_842.png index 18112c7e..75bfc172 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_842.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_842.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_843.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_843.png index 6ec643ef..974e55a3 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_843.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_843.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_844.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_844.png index 5a8bc7f4..4409d601 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_844.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_844.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_845.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_845.png index 088c5371..9534424a 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_845.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_845.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_846.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_846.png index 851ca644..b680fa5a 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_846.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_846.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_847.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_847.png index f67eb667..943692f8 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_847.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_847.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_848.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_848.png index 6e0b41fc..a25ef6ba 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_848.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_848.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_849.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_849.png index fb332f13..dca9a5d5 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_849.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_849.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_850.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_850.png index 0de3af4b..99672385 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_850.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_850.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_851.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_851.png index 1d9fbdf7..baf6b2ea 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_851.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_851.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_852.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_852.png index eb40f7b9..6868de81 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_852.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_852.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_853.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_853.png index 1b06f548..8e873011 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_853.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_853.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_854.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_854.png index 9d860767..3c789381 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_854.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_854.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_855.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_855.png index 10fd3096..e38d89a3 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_855.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_855.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_856.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_856.png index d31f6cd3..43c93324 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_856.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_856.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_857.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_857.png index 59ee3e5b..536f36e3 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_857.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_857.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_858.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_858.png index 6bbae0ff..3916bfab 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_858.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_858.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_859.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_859.png new file mode 100644 index 00000000..62b3b44f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_859.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_860.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_860.png new file mode 100644 index 00000000..7db0b8fb Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_860.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_861.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_861.png new file mode 100644 index 00000000..d64569b2 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_861.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_862.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_862.png new file mode 100644 index 00000000..8b84d1a9 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_862.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_863.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_863.png new file mode 100644 index 00000000..4e968c73 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_863.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_864.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_864.png new file mode 100644 index 00000000..cae2f882 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/140/309/s_864.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_832.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_832.png new file mode 100644 index 00000000..16c66c21 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_832.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_833.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_833.png new file mode 100644 index 00000000..fd83d9fd Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_833.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_834.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_834.png new file mode 100644 index 00000000..b95804c0 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_834.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_835.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_835.png new file mode 100644 index 00000000..5f0025e6 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_835.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_836.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_836.png new file mode 100644 index 00000000..8c307afd Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_836.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_837.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_837.png new file mode 100644 index 00000000..e3cb1cc6 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_837.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_838.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_838.png new file mode 100644 index 00000000..12462892 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_838.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_839.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_839.png index d46169e9..8c08909c 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_839.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_839.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_840.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_840.png index 7923c77c..45123e5f 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_840.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_840.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_841.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_841.png index 3bf2fa95..6de682b3 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_841.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_841.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_842.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_842.png index c21adacc..00f75b5e 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_842.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_842.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_843.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_843.png index 95b23ea1..a0ca7271 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_843.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_843.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_844.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_844.png index 1de6d917..7221f229 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_844.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_844.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_845.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_845.png index 4824c7fb..509d6b8b 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_845.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_845.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_846.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_846.png index b9cab6e4..8c392c03 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_846.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_846.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_847.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_847.png index 06467d29..f5db31ef 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_847.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_847.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_848.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_848.png index e125b272..c180de25 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_848.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_848.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_849.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_849.png index b2a655aa..529f8be4 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_849.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_849.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_850.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_850.png index f842773a..304fe515 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_850.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_850.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_851.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_851.png index 5a8c2103..d3171c24 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_851.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_851.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_852.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_852.png index 25784eba..68735569 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_852.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_852.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_853.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_853.png index 74a1c858..02d26f7a 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_853.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_853.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_854.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_854.png index 3d5cc435..33aac39a 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_854.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_854.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_855.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_855.png index 5feeaf29..e1be9a0f 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_855.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_855.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_856.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_856.png index 6e32e3bf..69a0d020 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_856.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_856.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_857.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_857.png index 70b709d6..bc375a9e 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_857.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_857.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_858.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_858.png index 3e844be2..17c7bed7 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_858.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_858.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_859.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_859.png new file mode 100644 index 00000000..2c134b6d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_859.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_860.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_860.png new file mode 100644 index 00000000..1cd50692 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_860.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_861.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_861.png new file mode 100644 index 00000000..946b96fb Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_861.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_862.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_862.png new file mode 100644 index 00000000..6767972f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_862.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_863.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_863.png new file mode 100644 index 00000000..645fe852 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_863.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_864.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_864.png new file mode 100644 index 00000000..729bded1 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/141/309/s_864.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_832.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_832.png new file mode 100644 index 00000000..0cb38e95 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_832.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_833.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_833.png new file mode 100644 index 00000000..6fcda7f2 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_833.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_834.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_834.png new file mode 100644 index 00000000..1492c8ab Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_834.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_835.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_835.png new file mode 100644 index 00000000..37b07fdd Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_835.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_836.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_836.png new file mode 100644 index 00000000..6526b6cb Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_836.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_837.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_837.png new file mode 100644 index 00000000..8efc7c5b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_837.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_838.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_838.png new file mode 100644 index 00000000..8e3c7a28 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_838.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_839.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_839.png index 204b7c1f..65dc997d 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_839.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_839.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_840.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_840.png index ece6ed33..8866db31 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_840.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_840.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_841.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_841.png index 14fddd63..4ac5c8e7 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_841.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_841.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_842.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_842.png index 39a05a33..6a469123 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_842.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_842.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_843.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_843.png index b009bcdb..d44b1359 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_843.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_843.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_844.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_844.png index ae7701b8..5caa197b 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_844.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_844.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_845.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_845.png index b4487e06..7a292f5e 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_845.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_845.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_846.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_846.png index 137ff758..b02984cf 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_846.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_846.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_847.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_847.png index 33ee5b51..04494d88 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_847.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_847.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_848.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_848.png index 1a4a8640..a44f6620 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_848.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_848.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_849.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_849.png index 1173489a..e15bb344 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_849.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_849.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_850.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_850.png index 6b44a8a2..89df5f28 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_850.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_850.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_851.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_851.png index 7be3b624..bc722fec 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_851.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_851.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_852.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_852.png index 7e953ca7..f3c5a5ba 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_852.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_852.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_853.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_853.png index bb750d96..03fb4d7e 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_853.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_853.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_854.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_854.png index e4f75013..fdb42259 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_854.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_854.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_855.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_855.png index 00298c52..17ef97d2 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_855.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_855.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_856.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_856.png index edf7d4f1..0fd97948 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_856.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_856.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_857.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_857.png index 0a1d83cb..77690535 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_857.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_857.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_858.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_858.png index 20729ce8..41ffd693 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_858.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_858.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_859.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_859.png new file mode 100644 index 00000000..0dbd2091 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_859.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_860.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_860.png new file mode 100644 index 00000000..2cc4e517 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_860.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_861.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_861.png new file mode 100644 index 00000000..9437a7c4 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_861.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_862.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_862.png new file mode 100644 index 00000000..2f48286b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_862.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_863.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_863.png new file mode 100644 index 00000000..6ae986ba Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_863.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_864.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_864.png new file mode 100644 index 00000000..b2b891d3 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/142/309/s_864.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_832.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_832.png new file mode 100644 index 00000000..34e2a92d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_832.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_833.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_833.png new file mode 100644 index 00000000..93aa1505 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_833.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_834.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_834.png new file mode 100644 index 00000000..03e7b3e1 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_834.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_835.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_835.png new file mode 100644 index 00000000..7d99a3e6 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_835.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_836.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_836.png new file mode 100644 index 00000000..e88bda35 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_836.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_837.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_837.png new file mode 100644 index 00000000..850a7e7e Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_837.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_838.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_838.png new file mode 100644 index 00000000..a2525656 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_838.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_839.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_839.png index 66649b23..03c673ae 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_839.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_839.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_840.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_840.png index 1ec10de0..496d6119 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_840.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_840.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_841.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_841.png index 18048fcb..0464e583 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_841.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_841.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_842.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_842.png index 53cdd225..51299145 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_842.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_842.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_843.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_843.png index 1dad644e..25a65efe 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_843.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_843.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_844.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_844.png index 4a53fdca..ad66b43c 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_844.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_844.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_845.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_845.png index a1c5cc91..3c2e0c8f 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_845.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_845.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_846.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_846.png index 6c0d8550..48a84bf0 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_846.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_846.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_847.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_847.png index 5025bfd4..436dfb2c 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_847.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_847.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_848.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_848.png index 7ce5962a..463215e7 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_848.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_848.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_849.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_849.png index 7516f1d0..46f33465 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_849.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_849.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_850.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_850.png index f8ca10cf..b792b3e0 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_850.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_850.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_851.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_851.png index 9a794a2b..f263145e 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_851.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_851.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_852.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_852.png index 590101d4..9c29b56a 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_852.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_852.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_853.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_853.png index 6f6c7b09..ca393d9b 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_853.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_853.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_854.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_854.png index 5d0dc56e..054326b6 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_854.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_854.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_855.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_855.png index 4d90fffc..fa2b8d5a 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_855.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_855.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_856.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_856.png index d175226c..e866489d 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_856.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_856.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_857.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_857.png index 91cf6eb1..cf643778 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_857.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_857.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_858.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_858.png index a1e34310..4bc8af68 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_858.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_858.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_859.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_859.png new file mode 100644 index 00000000..691036e1 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_859.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_860.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_860.png new file mode 100644 index 00000000..9ffea7e3 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_860.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_861.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_861.png new file mode 100644 index 00000000..875bba76 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_861.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_862.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_862.png new file mode 100644 index 00000000..c7a8bbef Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_862.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_863.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_863.png new file mode 100644 index 00000000..d48c4d53 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_863.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_864.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_864.png new file mode 100644 index 00000000..2e655674 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/143/309/s_864.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_832.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_832.png new file mode 100644 index 00000000..7510348f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_832.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_833.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_833.png new file mode 100644 index 00000000..de309047 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_833.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_834.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_834.png new file mode 100644 index 00000000..c197aa4d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_834.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_835.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_835.png new file mode 100644 index 00000000..2b8b66d8 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_835.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_836.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_836.png new file mode 100644 index 00000000..0f6fb17d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_836.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_837.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_837.png new file mode 100644 index 00000000..6c6f8811 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_837.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_838.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_838.png new file mode 100644 index 00000000..161d488b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_838.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_839.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_839.png index a918de57..39d6f9f5 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_839.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_839.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_840.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_840.png index 94dbb49f..4aff2f5c 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_840.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_840.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_841.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_841.png index 3a5771f2..014016cb 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_841.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_841.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_842.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_842.png index 42f40bd3..db0cb518 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_842.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_842.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_843.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_843.png index e60e2fda..5e056d78 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_843.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_843.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_844.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_844.png index 14f840a6..a8fd1a5c 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_844.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_844.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_845.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_845.png index ecd7d20f..a18ddd0f 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_845.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_845.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_846.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_846.png index faa2d34c..dc91cfc3 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_846.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_846.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_847.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_847.png index 6273599b..a5d3cc4d 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_847.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_847.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_848.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_848.png index 4b728330..3fdcf87d 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_848.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_848.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_849.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_849.png index 6c03eab7..8b8d5021 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_849.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_849.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_850.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_850.png index 4e516653..c5124ec5 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_850.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_850.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_851.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_851.png index 2ff61d9a..b54d4a33 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_851.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_851.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_852.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_852.png index 86fa19f1..570b224e 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_852.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_852.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_853.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_853.png index bd310ad7..a048f3d6 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_853.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_853.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_854.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_854.png index 24c60636..3ded4c64 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_854.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_854.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_855.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_855.png index 9fd5f2f5..1c56cff8 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_855.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_855.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_856.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_856.png index be1293c8..786c40e5 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_856.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_856.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_857.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_857.png index c3692891..3ba0f668 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_857.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_857.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_858.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_858.png index d747ae81..01b1f57e 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_858.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_858.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_859.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_859.png new file mode 100644 index 00000000..671810ab Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_859.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_860.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_860.png new file mode 100644 index 00000000..e6a89431 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_860.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_861.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_861.png new file mode 100644 index 00000000..6696abba Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_861.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_862.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_862.png new file mode 100644 index 00000000..0626c447 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_862.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_863.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_863.png new file mode 100644 index 00000000..cb162050 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_863.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_864.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_864.png new file mode 100644 index 00000000..e3a4de68 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/144/309/s_864.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_832.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_832.png new file mode 100644 index 00000000..0d28b011 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_832.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_833.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_833.png new file mode 100644 index 00000000..5ade733d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_833.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_834.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_834.png new file mode 100644 index 00000000..3b272655 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_834.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_835.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_835.png new file mode 100644 index 00000000..f5b9de9f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_835.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_836.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_836.png new file mode 100644 index 00000000..74a9f612 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_836.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_837.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_837.png new file mode 100644 index 00000000..58170efa Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_837.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_838.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_838.png new file mode 100644 index 00000000..47a1d4ed Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_838.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_839.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_839.png index e1417741..5270832c 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_839.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_839.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_840.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_840.png index 26d59e33..ff434585 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_840.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_840.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_841.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_841.png index dae72c84..4f884b55 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_841.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_841.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_842.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_842.png index daf0ce28..7a03c8cc 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_842.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_842.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_843.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_843.png index efd0ca60..c718d70d 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_843.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_843.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_844.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_844.png index 85623b45..68c4cf17 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_844.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_844.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_845.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_845.png index 48b79465..58691537 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_845.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_845.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_846.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_846.png index dfddf983..1e6e1642 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_846.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_846.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_847.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_847.png index 0d3fbfff..40643013 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_847.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_847.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_848.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_848.png index 94ffa4bf..9adc69a2 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_848.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_848.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_849.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_849.png index 65e110bb..f333a183 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_849.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_849.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_850.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_850.png index 93c6cfc3..fb616e3d 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_850.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_850.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_851.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_851.png index 33124977..8694e013 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_851.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_851.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_852.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_852.png index 89ed48f6..fc30391d 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_852.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_852.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_853.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_853.png index 19c879fc..eb428b50 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_853.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_853.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_854.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_854.png index da0e2d27..616eaaa1 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_854.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_854.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_855.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_855.png index 3812f667..fa80397f 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_855.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_855.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_856.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_856.png index 375a955a..1d23d7fb 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_856.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_856.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_857.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_857.png index f54def23..533ae79d 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_857.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_857.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_858.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_858.png index b8cbedb5..d89a190d 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_858.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_858.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_859.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_859.png new file mode 100644 index 00000000..329c1eb4 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_859.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_860.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_860.png new file mode 100644 index 00000000..f50c380d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_860.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_861.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_861.png new file mode 100644 index 00000000..ee41c475 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_861.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_862.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_862.png new file mode 100644 index 00000000..5f6e316e Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_862.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_863.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_863.png new file mode 100644 index 00000000..38776445 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_863.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_864.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_864.png new file mode 100644 index 00000000..87c71c82 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/145/309/s_864.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_832.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_832.png new file mode 100644 index 00000000..da3b520b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_832.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_833.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_833.png new file mode 100644 index 00000000..e376bbe9 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_833.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_834.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_834.png new file mode 100644 index 00000000..a26f068f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_834.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_835.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_835.png new file mode 100644 index 00000000..79c0c3dc Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_835.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_836.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_836.png new file mode 100644 index 00000000..d37bc4ac Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_836.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_837.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_837.png new file mode 100644 index 00000000..7343ecaf Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_837.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_838.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_838.png new file mode 100644 index 00000000..8d2658b3 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_838.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_839.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_839.png index 57953d6f..0ac18af7 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_839.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_839.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_840.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_840.png index 2edb0c5d..06e66f8d 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_840.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_840.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_841.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_841.png index 9a093f9d..6cfef443 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_841.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_841.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_842.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_842.png index f04c089a..eb5c4837 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_842.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_842.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_843.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_843.png index f1da96ae..e7864dfe 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_843.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_843.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_844.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_844.png index e97c3cdc..596e7204 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_844.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_844.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_845.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_845.png index ff0246ef..0933280e 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_845.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_845.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_846.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_846.png index c9aeb793..4137180f 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_846.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_846.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_847.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_847.png index afb889c1..f28ce5eb 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_847.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_847.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_848.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_848.png index b7afb5cb..66446e5a 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_848.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_848.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_849.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_849.png index 77824c2a..2c60cefb 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_849.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_849.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_850.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_850.png index fc218bfd..6a8cdecd 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_850.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_850.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_851.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_851.png index 7ff6aba9..8a957069 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_851.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_851.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_852.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_852.png index 3226b1fb..ee30d5cb 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_852.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_852.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_853.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_853.png index e1a6672a..54c40e4f 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_853.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_853.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_854.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_854.png index 2a611ad3..769b8160 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_854.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_854.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_855.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_855.png index de121558..acb6b368 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_855.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_855.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_856.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_856.png index 89315bb6..5eac63ae 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_856.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_856.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_857.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_857.png index beb2e4ba..80d9ae27 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_857.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_857.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_858.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_858.png index 87ae015b..3c295669 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_858.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_858.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_859.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_859.png new file mode 100644 index 00000000..2c192ea7 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_859.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_860.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_860.png new file mode 100644 index 00000000..f33d7da5 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_860.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_861.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_861.png new file mode 100644 index 00000000..ff9386b7 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_861.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_862.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_862.png new file mode 100644 index 00000000..5541c057 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_862.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_863.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_863.png new file mode 100644 index 00000000..42f05378 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_863.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_864.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_864.png new file mode 100644 index 00000000..4ef67640 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/146/309/s_864.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_832.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_832.png new file mode 100644 index 00000000..94c7b376 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_832.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_833.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_833.png new file mode 100644 index 00000000..e2b63ceb Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_833.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_834.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_834.png new file mode 100644 index 00000000..e069c637 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_834.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_835.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_835.png new file mode 100644 index 00000000..5ef0ad5f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_835.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_836.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_836.png new file mode 100644 index 00000000..a4548ffe Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_836.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_837.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_837.png new file mode 100644 index 00000000..632cfd75 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_837.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_838.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_838.png new file mode 100644 index 00000000..10b72f20 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_838.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_839.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_839.png index a25dc103..87d473ad 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_839.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_839.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_840.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_840.png index 3b627f14..acaeb7db 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_840.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_840.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_841.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_841.png index cd55c9e2..a51d9828 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_841.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_841.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_842.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_842.png index 0c93a4d6..ed84ddbe 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_842.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_842.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_843.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_843.png index 8ef90636..aae6bb1a 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_843.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_843.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_844.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_844.png index 55a5108f..d4e286e0 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_844.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_844.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_845.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_845.png index 3e5e3f8c..77f844dd 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_845.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_845.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_846.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_846.png index 5ef4bfca..793475cf 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_846.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_846.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_847.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_847.png index 611b26f3..cbe5198c 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_847.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_847.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_848.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_848.png index 5752db46..ae91ad24 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_848.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_848.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_849.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_849.png index 6829073c..276e33bc 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_849.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_849.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_850.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_850.png index b08a941a..8792749e 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_850.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_850.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_851.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_851.png index e26e6214..188fc03e 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_851.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_851.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_852.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_852.png index a8404b98..65499705 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_852.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_852.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_853.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_853.png index f3879327..95204d54 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_853.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_853.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_854.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_854.png index 7248abe8..aed20947 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_854.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_854.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_855.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_855.png index 9b95316f..aa2074a5 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_855.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_855.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_856.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_856.png index 03987fe2..27337a93 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_856.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_856.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_857.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_857.png index 86318db4..6420b64e 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_857.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_857.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_858.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_858.png index a45ed9f2..e266bf27 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_858.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_858.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_859.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_859.png new file mode 100644 index 00000000..9378ada4 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_859.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_860.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_860.png new file mode 100644 index 00000000..188701aa Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_860.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_861.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_861.png new file mode 100644 index 00000000..7f02076c Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_861.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_862.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_862.png new file mode 100644 index 00000000..ca9d587e Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_862.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_863.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_863.png new file mode 100644 index 00000000..6d1ffc8c Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_863.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_864.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_864.png new file mode 100644 index 00000000..2111bb85 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/147/309/s_864.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_832.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_832.png new file mode 100644 index 00000000..7ef8f6e9 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_832.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_833.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_833.png new file mode 100644 index 00000000..6a5d0d7e Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_833.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_834.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_834.png new file mode 100644 index 00000000..656c74b7 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_834.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_835.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_835.png new file mode 100644 index 00000000..14dc0f8f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_835.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_836.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_836.png new file mode 100644 index 00000000..8aac6783 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_836.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_837.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_837.png new file mode 100644 index 00000000..1e8f4ebd Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_837.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_838.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_838.png new file mode 100644 index 00000000..8a2b922f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_838.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_839.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_839.png index 130853db..378027a4 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_839.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_839.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_840.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_840.png index 279b0543..5cfef99b 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_840.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_840.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_841.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_841.png index 1e6000f1..713ba7fc 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_841.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_841.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_842.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_842.png index c5b7e003..55b2458b 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_842.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_842.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_843.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_843.png index f9d316f5..abedab9e 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_843.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_843.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_844.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_844.png index 6690a82b..201bece5 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_844.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_844.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_845.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_845.png index 29e6d5eb..1715e43f 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_845.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_845.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_846.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_846.png index e20d819a..c8766aa6 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_846.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_846.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_847.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_847.png index 200fb9ce..19d82b3a 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_847.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_847.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_848.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_848.png index fe7345ec..ca9ec9ae 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_848.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_848.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_849.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_849.png index 14867b91..10765478 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_849.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_849.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_850.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_850.png index 27a47fa8..ace15dae 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_850.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_850.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_851.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_851.png index c451a62d..6c63fa55 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_851.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_851.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_852.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_852.png index e26e9a51..52d26143 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_852.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_852.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_853.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_853.png index 79ad8386..db65c03c 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_853.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_853.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_854.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_854.png index c6d646ba..cb9c1b0d 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_854.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_854.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_855.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_855.png index bc65f05c..8bbd6e0d 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_855.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_855.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_856.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_856.png index 06ab0f76..01f08a90 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_856.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_856.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_857.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_857.png index ea2c776c..fa8f20a7 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_857.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_857.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_858.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_858.png index c0f58e18..87bdc4e6 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_858.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_858.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_859.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_859.png new file mode 100644 index 00000000..92af4639 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_859.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_860.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_860.png new file mode 100644 index 00000000..3ec337d5 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_860.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_861.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_861.png new file mode 100644 index 00000000..1c67eb16 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_861.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_862.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_862.png new file mode 100644 index 00000000..10679dec Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_862.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_863.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_863.png new file mode 100644 index 00000000..1bf3eee9 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_863.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_864.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_864.png new file mode 100644 index 00000000..6d386e9d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/148/309/s_864.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_832.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_832.png new file mode 100644 index 00000000..dacf43d1 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_832.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_833.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_833.png new file mode 100644 index 00000000..81a99c0c Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_833.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_834.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_834.png new file mode 100644 index 00000000..9bdd3bad Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_834.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_835.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_835.png new file mode 100644 index 00000000..ec2d4830 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_835.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_836.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_836.png new file mode 100644 index 00000000..fe4178b4 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_836.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_837.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_837.png new file mode 100644 index 00000000..b84218c6 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_837.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_838.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_838.png new file mode 100644 index 00000000..442889cb Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_838.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_839.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_839.png index 60abea01..6546e347 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_839.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_839.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_840.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_840.png index 45ab7678..be9e3c60 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_840.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_840.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_841.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_841.png index b31c854a..9846e03f 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_841.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_841.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_842.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_842.png index 448a30f5..d38936be 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_842.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_842.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_843.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_843.png index ecaf2ae4..70091585 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_843.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_843.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_844.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_844.png index 3ee30f8c..232da086 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_844.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_844.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_845.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_845.png index 24232121..872e7d97 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_845.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_845.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_846.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_846.png index 94b13c85..dcfed92c 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_846.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_846.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_847.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_847.png index 727c35a3..cd25cd8f 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_847.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_847.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_848.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_848.png index 34c1a16b..fdfaa32a 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_848.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_848.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_849.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_849.png index 6a212496..cd693c52 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_849.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_849.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_850.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_850.png index dcef73d4..ebc69ae4 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_850.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_850.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_851.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_851.png index 1e91a2b6..454236be 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_851.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_851.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_852.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_852.png index c7c63efa..8f67dde5 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_852.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_852.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_853.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_853.png index b8adda73..b15a5fcf 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_853.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_853.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_854.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_854.png index 574041e7..1287ec29 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_854.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_854.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_855.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_855.png index 82946651..e48dc0f8 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_855.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_855.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_856.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_856.png index 395daadb..8ac50f53 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_856.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_856.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_857.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_857.png index f713949b..6ac14f9a 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_857.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_857.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_858.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_858.png index 35ddc82c..58bff696 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_858.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_858.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_859.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_859.png new file mode 100644 index 00000000..3bdc2435 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_859.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_860.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_860.png new file mode 100644 index 00000000..dc3670da Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_860.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_861.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_861.png new file mode 100644 index 00000000..8f135450 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_861.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_862.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_862.png new file mode 100644 index 00000000..70de0b1f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_862.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_863.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_863.png new file mode 100644 index 00000000..ed2e9973 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_863.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_864.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_864.png new file mode 100644 index 00000000..45cc064f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/149/309/s_864.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_832.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_832.png new file mode 100644 index 00000000..2e013fbf Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_832.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_833.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_833.png new file mode 100644 index 00000000..8e588a0d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_833.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_834.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_834.png new file mode 100644 index 00000000..3a3f3bef Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_834.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_835.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_835.png new file mode 100644 index 00000000..330ebe2a Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_835.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_836.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_836.png new file mode 100644 index 00000000..273cbc64 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_836.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_837.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_837.png new file mode 100644 index 00000000..0e483e53 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_837.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_838.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_838.png new file mode 100644 index 00000000..2e9f8900 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_838.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_839.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_839.png index 0aeed2fb..6a3f441c 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_839.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_839.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_840.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_840.png index e31bde47..924b6c05 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_840.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_840.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_841.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_841.png index 2ca52ce7..b4fb89dd 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_841.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_841.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_842.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_842.png index 05d3bbc1..cc669049 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_842.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_842.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_843.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_843.png index 067eb089..1a79e508 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_843.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_843.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_844.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_844.png index b2398c17..1442ac24 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_844.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_844.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_845.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_845.png index 8b56f177..1ebc2518 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_845.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_845.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_846.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_846.png index 0f3f265f..f6de933c 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_846.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_846.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_847.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_847.png index 587aa5f9..b97da890 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_847.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_847.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_848.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_848.png index 0018fe7c..f72b9a16 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_848.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_848.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_849.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_849.png index 2bf1934c..8ec02888 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_849.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_849.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_850.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_850.png index 4995f903..5e4da707 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_850.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_850.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_851.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_851.png index 9de6b624..07211558 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_851.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_851.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_852.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_852.png index 87854387..3641a7d7 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_852.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_852.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_853.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_853.png index c3b11d5d..41de991f 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_853.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_853.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_854.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_854.png index 18054e05..89f464c8 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_854.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_854.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_855.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_855.png index 363ee8fb..89bbb511 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_855.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_855.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_856.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_856.png index 3cf7cf5c..4816ef95 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_856.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_856.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_857.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_857.png index 70f25aa5..bd21e9fb 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_857.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_857.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_858.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_858.png index fa9ec6f2..78872779 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_858.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_858.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_859.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_859.png new file mode 100644 index 00000000..8ec7e0c1 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_859.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_860.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_860.png new file mode 100644 index 00000000..4c6ebcef Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_860.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_861.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_861.png new file mode 100644 index 00000000..a7050de6 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_861.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_862.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_862.png new file mode 100644 index 00000000..3ef722b1 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_862.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_863.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_863.png new file mode 100644 index 00000000..d0af3a4f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_863.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_864.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_864.png new file mode 100644 index 00000000..6f763e5e Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/150/309/s_864.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_832.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_832.png new file mode 100644 index 00000000..2d4ce2e7 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_832.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_833.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_833.png new file mode 100644 index 00000000..de309cf3 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_833.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_834.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_834.png new file mode 100644 index 00000000..71dba07d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_834.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_835.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_835.png new file mode 100644 index 00000000..45b3181b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_835.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_836.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_836.png new file mode 100644 index 00000000..eb77293d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_836.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_837.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_837.png new file mode 100644 index 00000000..38c28c8d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_837.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_838.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_838.png new file mode 100644 index 00000000..ee704b2d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_838.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_839.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_839.png index 79d23edc..0373a14f 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_839.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_839.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_840.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_840.png index 96a103da..7b327680 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_840.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_840.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_841.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_841.png index a3878f51..e3bca78a 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_841.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_841.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_842.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_842.png index c4c55c24..9d03ff88 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_842.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_842.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_843.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_843.png index 346fb1c7..e0f15334 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_843.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_843.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_844.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_844.png index 77d7c5a9..67b77397 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_844.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_844.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_845.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_845.png index 42db1342..f5dbae80 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_845.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_845.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_846.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_846.png index e6f82826..c5aff18d 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_846.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_846.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_847.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_847.png index cf4f1c5b..02364148 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_847.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_847.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_848.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_848.png index 57b4f979..e3b3cafa 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_848.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_848.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_849.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_849.png index 53d47a92..45267a7a 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_849.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_849.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_850.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_850.png index eb914afa..fad09bc2 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_850.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_850.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_851.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_851.png index e6c2a669..2b76bc75 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_851.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_851.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_852.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_852.png index c5a777ac..9f050a76 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_852.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_852.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_853.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_853.png index ab55be71..900c7f68 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_853.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_853.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_854.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_854.png index 8522ddc2..4e2f8a3c 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_854.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_854.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_855.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_855.png index 7520dedd..04248ba5 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_855.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_855.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_856.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_856.png index 1a782bff..4d93a5a2 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_856.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_856.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_857.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_857.png index a86783b8..2c5fd246 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_857.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_857.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_858.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_858.png index e2699504..2811f61e 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_858.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_858.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_859.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_859.png new file mode 100644 index 00000000..71602e14 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_859.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_860.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_860.png new file mode 100644 index 00000000..eb281f21 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_860.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_861.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_861.png new file mode 100644 index 00000000..5de4a415 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_861.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_862.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_862.png new file mode 100644 index 00000000..b647f4c8 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_862.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_863.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_863.png new file mode 100644 index 00000000..58d6e68a Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_863.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_864.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_864.png new file mode 100644 index 00000000..751e57e6 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/151/309/s_864.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_832.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_832.png new file mode 100644 index 00000000..ecb2b759 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_832.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_833.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_833.png new file mode 100644 index 00000000..6b0e0669 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_833.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_834.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_834.png new file mode 100644 index 00000000..68622a3e Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_834.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_835.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_835.png new file mode 100644 index 00000000..9bc2e539 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_835.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_836.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_836.png new file mode 100644 index 00000000..37007734 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_836.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_837.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_837.png new file mode 100644 index 00000000..b4bb21d3 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_837.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_838.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_838.png new file mode 100644 index 00000000..9d9869e0 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_838.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_839.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_839.png index 3f07b1ae..433804f3 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_839.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_839.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_840.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_840.png index 66e1f96c..1a23a773 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_840.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_840.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_841.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_841.png index 4484006a..b517d3b0 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_841.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_841.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_842.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_842.png index 7d5e8723..e3be7436 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_842.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_842.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_843.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_843.png index ce14b854..b0020792 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_843.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_843.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_844.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_844.png index 38a4187e..99c923c3 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_844.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_844.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_845.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_845.png index ec8eee54..12678ef5 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_845.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_845.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_846.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_846.png index 51a341b9..d70aa03b 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_846.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_846.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_847.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_847.png index 10319a8d..b227b5db 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_847.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_847.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_848.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_848.png index 03b594df..cb733598 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_848.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_848.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_849.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_849.png index 2fc30fa8..b0f1e4e2 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_849.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_849.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_850.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_850.png index ad291560..844a41cb 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_850.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_850.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_851.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_851.png index 4406a3da..977b6fb6 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_851.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_851.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_852.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_852.png index 3a2b9e59..8b2ef9ac 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_852.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_852.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_853.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_853.png index 0e018640..9c48810f 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_853.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_853.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_854.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_854.png index e1596ca8..44d43d5b 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_854.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_854.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_855.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_855.png index 3dd46d61..c6c14876 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_855.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_855.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_856.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_856.png index f8ef6c42..d0ebb2ae 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_856.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_856.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_857.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_857.png index ca057f4c..e099de30 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_857.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_857.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_858.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_858.png index 1f5f0a40..6e611a73 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_858.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_858.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_859.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_859.png new file mode 100644 index 00000000..52c9d63b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_859.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_860.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_860.png new file mode 100644 index 00000000..2b47d4eb Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_860.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_861.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_861.png new file mode 100644 index 00000000..694e0e91 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_861.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_862.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_862.png new file mode 100644 index 00000000..156d0706 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_862.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_863.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_863.png new file mode 100644 index 00000000..cb0241ef Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_863.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_864.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_864.png new file mode 100644 index 00000000..e0417df9 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/152/309/s_864.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_832.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_832.png new file mode 100644 index 00000000..1ee0087e Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_832.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_833.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_833.png new file mode 100644 index 00000000..0eff4c1f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_833.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_834.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_834.png new file mode 100644 index 00000000..fc73b02a Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_834.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_835.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_835.png new file mode 100644 index 00000000..ba8a9d41 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_835.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_836.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_836.png new file mode 100644 index 00000000..6f904168 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_836.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_837.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_837.png new file mode 100644 index 00000000..bbeba087 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_837.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_838.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_838.png new file mode 100644 index 00000000..720c22a1 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_838.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_839.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_839.png index b1e29e39..79832c57 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_839.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_839.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_840.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_840.png index a9cd8de6..9039addc 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_840.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_840.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_841.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_841.png index 09f4145f..fae6e8aa 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_841.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_841.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_842.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_842.png index 9e394df7..65ad3705 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_842.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_842.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_843.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_843.png index afa88b93..2a8a9ec1 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_843.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_843.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_844.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_844.png index 34789e0c..ba1d8d68 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_844.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_844.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_845.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_845.png index f1716179..98498a9b 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_845.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_845.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_846.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_846.png index 94d56f40..0a8f9377 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_846.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_846.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_847.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_847.png index a1befbd8..f239f75f 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_847.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_847.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_848.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_848.png index e4be5a01..f70aa4e1 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_848.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_848.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_849.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_849.png index 1be4dcad..a4f7e01f 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_849.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_849.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_850.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_850.png index 04bb273a..f3916442 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_850.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_850.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_851.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_851.png index 71660aa3..10fcf023 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_851.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_851.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_852.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_852.png index f2eaea2a..9576f36c 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_852.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_852.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_853.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_853.png index 82ebc0b4..4b389b42 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_853.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_853.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_854.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_854.png index 92ba62f8..580aaa0d 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_854.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_854.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_855.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_855.png index fa6ac617..b51b2ddd 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_855.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_855.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_856.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_856.png index a76f73b9..6597823a 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_856.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_856.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_857.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_857.png index 663f15df..8fd0ab99 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_857.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_857.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_858.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_858.png index 58c6a7ee..856c3d85 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_858.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_858.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_859.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_859.png new file mode 100644 index 00000000..1121416e Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_859.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_860.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_860.png new file mode 100644 index 00000000..57dae9a0 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_860.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_861.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_861.png new file mode 100644 index 00000000..99a3a114 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_861.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_862.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_862.png new file mode 100644 index 00000000..356675ca Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_862.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_863.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_863.png new file mode 100644 index 00000000..fe179c06 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_863.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_864.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_864.png new file mode 100644 index 00000000..6b28dc79 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/153/309/s_864.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_832.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_832.png new file mode 100644 index 00000000..7226d504 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_832.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_833.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_833.png new file mode 100644 index 00000000..eaa81b1b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_833.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_834.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_834.png new file mode 100644 index 00000000..f17a056f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_834.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_835.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_835.png new file mode 100644 index 00000000..9bc326de Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_835.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_836.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_836.png new file mode 100644 index 00000000..b8fbf0cc Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_836.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_837.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_837.png new file mode 100644 index 00000000..f8b2f2ae Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_837.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_838.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_838.png new file mode 100644 index 00000000..349f01e6 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_838.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_839.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_839.png index 8e76c48b..96941b83 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_839.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_839.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_840.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_840.png index d3365436..af641c50 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_840.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_840.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_841.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_841.png index 7d4b8ad2..8bdb0a8b 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_841.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_841.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_842.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_842.png index 05ec13d7..fb462973 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_842.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_842.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_843.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_843.png index ed033db6..3ba03bb7 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_843.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_843.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_844.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_844.png index 92a6877d..d196be57 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_844.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_844.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_845.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_845.png index 071c4be3..b53c3a33 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_845.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_845.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_846.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_846.png index 6dcbca89..87817dff 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_846.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_846.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_847.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_847.png index d940ded9..efc19133 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_847.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_847.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_848.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_848.png index d0037342..096ba6e1 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_848.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_848.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_849.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_849.png index c7943730..a57caa8c 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_849.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_849.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_850.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_850.png index 1096cc7d..7090f79c 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_850.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_850.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_851.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_851.png index db021f53..b4d0a37f 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_851.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_851.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_852.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_852.png index 4d8ac431..dbb04376 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_852.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_852.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_853.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_853.png index 9d920d7c..c7f68a49 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_853.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_853.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_854.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_854.png index 44647169..0d24561c 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_854.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_854.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_855.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_855.png index 747aa094..1b8dbf07 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_855.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_855.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_856.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_856.png index e34e85ec..8138acb0 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_856.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_856.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_857.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_857.png index 0cdd7838..bb4d536d 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_857.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_857.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_858.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_858.png index e2715134..ebd1d7cd 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_858.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_858.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_859.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_859.png new file mode 100644 index 00000000..8521425d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_859.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_860.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_860.png new file mode 100644 index 00000000..2adca058 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_860.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_861.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_861.png new file mode 100644 index 00000000..7fb1c993 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_861.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_862.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_862.png new file mode 100644 index 00000000..76708636 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_862.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_863.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_863.png new file mode 100644 index 00000000..f9c26701 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_863.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_864.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_864.png new file mode 100644 index 00000000..7da46ee5 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/154/309/s_864.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_832.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_832.png new file mode 100644 index 00000000..80f50f1c Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_832.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_833.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_833.png new file mode 100644 index 00000000..2023fbd1 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_833.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_834.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_834.png new file mode 100644 index 00000000..b73599f7 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_834.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_835.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_835.png new file mode 100644 index 00000000..9fb8c3aa Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_835.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_836.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_836.png new file mode 100644 index 00000000..1c3a16da Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_836.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_837.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_837.png new file mode 100644 index 00000000..b5a25a3e Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_837.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_838.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_838.png new file mode 100644 index 00000000..27ffb692 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_838.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_839.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_839.png index 587d35f6..d0843773 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_839.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_839.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_840.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_840.png index 489585f6..84776f3d 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_840.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_840.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_841.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_841.png index 60b3df34..c3fff442 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_841.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_841.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_842.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_842.png index c8c7f4f2..fbf34983 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_842.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_842.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_843.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_843.png index ae320f00..0ad9fe69 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_843.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_843.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_844.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_844.png index 61e99ca6..62dd9958 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_844.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_844.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_845.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_845.png index 24c96c47..a49b85fe 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_845.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_845.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_846.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_846.png index e88817a9..60514fdd 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_846.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_846.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_847.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_847.png index c8465c73..3a573b9c 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_847.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_847.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_848.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_848.png index 463065ce..70f950c9 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_848.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_848.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_849.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_849.png index 4115dd95..e2b44b31 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_849.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_849.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_850.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_850.png index 60a2e926..9816892b 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_850.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_850.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_851.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_851.png index d649b366..5a066113 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_851.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_851.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_852.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_852.png index 369c2fc2..b663f256 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_852.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_852.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_853.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_853.png index 8c10be5b..f3ec7de9 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_853.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_853.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_854.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_854.png index cc32c468..8097098d 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_854.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_854.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_855.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_855.png index a1d2d3a0..c0639063 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_855.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_855.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_856.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_856.png index e802e55a..8532998e 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_856.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_856.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_857.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_857.png index c33222a7..f77c5eb2 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_857.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_857.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_858.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_858.png index 6d2d6226..de0f8244 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_858.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_858.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_859.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_859.png new file mode 100644 index 00000000..eb1f1a55 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_859.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_860.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_860.png new file mode 100644 index 00000000..6cde8e27 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_860.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_861.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_861.png new file mode 100644 index 00000000..e101db9e Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_861.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_862.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_862.png new file mode 100644 index 00000000..6aad61c2 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_862.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_863.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_863.png new file mode 100644 index 00000000..01622335 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_863.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_864.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_864.png new file mode 100644 index 00000000..316ecc33 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/155/309/s_864.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_832.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_832.png new file mode 100644 index 00000000..c95d7c37 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_832.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_833.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_833.png new file mode 100644 index 00000000..cddd63aa Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_833.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_834.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_834.png new file mode 100644 index 00000000..13ad6ced Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_834.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_835.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_835.png new file mode 100644 index 00000000..caf95053 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_835.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_836.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_836.png new file mode 100644 index 00000000..f32dd205 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_836.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_837.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_837.png new file mode 100644 index 00000000..5d605e89 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_837.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_838.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_838.png new file mode 100644 index 00000000..b775c227 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_838.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_839.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_839.png index 390bcb39..cdc67542 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_839.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_839.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_840.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_840.png index e29daca7..4f0ead0c 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_840.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_840.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_841.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_841.png index b2e33ab7..6aaf8335 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_841.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_841.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_842.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_842.png index 5bf7dee4..47350ebb 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_842.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_842.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_843.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_843.png index 2380a309..3fde8c9c 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_843.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_843.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_844.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_844.png index f1f69864..ad3a553b 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_844.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_844.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_845.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_845.png index 0513daf7..b6cf9922 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_845.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_845.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_846.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_846.png index 4f3a7b4f..ff960277 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_846.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_846.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_847.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_847.png index 900fa9c5..8dc4ce4b 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_847.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_847.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_848.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_848.png index d4a14aab..e0ae9ce6 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_848.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_848.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_849.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_849.png index c67965b9..7e5eb7a4 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_849.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_849.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_850.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_850.png index d368fa97..fa3ae3ba 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_850.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_850.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_851.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_851.png index af9b20c5..85bda553 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_851.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_851.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_852.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_852.png index 75ccf25a..84e36247 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_852.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_852.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_853.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_853.png index 8dfba692..3828f83e 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_853.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_853.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_854.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_854.png index 51ddfa6c..a2bdff25 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_854.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_854.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_855.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_855.png index 2472ed43..294bc4f5 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_855.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_855.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_856.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_856.png index ed5906b6..2ce98709 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_856.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_856.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_857.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_857.png index a2f3aed3..500cb43a 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_857.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_857.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_858.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_858.png index 7cec8ec8..cee6b708 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_858.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_858.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_859.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_859.png new file mode 100644 index 00000000..352f0448 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_859.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_860.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_860.png new file mode 100644 index 00000000..e26c5175 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_860.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_861.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_861.png new file mode 100644 index 00000000..0766d058 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_861.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_862.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_862.png new file mode 100644 index 00000000..2066ebee Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_862.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_863.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_863.png new file mode 100644 index 00000000..7ae21eb4 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_863.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_864.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_864.png new file mode 100644 index 00000000..ff998409 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/156/309/s_864.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_832.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_832.png new file mode 100644 index 00000000..4ca300d7 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_832.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_833.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_833.png new file mode 100644 index 00000000..0f502a36 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_833.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_834.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_834.png new file mode 100644 index 00000000..b3aaa83d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_834.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_835.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_835.png new file mode 100644 index 00000000..95451213 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_835.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_836.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_836.png new file mode 100644 index 00000000..6206fecb Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_836.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_837.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_837.png new file mode 100644 index 00000000..cc319ca0 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_837.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_838.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_838.png new file mode 100644 index 00000000..5523bfc1 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_838.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_839.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_839.png index fae75610..745ad3b4 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_839.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_839.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_840.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_840.png index 8bc4a9d3..12ccbe93 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_840.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_840.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_841.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_841.png index ac443592..95ccb5e9 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_841.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_841.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_842.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_842.png index 395124bc..fde72447 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_842.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_842.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_843.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_843.png index 7ff2ac2b..60105be8 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_843.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_843.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_844.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_844.png index 9f52d2b8..ee470db5 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_844.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_844.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_845.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_845.png index 2a39e121..1ab0e1b2 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_845.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_845.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_846.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_846.png index d76c0b44..4c6dcf16 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_846.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_846.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_847.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_847.png index fb5720f6..463d4485 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_847.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_847.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_848.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_848.png index 8ae15ff1..0e56b2f2 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_848.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_848.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_849.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_849.png index 482906fa..b5b0d121 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_849.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_849.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_850.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_850.png index ff0d33a0..4194955e 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_850.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_850.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_851.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_851.png index 90defa22..7f0b343c 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_851.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_851.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_852.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_852.png index e90c9cab..2bec3020 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_852.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_852.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_853.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_853.png index 1bdb15e5..4c0955b4 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_853.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_853.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_854.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_854.png index 0c1461eb..dce76ed3 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_854.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_854.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_855.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_855.png index 4affd9f2..ec24f446 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_855.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_855.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_856.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_856.png index 74892fa0..9a7b3f28 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_856.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_856.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_857.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_857.png index 615537c5..3877ecfe 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_857.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_857.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_858.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_858.png index b8e4c200..b4b25e02 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_858.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_858.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_859.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_859.png new file mode 100644 index 00000000..3b5405dc Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_859.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_860.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_860.png new file mode 100644 index 00000000..6035ce06 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_860.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_861.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_861.png new file mode 100644 index 00000000..4c8e552f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_861.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_862.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_862.png new file mode 100644 index 00000000..83025ea1 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_862.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_863.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_863.png new file mode 100644 index 00000000..932b2e68 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_863.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_864.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_864.png new file mode 100644 index 00000000..7c317b5b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/157/309/s_864.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_832.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_832.png new file mode 100644 index 00000000..d4d0c8a1 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_832.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_833.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_833.png new file mode 100644 index 00000000..839305d4 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_833.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_834.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_834.png new file mode 100644 index 00000000..18c7231f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_834.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_835.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_835.png new file mode 100644 index 00000000..db1cf24b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_835.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_836.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_836.png new file mode 100644 index 00000000..79a832b1 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_836.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_837.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_837.png new file mode 100644 index 00000000..97effc6b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_837.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_838.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_838.png new file mode 100644 index 00000000..b46a5f99 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_838.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_839.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_839.png index 6a1a83d6..93092aca 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_839.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_839.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_840.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_840.png index f51c6ecb..62cbdf24 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_840.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_840.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_841.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_841.png index 72fe1409..95d9569f 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_841.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_841.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_842.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_842.png index 05640925..9e542896 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_842.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_842.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_843.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_843.png index 88aabce4..9f7ea492 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_843.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_843.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_844.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_844.png index dbcf3c02..273877c9 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_844.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_844.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_845.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_845.png index fd5efd07..6817943a 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_845.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_845.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_846.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_846.png index fdd721aa..c579511c 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_846.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_846.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_847.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_847.png index 102d3b89..32b40eac 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_847.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_847.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_848.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_848.png index 812154ab..f16ed3d0 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_848.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_848.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_849.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_849.png index ee99a10c..3e0086c4 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_849.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_849.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_850.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_850.png index 64b12019..efd28c3a 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_850.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_850.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_851.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_851.png index 17cb6f37..5e7947ac 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_851.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_851.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_852.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_852.png index 763115b6..4bea173c 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_852.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_852.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_853.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_853.png index 484b1f0b..cc6d2fb3 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_853.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_853.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_854.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_854.png index 51f342fe..7388e08d 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_854.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_854.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_855.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_855.png index f51357ad..9b972642 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_855.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_855.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_856.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_856.png index df4fa12a..bb6df6ba 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_856.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_856.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_857.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_857.png index 7fd83841..2292fcdc 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_857.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_857.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_858.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_858.png index b822e976..c6865cce 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_858.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_858.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_859.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_859.png new file mode 100644 index 00000000..4744c2a7 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_859.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_860.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_860.png new file mode 100644 index 00000000..d44f1461 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_860.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_861.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_861.png new file mode 100644 index 00000000..59131460 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_861.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_862.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_862.png new file mode 100644 index 00000000..18449496 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_862.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_863.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_863.png new file mode 100644 index 00000000..1f53c703 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_863.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_864.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_864.png new file mode 100644 index 00000000..d3acebba Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/158/309/s_864.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_832.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_832.png new file mode 100644 index 00000000..ee31847f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_832.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_833.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_833.png new file mode 100644 index 00000000..91d90f82 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_833.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_834.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_834.png new file mode 100644 index 00000000..e1d36d56 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_834.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_835.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_835.png new file mode 100644 index 00000000..4b2d195b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_835.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_836.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_836.png new file mode 100644 index 00000000..21dc08f4 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_836.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_837.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_837.png new file mode 100644 index 00000000..73202b2c Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_837.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_838.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_838.png new file mode 100644 index 00000000..0a1645da Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_838.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_839.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_839.png index 9cc12e86..ce99f16b 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_839.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_839.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_840.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_840.png index e02e4bb9..4dc2a7c8 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_840.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_840.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_841.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_841.png index 85a6ffb8..1bd429c4 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_841.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_841.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_842.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_842.png index 8917773e..1f73a6df 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_842.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_842.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_843.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_843.png index 8cda0925..ea846c67 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_843.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_843.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_844.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_844.png index c9602816..3a86cb1f 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_844.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_844.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_845.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_845.png index 540b99ba..594a3eac 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_845.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_845.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_846.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_846.png index 7c9b4511..4a24c3b6 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_846.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_846.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_847.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_847.png index 140c2048..7447d48c 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_847.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_847.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_848.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_848.png index b1a8595b..b14ba7fd 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_848.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_848.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_849.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_849.png index 61fb39b6..a67b1648 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_849.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_849.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_850.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_850.png index 9c55d6db..7ffe162e 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_850.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_850.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_851.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_851.png index c20e2a62..47b4a980 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_851.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_851.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_852.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_852.png index 879e4eae..33ffdd03 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_852.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_852.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_853.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_853.png index af49a2d7..61eb1186 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_853.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_853.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_854.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_854.png index 676b473a..37cc8a90 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_854.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_854.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_855.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_855.png index 54187735..74c31bbb 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_855.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_855.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_856.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_856.png index 320f120c..3059bb63 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_856.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_856.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_857.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_857.png index 4acaa91c..cae81ffc 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_857.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_857.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_858.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_858.png index 853652d3..c23ea3d7 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_858.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_858.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_859.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_859.png new file mode 100644 index 00000000..6c6d4c10 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_859.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_860.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_860.png new file mode 100644 index 00000000..5a96fb5f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_860.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_861.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_861.png new file mode 100644 index 00000000..ec8038e5 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_861.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_862.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_862.png new file mode 100644 index 00000000..5ec76f7b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_862.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_863.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_863.png new file mode 100644 index 00000000..0f698292 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_863.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_864.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_864.png new file mode 100644 index 00000000..0707b597 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/159/309/s_864.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_832.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_832.png new file mode 100644 index 00000000..8210af5b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_832.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_833.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_833.png new file mode 100644 index 00000000..27a788e6 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_833.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_834.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_834.png new file mode 100644 index 00000000..6cc5fbdc Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_834.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_835.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_835.png new file mode 100644 index 00000000..b9e71508 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_835.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_836.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_836.png new file mode 100644 index 00000000..07d810d0 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_836.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_837.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_837.png new file mode 100644 index 00000000..d4c5df72 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_837.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_838.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_838.png new file mode 100644 index 00000000..4296a2a8 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_838.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_839.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_839.png index 51ee8943..4b0a8026 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_839.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_839.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_840.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_840.png index 47d2c402..32215920 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_840.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_840.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_841.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_841.png index 7c0de4a8..6e399b76 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_841.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_841.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_842.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_842.png index 5c53ba98..6fea860e 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_842.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_842.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_843.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_843.png index ce14a32c..3257b0cb 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_843.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_843.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_844.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_844.png index 0fde5226..5dc3f041 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_844.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_844.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_845.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_845.png index 446e686d..60ca9d60 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_845.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_845.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_846.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_846.png index 79cb039e..87691439 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_846.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_846.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_847.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_847.png index b018e37c..b95bbffb 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_847.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_847.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_848.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_848.png index a33cd0c0..98ff316b 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_848.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_848.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_849.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_849.png index 6773b575..3a7cd2d3 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_849.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_849.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_850.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_850.png index ec83c2c3..6cb11e41 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_850.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_850.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_851.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_851.png index 29855d86..3c86dd0e 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_851.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_851.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_852.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_852.png index 488d094a..0926bbfa 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_852.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_852.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_853.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_853.png index 7adea45c..5c87f2df 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_853.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_853.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_854.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_854.png index 75b3be52..58665cf3 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_854.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_854.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_855.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_855.png index 51a8e48c..ffeecb48 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_855.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_855.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_856.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_856.png index 7a515020..5e51eba1 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_856.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_856.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_857.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_857.png index 795f487d..ec42271f 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_857.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_857.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_858.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_858.png index 3ac86323..827aa00d 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_858.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_858.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_859.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_859.png new file mode 100644 index 00000000..0db5801f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_859.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_860.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_860.png new file mode 100644 index 00000000..7ba3354b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_860.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_861.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_861.png new file mode 100644 index 00000000..27e5a810 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_861.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_862.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_862.png new file mode 100644 index 00000000..d558543f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_862.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_863.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_863.png new file mode 100644 index 00000000..09c61775 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_863.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_864.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_864.png new file mode 100644 index 00000000..6373409f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/160/309/s_864.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_832.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_832.png new file mode 100644 index 00000000..80b404f8 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_832.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_833.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_833.png new file mode 100644 index 00000000..57f39677 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_833.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_834.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_834.png new file mode 100644 index 00000000..2d717c09 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_834.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_835.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_835.png new file mode 100644 index 00000000..87238893 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_835.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_836.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_836.png new file mode 100644 index 00000000..ec4f0caf Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_836.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_837.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_837.png new file mode 100644 index 00000000..46e96715 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_837.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_838.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_838.png new file mode 100644 index 00000000..15796775 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_838.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_839.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_839.png index 97251447..6beb9354 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_839.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_839.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_840.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_840.png index 9717a663..e14b13a7 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_840.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_840.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_841.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_841.png index 00fec23c..6349f226 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_841.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_841.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_842.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_842.png index 8a19cc5e..f2c74c37 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_842.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_842.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_843.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_843.png index 8e40a3ce..1c729a39 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_843.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_843.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_844.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_844.png index c451714b..9b14badb 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_844.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_844.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_845.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_845.png index 33cddbd1..1ad448a0 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_845.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_845.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_846.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_846.png index 70d393fc..f5bcbade 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_846.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_846.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_847.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_847.png index 6d67a92b..7d820830 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_847.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_847.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_848.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_848.png index b8a1d602..191581da 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_848.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_848.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_849.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_849.png index 6c0e6ff4..387bb233 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_849.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_849.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_850.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_850.png index 4cc3c831..bc714635 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_850.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_850.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_851.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_851.png index 8cbd1fcf..3099e3e1 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_851.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_851.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_852.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_852.png index c9e44b7f..985c49f5 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_852.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_852.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_853.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_853.png index bf513669..92fd9629 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_853.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_853.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_854.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_854.png index d4f52ee6..a69adf9a 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_854.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_854.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_855.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_855.png index 5bcacdee..81ad5a18 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_855.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_855.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_856.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_856.png index 22de785e..36b21b8c 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_856.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_856.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_857.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_857.png index f745b949..b9c8cd61 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_857.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_857.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_858.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_858.png index 64b950e2..bb6c8e79 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_858.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_858.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_859.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_859.png new file mode 100644 index 00000000..bdf22aa1 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_859.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_860.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_860.png new file mode 100644 index 00000000..e47c3aa4 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_860.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_861.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_861.png new file mode 100644 index 00000000..cd11f900 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_861.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_862.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_862.png new file mode 100644 index 00000000..30a88cb6 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_862.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_863.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_863.png new file mode 100644 index 00000000..b3451e43 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_863.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_864.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_864.png new file mode 100644 index 00000000..d946d00b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/161/309/s_864.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_832.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_832.png new file mode 100644 index 00000000..3b413c2d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_832.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_833.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_833.png new file mode 100644 index 00000000..97e5eac4 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_833.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_834.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_834.png new file mode 100644 index 00000000..384bac6a Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_834.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_835.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_835.png new file mode 100644 index 00000000..a084192a Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_835.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_836.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_836.png new file mode 100644 index 00000000..0cde805f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_836.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_837.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_837.png new file mode 100644 index 00000000..dfd5e7c6 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_837.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_838.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_838.png new file mode 100644 index 00000000..5aa0b8a3 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_838.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_839.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_839.png index c3830fa8..79bebb64 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_839.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_839.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_840.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_840.png index 7f12e430..531a65da 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_840.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_840.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_841.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_841.png index 8f28a4a6..67a76cb0 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_841.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_841.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_842.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_842.png index 68d38687..cfc6b9b3 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_842.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_842.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_843.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_843.png index 1c4d3a8b..9dd14902 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_843.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_843.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_844.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_844.png index 1cecf309..51d1e111 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_844.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_844.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_845.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_845.png index 0eccd32f..cea76562 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_845.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_845.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_846.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_846.png index ab52dfcf..f765218d 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_846.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_846.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_847.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_847.png index 5ec296f0..89d735ad 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_847.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_847.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_848.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_848.png index 3aabdadd..e1146de1 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_848.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_848.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_849.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_849.png index 66100955..a4e00d3c 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_849.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_849.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_850.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_850.png index 84e66e62..f68f136f 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_850.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_850.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_851.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_851.png index 65feb38e..3293369e 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_851.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_851.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_852.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_852.png index f1ab3b7b..f7ef4f33 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_852.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_852.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_853.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_853.png index 3b3a9ec7..bd0c6d3f 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_853.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_853.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_854.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_854.png index eefca097..7aaf9d09 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_854.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_854.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_855.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_855.png index ec940362..292d4b5f 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_855.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_855.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_856.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_856.png index b3e2e9c4..f310b2fa 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_856.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_856.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_857.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_857.png index 8fbb6bef..6c651bd8 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_857.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_857.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_858.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_858.png index 6f34d6f7..4b6bc7ff 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_858.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_858.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_859.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_859.png new file mode 100644 index 00000000..f7651424 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_859.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_860.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_860.png new file mode 100644 index 00000000..2c31b408 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_860.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_861.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_861.png new file mode 100644 index 00000000..edc44bcb Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_861.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_862.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_862.png new file mode 100644 index 00000000..4aba82f5 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_862.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_863.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_863.png new file mode 100644 index 00000000..879dbf5f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_863.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_864.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_864.png new file mode 100644 index 00000000..80d4abf2 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/162/309/s_864.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_832.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_832.png new file mode 100644 index 00000000..f677ba11 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_832.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_833.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_833.png new file mode 100644 index 00000000..08362bb5 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_833.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_834.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_834.png new file mode 100644 index 00000000..eef4aae1 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_834.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_835.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_835.png new file mode 100644 index 00000000..1b842071 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_835.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_836.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_836.png new file mode 100644 index 00000000..1d5dc925 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_836.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_837.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_837.png new file mode 100644 index 00000000..9e1b82af Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_837.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_838.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_838.png new file mode 100644 index 00000000..b390ee4f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_838.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_839.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_839.png index ed226cfe..308b88df 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_839.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_839.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_840.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_840.png index c3de3c86..24a52f1d 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_840.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_840.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_841.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_841.png index 6010d9ad..4359c083 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_841.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_841.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_842.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_842.png index a7c6e8e9..450d4182 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_842.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_842.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_843.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_843.png index c9b8bf9d..66dc5f7d 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_843.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_843.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_844.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_844.png index 9a9c7b12..6b127d67 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_844.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_844.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_845.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_845.png index 8b03a33f..fd241a1a 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_845.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_845.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_846.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_846.png index 550abf6c..83e09072 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_846.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_846.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_847.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_847.png index 3f3ba7b7..7d6729cd 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_847.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_847.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_848.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_848.png index a7994f51..f0d14cd2 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_848.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_848.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_849.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_849.png index f1e75473..f8ee7cee 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_849.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_849.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_850.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_850.png index 282029aa..cdf63a8a 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_850.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_850.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_851.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_851.png index 551b6a57..411bc3d7 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_851.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_851.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_852.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_852.png index 0a8f955b..5749de4c 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_852.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_852.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_853.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_853.png index a0e7afb7..954abfa0 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_853.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_853.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_854.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_854.png index 153f28f4..55a650e3 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_854.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_854.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_855.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_855.png index 95d0b05e..a72d03d1 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_855.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_855.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_856.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_856.png index db82c8c4..c397e551 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_856.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_856.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_857.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_857.png index 929a5627..665782df 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_857.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_857.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_858.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_858.png index a705594d..519c5db8 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_858.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_858.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_859.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_859.png new file mode 100644 index 00000000..dae14bdb Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_859.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_860.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_860.png new file mode 100644 index 00000000..6efcb88a Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_860.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_861.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_861.png new file mode 100644 index 00000000..9a787ec1 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_861.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_862.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_862.png new file mode 100644 index 00000000..459ae2ff Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_862.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_863.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_863.png new file mode 100644 index 00000000..a69628f2 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_863.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_864.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_864.png new file mode 100644 index 00000000..a43ee8bc Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/163/309/s_864.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_832.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_832.png new file mode 100644 index 00000000..115d9ebf Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_832.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_833.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_833.png new file mode 100644 index 00000000..7f429342 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_833.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_834.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_834.png new file mode 100644 index 00000000..75e4746f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_834.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_835.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_835.png new file mode 100644 index 00000000..5e18ef2f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_835.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_836.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_836.png new file mode 100644 index 00000000..7039801e Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_836.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_837.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_837.png new file mode 100644 index 00000000..b19a577d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_837.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_838.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_838.png new file mode 100644 index 00000000..af2064e2 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_838.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_839.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_839.png index b47deb13..0ae454b3 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_839.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_839.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_840.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_840.png index bcff16b3..41e7448d 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_840.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_840.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_841.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_841.png index 0acb5b0a..d16f8fc2 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_841.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_841.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_842.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_842.png index 4aa072cd..66e93691 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_842.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_842.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_843.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_843.png index f428b339..412d1ffc 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_843.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_843.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_844.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_844.png index b085d66c..309d44b9 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_844.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_844.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_845.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_845.png index aac3a1b0..12d1aa21 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_845.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_845.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_846.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_846.png index 0e1b86f4..f00b1b69 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_846.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_846.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_847.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_847.png index 80a020c3..42c0a500 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_847.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_847.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_848.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_848.png index 834574a2..5e0c975b 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_848.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_848.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_849.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_849.png index 82371c86..bac984a6 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_849.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_849.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_850.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_850.png index d95dda13..29432bb1 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_850.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_850.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_851.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_851.png index 7642fb71..d64faa42 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_851.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_851.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_852.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_852.png index efa938d1..04393d74 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_852.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_852.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_853.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_853.png index ebe5fa27..22569ce6 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_853.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_853.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_854.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_854.png index 6cf75943..40f4c703 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_854.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_854.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_855.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_855.png index 69e44256..77ccd9c1 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_855.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_855.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_856.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_856.png index 3c9f989b..a9c41788 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_856.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_856.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_857.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_857.png index ac6bf8d8..0aa3c758 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_857.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_857.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_858.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_858.png index 8b132b34..fca189bf 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_858.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_858.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_859.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_859.png new file mode 100644 index 00000000..3d32c7f0 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_859.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_860.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_860.png new file mode 100644 index 00000000..ede3defe Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_860.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_861.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_861.png new file mode 100644 index 00000000..f340aae0 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_861.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_862.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_862.png new file mode 100644 index 00000000..c2f622c0 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_862.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_863.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_863.png new file mode 100644 index 00000000..1a262dbc Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_863.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_864.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_864.png new file mode 100644 index 00000000..7c99d346 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/164/309/s_864.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_832.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_832.png new file mode 100644 index 00000000..5a7fb6ec Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_832.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_833.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_833.png new file mode 100644 index 00000000..d724af42 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_833.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_834.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_834.png new file mode 100644 index 00000000..a523a22c Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_834.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_835.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_835.png new file mode 100644 index 00000000..403808a5 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_835.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_836.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_836.png new file mode 100644 index 00000000..52a58a27 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_836.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_837.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_837.png new file mode 100644 index 00000000..b57d4836 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_837.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_838.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_838.png new file mode 100644 index 00000000..c982c518 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_838.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_839.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_839.png index 5edc727e..57de580f 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_839.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_839.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_840.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_840.png index 3b06005e..91603e60 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_840.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_840.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_841.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_841.png index dfa95e2d..44e18e04 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_841.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_841.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_842.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_842.png index c66a7e75..eb3f2f0d 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_842.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_842.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_843.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_843.png index f89d02df..1c98195f 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_843.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_843.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_844.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_844.png index 712fddc4..edcff65b 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_844.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_844.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_845.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_845.png index 363fa62f..15ee45dc 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_845.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_845.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_846.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_846.png index abf1ac62..f3b4c6df 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_846.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_846.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_847.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_847.png index fb7f283a..901e7bc2 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_847.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_847.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_848.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_848.png index 445b8bbf..8c1b987a 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_848.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_848.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_849.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_849.png index 008943f3..bde2771e 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_849.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_849.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_850.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_850.png index 3afbeb9f..8c6a14c9 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_850.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_850.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_851.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_851.png index 9ed4ed69..c1521773 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_851.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_851.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_852.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_852.png index db68ef5f..f7f542f2 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_852.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_852.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_853.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_853.png index f22453a0..d2b2648c 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_853.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_853.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_854.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_854.png index c329d45c..b1562fce 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_854.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_854.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_855.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_855.png index 1da1e20c..28e15adb 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_855.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_855.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_856.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_856.png index c9f7f295..a0679274 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_856.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_856.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_857.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_857.png index 22950c50..523a9d61 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_857.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_857.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_858.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_858.png index da52ce1b..a0b78cef 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_858.png and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_858.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_859.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_859.png new file mode 100644 index 00000000..b0c8537e Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_859.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_860.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_860.png new file mode 100644 index 00000000..1f1e0f6d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_860.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_861.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_861.png new file mode 100644 index 00000000..d88daf9a Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_861.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_862.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_862.png new file mode 100644 index 00000000..4adc36c6 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_862.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_863.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_863.png new file mode 100644 index 00000000..2a23b41b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_863.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_864.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_864.png new file mode 100644 index 00000000..17f96a7c Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/165/309/s_864.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_832.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_832.png new file mode 100644 index 00000000..5c8d52bb Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_832.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_833.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_833.png new file mode 100644 index 00000000..eb699f6d Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_833.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_834.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_834.png new file mode 100644 index 00000000..faac3b3e Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_834.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_835.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_835.png new file mode 100644 index 00000000..6de6aa1b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_835.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_836.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_836.png new file mode 100644 index 00000000..7f1b26ca Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_836.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_837.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_837.png new file mode 100644 index 00000000..8e986233 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_837.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_838.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_838.png new file mode 100644 index 00000000..39fcc570 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_838.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_839.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_839.png new file mode 100644 index 00000000..2a47d54e Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_839.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_840.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_840.png new file mode 100644 index 00000000..57db15c9 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_840.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_841.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_841.png new file mode 100644 index 00000000..d1f45bcf Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_841.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_842.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_842.png new file mode 100644 index 00000000..d3cdcfd7 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_842.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_843.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_843.png new file mode 100644 index 00000000..2d4318c1 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_843.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_844.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_844.png new file mode 100644 index 00000000..3af21df6 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_844.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_845.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_845.png new file mode 100644 index 00000000..ada1dccb Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_845.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_846.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_846.png new file mode 100644 index 00000000..e0a6ae4f Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_846.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_847.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_847.png new file mode 100644 index 00000000..083b231a Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_847.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_848.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_848.png new file mode 100644 index 00000000..a40380e7 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_848.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_849.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_849.png new file mode 100644 index 00000000..c2f6f4a8 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_849.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_850.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_850.png new file mode 100644 index 00000000..937472c1 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_850.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_851.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_851.png new file mode 100644 index 00000000..5cd61b51 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_851.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_852.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_852.png new file mode 100644 index 00000000..2d20bc16 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_852.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_853.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_853.png new file mode 100644 index 00000000..ec73fc82 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_853.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_854.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_854.png new file mode 100644 index 00000000..dc647da6 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_854.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_855.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_855.png new file mode 100644 index 00000000..460be518 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_855.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_856.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_856.png new file mode 100644 index 00000000..8ed06510 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_856.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_857.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_857.png new file mode 100644 index 00000000..10928566 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_857.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_858.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_858.png new file mode 100644 index 00000000..b3242434 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_858.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_859.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_859.png new file mode 100644 index 00000000..450f41fc Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_859.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_860.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_860.png new file mode 100644 index 00000000..6e00e592 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_860.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_861.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_861.png new file mode 100644 index 00000000..4730196b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_861.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_862.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_862.png new file mode 100644 index 00000000..f5a9681b Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_862.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_863.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_863.png new file mode 100644 index 00000000..88e3aca4 Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_863.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_864.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_864.png new file mode 100644 index 00000000..750113ac Binary files /dev/null and b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/-2/468/166/309/s_864.png differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/33/77/s_464.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/33/77/s_464.png deleted file mode 100644 index 4030f418..00000000 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/33/77/s_464.png and /dev/null differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/33/77/s_471.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/33/77/s_471.png deleted file mode 100644 index 1f7e98e9..00000000 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/33/77/s_471.png and /dev/null differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/33/77/s_472.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/33/77/s_472.png deleted file mode 100644 index 37c03522..00000000 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/33/77/s_472.png and /dev/null differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/34/77/s_464.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/34/77/s_464.png deleted file mode 100644 index e5e35478..00000000 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/34/77/s_464.png and /dev/null differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/34/77/s_471.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/34/77/s_471.png deleted file mode 100644 index 760ea5b6..00000000 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/34/77/s_471.png and /dev/null differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/34/77/s_472.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/34/77/s_472.png deleted file mode 100644 index 06cbeeac..00000000 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/34/77/s_472.png and /dev/null differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/35/77/s_464.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/35/77/s_464.png deleted file mode 100644 index e575496a..00000000 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/35/77/s_464.png and /dev/null differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/35/77/s_471.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/35/77/s_471.png deleted file mode 100644 index 67add2f2..00000000 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/35/77/s_471.png and /dev/null differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/35/77/s_472.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/35/77/s_472.png deleted file mode 100644 index bae012b3..00000000 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/35/77/s_472.png and /dev/null differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/36/77/s_464.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/36/77/s_464.png deleted file mode 100644 index 3832a1d5..00000000 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/36/77/s_464.png and /dev/null differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/36/77/s_471.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/36/77/s_471.png deleted file mode 100644 index 03c2fd6a..00000000 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/36/77/s_471.png and /dev/null differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/36/77/s_472.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/36/77/s_472.png deleted file mode 100644 index fe7dbac5..00000000 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/36/77/s_472.png and /dev/null differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/37/77/s_464.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/37/77/s_464.png deleted file mode 100644 index 8c8bc82d..00000000 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/37/77/s_464.png and /dev/null differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/37/77/s_471.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/37/77/s_471.png deleted file mode 100644 index d81db17a..00000000 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/37/77/s_471.png and /dev/null differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/37/77/s_472.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/37/77/s_472.png deleted file mode 100644 index 1ec8c04b..00000000 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/37/77/s_472.png and /dev/null differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/38/77/s_464.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/38/77/s_464.png deleted file mode 100644 index 75eb934b..00000000 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/38/77/s_464.png and /dev/null differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/38/77/s_471.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/38/77/s_471.png deleted file mode 100644 index b8cde5f2..00000000 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/38/77/s_471.png and /dev/null differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/38/77/s_472.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/38/77/s_472.png deleted file mode 100644 index c1783060..00000000 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/38/77/s_472.png and /dev/null differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/39/77/s_464.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/39/77/s_464.png deleted file mode 100644 index 15a7e97e..00000000 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/39/77/s_464.png and /dev/null differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/39/77/s_471.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/39/77/s_471.png deleted file mode 100644 index 7f4a4b96..00000000 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/39/77/s_471.png and /dev/null differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/39/77/s_472.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/39/77/s_472.png deleted file mode 100644 index 9fb5a6b3..00000000 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/39/77/s_472.png and /dev/null differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/40/77/s_464.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/40/77/s_464.png deleted file mode 100644 index cf6105bd..00000000 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/40/77/s_464.png and /dev/null differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/40/77/s_471.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/40/77/s_471.png deleted file mode 100644 index 9c3839f5..00000000 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/40/77/s_471.png and /dev/null differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/40/77/s_472.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/40/77/s_472.png deleted file mode 100644 index b0f04755..00000000 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/40/77/s_472.png and /dev/null differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/41/77/s_464.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/41/77/s_464.png deleted file mode 100644 index 8cf5bd41..00000000 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/41/77/s_464.png and /dev/null differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/41/77/s_471.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/41/77/s_471.png deleted file mode 100644 index b4d85801..00000000 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/41/77/s_471.png and /dev/null differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/41/77/s_472.png b/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/41/77/s_472.png deleted file mode 100644 index 1a4260ad..00000000 Binary files a/HORUS/SD/SCRIPTS/YAAPU/MAPS/sat_tiles/0/117/41/77/s_472.png and /dev/null differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/menu.lua b/HORUS/SD/SCRIPTS/YAAPU/menu.lua index 3a6715ca..f226b070 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/menu.lua and b/HORUS/SD/SCRIPTS/YAAPU/menu.lua differ diff --git a/HORUS/SD/SCRIPTS/YAAPU/menu.luac b/HORUS/SD/SCRIPTS/YAAPU/menu.luac index 3a6715ca..daefaa9d 100644 Binary files a/HORUS/SD/SCRIPTS/YAAPU/menu.luac and b/HORUS/SD/SCRIPTS/YAAPU/menu.luac differ diff --git a/HORUS/SD/SOUNDS/yaapu0/de/1008001424.wav b/HORUS/SD/SOUNDS/yaapu0/de/1008001424.wav new file mode 100644 index 00000000..83254641 Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/de/1008001424.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/de/116655276.wav b/HORUS/SD/SOUNDS/yaapu0/de/116655276.wav new file mode 100644 index 00000000..37a34f4b Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/de/116655276.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/de/1204090832.wav b/HORUS/SD/SOUNDS/yaapu0/de/1204090832.wav new file mode 100644 index 00000000..9ec6dd72 Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/de/1204090832.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/de/1249672288.wav b/HORUS/SD/SOUNDS/yaapu0/de/1249672288.wav new file mode 100644 index 00000000..a2a01407 Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/de/1249672288.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/de/1309405592.wav b/HORUS/SD/SOUNDS/yaapu0/de/1309405592.wav new file mode 100644 index 00000000..f4c7edb3 Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/de/1309405592.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/de/1352994600.wav b/HORUS/SD/SOUNDS/yaapu0/de/1352994600.wav new file mode 100644 index 00000000..2f01307c Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/de/1352994600.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/de/1396289024.wav b/HORUS/SD/SOUNDS/yaapu0/de/1396289024.wav new file mode 100644 index 00000000..939084c0 Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/de/1396289024.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/de/1698465616.wav b/HORUS/SD/SOUNDS/yaapu0/de/1698465616.wav new file mode 100644 index 00000000..61bd4d3c Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/de/1698465616.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/de/1746499976.wav b/HORUS/SD/SOUNDS/yaapu0/de/1746499976.wav new file mode 100644 index 00000000..3d99e21d Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/de/1746499976.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/de/1809087708.wav b/HORUS/SD/SOUNDS/yaapu0/de/1809087708.wav new file mode 100644 index 00000000..bacf49e0 Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/de/1809087708.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/de/1834616480.wav b/HORUS/SD/SOUNDS/yaapu0/de/1834616480.wav new file mode 100644 index 00000000..4d0ccec5 Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/de/1834616480.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/de/1883944664.wav b/HORUS/SD/SOUNDS/yaapu0/de/1883944664.wav new file mode 100644 index 00000000..1d6d1812 Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/de/1883944664.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/de/1997782032.wav b/HORUS/SD/SOUNDS/yaapu0/de/1997782032.wav new file mode 100644 index 00000000..4a891f97 Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/de/1997782032.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/de/2139150204.wav b/HORUS/SD/SOUNDS/yaapu0/de/2139150204.wav new file mode 100644 index 00000000..6e645b03 Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/de/2139150204.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/de/2310179660.wav b/HORUS/SD/SOUNDS/yaapu0/de/2310179660.wav new file mode 100644 index 00000000..64da362c Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/de/2310179660.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/de/2386213680.wav b/HORUS/SD/SOUNDS/yaapu0/de/2386213680.wav new file mode 100644 index 00000000..1d41cb54 Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/de/2386213680.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/de/2599859119.wav b/HORUS/SD/SOUNDS/yaapu0/de/2599859119.wav new file mode 100644 index 00000000..b4266bbb Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/de/2599859119.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/de/264977348.wav b/HORUS/SD/SOUNDS/yaapu0/de/264977348.wav new file mode 100644 index 00000000..b7854d03 Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/de/264977348.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/de/2664106240.wav b/HORUS/SD/SOUNDS/yaapu0/de/2664106240.wav new file mode 100644 index 00000000..cd5aafd0 Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/de/2664106240.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/de/2730864352.wav b/HORUS/SD/SOUNDS/yaapu0/de/2730864352.wav new file mode 100644 index 00000000..b9707259 Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/de/2730864352.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/de/2890289840.wav b/HORUS/SD/SOUNDS/yaapu0/de/2890289840.wav new file mode 100644 index 00000000..fb579d86 Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/de/2890289840.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/de/2913564252.wav b/HORUS/SD/SOUNDS/yaapu0/de/2913564252.wav new file mode 100644 index 00000000..52f9ae82 Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/de/2913564252.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/de/3025044912.wav b/HORUS/SD/SOUNDS/yaapu0/de/3025044912.wav new file mode 100644 index 00000000..d5e5e93a Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/de/3025044912.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/de/3311875476.wav b/HORUS/SD/SOUNDS/yaapu0/de/3311875476.wav new file mode 100644 index 00000000..e97ab7f0 Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/de/3311875476.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/de/3417557720.wav b/HORUS/SD/SOUNDS/yaapu0/de/3417557720.wav new file mode 100644 index 00000000..24a25242 Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/de/3417557720.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/de/3708582640.wav b/HORUS/SD/SOUNDS/yaapu0/de/3708582640.wav new file mode 100644 index 00000000..d422a23f Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/de/3708582640.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/de/3956583920.wav b/HORUS/SD/SOUNDS/yaapu0/de/3956583920.wav new file mode 100644 index 00000000..f4c7edb3 Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/de/3956583920.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/de/4019153925.wav b/HORUS/SD/SOUNDS/yaapu0/de/4019153925.wav new file mode 100644 index 00000000..021941a9 Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/de/4019153925.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/de/4026147344.wav b/HORUS/SD/SOUNDS/yaapu0/de/4026147344.wav new file mode 100644 index 00000000..c321c1aa Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/de/4026147344.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/de/4091124880.wav b/HORUS/SD/SOUNDS/yaapu0/de/4091124880.wav new file mode 100644 index 00000000..9fb74d9d Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/de/4091124880.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/de/4137200300.wav b/HORUS/SD/SOUNDS/yaapu0/de/4137200300.wav new file mode 100644 index 00000000..9d9a63e1 Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/de/4137200300.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/de/4175833240.wav b/HORUS/SD/SOUNDS/yaapu0/de/4175833240.wav new file mode 100644 index 00000000..50f54557 Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/de/4175833240.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/de/554623408.wav b/HORUS/SD/SOUNDS/yaapu0/de/554623408.wav new file mode 100644 index 00000000..69016929 Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/de/554623408.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/de/636067590.wav b/HORUS/SD/SOUNDS/yaapu0/de/636067590.wav new file mode 100644 index 00000000..52f9ae82 Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/de/636067590.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/de/656739232.wav b/HORUS/SD/SOUNDS/yaapu0/de/656739232.wav new file mode 100644 index 00000000..e6d6d073 Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/de/656739232.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/de/883458048.wav b/HORUS/SD/SOUNDS/yaapu0/de/883458048.wav new file mode 100644 index 00000000..9e60b8cf Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/de/883458048.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/de/981284144.wav b/HORUS/SD/SOUNDS/yaapu0/de/981284144.wav new file mode 100644 index 00000000..1b2bed62 Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/de/981284144.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/de/986165592.wav b/HORUS/SD/SOUNDS/yaapu0/de/986165592.wav new file mode 100644 index 00000000..021941a9 Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/de/986165592.wav differ diff --git a/TARANIS/SD/SOUNDS/yaapu0/fr/simpleoff.missing b/HORUS/SD/SOUNDS/yaapu0/de/autorotate.missing similarity index 100% rename from TARANIS/SD/SOUNDS/yaapu0/fr/simpleoff.missing rename to HORUS/SD/SOUNDS/yaapu0/de/autorotate.missing diff --git a/TARANIS/SD/SOUNDS/yaapu0/fr/simpleon.missing b/HORUS/SD/SOUNDS/yaapu0/de/systemid.missing similarity index 100% rename from TARANIS/SD/SOUNDS/yaapu0/fr/simpleon.missing rename to HORUS/SD/SOUNDS/yaapu0/de/systemid.missing diff --git a/HORUS/SD/SOUNDS/yaapu0/de/thermal.missing b/HORUS/SD/SOUNDS/yaapu0/de/thermal.missing new file mode 100644 index 00000000..e69de29b diff --git a/HORUS/SD/SOUNDS/yaapu0/en/1008001424.wav b/HORUS/SD/SOUNDS/yaapu0/en/1008001424.wav index e67f0f19..83254641 100644 Binary files a/HORUS/SD/SOUNDS/yaapu0/en/1008001424.wav and b/HORUS/SD/SOUNDS/yaapu0/en/1008001424.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/en/116655276.wav b/HORUS/SD/SOUNDS/yaapu0/en/116655276.wav index 48cb155f..37a34f4b 100644 Binary files a/HORUS/SD/SOUNDS/yaapu0/en/116655276.wav and b/HORUS/SD/SOUNDS/yaapu0/en/116655276.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/en/1204090832.wav b/HORUS/SD/SOUNDS/yaapu0/en/1204090832.wav index 84126d80..9ec6dd72 100644 Binary files a/HORUS/SD/SOUNDS/yaapu0/en/1204090832.wav and b/HORUS/SD/SOUNDS/yaapu0/en/1204090832.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/en/1249672288.wav b/HORUS/SD/SOUNDS/yaapu0/en/1249672288.wav index 81ccac87..a2a01407 100644 Binary files a/HORUS/SD/SOUNDS/yaapu0/en/1249672288.wav and b/HORUS/SD/SOUNDS/yaapu0/en/1249672288.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/en/1309405592.wav b/HORUS/SD/SOUNDS/yaapu0/en/1309405592.wav index a0c908a3..f4c7edb3 100644 Binary files a/HORUS/SD/SOUNDS/yaapu0/en/1309405592.wav and b/HORUS/SD/SOUNDS/yaapu0/en/1309405592.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/en/1352994600.wav b/HORUS/SD/SOUNDS/yaapu0/en/1352994600.wav new file mode 100644 index 00000000..2f01307c Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/en/1352994600.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/en/1396289024.wav b/HORUS/SD/SOUNDS/yaapu0/en/1396289024.wav index 01a8f4bc..939084c0 100644 Binary files a/HORUS/SD/SOUNDS/yaapu0/en/1396289024.wav and b/HORUS/SD/SOUNDS/yaapu0/en/1396289024.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/en/1535290648.wav b/HORUS/SD/SOUNDS/yaapu0/en/1535290648.wav deleted file mode 100644 index b2018bb9..00000000 Binary files a/HORUS/SD/SOUNDS/yaapu0/en/1535290648.wav and /dev/null differ diff --git a/HORUS/SD/SOUNDS/yaapu0/en/1698465616.wav b/HORUS/SD/SOUNDS/yaapu0/en/1698465616.wav new file mode 100644 index 00000000..61bd4d3c Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/en/1698465616.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/en/1746499976.wav b/HORUS/SD/SOUNDS/yaapu0/en/1746499976.wav new file mode 100644 index 00000000..3d99e21d Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/en/1746499976.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/en/1809087708.wav b/HORUS/SD/SOUNDS/yaapu0/en/1809087708.wav index 52e4896d..bacf49e0 100644 Binary files a/HORUS/SD/SOUNDS/yaapu0/en/1809087708.wav and b/HORUS/SD/SOUNDS/yaapu0/en/1809087708.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/en/1834616480.wav b/HORUS/SD/SOUNDS/yaapu0/en/1834616480.wav index 1a4df589..4d0ccec5 100644 Binary files a/HORUS/SD/SOUNDS/yaapu0/en/1834616480.wav and b/HORUS/SD/SOUNDS/yaapu0/en/1834616480.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/en/1883944664.wav b/HORUS/SD/SOUNDS/yaapu0/en/1883944664.wav index a3a78004..1d6d1812 100644 Binary files a/HORUS/SD/SOUNDS/yaapu0/en/1883944664.wav and b/HORUS/SD/SOUNDS/yaapu0/en/1883944664.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/en/1997782032.wav b/HORUS/SD/SOUNDS/yaapu0/en/1997782032.wav index d4617970..4a891f97 100644 Binary files a/HORUS/SD/SOUNDS/yaapu0/en/1997782032.wav and b/HORUS/SD/SOUNDS/yaapu0/en/1997782032.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/en/2139150204.wav b/HORUS/SD/SOUNDS/yaapu0/en/2139150204.wav new file mode 100644 index 00000000..6e645b03 Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/en/2139150204.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/en/2310179660.wav b/HORUS/SD/SOUNDS/yaapu0/en/2310179660.wav index db82b477..64da362c 100644 Binary files a/HORUS/SD/SOUNDS/yaapu0/en/2310179660.wav and b/HORUS/SD/SOUNDS/yaapu0/en/2310179660.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/en/2386213680.wav b/HORUS/SD/SOUNDS/yaapu0/en/2386213680.wav index b564e548..1d41cb54 100644 Binary files a/HORUS/SD/SOUNDS/yaapu0/en/2386213680.wav and b/HORUS/SD/SOUNDS/yaapu0/en/2386213680.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/en/2599859119.wav b/HORUS/SD/SOUNDS/yaapu0/en/2599859119.wav new file mode 100644 index 00000000..b4266bbb Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/en/2599859119.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/en/264977348.wav b/HORUS/SD/SOUNDS/yaapu0/en/264977348.wav index aa1f6af5..b7854d03 100644 Binary files a/HORUS/SD/SOUNDS/yaapu0/en/264977348.wav and b/HORUS/SD/SOUNDS/yaapu0/en/264977348.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/en/2664106240.wav b/HORUS/SD/SOUNDS/yaapu0/en/2664106240.wav index 25f9a91a..cd5aafd0 100644 Binary files a/HORUS/SD/SOUNDS/yaapu0/en/2664106240.wav and b/HORUS/SD/SOUNDS/yaapu0/en/2664106240.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/en/2730864352.wav b/HORUS/SD/SOUNDS/yaapu0/en/2730864352.wav new file mode 100644 index 00000000..b9707259 Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/en/2730864352.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/en/2890289840.wav b/HORUS/SD/SOUNDS/yaapu0/en/2890289840.wav index c4c0b756..fb579d86 100644 Binary files a/HORUS/SD/SOUNDS/yaapu0/en/2890289840.wav and b/HORUS/SD/SOUNDS/yaapu0/en/2890289840.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/en/2913564252.wav b/HORUS/SD/SOUNDS/yaapu0/en/2913564252.wav new file mode 100644 index 00000000..52f9ae82 Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/en/2913564252.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/en/3025044912.wav b/HORUS/SD/SOUNDS/yaapu0/en/3025044912.wav index 735d20f9..d5e5e93a 100644 Binary files a/HORUS/SD/SOUNDS/yaapu0/en/3025044912.wav and b/HORUS/SD/SOUNDS/yaapu0/en/3025044912.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/en/3311875476.wav b/HORUS/SD/SOUNDS/yaapu0/en/3311875476.wav index 4c99e007..e97ab7f0 100644 Binary files a/HORUS/SD/SOUNDS/yaapu0/en/3311875476.wav and b/HORUS/SD/SOUNDS/yaapu0/en/3311875476.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/en/3417557720.wav b/HORUS/SD/SOUNDS/yaapu0/en/3417557720.wav index 3cb098d0..24a25242 100644 Binary files a/HORUS/SD/SOUNDS/yaapu0/en/3417557720.wav and b/HORUS/SD/SOUNDS/yaapu0/en/3417557720.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/en/3602501704.wav b/HORUS/SD/SOUNDS/yaapu0/en/3602501704.wav deleted file mode 100644 index cba6a22c..00000000 Binary files a/HORUS/SD/SOUNDS/yaapu0/en/3602501704.wav and /dev/null differ diff --git a/HORUS/SD/SOUNDS/yaapu0/en/3708582640.wav b/HORUS/SD/SOUNDS/yaapu0/en/3708582640.wav index cdbec948..d422a23f 100644 Binary files a/HORUS/SD/SOUNDS/yaapu0/en/3708582640.wav and b/HORUS/SD/SOUNDS/yaapu0/en/3708582640.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/en/3721120084.wav b/HORUS/SD/SOUNDS/yaapu0/en/3721120084.wav deleted file mode 100644 index 8f6e375e..00000000 Binary files a/HORUS/SD/SOUNDS/yaapu0/en/3721120084.wav and /dev/null differ diff --git a/HORUS/SD/SOUNDS/yaapu0/en/3879875148.wav b/HORUS/SD/SOUNDS/yaapu0/en/3879875148.wav deleted file mode 100644 index 8f6e375e..00000000 Binary files a/HORUS/SD/SOUNDS/yaapu0/en/3879875148.wav and /dev/null differ diff --git a/HORUS/SD/SOUNDS/yaapu0/en/3956583920.wav b/HORUS/SD/SOUNDS/yaapu0/en/3956583920.wav index a0c908a3..f4c7edb3 100644 Binary files a/HORUS/SD/SOUNDS/yaapu0/en/3956583920.wav and b/HORUS/SD/SOUNDS/yaapu0/en/3956583920.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/en/4019153925.wav b/HORUS/SD/SOUNDS/yaapu0/en/4019153925.wav index e140e6ea..021941a9 100644 Binary files a/HORUS/SD/SOUNDS/yaapu0/en/4019153925.wav and b/HORUS/SD/SOUNDS/yaapu0/en/4019153925.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/en/4026147344.wav b/HORUS/SD/SOUNDS/yaapu0/en/4026147344.wav new file mode 100644 index 00000000..c321c1aa Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/en/4026147344.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/en/4091124880.wav b/HORUS/SD/SOUNDS/yaapu0/en/4091124880.wav index 054968c0..9fb74d9d 100644 Binary files a/HORUS/SD/SOUNDS/yaapu0/en/4091124880.wav and b/HORUS/SD/SOUNDS/yaapu0/en/4091124880.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/en/4137200300.wav b/HORUS/SD/SOUNDS/yaapu0/en/4137200300.wav index 0913903c..9d9a63e1 100644 Binary files a/HORUS/SD/SOUNDS/yaapu0/en/4137200300.wav and b/HORUS/SD/SOUNDS/yaapu0/en/4137200300.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/en/4175833240.wav b/HORUS/SD/SOUNDS/yaapu0/en/4175833240.wav new file mode 100644 index 00000000..50f54557 Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/en/4175833240.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/en/554623408.wav b/HORUS/SD/SOUNDS/yaapu0/en/554623408.wav index 047b66ac..69016929 100644 Binary files a/HORUS/SD/SOUNDS/yaapu0/en/554623408.wav and b/HORUS/SD/SOUNDS/yaapu0/en/554623408.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/en/636067590.wav b/HORUS/SD/SOUNDS/yaapu0/en/636067590.wav new file mode 100644 index 00000000..52f9ae82 Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/en/636067590.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/en/656739232.wav b/HORUS/SD/SOUNDS/yaapu0/en/656739232.wav index 940438cc..e6d6d073 100644 Binary files a/HORUS/SD/SOUNDS/yaapu0/en/656739232.wav and b/HORUS/SD/SOUNDS/yaapu0/en/656739232.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/en/883458048.wav b/HORUS/SD/SOUNDS/yaapu0/en/883458048.wav new file mode 100644 index 00000000..9e60b8cf Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/en/883458048.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/en/956150328.wav b/HORUS/SD/SOUNDS/yaapu0/en/956150328.wav deleted file mode 100644 index 8f6e375e..00000000 Binary files a/HORUS/SD/SOUNDS/yaapu0/en/956150328.wav and /dev/null differ diff --git a/HORUS/SD/SOUNDS/yaapu0/en/981284144.wav b/HORUS/SD/SOUNDS/yaapu0/en/981284144.wav new file mode 100644 index 00000000..1b2bed62 Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/en/981284144.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/en/986165592.wav b/HORUS/SD/SOUNDS/yaapu0/en/986165592.wav index e140e6ea..021941a9 100644 Binary files a/HORUS/SD/SOUNDS/yaapu0/en/986165592.wav and b/HORUS/SD/SOUNDS/yaapu0/en/986165592.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/en/autorotate.wav b/HORUS/SD/SOUNDS/yaapu0/en/autorotate.wav new file mode 100644 index 00000000..55a296d1 Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/en/autorotate.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/en/systemid.wav b/HORUS/SD/SOUNDS/yaapu0/en/systemid.wav new file mode 100644 index 00000000..cc0e1b5c Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/en/systemid.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/en/thermal.wav b/HORUS/SD/SOUNDS/yaapu0/en/thermal.wav new file mode 100644 index 00000000..8922f2f7 Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/en/thermal.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/english.psv b/HORUS/SD/SOUNDS/yaapu0/english.psv index 23439ddb..69f3f0cc 100644 --- a/HORUS/SD/SOUNDS/yaapu0/english.psv +++ b/HORUS/SD/SOUNDS/yaapu0/english.psv @@ -71,9 +71,12 @@ SOUNDS/yaapu0/en|ssimpleoff|super simple mode disabled SOUNDS/yaapu0/en|ssimpleon|super simple mode enabled SOUNDS/yaapu0/en|stabilize|Stabilize flight mode SOUNDS/yaapu0/en|steering_r|Steering mode +SOUNDS/yaapu0/en|thermal|Thermal flight mode SOUNDS/yaapu0/en|throw|Throw flight mode SOUNDS/yaapu0/en|timealert|Timer alert SOUNDS/yaapu0/en|training|Training flight mode SOUNDS/yaapu0/en|zigzag|Zigzag flight mode SOUNDS/yaapu0/en|takeoff|takeoff flight mode +SOUNDS/yaapu0/en|systemid|System I D flight mode +SOUNDS/yaapu0/en|autorotate|autorotate flight mode SOUNDS/yaapu0/en|yaapu|Yaa-pu telemetry ready diff --git a/HORUS/SD/SOUNDS/yaapu0/english_msg_hash.psv b/HORUS/SD/SOUNDS/yaapu0/english_msg_hash.psv index b0f74a05..712a9753 100644 --- a/HORUS/SD/SOUNDS/yaapu0/english_msg_hash.psv +++ b/HORUS/SD/SOUNDS/yaapu0/english_msg_hash.psv @@ -1,43 +1,38 @@ -/SOUNDS/yaapu0/en|264977348|PreArming: Need 3D Fix -/SOUNDS/yaapu0/en|1834616480|Smart RTL Unavailable -/SOUNDS/yaapu0/en|2386213680|EKF variance -/SOUNDS/yaapu0/en|2310179660|GPS Glitch cleared -/SOUNDS/yaapu0/en|4137200300|GPS Glitch -/SOUNDS/yaapu0/en|2664106240|Parachute: Released -/SOUNDS/yaapu0/en|656739232|Flight plan received -/SOUNDS/yaapu0/en|3708582640|Mission complete -/SOUNDS/yaapu0/en|1809087708|Geofence triggered -/SOUNDS/yaapu0/en|116655276|Flight mode change failed -/SOUNDS/yaapu0/en|1008001424|AutoTune: Success -/SOUNDS/yaapu0/en|1396289024|AutoTune: Failed -/SOUNDS/yaapu0/en|986165592|Transition done -/SOUNDS/yaapu0/en|1249672288|Transition started -/SOUNDS/yaapu0/en|4019153925|Transition done -/SOUNDS/yaapu0/en|3417557720|Transition VTOL done -/SOUNDS/yaapu0/en|1204090832|Land descend started -/SOUNDS/yaapu0/en|2890289840|Land final started -/SOUNDS/yaapu0/en|1535290648|Soaring: forcing RTL -/SOUNDS/yaapu0/en|3602501704|Soaring: Thermal detected -/SOUNDS/yaapu0/en|3330664438|Soaring: Thermal detected -/SOUNDS/yaapu0/en|3721120084|Soaring: Thermal ended -/SOUNDS/yaapu0/en|956150328|Soaring: Thermal ended -/SOUNDS/yaapu0/en|722073480|Soaring: Thermal ended -/SOUNDS/yaapu0/en|3879875148|Soaring: Thermal ended -/SOUNDS/yaapu0/en|3806931323|Soaring: Too low -/SOUNDS/yaapu0/en|886442312|Soaring: Too low -/SOUNDS/yaapu0/en|483575668|Soaring: Too low -/SOUNDS/yaapu0/en|1412704816|Soaring: Too high -/SOUNDS/yaapu0/en|1457255568|Soaring: Too high -/SOUNDS/yaapu0/en|3651151340|Soaring: Too high -/SOUNDS/yaapu0/en|24877608|Soaring: Drifted too far -/SOUNDS/yaapu0/en|1481434156|Soaring: Drifted too far -/SOUNDS/yaapu0/en|1811095020|Soaring: Drifted too far -/SOUNDS/yaapu0/en|1883944664|Soaring: Outside max radius -/SOUNDS/yaapu0/en|4091124880|reached command: -/SOUNDS/yaapu0/en|3311875476|reached waypoint: -/SOUNDS/yaapu0/en|1997782032|Passed waypoint: -/SOUNDS/yaapu0/en|554623408|Takeoff complete -/SOUNDS/yaapu0/en|3025044912|Smart RTL deactivated -/SOUNDS/yaapu0/en|3956583920|GPS home acquired -/SOUNDS/yaapu0/en|1309405592|GPS home acquired -/SOUNDS/yaapu0/en|2773270064|GPS home acquired +/SOUNDS/yaapu0/en|264977348|PreArming: Need 3D Fix +/SOUNDS/yaapu0/en|1834616480|Smart RTL Unavailable +/SOUNDS/yaapu0/en|2386213680|EKF variance +/SOUNDS/yaapu0/en|2310179660|GPS Glitch cleared +/SOUNDS/yaapu0/en|4137200300|GPS Glitch +/SOUNDS/yaapu0/en|2664106240|Parachute: Released +/SOUNDS/yaapu0/en|656739232|Flight plan received +/SOUNDS/yaapu0/en|3708582640|Mission complete +/SOUNDS/yaapu0/en|1809087708|Geofence triggered +/SOUNDS/yaapu0/en|116655276|Flight mode change failed +/SOUNDS/yaapu0/en|1008001424|AutoTune: Success +/SOUNDS/yaapu0/en|1396289024|AutoTune: Failed +/SOUNDS/yaapu0/en|986165592|Transition done +/SOUNDS/yaapu0/en|1249672288|Transition started +/SOUNDS/yaapu0/en|4019153925|Transition done +/SOUNDS/yaapu0/en|3417557720|Transition VTOL done +/SOUNDS/yaapu0/en|1204090832|Land descend started +/SOUNDS/yaapu0/en|2890289840|Land final started +/SOUNDS/yaapu0/en|1883944664|Soaring: Outside max radius +/SOUNDS/yaapu0/en|4175833240|Soaring: Disabled. +/SOUNDS/yaapu0/en|2599859119|Soaring: not climbing +/SOUNDS/yaapu0/en|636067590|Soaring: drifted too far +/SOUNDS/yaapu0/en|2730864352|Soaring: Too high +/SOUNDS/yaapu0/en|1698465616|Soaring: Too low +/SOUNDS/yaapu0/en|981284144|Soaring: Thermal ended +/SOUNDS/yaapu0/en|2913564252|Soaring: Drifted too far +/SOUNDS/yaapu0/en|1746499976|Soaring: Exit via RC switch +/SOUNDS/yaapu0/en|883458048|Soaring: Enabled. +/SOUNDS/yaapu0/en|2139150204|Soaring: thermal weak +/SOUNDS/yaapu0/en|1352994600|Soaring: reached upper altitude +/SOUNDS/yaapu0/en|4026147344|Soaring: reached lower altitude +/SOUNDS/yaapu0/en|4091124880|reached command: +/SOUNDS/yaapu0/en|3311875476|reached waypoint: +/SOUNDS/yaapu0/en|1997782032|Passed waypoint: +/SOUNDS/yaapu0/en|554623408|Takeoff complete +/SOUNDS/yaapu0/en|3025044912|Smart RTL deactivated +/SOUNDS/yaapu0/en|3956583920|GPS home acquired +/SOUNDS/yaapu0/en|1309405592|GPS home acquired diff --git a/HORUS/SD/SOUNDS/yaapu0/fr/1008001424.wav b/HORUS/SD/SOUNDS/yaapu0/fr/1008001424.wav new file mode 100644 index 00000000..83254641 Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/fr/1008001424.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/fr/116655276.wav b/HORUS/SD/SOUNDS/yaapu0/fr/116655276.wav new file mode 100644 index 00000000..37a34f4b Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/fr/116655276.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/fr/1204090832.wav b/HORUS/SD/SOUNDS/yaapu0/fr/1204090832.wav new file mode 100644 index 00000000..9ec6dd72 Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/fr/1204090832.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/fr/1249672288.wav b/HORUS/SD/SOUNDS/yaapu0/fr/1249672288.wav new file mode 100644 index 00000000..a2a01407 Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/fr/1249672288.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/fr/1309405592.wav b/HORUS/SD/SOUNDS/yaapu0/fr/1309405592.wav new file mode 100644 index 00000000..f4c7edb3 Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/fr/1309405592.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/fr/1352994600.wav b/HORUS/SD/SOUNDS/yaapu0/fr/1352994600.wav new file mode 100644 index 00000000..2f01307c Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/fr/1352994600.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/fr/1396289024.wav b/HORUS/SD/SOUNDS/yaapu0/fr/1396289024.wav new file mode 100644 index 00000000..939084c0 Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/fr/1396289024.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/fr/1698465616.wav b/HORUS/SD/SOUNDS/yaapu0/fr/1698465616.wav new file mode 100644 index 00000000..61bd4d3c Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/fr/1698465616.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/fr/1746499976.wav b/HORUS/SD/SOUNDS/yaapu0/fr/1746499976.wav new file mode 100644 index 00000000..3d99e21d Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/fr/1746499976.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/fr/1809087708.wav b/HORUS/SD/SOUNDS/yaapu0/fr/1809087708.wav new file mode 100644 index 00000000..bacf49e0 Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/fr/1809087708.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/fr/1834616480.wav b/HORUS/SD/SOUNDS/yaapu0/fr/1834616480.wav new file mode 100644 index 00000000..4d0ccec5 Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/fr/1834616480.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/fr/1883944664.wav b/HORUS/SD/SOUNDS/yaapu0/fr/1883944664.wav new file mode 100644 index 00000000..1d6d1812 Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/fr/1883944664.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/fr/1997782032.wav b/HORUS/SD/SOUNDS/yaapu0/fr/1997782032.wav new file mode 100644 index 00000000..4a891f97 Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/fr/1997782032.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/fr/2139150204.wav b/HORUS/SD/SOUNDS/yaapu0/fr/2139150204.wav new file mode 100644 index 00000000..6e645b03 Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/fr/2139150204.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/fr/2310179660.wav b/HORUS/SD/SOUNDS/yaapu0/fr/2310179660.wav new file mode 100644 index 00000000..64da362c Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/fr/2310179660.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/fr/2386213680.wav b/HORUS/SD/SOUNDS/yaapu0/fr/2386213680.wav new file mode 100644 index 00000000..1d41cb54 Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/fr/2386213680.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/fr/2599859119.wav b/HORUS/SD/SOUNDS/yaapu0/fr/2599859119.wav new file mode 100644 index 00000000..b4266bbb Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/fr/2599859119.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/fr/264977348.wav b/HORUS/SD/SOUNDS/yaapu0/fr/264977348.wav new file mode 100644 index 00000000..b7854d03 Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/fr/264977348.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/fr/2664106240.wav b/HORUS/SD/SOUNDS/yaapu0/fr/2664106240.wav new file mode 100644 index 00000000..cd5aafd0 Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/fr/2664106240.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/fr/2730864352.wav b/HORUS/SD/SOUNDS/yaapu0/fr/2730864352.wav new file mode 100644 index 00000000..b9707259 Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/fr/2730864352.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/fr/2890289840.wav b/HORUS/SD/SOUNDS/yaapu0/fr/2890289840.wav new file mode 100644 index 00000000..fb579d86 Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/fr/2890289840.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/fr/2913564252.wav b/HORUS/SD/SOUNDS/yaapu0/fr/2913564252.wav new file mode 100644 index 00000000..52f9ae82 Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/fr/2913564252.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/fr/3025044912.wav b/HORUS/SD/SOUNDS/yaapu0/fr/3025044912.wav new file mode 100644 index 00000000..d5e5e93a Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/fr/3025044912.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/fr/3311875476.wav b/HORUS/SD/SOUNDS/yaapu0/fr/3311875476.wav new file mode 100644 index 00000000..e97ab7f0 Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/fr/3311875476.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/fr/3417557720.wav b/HORUS/SD/SOUNDS/yaapu0/fr/3417557720.wav new file mode 100644 index 00000000..24a25242 Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/fr/3417557720.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/fr/3708582640.wav b/HORUS/SD/SOUNDS/yaapu0/fr/3708582640.wav new file mode 100644 index 00000000..d422a23f Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/fr/3708582640.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/fr/3956583920.wav b/HORUS/SD/SOUNDS/yaapu0/fr/3956583920.wav new file mode 100644 index 00000000..f4c7edb3 Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/fr/3956583920.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/fr/4019153925.wav b/HORUS/SD/SOUNDS/yaapu0/fr/4019153925.wav new file mode 100644 index 00000000..021941a9 Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/fr/4019153925.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/fr/4026147344.wav b/HORUS/SD/SOUNDS/yaapu0/fr/4026147344.wav new file mode 100644 index 00000000..c321c1aa Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/fr/4026147344.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/fr/4091124880.wav b/HORUS/SD/SOUNDS/yaapu0/fr/4091124880.wav new file mode 100644 index 00000000..9fb74d9d Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/fr/4091124880.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/fr/4137200300.wav b/HORUS/SD/SOUNDS/yaapu0/fr/4137200300.wav new file mode 100644 index 00000000..9d9a63e1 Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/fr/4137200300.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/fr/4175833240.wav b/HORUS/SD/SOUNDS/yaapu0/fr/4175833240.wav new file mode 100644 index 00000000..50f54557 Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/fr/4175833240.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/fr/554623408.wav b/HORUS/SD/SOUNDS/yaapu0/fr/554623408.wav new file mode 100644 index 00000000..69016929 Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/fr/554623408.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/fr/636067590.wav b/HORUS/SD/SOUNDS/yaapu0/fr/636067590.wav new file mode 100644 index 00000000..52f9ae82 Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/fr/636067590.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/fr/656739232.wav b/HORUS/SD/SOUNDS/yaapu0/fr/656739232.wav new file mode 100644 index 00000000..e6d6d073 Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/fr/656739232.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/fr/883458048.wav b/HORUS/SD/SOUNDS/yaapu0/fr/883458048.wav new file mode 100644 index 00000000..9e60b8cf Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/fr/883458048.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/fr/981284144.wav b/HORUS/SD/SOUNDS/yaapu0/fr/981284144.wav new file mode 100644 index 00000000..1b2bed62 Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/fr/981284144.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/fr/986165592.wav b/HORUS/SD/SOUNDS/yaapu0/fr/986165592.wav new file mode 100644 index 00000000..021941a9 Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/fr/986165592.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/fr/thermal.missing b/HORUS/SD/SOUNDS/yaapu0/fr/thermal.missing new file mode 100644 index 00000000..e69de29b diff --git a/HORUS/SD/SOUNDS/yaapu0/it/1008001424.wav b/HORUS/SD/SOUNDS/yaapu0/it/1008001424.wav index f24fe173..c12a00aa 100644 Binary files a/HORUS/SD/SOUNDS/yaapu0/it/1008001424.wav and b/HORUS/SD/SOUNDS/yaapu0/it/1008001424.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/it/116655276.wav b/HORUS/SD/SOUNDS/yaapu0/it/116655276.wav index cca333a5..020da5ba 100644 Binary files a/HORUS/SD/SOUNDS/yaapu0/it/116655276.wav and b/HORUS/SD/SOUNDS/yaapu0/it/116655276.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/it/1204090832.wav b/HORUS/SD/SOUNDS/yaapu0/it/1204090832.wav index 090b20da..9d427d38 100644 Binary files a/HORUS/SD/SOUNDS/yaapu0/it/1204090832.wav and b/HORUS/SD/SOUNDS/yaapu0/it/1204090832.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/it/1249672288.wav b/HORUS/SD/SOUNDS/yaapu0/it/1249672288.wav index d8db8351..24e355f5 100644 Binary files a/HORUS/SD/SOUNDS/yaapu0/it/1249672288.wav and b/HORUS/SD/SOUNDS/yaapu0/it/1249672288.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/it/1309405592.wav b/HORUS/SD/SOUNDS/yaapu0/it/1309405592.wav index a7cee0be..66089262 100644 Binary files a/HORUS/SD/SOUNDS/yaapu0/it/1309405592.wav and b/HORUS/SD/SOUNDS/yaapu0/it/1309405592.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/it/1352994600.wav b/HORUS/SD/SOUNDS/yaapu0/it/1352994600.wav new file mode 100644 index 00000000..0ec3571b Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/it/1352994600.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/it/1396289024.wav b/HORUS/SD/SOUNDS/yaapu0/it/1396289024.wav index fe53dfe2..bf6b66f9 100644 Binary files a/HORUS/SD/SOUNDS/yaapu0/it/1396289024.wav and b/HORUS/SD/SOUNDS/yaapu0/it/1396289024.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/it/1535290648.wav b/HORUS/SD/SOUNDS/yaapu0/it/1535290648.wav deleted file mode 100644 index f3d87100..00000000 Binary files a/HORUS/SD/SOUNDS/yaapu0/it/1535290648.wav and /dev/null differ diff --git a/HORUS/SD/SOUNDS/yaapu0/it/1698465616.wav b/HORUS/SD/SOUNDS/yaapu0/it/1698465616.wav new file mode 100644 index 00000000..759f5c7a Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/it/1698465616.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/it/1746499976.wav b/HORUS/SD/SOUNDS/yaapu0/it/1746499976.wav new file mode 100644 index 00000000..ad7798e6 Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/it/1746499976.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/it/1809087708.wav b/HORUS/SD/SOUNDS/yaapu0/it/1809087708.wav index 5fb959d3..61e6b716 100644 Binary files a/HORUS/SD/SOUNDS/yaapu0/it/1809087708.wav and b/HORUS/SD/SOUNDS/yaapu0/it/1809087708.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/it/1834616480.wav b/HORUS/SD/SOUNDS/yaapu0/it/1834616480.wav index 752f68dd..ea313c11 100644 Binary files a/HORUS/SD/SOUNDS/yaapu0/it/1834616480.wav and b/HORUS/SD/SOUNDS/yaapu0/it/1834616480.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/it/1883944664.wav b/HORUS/SD/SOUNDS/yaapu0/it/1883944664.wav new file mode 100644 index 00000000..037648ba Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/it/1883944664.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/it/1997782032.wav b/HORUS/SD/SOUNDS/yaapu0/it/1997782032.wav index 457afa5a..d0dd5588 100644 Binary files a/HORUS/SD/SOUNDS/yaapu0/it/1997782032.wav and b/HORUS/SD/SOUNDS/yaapu0/it/1997782032.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/it/2139150204.wav b/HORUS/SD/SOUNDS/yaapu0/it/2139150204.wav new file mode 100644 index 00000000..d245e632 Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/it/2139150204.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/it/2310179660.wav b/HORUS/SD/SOUNDS/yaapu0/it/2310179660.wav index fb2281c5..c1abc37b 100644 Binary files a/HORUS/SD/SOUNDS/yaapu0/it/2310179660.wav and b/HORUS/SD/SOUNDS/yaapu0/it/2310179660.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/it/2386213680.wav b/HORUS/SD/SOUNDS/yaapu0/it/2386213680.wav index 1ee39406..28e45a19 100644 Binary files a/HORUS/SD/SOUNDS/yaapu0/it/2386213680.wav and b/HORUS/SD/SOUNDS/yaapu0/it/2386213680.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/it/2599859119.wav b/HORUS/SD/SOUNDS/yaapu0/it/2599859119.wav new file mode 100644 index 00000000..bd9cabce Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/it/2599859119.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/it/264977348.wav b/HORUS/SD/SOUNDS/yaapu0/it/264977348.wav index c0807a9a..8826e067 100644 Binary files a/HORUS/SD/SOUNDS/yaapu0/it/264977348.wav and b/HORUS/SD/SOUNDS/yaapu0/it/264977348.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/it/2664106240.wav b/HORUS/SD/SOUNDS/yaapu0/it/2664106240.wav index d15e1b74..f655fb43 100644 Binary files a/HORUS/SD/SOUNDS/yaapu0/it/2664106240.wav and b/HORUS/SD/SOUNDS/yaapu0/it/2664106240.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/it/2730864352.wav b/HORUS/SD/SOUNDS/yaapu0/it/2730864352.wav new file mode 100644 index 00000000..0ec3571b Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/it/2730864352.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/it/2890289840.wav b/HORUS/SD/SOUNDS/yaapu0/it/2890289840.wav index 532d7711..fc7947e0 100644 Binary files a/HORUS/SD/SOUNDS/yaapu0/it/2890289840.wav and b/HORUS/SD/SOUNDS/yaapu0/it/2890289840.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/it/2913564252.wav b/HORUS/SD/SOUNDS/yaapu0/it/2913564252.wav new file mode 100644 index 00000000..f906f2f4 Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/it/2913564252.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/it/3025044912.wav b/HORUS/SD/SOUNDS/yaapu0/it/3025044912.wav index d5dd5da3..c98251f0 100644 Binary files a/HORUS/SD/SOUNDS/yaapu0/it/3025044912.wav and b/HORUS/SD/SOUNDS/yaapu0/it/3025044912.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/it/3311875476.wav b/HORUS/SD/SOUNDS/yaapu0/it/3311875476.wav index 0043a623..da61a73a 100644 Binary files a/HORUS/SD/SOUNDS/yaapu0/it/3311875476.wav and b/HORUS/SD/SOUNDS/yaapu0/it/3311875476.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/it/3417557720.wav b/HORUS/SD/SOUNDS/yaapu0/it/3417557720.wav index 9f08cd7c..1c32d480 100644 Binary files a/HORUS/SD/SOUNDS/yaapu0/it/3417557720.wav and b/HORUS/SD/SOUNDS/yaapu0/it/3417557720.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/it/3602501704.wav b/HORUS/SD/SOUNDS/yaapu0/it/3602501704.wav deleted file mode 100644 index 13932c67..00000000 Binary files a/HORUS/SD/SOUNDS/yaapu0/it/3602501704.wav and /dev/null differ diff --git a/HORUS/SD/SOUNDS/yaapu0/it/3708582640.wav b/HORUS/SD/SOUNDS/yaapu0/it/3708582640.wav index 55eb8cfe..3fad3ed5 100644 Binary files a/HORUS/SD/SOUNDS/yaapu0/it/3708582640.wav and b/HORUS/SD/SOUNDS/yaapu0/it/3708582640.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/it/3721120084.wav b/HORUS/SD/SOUNDS/yaapu0/it/3721120084.wav deleted file mode 100644 index a8460411..00000000 Binary files a/HORUS/SD/SOUNDS/yaapu0/it/3721120084.wav and /dev/null differ diff --git a/HORUS/SD/SOUNDS/yaapu0/it/3879875148.wav b/HORUS/SD/SOUNDS/yaapu0/it/3879875148.wav deleted file mode 100644 index a8460411..00000000 Binary files a/HORUS/SD/SOUNDS/yaapu0/it/3879875148.wav and /dev/null differ diff --git a/HORUS/SD/SOUNDS/yaapu0/it/3956583920.wav b/HORUS/SD/SOUNDS/yaapu0/it/3956583920.wav index a7cee0be..66089262 100644 Binary files a/HORUS/SD/SOUNDS/yaapu0/it/3956583920.wav and b/HORUS/SD/SOUNDS/yaapu0/it/3956583920.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/it/4019153925.wav b/HORUS/SD/SOUNDS/yaapu0/it/4019153925.wav index e65ea26b..1c32d480 100644 Binary files a/HORUS/SD/SOUNDS/yaapu0/it/4019153925.wav and b/HORUS/SD/SOUNDS/yaapu0/it/4019153925.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/it/4026147344.wav b/HORUS/SD/SOUNDS/yaapu0/it/4026147344.wav new file mode 100644 index 00000000..759f5c7a Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/it/4026147344.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/it/4091124880.wav b/HORUS/SD/SOUNDS/yaapu0/it/4091124880.wav index 3db20be7..dcf0dda9 100644 Binary files a/HORUS/SD/SOUNDS/yaapu0/it/4091124880.wav and b/HORUS/SD/SOUNDS/yaapu0/it/4091124880.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/it/4137200300.wav b/HORUS/SD/SOUNDS/yaapu0/it/4137200300.wav index 988a46b0..6655f871 100644 Binary files a/HORUS/SD/SOUNDS/yaapu0/it/4137200300.wav and b/HORUS/SD/SOUNDS/yaapu0/it/4137200300.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/it/4175833240.wav b/HORUS/SD/SOUNDS/yaapu0/it/4175833240.wav new file mode 100644 index 00000000..9f1e7079 Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/it/4175833240.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/it/554623408.wav b/HORUS/SD/SOUNDS/yaapu0/it/554623408.wav index 427ec166..d70dc177 100644 Binary files a/HORUS/SD/SOUNDS/yaapu0/it/554623408.wav and b/HORUS/SD/SOUNDS/yaapu0/it/554623408.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/it/636067590.wav b/HORUS/SD/SOUNDS/yaapu0/it/636067590.wav new file mode 100644 index 00000000..6a2a84ea Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/it/636067590.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/it/656739232.wav b/HORUS/SD/SOUNDS/yaapu0/it/656739232.wav index 76790559..332211d7 100644 Binary files a/HORUS/SD/SOUNDS/yaapu0/it/656739232.wav and b/HORUS/SD/SOUNDS/yaapu0/it/656739232.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/it/883458048.wav b/HORUS/SD/SOUNDS/yaapu0/it/883458048.wav new file mode 100644 index 00000000..6619c70b Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/it/883458048.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/it/956150328.wav b/HORUS/SD/SOUNDS/yaapu0/it/956150328.wav deleted file mode 100644 index 943303ea..00000000 Binary files a/HORUS/SD/SOUNDS/yaapu0/it/956150328.wav and /dev/null differ diff --git a/HORUS/SD/SOUNDS/yaapu0/it/981284144.wav b/HORUS/SD/SOUNDS/yaapu0/it/981284144.wav new file mode 100644 index 00000000..ad7798e6 Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/it/981284144.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/it/986165592.wav b/HORUS/SD/SOUNDS/yaapu0/it/986165592.wav index 9f08cd7c..1c32d480 100644 Binary files a/HORUS/SD/SOUNDS/yaapu0/it/986165592.wav and b/HORUS/SD/SOUNDS/yaapu0/it/986165592.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/it/autorotate.wav b/HORUS/SD/SOUNDS/yaapu0/it/autorotate.wav new file mode 100644 index 00000000..4128e95b Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/it/autorotate.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/it/systemid.wav b/HORUS/SD/SOUNDS/yaapu0/it/systemid.wav new file mode 100644 index 00000000..72e71624 Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/it/systemid.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/it/thermal.wav b/HORUS/SD/SOUNDS/yaapu0/it/thermal.wav new file mode 100644 index 00000000..e7a05f37 Binary files /dev/null and b/HORUS/SD/SOUNDS/yaapu0/it/thermal.wav differ diff --git a/HORUS/SD/WIDGETS/Yaapu/main.lua b/HORUS/SD/WIDGETS/Yaapu/main.lua index fd45c9f7..c99036d7 100644 Binary files a/HORUS/SD/WIDGETS/Yaapu/main.lua and b/HORUS/SD/WIDGETS/Yaapu/main.lua differ diff --git a/HORUS/SD/WIDGETS/Yaapu/main.luac b/HORUS/SD/WIDGETS/Yaapu/main.luac index fd45c9f7..e7c5f3d8 100644 Binary files a/HORUS/SD/WIDGETS/Yaapu/main.luac and b/HORUS/SD/WIDGETS/Yaapu/main.luac differ diff --git a/HORUS/SOURCES/PP/includes/hud_algo_inc.lua b/HORUS/SOURCES/PP/includes/hud_algo_inc.lua deleted file mode 100644 index c86ceb16..00000000 --- a/HORUS/SOURCES/PP/includes/hud_algo_inc.lua +++ /dev/null @@ -1,179 +0,0 @@ - --lcd.setColor(CUSTOM_COLOR,lcd.RGB(77, 153, 0)) - --lcd.setColor(CUSTOM_COLOR,lcd.RGB(0x90, 0x63, 0x20)) --906320 bighud brown - lcd.setColor(CUSTOM_COLOR,lcd.RGB(0x63, 0x30, 0x00)) --623000 old brown - - -- angle of the line passing on point(ox,oy) - local angle = math.tan(math.rad(-telemetry.roll)) - -- prevent divide by zero - if telemetry.roll == 0 then - drawLib.drawFilledRectangle(minX,math.max(minY,dy+minY+(maxY-minY)/2),maxX-minX,math.min(maxY-minY,(maxY-minY)/2-dy+(math.abs(dy) > 0 and 1 or 0)),CUSTOM_COLOR) - elseif math.abs(telemetry.roll) >= 180 then - drawLib.drawFilledRectangle(minX,minY,maxX-minX,math.min(maxY-minY,(maxY-minY)/2+dy),CUSTOM_COLOR) - else -#ifdef HUD_ALGO1 - -- HUD drawn using vertical bars of width 2 - local step = 2 - local steps = (maxX - minX)/step - local xx = 0 - local xxR = 0 - for s=0,steps -1 - do - xx = minX + s*step - xxR = xx + step - if telemetry.roll > 90 or telemetry.roll < -90 then - yy = (oy - ox*angle) + math.floor(xx*angle) - if yy > minY + 1 and yy < maxY then - lcd.drawFilledRectangle(xx,minY,step,yy-minY,CUSTOM_COLOR) - elseif yy >= maxY then - lcd.drawFilledRectangle(xx,minY,step,maxY-minY,CUSTOM_COLOR) - end - else - yy = (oy - ox*angle) + math.floor(xx*angle) - if yy <= minY then - lcd.drawFilledRectangle(xx,minY,step,maxY-minY,CUSTOM_COLOR) - elseif yy < maxY then - lcd.drawFilledRectangle(xx,yy,step,maxY-yy+1,CUSTOM_COLOR) - end - end - end -#endif --HUD_ALGO1 -#ifdef HUD_ALGO2 - -- HUD drawn using boxes + horizontal bars of height 2 - local minxY = (oy - ox * angle) + minX * angle; - local maxxY = (oy - ox * angle) + maxX * angle; - local maxyX = (maxY - (oy - ox * angle)) / angle; - local minyX = (minY - (oy - ox * angle)) / angle; - -- - if ( 0 <= -telemetry.roll and -telemetry.roll <= 90 ) then - if (minxY > minY and maxxY < maxY) then - -- 5 - lcd.drawFilledRectangle(minX, maxxY, maxX - minX, maxY - maxxY,CUSTOM_COLOR) - drawLib.fillTriangle(ox, oy, math.max(minX, minyX), math.min(maxX, maxyX), -telemetry.roll, angle, CUSTOM_COLOR) - elseif (minxY < minY and maxxY < maxY and maxxY > minY) then - -- 6 - lcd.drawFilledRectangle(minX, minY, minyX - minX, maxxY - minY,CUSTOM_COLOR); - lcd.drawFilledRectangle(minX, maxxY, maxX - minX, maxY - maxxY,CUSTOM_COLOR); - drawLib.fillTriangle(ox, oy, math.max(minX, minyX), math.min(maxX, maxyX), -telemetry.roll, angle, CUSTOM_COLOR) - elseif (minxY < minY and maxxY > maxY) then - -- 7 - lcd.drawFilledRectangle(minX, minY, minyX - minX, maxY - minY,CUSTOM_COLOR); - drawLib.fillTriangle(ox, oy, math.max(minX, minyX), math.min(maxX, maxyX), -telemetry.roll, angle, CUSTOM_COLOR) - elseif (minxY < maxY and minxY > minY) then - -- 8 - drawLib.fillTriangle(ox, oy, math.max(minX, minyX), math.min(maxX, maxyX), -telemetry.roll, angle, CUSTOM_COLOR) - elseif (minxY < minY and maxxY < minY) then - -- off screen - lcd.drawFilledRectangle(minX, minY, maxX - minX, maxY - minY,CUSTOM_COLOR); - end - elseif (90 < -telemetry.roll and -telemetry.roll <= 180) then - if (minxY < maxY and maxxY > minY) then - -- 9 - lcd.drawFilledRectangle(minX, minY, maxX - minX, maxxY - minY,CUSTOM_COLOR); - drawLib.fillTriangle(ox, oy, math.max(minX, maxyX), math.min(maxX, minyX), -telemetry.roll, angle,CUSTOM_COLOR); - elseif (minxY > maxY and maxxY > minY and maxxY < maxY) then - -- 10 - lcd.drawFilledRectangle(minX, minY, maxX - minX, maxxY - minY,CUSTOM_COLOR); - lcd.drawFilledRectangle(minX, maxxY, maxyX - minX, maxY - maxxY,CUSTOM_COLOR); - drawLib.fillTriangle(ox, oy, math.max(minX, maxyX), math.min(maxX, minyX), -telemetry.roll, angle,CUSTOM_COLOR); - elseif (minxY > maxY and maxyX < maxX) then - -- 11 - lcd.drawFilledRectangle(minX, minY, maxyX - minX, maxY - minY,CUSTOM_COLOR); - drawLib.fillTriangle(ox, oy, math.max(minX, maxyX), math.min(maxX, minyX), -telemetry.roll, angle,CUSTOM_COLOR); - elseif (minxY < maxY and minxY > minY) then - -- 12 - drawLib.fillTriangle(ox, oy, math.max(minX, maxyX), math.min(maxX, minyX), -telemetry.roll, angle,CUSTOM_COLOR); - elseif (minxY > maxY and maxxY > maxY) then - -- off screen - lcd.drawFilledRectangle(minX, minY, maxX - minX, maxY - minY,CUSTOM_COLOR); - end - -- 9,10,11,12 - elseif (-90 < -telemetry.roll and -telemetry.roll < 0) then - if (minxY < maxY and maxxY > minY) then - -- 1 - lcd.drawFilledRectangle(minX, minxY, maxX - minX, maxY - minxY,CUSTOM_COLOR); - drawLib.fillTriangle(ox, oy, math.max(minX, maxyX), math.min(maxX, minyX), -telemetry.roll, angle,CUSTOM_COLOR); - elseif (minxY < maxY and maxxY < minY and minxY > minY) then - -- 2 - lcd.drawFilledRectangle(minX, minxY, maxX - minX, maxY - minxY,CUSTOM_COLOR); - lcd.drawFilledRectangle(minyX, minY, maxX - minyX, minxY - minY,CUSTOM_COLOR); - drawLib.fillTriangle(ox, oy, math.max(minX, maxyX), math.min(maxX, minyX), -telemetry.roll, angle,CUSTOM_COLOR); - elseif (minxY > maxY and maxxY < minY) then - -- 3 - lcd.drawFilledRectangle(minyX, minY, maxX - minyX, maxY - minY,CUSTOM_COLOR); - drawLib.fillTriangle(ox, oy, math.max(minX, maxyX), math.min(maxX, minyX), -telemetry.roll, angle,CUSTOM_COLOR); - elseif (minxY > minY and maxxY < maxY) then - -- 4 - drawLib.fillTriangle(ox, oy, math.max(minX, maxyX), math.min(maxX, minyX), -telemetry.roll, angle,CUSTOM_COLOR); - elseif (minxY < minY and maxxY < minY) then - -- off screen - lcd.drawFilledRectangle(minX, minY, maxX - minX, maxY - minY,CUSTOM_COLOR); - end - elseif (-180 <= -telemetry.roll and -telemetry.roll <= -90) then - if (minxY > minY and maxxY < maxY) then - -- 13 - lcd.drawFilledRectangle(minX, minY, maxX - minX, minxY - minY,CUSTOM_COLOR); - drawLib.fillTriangle(ox, oy, math.max(minX, minyX), math.min(maxX, maxyX), -telemetry.roll, angle,CUSTOM_COLOR); - elseif (maxxY > maxY and minxY > minY and minxY < maxY) then - -- 14 - lcd.drawFilledRectangle(minX, minY, maxX - minX, minxY - minY,CUSTOM_COLOR); - lcd.drawFilledRectangle(maxyX, minxY, maxX - maxyX, maxY - minxY,CUSTOM_COLOR); - drawLib.fillTriangle(ox, oy, math.max(minX, minyX), math.min(maxX, maxyX), -telemetry.roll, angle,CUSTOM_COLOR); - elseif (minxY < minY and maxyX < maxX) then - -- 15 - lcd.drawFilledRectangle(maxyX, minY, maxX - maxyX, maxY - minY,CUSTOM_COLOR); - drawLib.fillTriangle(ox, oy, math.max(minX, minyX), math.min(maxX, maxyX), -telemetry.roll, angle,CUSTOM_COLOR); - elseif (minxY < minY and maxxY > minY) then - -- 16 - drawLib.fillTriangle(ox, oy, math.max(minX, minyX), math.min(maxX, maxyX), -telemetry.roll, angle,CUSTOM_COLOR); - elseif (minxY > maxY and maxxY > minY) then - -- off screen - lcd.drawFilledRectangle(minX, minY, maxX - minX, maxY - minY,CUSTOM_COLOR); - end - end -#endif --HUD_ALGO2 -#ifdef HUD_ALGO3 - -- HUD drawn using horizontal bars of height 2 - -- true if flying inverted - local inverted = math.abs(telemetry.roll) > 90 - -- true if part of the hud can be filled in one pass with a rectangle - local fillNeeded = false - local yRect = inverted and 0 or LCD_H - - local step = 2 - local steps = (maxY - minY)/step - 1 - local yy = 0 - - if 0 < telemetry.roll and telemetry.roll < 180 then - for s=0,steps - do - yy = minY + s*step - xx = ox + (yy-oy)/angle - if xx >= minX and xx <= maxX then - lcd.drawFilledRectangle(xx, yy, maxX-xx+1, step,CUSTOM_COLOR) - elseif xx < minX then - yRect = inverted and math.max(yy,yRect)+step or math.min(yy,yRect) - fillNeeded = true - end - end - elseif -180 < telemetry.roll and telemetry.roll < 0 then - for s=0,steps - do - yy = minY + s*step - xx = ox + (yy-oy)/angle - if xx >= minX and xx <= maxX then - lcd.drawFilledRectangle(minX, yy, xx-minX, step,CUSTOM_COLOR) - elseif xx > maxX then - yRect = inverted and math.max(yy,yRect)+step or math.min(yy,yRect) - fillNeeded = true - end - end - end - - if fillNeeded then - local yMin = inverted and minY or yRect - local height = inverted and yRect - minY or maxY-yRect - --lcd.setColor(CUSTOM_COLOR,COLOR_RED) --623000 old brown - lcd.drawFilledRectangle(minX, yMin, maxX-minX, height ,CUSTOM_COLOR) - end -#endif --HUD_ALGO3 - end diff --git a/HORUS/SOURCES/PP/includes/layout_1_inc.lua b/HORUS/SOURCES/PP/includes/layout_1_inc.lua deleted file mode 100644 index 99c0791f..00000000 --- a/HORUS/SOURCES/PP/includes/layout_1_inc.lua +++ /dev/null @@ -1,52 +0,0 @@ ---------------------------------- --- LAYOUT ---------------------------------- -#define LEFTPANE_X 68 -#define RIGHTPANE_X 68 - -#define BOX1_X 0 -#define BOX1_Y 38 -#define BOX1_WIDTH 66 -#define BOX1_HEIGHT 8 - -#define BOX2_X 61 -#define BOX2_Y 46 -#define BOX2_WIDTH 17 -#define BOX2_HEIGHT 12 - -#define FLIGHTMODE_X 2 -#define FLIGHTMODE_Y 234 -#define FLIGHTMODE_FLAGS MIDSIZE+TIMEHOUR - -#define HOMEANGLE_X 60 -#define HOMEANGLE_Y 27 -#define HOMEANGLE_XLABEL 3 -#define HOMEANGLE_YLABEL 27 -#define HOMEANGLE_FLAGS SMLSIZE - -#define GPS_X 160 -#define GPS_Y 210 -#define GPS_BORDER 0 - --- x:300 y:135 inside HUD -#define HOMEDIR_X 240 -#define HOMEDIR_Y 174 -#define HOMEDIR_R 20 - -#define FLIGHTTIME_X 330 -#define FLIGHTTIME_Y 206 -#define FLIGHTTIME_FLAGS DBLSIZE - -#define VSPEED_X 175 -#define VSPEED_Y LCD_H-60 -#define VSPEED_FLAGS MIDSIZE -#define VSPEED_XLABEL 165 -#define VSPEED_YLABEL LCD_H-37 -#define VSPEED_FLAGSLABEL SMLSIZE - -#define ALT_X 310 -#define ALT_Y LCD_H-60 -#define ALT_FLAGS MIDSIZE+RIGHT -#define ALT_XLABEL 275 -#define ALT_YLABEL LCD_H-37 -#define ALT_FLAGSLABEL SMLSIZE diff --git a/HORUS/SOURCES/PP/includes/layout_2_inc.lua b/HORUS/SOURCES/PP/includes/layout_2_inc.lua deleted file mode 100644 index d725309d..00000000 --- a/HORUS/SOURCES/PP/includes/layout_2_inc.lua +++ /dev/null @@ -1,51 +0,0 @@ ---------------------------------- --- LAYOUT ---------------------------------- -#define LEFTPANE_X 68 -#define RIGHTPANE_X 68 - -#define BOX1_X 0 -#define BOX1_Y 38 -#define BOX1_WIDTH 66 -#define BOX1_HEIGHT 8 - -#define BOX2_X 61 -#define BOX2_Y 46 -#define BOX2_WIDTH 17 -#define BOX2_HEIGHT 12 - -#define FLIGHTMODE_X 2 -#define FLIGHTMODE_Y 222 -#define FLIGHTMODE_FLAGS MIDSIZE - -#define HOMEANGLE_X 60 -#define HOMEANGLE_Y 27 -#define HOMEANGLE_XLABEL 3 -#define HOMEANGLE_YLABEL 27 -#define HOMEANGLE_FLAGS SMLSIZE - -#define GPS_X 2 -#define GPS_Y 22 -#define GPS_BORDER 0 - -#define HOMEDIR_X (LCD_W/2) -#define HOMEDIR_Y 180 -#define HOMEDIR_R 22 - -#define FLIGHTTIME_X 330 -#define FLIGHTTIME_Y 206 -#define FLIGHTTIME_FLAGS DBLSIZE - -#define VSPEED_X 68 -#define VSPEED_Y 178 -#define VSPEED_FLAGS MIDSIZE+RIGHT -#define VSPEED_XLABEL 68 -#define VSPEED_YLABEL 165 -#define VSPEED_FLAGSLABEL SMLSIZE - -#define ALT_X 153 -#define ALT_Y 178 -#define ALT_FLAGS MIDSIZE+RIGHT -#define ALT_XLABEL 153 -#define ALT_YLABEL 165 -#define ALT_FLAGSLABEL SMLSIZE \ No newline at end of file diff --git a/HORUS/SOURCES/PP/includes/yaapu_inc.lua b/HORUS/SOURCES/PP/includes/yaapu_inc.lua deleted file mode 100644 index 121a73ff..00000000 --- a/HORUS/SOURCES/PP/includes/yaapu_inc.lua +++ /dev/null @@ -1,420 +0,0 @@ --- --- An FRSKY S.Port based Telemetry script for the Horus X10 and X12 radios --- --- Copyright (C) 2018-2019. Alessandro Apostoli --- https://github.com/yaapu --- --- This program is free software; you can redistribute it and/or modify --- it under the terms of the GNU General Public License as published by --- the Free Software Foundation; either version 3 of the License, or --- (at your option) any later version. --- --- This program is distributed in the hope that it will be useful, --- but WITHOUT ANY WARRANTY, without even the implied warranty of --- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --- GNU General Public License for more details. --- --- You should have received a copy of the GNU General Public License --- along with this program; if not, see . --- - ---------------------- --- MAIN CONFIG --- 480x272 LCD_W x LCD_H ---------------------- - ---------------------- --- VERSION ---------------------- -#define VERSION "Yaapu Telemetry Widget 1.8.1" -#define VERSION_CONFIG 181 --- load and compile of lua files -#define LOADSCRIPT -#ifdef LOADSCRIPT -#define LOAD_LUA -#endif --- uncomment to force compile of all chunks, comment for release ---#define COMPILE -#ifdef COMPILE -#define LOAD_LUA -#endif --- fix for issue OpenTX 2.2.1 on X10/X10S - https://github.com/opentx/opentx/issues/5764 -#define X10_OPENTX_221 - ---------------------- --- FEATURE CONFIG ---------------------- --- enable splash screen for no telemetry data ---#define SPLASH --- enable code to draw a compass rose vs a compass ribbon ---#define COMPASS_ROSE - ---------------------- --- DEV FEATURE CONFIG ---------------------- --- enable memory debuging ---#define MEMDEBUG --- enable dev code ---#define DEV --- uncomment haversine calculation routine ---#define HAVERSINE --- enable telemetry logging to file (experimental) ---#define LOGTELEMETRY --- use radio channels imputs to generate fake telemetry data ---#define TESTMODE -#ifdef TESTMODE - -- cell count - #define CELLCOUNT 6 - --#define DEMO - -- clone batt 1 data over fake batt 2 - #define BATT2TEST - -- clone FLVSS1 data over a fake FLVSS 2 - --#define FLVSS2TEST - --pushes some test messages - --#define TESTMESSAGES - --simulate voltage only battery monitor - #define NOCURRENT -#endif --- enable debug of generated hash or short hash string ---#define HASHDEBUG - ---------------------- --- DEBUG REFRESH RATES ---------------------- --- calc and show hud refresh rate ---#define HUDRATE --- calc and show telemetry process rate ---#define BGTELERATE - ---------------------- --- SENSOR IDS ---------------------- -#define VFAS_ID 0x021F -#define VFAS_SUBID 0 -#define VFAS_INSTANCE 0 -#define VFAS_PRECISION 2 -#define VFAS_NAME "VFAS" - -#define CURR_ID 0x020F -#define CURR_SUBID 0 -#define CURR_INSTANCE 0 -#define CURR_PRECISION 1 -#define CURR_NAME "CURR" - -#define VSpd_ID 0x011F -#define VSpd_SUBID 0 -#define VSpd_INSTANCE 0 -#define VSpd_PRECISION 1 -#define VSpd_NAME "VSpd" - -#define GSpd_ID 0x083F -#define GSpd_SUBID 0 -#define GSpd_INSTANCE 0 -#define GSpd_PRECISION 0 -#define GSpd_NAME "GSpd" - -#define Alt_ID 0x010F -#define Alt_SUBID 0 -#define Alt_INSTANCE 0 -#define Alt_PRECISION 1 -#define Alt_NAME "Alt" - -#define GAlt_ID 0x082F -#define GAlt_SUBID 0 -#define GAlt_INSTANCE 0 -#define GAlt_PRECISION 0 -#define GAlt_NAME "GAlt" - -#define Hdg_ID 0x084F -#define Hdg_SUBID 0 -#define Hdg_INSTANCE 0 -#define Hdg_PRECISION 0 -#define Hdg_NAME "Hdg" - -#define Fuel_ID 0x060F -#define Fuel_SUBID 0 -#define Fuel_INSTANCE 0 -#define Fuel_PRECISION 0 -#define Fuel_NAME "Fuel" - -#define IMUTmp_ID 0x041F -#define IMUTmp_SUBID 0 -#define IMUTmp_INSTANCE 0 -#define IMUTmp_PRECISION 0 -#define IMUTmp_NAME "IMUt" - -#define ARM_ID 0x060F -#define ARM_SUBID 0 -#define ARM_INSTANCE 1 -#define ARM_PRECISION 0 -#define ARM_NAME "ARM" - -#define WPD_ID 0x082F -#define WPD_SUBID 0 -#define WPD_INSTANCE 10 -#define WPD_PRECISION 0 -#define WPD_NAME "WPD" - -#define WPN_ID 0x050F -#define WPN_SUBID 0 -#define WPN_INSTANCE 10 -#define WPN_PRECISION 0 -#define WPN_NAME "WPN" - -#define WPX_ID 0x082F -#define WPX_SUBID 0 -#define WPX_INSTANCE 11 -#define WPX_PRECISION 0 -#define WPX_NAME "WPX" - -#define WPB_ID 0x084F -#define WPB_SUBID 0 -#define WPB_INSTANCE 10 -#define WPB_PRECISION 0 -#define WPB_NAME "WPB" - -#define ASpd_ID 0x0AF -#define ASpd_SUBID 0 -#define ASpd_INSTANCE 0 -#define ASpd_PRECISION 0 -#define ASpd_NAME "ASpd" - -#define BAlt_ID 0x010F -#define BAlt_SUBID 0 -#define BAlt_INSTANCE 1 -#define BAlt_PRECISION 1 -#define BAlt_NAME "BAlt" - --- Throttle and RC use RPM sensor IDs -#define Thr_ID 0x050F -#define Thr_SUBID 0 -#define Thr_INSTANCE 0 -#define Thr_PRECISION 0 -#define Thr_NAME "Thr" - ---------------------- --- BATTERY DEFAULTS ---------------------- -#define CELLFULL 4.35 -#define CELLEMPTY 3.0 ---------------------------------- --- BACKLIGHT SUPPORT --- GV is zero based, GV 8 = GV 9 in OpenTX ---------------------------------- -#define BACKLIGHT_GV 8 -#define BACKLIGHT_DURATION 5 ---------------------------------- --- CONF REFRESH GV ---------------------------------- -#define CONF_GV 8 -#define CONF_FM_GV 8 - ---------------------------------- --- ALARMS ---------------------------------- ---[[ - ALARM_TYPE_MIN needs arming (min has to be reached first), value below level for grace, once armed is periodic, reset on landing - ALARM_TYPE_MAX no arming, value above level for grace, once armed is periodic, reset on landing - ALARM_TYPE_TIMER no arming, fired periodically, spoken time, reset on landing - ALARM_TYPE_BATT needs arming (min has to be reached first), value below level for grace, no reset on landing -{ - 1 = notified, - 2 = alarm start, - 3 = armed, - 4 = type(0=min,1=max,2=timer,3=batt), - 5 = grace duration - 6 = ready - 7 = last alarm -} ---]] -#define ALARM_NOTIFIED 1 -#define ALARM_START 2 -#define ALARM_ARMED 3 -#define ALARM_TYPE 4 -#define ALARM_GRACE 5 -#define ALARM_READY 6 -#define ALARM_LAST_ALARM 7 --- -#define ALARMS_MIN_ALT 1 -#define ALARMS_MAX_ALT 2 -#define ALARMS_MAX_DIST 3 -#define ALARMS_FS_EKF 4 -#define ALARMS_FS_BATT 5 -#define ALARMS_TIMER 6 -#define ALARMS_BATT_L1 7 -#define ALARMS_BATT_L2 8 -#define ALARMS_MAX_HDOP 9 --- -#define ALARM_TYPE_MIN 0 -#define ALARM_TYPE_MAX 1 -#define ALARM_TYPE_TIMER 2 -#define ALARM_TYPE_BATT 3 -#define ALARM_TYPE_BATT_CRT 4 --- -#define ALARM_TYPE_BATT_GRACE 4 - -#define MIN_BATT1_FC 1 -#define MIN_BATT2_FC 2 -#define MIN_CELL1_VS 3 -#define MIN_CELL2_VS 4 -#define MIN_BATT1_VS 5 -#define MIN_BATT2_VS 6 --- -#define MAX_CURR 7 -#define MAX_CURR1 8 -#define MAX_CURR2 9 -#define MAX_POWER 10 -#define MINMAX_ALT 11 -#define MAX_GPSALT 12 -#define MAX_VSPEED 13 -#define MAX_HSPEED 14 -#define MAX_DIST 15 -#define MAX_RANGE 16 - ----------------------- --- COMMON LAYOUT ----------------------- --- enable vertical bars HUD drawing (same as taranis) ---#define HUD_ALGO1 --- enable optimized hor bars HUD drawing ---#define HUD_ALGO2 --- enable hor bars HUD drawing -#define HUD_ALGO3 - -#define TOPBAR_Y 0 -#define TOPBAR_HEIGHT 20 -#define TOPBAR_WIDTH LCD_W - -#define BOTTOMBAR_Y LCD_H-20 -#define BOTTOMBAR_HEIGHT 20 -#define BOTTOMBAR_WIDTH LCD_W - -#define RSSI_X 285 -#define RSSI_Y 0 -#define RSSI_FLAGS 0 - -#define TXVOLTAGE_X 350 -#define TXVOLTAGE_Y 0 -#define TXVOLTAGE_FLAGS 0 - - --------------------------------------------------------------------------------- --- MENU VALUE,COMBO --------------------------------------------------------------------------------- -#define TYPEVALUE 0 -#define TYPECOMBO 1 -#define MENU_Y 25 -#define MENU_PAGESIZE 11 -#define MENU_ITEM_X 300 - --------------------------- --- UNIT OF MEASURE --------------------------- -local unitScale = getGeneralSettings().imperial == 0 and 1 or 3.28084 -local unitLabel = getGeneralSettings().imperial == 0 and "m" or "ft" -local unitLongScale = getGeneralSettings().imperial == 0 and 1/1000 or 1/1609.34 -local unitLongLabel = getGeneralSettings().imperial == 0 and "km" or "mi" - -#define UNIT_ALT_SCALE unitScale -#define UNIT_DIST_SCALE unitScale -#define UNIT_DIST_LONG_SCALE unitLongScale -#define UNIT_ALT_LABEL unitLabel -#define UNIT_DIST_LABEL unitLabel -#define UNIT_DIST_LONG_LABEL unitLongLabel -#define UNIT_HSPEED_SCALE conf.horSpeedMultiplier -#define UNIT_VSPEED_SCALE conf.vertSpeedMultiplier -#define UNIT_HSPEED_LABEL conf.horSpeedLabel -#define UNIT_VSPEED_LABEL conf.vertSpeedLabel - ------------------------ --- BATTERY ------------------------ --- offsets are: 1 celm, 4 batt, 7 curr, 10 mah, 13 cap, indexing starts at 1 -#define BATT_CELL 1 -#define BATT_VOLT 4 -#define BATT_CURR 7 -#define BATT_MAH 10 -#define BATT_CAP 13 -#define BATT_PERC 16 --- -#define BATT_IDALL 0 -#define BATT_ID1 1 -#define BATT_ID2 2 - -#define BATTCONF_PARALLEL 1 -#define BATTCONF_SERIAL 2 -#define BATTCONF_OTHER 3 ------------------------ --- LIBRARY LOADING ------------------------ -#ifdef LOAD_LUA -#define loadMenuLib() dofile(basePath..menuLibFile..".lua") -#else -#define loadMenuLib() dofile(basePath..menuLibFile..".luac") -#endif - ----------------------- ---- COLORS ----------------------- -#define COLOR_BLACK 0x0000 -#define COLOR_WHITE 0xFFFF -#define COLOR_GREEN 0x1FEA -#define COLOR_DARKBLUE 0x0AB1 -#define COLOR_DARKBLUE_2 0x0169 -#define COLOR_DARKBLUE_3 0x01AB -#define COLOR_BLUE -#define COLOR_YELLOW 0xFE60 -#define COLOR_ORANGE 0xFE60 -#define COLOR_RED 0xF800 -#define COLOR_LIGHT_GREY 0x8C71 -#define COLOR_GREY 0x7BCF -#define COLOR_DARK_GREY 0x5AEB -#define COLOR_LIGHTRED 0xF9A0 -#define COLOR_BARS_2 0x10A3 - -#define COLOR_BATTERY COLOR_YELLOW ---#define COLOR_LABEL COLOR_GREY -#define COLOR_LABEL COLOR_BLACK -#define COLOR_TEXT COLOR_WHITE -#define COLOR_TEXTEX COLOR_WHITE ---#define COLOR_BG COLOR_DARKBLUE_2 -#define COLOR_BG COLOR_DARKBLUE -#define COLOR_BARS COLOR_BLACK ---#define COLOR_BARSEX COLOR_BARS_2 -#define COLOR_BARSEX COLOR_BLACK -#define COLOR_LINES COLOR_WHITE -#define COLOR_NOTELEM COLOR_RED - -#define COLOR_CRIT COLOR_RED -#define COLOR_WARN COLOR_YELLOW - ---#define COLOR_SENSORS COLOR_DARKBLUE_2 -#define COLOR_SENSORS COLOR_BLACK -#define COLOR_SENSORS_LABEL COLOR_LIGHT_GREY -#define COLOR_SENSORS_TEXT COLOR_WHITE - ------------------------------------ --- STATE TRANSITION ENGINE SUPPORT ------------------------------------ -#define TRANSITION_LASTVALUE 1 -#define TRANSITION_LASTCHANGED 2 -#define TRANSITION_DONE 3 -#define TRANSITION_DELAY 4 - -#define TRANSITIONS_FLIGHTMODE 1 - --------------------------- --- CLIPPING ALGO DEFINES --------------------------- -#define CS_INSIDE 0 -#define CS_LEFT 1 -#define CS_RIGHT 2 -#define CS_BOTTOM 4 -#define CS_TOP 8 - - - - - - - diff --git a/HORUS/SOURCES/PP/lib/copter.lua b/HORUS/SOURCES/PP/lib/copter.lua deleted file mode 100644 index 224854f8..00000000 --- a/HORUS/SOURCES/PP/lib/copter.lua +++ /dev/null @@ -1,59 +0,0 @@ - --[[ - // Auto Pilot Modes enumeration - enum control_mode_t { - STABILIZE = 0, // manual airframe angle with manual throttle - ACRO = 1, // manual body-frame angular rate with manual throttle - ALT_HOLD = 2, // manual airframe angle with automatic throttle - AUTO = 3, // fully automatic waypoint control using mission commands - GUIDED = 4, // fully automatic fly to coordinate or fly at velocity/direction using GCS immediate commands - LOITER = 5, // automatic horizontal acceleration with automatic throttle - RTL = 6, // automatic return to launching point - CIRCLE = 7, // automatic circular flight with automatic throttle - LAND = 9, // automatic landing with horizontal position control - DRIFT = 11, // semi-automous position, yaw and throttle control - SPORT = 13, // manual earth-frame angular rate control with manual throttle - FLIP = 14, // automatically flip the vehicle on the roll axis - AUTOTUNE = 15, // automatically tune the vehicle's roll and pitch gains - POSHOLD = 16, // automatic position hold with manual override, with automatic throttle - BRAKE = 17, // full-brake using inertial/GPS system, no pilot input - THROW = 18, // throw to launch mode using inertial/GPS system, no pilot input - AVOID_ADSB = 19, // automatic avoidance of obstacles in the macro scale - e.g. full-sized aircraft - GUIDED_NOGPS = 20, // guided mode but only accepts attitude and altitude - SMART_RTL = 21, // SMART_RTL returns to home by retracing its steps - FLOWHOLD = 22, // FLOWHOLD holds position with optical flow without rangefinder - FOLLOW = 23, // follow attempts to follow another vehicle or ground station - ZIGZAG = 24, // ZIGZAG mode is able to fly in a zigzag manner with predefined point A and point B - }; - --]] - local flightModes = {} - - -- copter flight modes - flightModes[0]="" - flightModes[1]="Stabilize" - flightModes[2]="Acro" - flightModes[3]="AltHold" - flightModes[4]="Auto" - flightModes[5]="Guided" - flightModes[6]="Loiter" - flightModes[7]="RTL" - flightModes[8]="Circle" - flightModes[9]="" - flightModes[10]="Land" - flightModes[11]="" - flightModes[12]="Drift" - flightModes[13]="" - flightModes[14]="Sport" - flightModes[15]="Flip" - flightModes[16]="AutoTune" - flightModes[17]="PosHold" - flightModes[18]="Brake" - flightModes[19]="Throw" - flightModes[20]="AvoidADSB" - flightModes[21]="GuidedNOGPS" - flightModes[22]="SmartRTL" - flightModes[23]="FlowHold" - flightModes[24]="Follow" - flightModes[25]="ZigZag" - flightModes[26]="Initializing" - -return {flightModes=flightModes} \ No newline at end of file diff --git a/HORUS/SOURCES/PP/lib/copter_px4.lua b/HORUS/SOURCES/PP/lib/copter_px4.lua deleted file mode 100644 index f1bb2c01..00000000 --- a/HORUS/SOURCES/PP/lib/copter_px4.lua +++ /dev/null @@ -1,28 +0,0 @@ -local flightModes = {} --- plane flight modes -flightModes[0]="" -flightModes[1]="Manual" -flightModes[2]="AltCtl" --px4 specific -flightModes[3]="PosCtl" --px4 specific -flightModes[4]="Ready" --px4 specific -flightModes[5]="Takeoff" --px4 specific -flightModes[6]="Loiter" -flightModes[7]="Mission" --px4 specific -flightModes[8]="RTL" -flightModes[9]="Land" -flightModes[10]="RTGS" --px4 specific -flightModes[11]="Follow" -flightModes[12]="PrecLand" --px4 specific -flightModes[13]="" -flightModes[14]="Acro" -flightModes[15]="OffBoard" --px4 specific -flightModes[16]="Stabilize" -flightModes[17]="RAttitude" --px4 specific -flightModes[18]="Simple" --px4 specific -flightModes[19]="" -flightModes[20]="" -flightModes[21]="" -flightModes[22]="" -flightModes[23]="" --- -return {flightModes=flightModes} diff --git a/HORUS/SOURCES/PP/lib/draw.lua b/HORUS/SOURCES/PP/lib/draw.lua deleted file mode 100644 index 71ba7417..00000000 --- a/HORUS/SOURCES/PP/lib/draw.lua +++ /dev/null @@ -1,489 +0,0 @@ -#include "includes/yaapu_inc.lua" - --- model and opentx version -local ver, radio, maj, minor, rev = getVersion() - -#ifdef DEV -local function draw8(x0,y0,x,y) - lcd.drawPoint(x0 + x, y0 + y); - lcd.drawPoint(x0 + y, y0 + x); - lcd.drawPoint(x0 - y, y0 + x); - lcd.drawPoint(x0 - x, y0 + y); - lcd.drawPoint(x0 - x, y0 - y); - lcd.drawPoint(x0 - y, y0 - x); - lcd.drawPoint(x0 + y, y0 - x); - lcd.drawPoint(x0 + x, y0 - y); -end - -local function drawCircle10(x0,y0) - draw8(x0,y0,5,1) - draw8(x0,y0,5,2) - draw8(x0,y0,4,3) - draw8(x0,y0,4,4) - lcd.drawPoint(x0 + 5,y0) - lcd.drawPoint(x0 - 5,y0) - lcd.drawPoint(x0,y0 + 5) - lcd.drawPoint(x0,y0 - 5) -end - -local function drawCircle(x0,y0,radius,delta) - local x = radius-1 - local y = 0 - local dx = delta - local dy = delta - local err = dx - bit32.lshift(radius,1) - while (x >= y) do - lcd.drawPoint(x0 + x, y0 + y); - lcd.drawPoint(x0 + y, y0 + x); - lcd.drawPoint(x0 - y, y0 + x); - lcd.drawPoint(x0 - x, y0 + y); - lcd.drawPoint(x0 - x, y0 - y); - lcd.drawPoint(x0 - y, y0 - x); - lcd.drawPoint(x0 + y, y0 - x); - lcd.drawPoint(x0 + x, y0 - y); - if err <= 0 then - y=y+1 - err = err + dy - dy = dy + 2 - end - if err > 0 then - - x=x-1 - dx = dx + 2 - err = err + dx - bit32.lshift(radius,1) - end - end -end - -local function drawHomePad(x0,y0) - drawCircle(x0 + 5,y0,5,2) - lcd.drawText(x0 + 5 - 2,y0 - 3,"H") -end - -local function drawScreenTitle(title,page, pages) - lcd.drawFilledRectangle(0, 0, LCD_W, 30, TITLE_BGCOLOR) - lcd.drawText(1, 5, title, MENU_TITLE_COLOR) - lcd.drawText(LCD_W-40, 5, page.."/"..pages, MENU_TITLE_COLOR) -end -#endif --DEV - -#ifdef X10_OPENTX_221 -local drawLine = nil - -if string.find(radio, "x10") and tonumber(maj..minor..rev) < 222 then - drawLine = function(x1,y1,x2,y2,flags1,flags2) lcd.drawLine(LCD_W-x1,LCD_H-y1,LCD_W-x2,LCD_H-y2,flags1,flags2) end -else - drawLine = function(x1,y1,x2,y2,flags1,flags2) lcd.drawLine(x1,y1,x2,y2,flags1,flags2) end -end -#endif --X10_OPENTX_221 - -local function drawHArrow(x,y,width,left,right,drawBlinkBitmap) - lcd.drawLine(x, y, x + width,y, SOLID, 0) - if left == true then - lcd.drawLine(x + 1,y - 1,x + 2,y - 2, SOLID, 0) - lcd.drawLine(x + 1,y + 1,x + 2,y + 2, SOLID, 0) - end - if right == true then - lcd.drawLine(x + width - 1,y - 1,x + width - 2,y - 2, SOLID, 0) - lcd.drawLine(x + width - 1,y + 1,x + width - 2,y + 2, SOLID, 0) - end -end --- -local function drawVArrow(x,y,top,bottom,utils) - if top == true then - utils.drawBlinkBitmap("uparrow",x,y) - else - utils.drawBlinkBitmap("downarrow",x,y) - end -end - -local function drawHomeIcon(x,y,utils) - lcd.drawBitmap(utils.getBitmap("minihomeorange"),x,y) -end - -local function computeOutCode(x,y,xmin,ymin,xmax,ymax) - local code = CS_INSIDE; --initialised as being inside of hud - -- - if x < xmin then --to the left of hud - code = bit32.bor(code,CS_LEFT); - elseif x > xmax then --to the right of hud - code = bit32.bor(code,CS_RIGHT); - end - if y < ymin then --below the hud - code = bit32.bor(code,CS_TOP); - elseif y > ymax then --above the hud - code = bit32.bor(code,CS_BOTTOM); - end - -- - return code; -end - --- Cohen–Sutherland clipping algorithm --- https://en.wikipedia.org/wiki/Cohen%E2%80%93Sutherland_algorithm -local function drawLineWithClippingXY(x0,y0,x1,y1,style,xmin,xmax,ymin,ymax,color,radio,rev) - -- compute outcodes for P0, P1, and whatever point lies outside the clip rectangle - local outcode0 = computeOutCode(x0, y0, xmin, ymin, xmax, ymax); - local outcode1 = computeOutCode(x1, y1, xmin, ymin, xmax, ymax); - local accept = false; - - while (true) do - if ( bit32.bor(outcode0,outcode1) == CS_INSIDE) then - -- bitwise OR is 0: both points inside window; trivially accept and exit loop - accept = true; - break; - elseif (bit32.band(outcode0,outcode1) ~= CS_INSIDE) then - -- bitwise AND is not 0: both points share an outside zone (LEFT, RIGHT, TOP, BOTTOM) - -- both must be outside window; exit loop (accept is false) - break; - else - -- failed both tests, so calculate the line segment to clip - -- from an outside point to an intersection with clip edge - local x = 0 - local y = 0 - -- At least one endpoint is outside the clip rectangle; pick it. - local outcodeOut = outcode0 ~= CS_INSIDE and outcode0 or outcode1 - -- No need to worry about divide-by-zero because, in each case, the - -- outcode bit being tested guarantees the denominator is non-zero - if bit32.band(outcodeOut,CS_BOTTOM) ~= CS_INSIDE then --point is above the clip window - x = x0 + (x1 - x0) * (ymax - y0) / (y1 - y0) - y = ymax - elseif bit32.band(outcodeOut,CS_TOP) ~= CS_INSIDE then --point is below the clip window - x = x0 + (x1 - x0) * (ymin - y0) / (y1 - y0) - y = ymin - elseif bit32.band(outcodeOut,CS_RIGHT) ~= CS_INSIDE then --point is to the right of clip window - y = y0 + (y1 - y0) * (xmax - x0) / (x1 - x0) - x = xmax - elseif bit32.band(outcodeOut,CS_LEFT) ~= CS_INSIDE then --point is to the left of clip window - y = y0 + (y1 - y0) * (xmin - x0) / (x1 - x0) - x = xmin - end - -- Now we move outside point to intersection point to clip - -- and get ready for next pass. - if outcodeOut == outcode0 then - x0 = x - y0 = y - outcode0 = computeOutCode(x0, y0, xmin, ymin, xmax, ymax) - else - x1 = x - y1 = y - outcode1 = computeOutCode(x1, y1, xmin, ymin, xmax, ymax) - end - end - end - if accept then -#ifdef X10_OPENTX_221 - drawLine(x0,y0,x1,y1, style,color) -#else - lcd.drawLine(x0,y0,x1,y1, style,color) -#endif - end -end - -local function drawLineWithClipping(ox,oy,angle,len,style,xmin,xmax,ymin,ymax,color,radio,rev) - local xx = math.cos(math.rad(angle)) * len * 0.5 - local yy = math.sin(math.rad(angle)) * len * 0.5 - - local x0 = ox - xx - local x1 = ox + xx - local y0 = oy - yy - local y1 = oy + yy - - drawLineWithClippingXY(x0,y0,x1,y1,style,xmin,xmax,ymin,ymax,color,radio,rev) -end - -local function drawNumberWithDim(x,y,xDim,yDim,number,dim,flags,dimFlags) - lcd.drawNumber(x, y, number,flags) - lcd.drawText(xDim, yDim, dim, dimFlags) -end - -local function drawRArrow(x,y,r,angle,color) - local ang = math.rad(angle - 90) - local x1 = x + r * math.cos(ang) - local y1 = y + r * math.sin(ang) - - ang = math.rad(angle - 90 + 150) - local x2 = x + r * math.cos(ang) - local y2 = y + r * math.sin(ang) - - ang = math.rad(angle - 90 - 150) - local x3 = x + r * math.cos(ang) - local y3 = y + r * math.sin(ang) - ang = math.rad(angle - 270) - local x4 = x + r * 0.5 * math.cos(ang) - local y4 = y + r * 0.5 *math.sin(ang) - -- -#ifdef X10_OPENTX_221 - drawLine(x1,y1,x2,y2,SOLID,color) - drawLine(x1,y1,x3,y3,SOLID,color) - drawLine(x2,y2,x4,y4,SOLID,color) - drawLine(x3,y3,x4,y4,SOLID,color) -#else - lcd.drawLine(x1,y1,x2,y2,SOLID,color) - lcd.drawLine(x1,y1,x3,y3,SOLID,color) - lcd.drawLine(x2,y2,x4,y4,SOLID,color) - lcd.drawLine(x3,y3,x4,y4,SOLID,color) -#endif -end - -local function drawFailsafe(telemetry,utils) - if telemetry.ekfFailsafe > 0 then - utils.drawBlinkBitmap("ekffailsafe",LCD_W/2 - 90,154) - end - if telemetry.battFailsafe > 0 then - utils.drawBlinkBitmap("battfailsafe",LCD_W/2 - 90,154) - end -end - -local function drawArmStatus(status,telemetry,utils) - -- armstatus - if telemetry.ekfFailsafe == 0 and telemetry.battFailsafe == 0 and status.timerRunning == 0 then - if (telemetry.statusArmed == 1) then - lcd.drawBitmap(utils.getBitmap("armed"),LCD_W/2 - 90,154) - else - utils.drawBlinkBitmap("disarmed",LCD_W/2 - 90,154) - end - end -end - -local function drawNoTelemetryData(status,telemetry,utils,telemetryEnabled) - -- no telemetry data - if (not telemetryEnabled()) then -#ifdef SPLASH - lcd.drawBitmap(utils.getBitmap("notelemetry"),(LCD_W-404)/2,(LCD_H-164)/2 + 10) --404x164 - lcd.setColor(CUSTOM_COLOR,lcd.RGB(255,255,255)) - lcd.drawText(130, 208, VERSION, SMLSIZE+CUSTOM_COLOR) -#else --SPLASH - lcd.setColor(CUSTOM_COLOR,COLOR_WHITE) - lcd.drawFilledRectangle(88,74, 304, 84, CUSTOM_COLOR) - lcd.setColor(CUSTOM_COLOR,COLOR_NOTELEM) - lcd.drawFilledRectangle(90,76, 300, 80, CUSTOM_COLOR) - lcd.setColor(CUSTOM_COLOR,COLOR_TEXT) - lcd.drawText(110, 85, "no telemetry data", DBLSIZE+CUSTOM_COLOR) - lcd.drawText(130, 120, VERSION, SMLSIZE+CUSTOM_COLOR) -#endif -- SPLAH - end -end - -local function drawFilledRectangle(x,y,w,h,flags) - if w > 0 and h > 0 then - lcd.drawFilledRectangle(x,y,w,h,flags) - end -end - -#ifdef HUD_ALGO2 -local function fillTriangle(ox, oy, x1, x2, roll, angle,color) - local step = 2 - -- - local y1 = (oy - ox*angle) + x1*angle - local y2 = (oy - ox*angle) + x2*angle - -- - local steps = math.abs(y2-y1) / step - if (0 < roll and roll <= 90) then - for s=0,steps - do - yy = y1 + s*step - xx = (yy - (oy - ox*angle))/angle - lcd.drawRectangle(x1,yy,xx - x1,step,color) - end - elseif (90 < roll and roll <= 180) then - for s=0,steps - do - yy = y2 + s*step - xx = (yy - (oy - ox*angle))/angle - lcd.drawRectangle(x1,yy,xx - x1,step,color) - end - elseif (-90 < roll and roll < 0) then - for s=0,steps - do - yy = y2 + s*step - xx = (yy - (oy - ox*angle))/angle - lcd.drawRectangle(xx,yy,x2-xx+1,step,color) - end - elseif (-180 < roll and roll <= -90) then - for s=0,steps - do - yy = y1 + s*step - xx = (yy - (oy - ox*angle))/angle - lcd.drawRectangle(xx,yy,x2-xx+1,step,color) - end - end -end -#endif --HUD_ALGO2 - -local yawRibbonPoints = {} --- -yawRibbonPoints[0]="N" -yawRibbonPoints[1]=nil -yawRibbonPoints[2]="NE" -yawRibbonPoints[3]=nil -yawRibbonPoints[4]="E" -yawRibbonPoints[5]=nil -yawRibbonPoints[6]="SE" -yawRibbonPoints[7]=nil -yawRibbonPoints[8]="S" -yawRibbonPoints[9]=nil -yawRibbonPoints[10]="SW" -yawRibbonPoints[11]=nil -yawRibbonPoints[12]="W" -yawRibbonPoints[13]=nil -yawRibbonPoints[14]="NW" -yawRibbonPoints[15]=nil - --- optimized yaw ribbon drawing -local function drawCompassRibbon(y,myWidget,conf,telemetry,status,battery,utils,width,xMin,xMax,stepWidth,bigFont) - -- ribbon centered +/- 90 on yaw - local centerYaw = (telemetry.yaw + 270 - (bigFont and 16 or 10))%360 -- (-10 needed to center ribbon) - -- this is the first point left to be drawn on the compass ribbon - local nextPoint = math.floor(centerYaw/22.5) * 22.5 - -- x coord of first ribbon letter - local nextPointX = xMin + (nextPoint - centerYaw)/22.5 * stepWidth - -- - local i = (nextPoint / 22.5) % 16 - for idx=1,12 - do - local letterOffset = 1 - local lineOffset = 4 - if nextPointX >= xMin -3 and nextPointX < xMax then - if yawRibbonPoints[i] == nil then - lcd.setColor(CUSTOM_COLOR,COLOR_LINES) - lcd.drawLine(nextPointX + lineOffset, y+1, nextPointX + lineOffset, y+7, SOLID, CUSTOM_COLOR) - else - if #yawRibbonPoints[i] > 1 then - letterOffset = -5 - lineOffset = 2 - end - lcd.setColor(CUSTOM_COLOR,COLOR_TEXT) - --lcd.setColor(CUSTOM_COLOR,COLOR_GREY) - lcd.drawText(nextPointX+letterOffset,y+(bigFont and -2 or 0),yawRibbonPoints[i],SMLSIZE+CUSTOM_COLOR) - end - end - i = (i + 1) % 16 - nextPointX = nextPointX + stepWidth - end - -- home icon - local homeOffset = 0 - local angle = telemetry.homeAngle - telemetry.yaw - if angle < 0 then - angle = 360 + angle - end - if angle > 270 or angle < 90 then - homeOffset = ((angle + 90) % 180)/180 * width - elseif angle >= 90 and angle <= 180 then - homeOffset = width - end - drawHomeIcon(xMin + homeOffset -5,y + (bigFont and 28 or 20),utils) - -- yaw angle box - local xx = 0 - if ( telemetry.yaw < 10) then - xx = bigFont and 20 or 14 - elseif (telemetry.yaw < 100) then - xx = bigFont and 40 or 28 - else - xx = bigFont and 60 or 42 - end - --lcd.drawNumber(LCD_W/2 + xx - 6, YAW_Y, telemetry.yaw, MIDSIZE+INVERS) - lcd.setColor(CUSTOM_COLOR,COLOR_BLACK) - lcd.drawFilledRectangle(LCD_W/2 - (xx/2), y - 1, xx, bigFont and 28 or 20, CUSTOM_COLOR+SOLID) - lcd.drawRectangle(LCD_W/2 - (xx/2) - 1, y - 1, xx+2, bigFont and 28 or 20, CUSTOM_COLOR+SOLID) - lcd.setColor(CUSTOM_COLOR,COLOR_TEXT) - lcd.drawNumber(LCD_W/2 - (xx/2), y - 6, telemetry.yaw, (bigFont and DBLSIZE or MIDSIZE)+CUSTOM_COLOR) -end - -local function drawStatusBar(maxRows,conf,telemetry,status,battery,alarms,frame,utils,gpsStatuses) - local yDelta = (maxRows-1)*12 - - lcd.setColor(CUSTOM_COLOR,COLOR_BARSEX) - lcd.drawFilledRectangle(0,229-yDelta,480,LCD_H-(229-yDelta),CUSTOM_COLOR) - -- flight time - lcd.setColor(CUSTOM_COLOR,COLOR_TEXTEX) - lcd.drawTimer(LCD_W, 224-yDelta, model.getTimer(2).value, DBLSIZE+CUSTOM_COLOR+RIGHT) - -- flight mode - lcd.setColor(CUSTOM_COLOR,COLOR_TEXTEX) - if status.strFlightMode ~= nil then - lcd.drawText(1,230-yDelta,status.strFlightMode,MIDSIZE+CUSTOM_COLOR) - end - -- gps status, draw coordinatyes if good at least once - if telemetry.lon ~= nil and telemetry.lat ~= nil then - lcd.drawText(370,227-yDelta,utils.decToDMSFull(telemetry.lat),SMLSIZE+CUSTOM_COLOR+RIGHT) - lcd.drawText(370,241-yDelta,utils.decToDMSFull(telemetry.lon,telemetry.lat),SMLSIZE+CUSTOM_COLOR+RIGHT) - end - -- gps status - local hdop = telemetry.gpsHdopC - local strStatus = gpsStatuses[telemetry.gpsStatus] - local flags = BLINK - local mult = 1 - - if telemetry.gpsStatus > 2 then - if telemetry.homeAngle ~= -1 then - flags = PREC1 - end - if hdop > 999 then - hdop = 999 - flags = 0 - mult=0.1 - elseif hdop > 99 then - flags = 0 - mult=0.1 - end - -- HDOP -#ifdef MAX_HDOP - if telemetry.gpsHdopC > conf.maxHdopAlert then - lcd.setColor(CUSTOM_COLOR,COLOR_YELLOW) - lcd.drawNumber(270,226-yDelta, hdop*mult,DBLSIZE+flags+RIGHT+CUSTOM_COLOR) - else - lcd.drawNumber(270,226-yDelta, hdop*mult,DBLSIZE+flags+RIGHT+CUSTOM_COLOR) - end -#else - lcd.drawNumber(270,226-yDelta, hdop*mult,DBLSIZE+flags+RIGHT+CUSTOM_COLOR) -#endif - -- SATS - lcd.setColor(CUSTOM_COLOR,COLOR_TEXTEX) - lcd.drawText(170,226-yDelta, strStatus, SMLSIZE+CUSTOM_COLOR) - - lcd.setColor(CUSTOM_COLOR,COLOR_TEXTEX) - if telemetry.numSats == 15 then - lcd.drawNumber(170,235-yDelta, telemetry.numSats, MIDSIZE+CUSTOM_COLOR) - lcd.drawText(200,239-yDelta, "+", SMLSIZE+CUSTOM_COLOR) - else - lcd.drawNumber(170,235-yDelta,telemetry.numSats, MIDSIZE+CUSTOM_COLOR) - end - elseif telemetry.gpsStatus == 0 then - utils.drawBlinkBitmap("nogpsicon",150,227-yDelta) - else - utils.drawBlinkBitmap("nolockicon",150,227-yDelta) - end - - local offset = math.min(maxRows,#status.messages+1) - - for i=0,offset-1 do - if status.messages[(status.messageCount + i - offset) % (#status.messages+1)][2] < 4 then - lcd.setColor(CUSTOM_COLOR,lcd.RGB(255,70,0)) - elseif status.messages[(status.messageCount + i - offset) % (#status.messages+1)][2] == 4 then - lcd.setColor(CUSTOM_COLOR,lcd.RGB(255,255,0)) - else - lcd.setColor(CUSTOM_COLOR,COLOR_TEXT) - end - lcd.drawText(1,(256-yDelta)+(12*i), status.messages[(status.messageCount + i - offset) % (#status.messages+1)][1],SMLSIZE+CUSTOM_COLOR) - end -end - -return { - drawNumberWithDim=drawNumberWithDim, - drawHomeIcon=drawHomeIcon, - drawHArrow=drawHArrow, - drawVArrow=drawVArrow, - drawRArrow=drawRArrow, - computeOutCode=computeOutCode, - drawLineWithClippingXY=drawLineWithClippingXY, - drawLineWithClipping=drawLineWithClipping, - drawFailsafe=drawFailsafe, - drawArmStatus=drawArmStatus, - drawNoTelemetryData=drawNoTelemetryData, - drawStatusBar=drawStatusBar, - drawFilledRectangle=drawFilledRectangle, -#ifdef HUD_ALGO2 - fillTriangle=fillTriangle, -#endif --HUD_ALGO2 - drawCompassRibbon=drawCompassRibbon, - yawRibbonPoints=yawRibbonPoints -} diff --git a/HORUS/SOURCES/PP/lib/hud_1.lua b/HORUS/SOURCES/PP/lib/hud_1.lua deleted file mode 100644 index 3fc5bef2..00000000 --- a/HORUS/SOURCES/PP/lib/hud_1.lua +++ /dev/null @@ -1,228 +0,0 @@ -#include "includes/yaapu_inc.lua" -#include "includes/layout_1_inc.lua" - -#define LEFTWIDTH 38 -#define RIGHTWIDTH 38 - -#define HUD_WIDTH 280 -#define HUD_HEIGHT 134 -#define HUD_X (LCD_W-HUD_WIDTH)/2 -#define HUD_Y 18 -#define HUD_Y_MID 85 - -#define VARIO_X 372 -#define VARIO_Y HUD_Y + 18 -#define VARIO_H HUD_HEIGHT/2 -#define VARIO_W 8 - ------------------------ --- COMPASS RIBBON ------------------------ -#define YAW_X (LCD_W-260)/2 -#define YAW_Y 18 -#define YAW_WIDTH 240 - -#define YAWICON_Y 40 -#define YAWTEXT_Y 18 -#define YAW_STEPWIDTH 25 -#define YAW_SYMBOLS 16 -#define YAW_X_MIN (LCD_W-YAW_WIDTH)/2 -#define YAW_X_MAX (LCD_W+YAW_WIDTH)/2 - -#define PITCH_X 248 -#define PITCH_Y 90 - -#define ROLL_X 214 -#define ROLL_Y 76 - - -#define R2 21 - --- model and opentx version -local ver, radio, maj, minor, rev = getVersion() -#ifdef HUDTIMER -local hudDrawTime = 0 -local hudDrawCounter = 0 -#endif - -local function drawHud(myWidget,drawLib,conf,telemetry,status,battery,utils) -#ifdef HUDTIMER - local hudStart = getTime() -#endif - - local r = -telemetry.roll - local cx,cy,dx,dy,ccx,ccy,cccx,cccy - local yPos = TOPBAR_Y + TOPBAR_HEIGHT + 8 - ----------------------- - -- artificial horizon - ----------------------- - -- no roll ==> segments are vertical, offsets are multiples of R2 - if ( telemetry.roll == 0 or math.abs(telemetry.roll) == 180) then - dx=0 - dy=telemetry.pitch * 1.85 - cx=0 - cy=R2 - ccx=0 - ccy=2*R2 - cccx=0 - cccy=3*R2 - else - -- center line offsets - dx = math.cos(math.rad(90 - r)) * -telemetry.pitch - dy = math.sin(math.rad(90 - r)) * telemetry.pitch * 1.85 - -- 1st line offsets - cx = math.cos(math.rad(90 - r)) * R2 - cy = math.sin(math.rad(90 - r)) * R2 - end - local rollX = math.floor(HUD_X + HUD_WIDTH/2) - ----------------------- - -- dark color for "ground" - ----------------------- - -- 140x90 - local minY = HUD_Y - local maxY = HUD_Y + HUD_HEIGHT - - local minX = HUD_X - local maxX = HUD_X + HUD_WIDTH - - local ox = HUD_X + HUD_WIDTH/2 + dx - local oy = HUD_Y_MID + dy - local yy = 0 - - --lcd.setColor(CUSTOM_COLOR,lcd.RGB(0x7b, 0x9d, 0xff)) -- default blue 7B9DFF - --lcd.drawFilledRectangle(minX,minY,maxX-minX,maxY - minY,CUSTOM_COLOR) - lcd.drawBitmap(utils.getBitmap("hud_bg_280x134"),(LCD_W-HUD_WIDTH)/2,HUD_Y) --160x90 - -- HUD - #include "includes/hud_algo_inc.lua" - - -- parallel lines above and below horizon - local linesMaxY = maxY-2 - local linesMinY = minY+10 - lcd.setColor(CUSTOM_COLOR,COLOR_WHITE) - -- +/- 90 deg - for dist=1,8 - do - drawLib.drawLineWithClipping(rollX + dx - dist*cx,dy + HUD_Y_MID + dist*cy,r,(dist%2==0 and 80 or 40),DOTTED,HUD_X+2,HUD_X+HUD_WIDTH-2,linesMinY,linesMaxY,CUSTOM_COLOR,radio,rev) - drawLib.drawLineWithClipping(rollX + dx + dist*cx,dy + HUD_Y_MID - dist*cy,r,(dist%2==0 and 80 or 40),DOTTED,HUD_X+2,HUD_X+HUD_WIDTH-2,linesMinY,linesMaxY,CUSTOM_COLOR,radio,rev) - end - - -- hashmarks - local startY = minY + 1 - local endY = maxY - 10 - local step = 18 - -- hSpeed - local roundHSpeed = math.floor((telemetry.hSpeed*UNIT_HSPEED_SCALE*0.1/5)+0.5)*5; - local offset = math.floor((telemetry.hSpeed*UNIT_HSPEED_SCALE*0.1-roundHSpeed)*0.2*step); - local ii = 0; - local yy = 0 - lcd.setColor(CUSTOM_COLOR,lcd.RGB(120,120,120)) - for j=roundHSpeed+20,roundHSpeed-20,-5 - do - yy = startY + (ii*step) + offset - 14 - if yy >= startY and yy < endY then - lcd.drawLine(HUD_X, yy+9, HUD_X + 4, yy+9, SOLID, CUSTOM_COLOR) - lcd.drawNumber(HUD_X + 7, yy, j, SMLSIZE+CUSTOM_COLOR) - end - ii=ii+1; - end - -- altitude - local roundAlt = math.floor((telemetry.homeAlt*UNIT_ALT_SCALE/5)+0.5)*5; - offset = math.floor((telemetry.homeAlt*UNIT_ALT_SCALE-roundAlt)*0.2*step); - ii = 0; - yy = 0 - for j=roundAlt+20,roundAlt-20,-5 - do - yy = startY + (ii*step) + offset - 14 - if yy >= startY and yy < endY then - lcd.drawLine(HUD_X + HUD_WIDTH - 14, yy+8, HUD_X + HUD_WIDTH-10 , yy+8, SOLID, CUSTOM_COLOR) - lcd.drawNumber(HUD_X + HUD_WIDTH - 16, yy, j, SMLSIZE+RIGHT+CUSTOM_COLOR) - end - ii=ii+1; - end - lcd.setColor(CUSTOM_COLOR,COLOR_WHITE) - - ------------------------------------- - -- hud bitmap - ------------------------------------- - lcd.drawBitmap(utils.getBitmap("hud_280x134"),(LCD_W-HUD_WIDTH)/2,HUD_Y) --160x90 - - ------------------------------------- - -- vario - ------------------------------------- - local varioMax = 5 - local varioSpeed = math.min(math.abs(0.1*telemetry.vSpeed),5) - local varioH = varioSpeed/varioMax*52 - --varioH = varioH + (varioH > 0 and 1 or 0) - if telemetry.vSpeed > 0 then - varioY = 19 + (52 - varioH) - else - varioY = 85 + 15 - end - --00ae10 - lcd.setColor(CUSTOM_COLOR,lcd.RGB(255, 0xce, 0)) --yellow - --lcd.setColor(CUSTOM_COLOR,lcd.RGB(00, 0xED, 0x32)) --green - -- lcd.setColor(CUSTOM_COLOR,lcd.RGB(50, 50, 50)) --dark grey - --lcd.setColor(CUSTOM_COLOR,lcd.RGB(255, 255, 255)) --white - lcd.drawFilledRectangle(VARIO_X, varioY, VARIO_W, varioH, CUSTOM_COLOR, 0) - - ------------------------------------- - -- left and right indicators on HUD - ------------------------------------- - -- DATA - lcd.setColor(CUSTOM_COLOR,lcd.RGB(00, 0xED, 0x32)) --green - -- altitude - local alt = utils.getMaxValue(telemetry.homeAlt,MINMAX_ALT) * UNIT_ALT_SCALE - if math.abs(alt) > 999 or alt < -99 then - lcd.drawNumber(HUD_X+HUD_WIDTH+1,HUD_Y_MID-16,alt,MIDSIZE+CUSTOM_COLOR+RIGHT) - elseif math.abs(alt) >= 10 then - lcd.drawNumber(HUD_X+HUD_WIDTH+1,HUD_Y_MID-20,alt,DBLSIZE+CUSTOM_COLOR+RIGHT) - else - lcd.drawNumber(HUD_X+HUD_WIDTH+1,HUD_Y_MID-20,alt*10,DBLSIZE+PREC1+CUSTOM_COLOR+RIGHT) - end - -- telemetry.hSpeed is in dm/s - local hSpeed = utils.getMaxValue(telemetry.hSpeed,MAX_HSPEED) * 0.1 * UNIT_HSPEED_SCALE - if (math.abs(hSpeed) >= 10) then - lcd.drawNumber(HUD_X+2,HUD_Y_MID-20,hSpeed,DBLSIZE+CUSTOM_COLOR) - else - lcd.drawNumber(HUD_X+2,HUD_Y_MID-20,hSpeed*10,DBLSIZE+CUSTOM_COLOR+PREC1) - end - lcd.setColor(CUSTOM_COLOR,COLOR_TEXT) - -- min/max arrows - if status.showMinMaxValues == true then - drawLib.drawVArrow(HUD_X+68, HUD_Y_MID-12,true,false,utils) - drawLib.drawVArrow(HUD_X+HUD_WIDTH-79, HUD_Y_MID-12,true,false,utils) - end - - -- vspeed box - lcd.setColor(CUSTOM_COLOR,COLOR_TEXT) - - local vSpeed = utils.getMaxValue(telemetry.vSpeed,MAX_VSPEED) * 0.1 -- m/s - - local xx = math.abs(vSpeed*UNIT_VSPEED_SCALE) > 999 and 4 or 3 - xx = xx + (vSpeed*UNIT_VSPEED_SCALE < 0 and 1 or 0) - - if math.abs(vSpeed*UNIT_VSPEED_SCALE*10) > 99 then -- - lcd.drawNumber((LCD_W)/2 + (xx/2)*12, 127, vSpeed*UNIT_VSPEED_SCALE, MIDSIZE+CUSTOM_COLOR+RIGHT) - else - lcd.drawNumber((LCD_W)/2 + (xx/2)*12, 127, vSpeed*UNIT_VSPEED_SCALE*10, MIDSIZE+CUSTOM_COLOR+RIGHT+PREC1) - end - - -- compass ribbon - drawLib.drawCompassRibbon(YAW_Y,myWidget,conf,telemetry,status,battery,utils,YAW_WIDTH,YAW_X_MIN,YAW_X_MAX,YAW_STEPWIDTH,true) - - -- pitch and roll - lcd.setColor(CUSTOM_COLOR,COLOR_YELLOW) - local xoffset = math.abs(telemetry.pitch) > 99 and 6 or 0 - lcd.drawNumber(PITCH_X+xoffset,PITCH_Y,telemetry.pitch,CUSTOM_COLOR+SMLSIZE+RIGHT) - lcd.drawNumber(ROLL_X,ROLL_Y,telemetry.roll,CUSTOM_COLOR+SMLSIZE+RIGHT) - lcd.setColor(CUSTOM_COLOR,COLOR_TEXT) -#ifdef HUDTIMER - hudDrawTime = hudDrawTime + (getTime() - hudStart) - hudDrawCounter = hudDrawCounter + 1 -#endif -end - -local function background(myWidget,conf,telemetry,status,utils) -end - -return {drawHud=drawHud,background=background} \ No newline at end of file diff --git a/HORUS/SOURCES/PP/lib/hud_2.lua b/HORUS/SOURCES/PP/lib/hud_2.lua deleted file mode 100644 index febc5e8d..00000000 --- a/HORUS/SOURCES/PP/lib/hud_2.lua +++ /dev/null @@ -1,202 +0,0 @@ -#include "includes/yaapu_inc.lua" -#include "includes/layout_2_inc.lua" - -#define LEFTWIDTH 38 -#define RIGHTWIDTH 38 - -#define HUD_WIDTH 160 -#define HUD_HEIGHT 90 -#define HUD_X (LCD_W-HUD_WIDTH)/2 -#define HUD_Y 24 -#define HUD_Y_MID 69 - -#define VARIO_X 310 -#define VARIO_Y HUD_Y -#define VARIO_H HUD_HEIGHT/2 -#define VARIO_W 10 - ------------------------ --- COMPASS RIBBON ------------------------ -#define YAW_X (LCD_W-140)/2 -#define YAW_Y 120 -#define YAW_WIDTH 140 - -#define YAWICON_Y 3 -#define YAWTEXT_Y 16 -#define YAW_STEPWIDTH 15 -#define YAW_SYMBOLS 16 -#define YAW_X_MIN (LCD_W-YAW_WIDTH)/2 -#define YAW_X_MAX (LCD_W+YAW_WIDTH)/2 -#define R2 12 - - --- model and opentx version -local ver, radio, maj, minor, rev = getVersion() -#ifdef HUDTIMER -local hudDrawTime = 0 -local hudDrawCounter = 0 -#endif - -local function drawHud(myWidget,drawLib,conf,telemetry,status,battery,utils) -#ifdef HUDTIMER - local hudStart = getTime() -#endif - - local r = -telemetry.roll - local cx,cy,dx,dy,ccx,ccy,cccx,cccy - local yPos = TOPBAR_Y + TOPBAR_HEIGHT + 8 - ----------------------- - -- artificial horizon - ----------------------- - -- no roll ==> segments are vertical, offsets are multiples of R2 - if ( telemetry.roll == 0) then - dx=0 - dy=telemetry.pitch - cx=0 - cy=R2 - ccx=0 - ccy=2*R2 - cccx=0 - cccy=3*R2 - else - -- center line offsets - dx = math.cos(math.rad(90 - r)) * -telemetry.pitch - dy = math.sin(math.rad(90 - r)) * telemetry.pitch - -- 1st line offsets - cx = math.cos(math.rad(90 - r)) * R2 - cy = math.sin(math.rad(90 - r)) * R2 - -- 2nd line offsets - ccx = math.cos(math.rad(90 - r)) * 2 * R2 - ccy = math.sin(math.rad(90 - r)) * 2 * R2 - -- 3rd line offsets - cccx = math.cos(math.rad(90 - r)) * 3 * R2 - cccy = math.sin(math.rad(90 - r)) * 3 * R2 - end - local rollX = math.floor(HUD_X + HUD_WIDTH/2) - ----------------------- - -- dark color for "ground" - ----------------------- - -- 140x90 - local minY = HUD_Y - local maxY = HUD_Y + HUD_HEIGHT - - local minX = HUD_X - local maxX = HUD_X + HUD_WIDTH - - local ox = HUD_X + HUD_WIDTH/2 + dx - local oy = HUD_Y_MID + dy - local yy = 0 - - --lcd.setColor(CUSTOM_COLOR,lcd.RGB(0x0d, 0x68, 0xb1)) -- bighud blue - lcd.setColor(CUSTOM_COLOR,lcd.RGB(0x7b, 0x9d, 0xff)) -- default blue - lcd.drawFilledRectangle(minX,minY,maxX-minX,maxY - minY,CUSTOM_COLOR) - -- HUD - #include "includes/hud_algo_inc.lua" - - -- parallel lines above and below horizon - local linesMaxY = maxY-1 - local linesMinY = minY+1 - lcd.setColor(CUSTOM_COLOR,COLOR_WHITE) - -- +/- 90 deg - for dist=1,8 - do - drawLib.drawLineWithClipping(rollX + dx - dist*cx,dy + HUD_Y_MID + dist*cy,r,(dist%2==0 and 40 or 20),DOTTED,HUD_X+2,HUD_X+HUD_WIDTH-2,linesMinY,linesMaxY,CUSTOM_COLOR,radio,rev) - drawLib.drawLineWithClipping(rollX + dx + dist*cx,dy + HUD_Y_MID - dist*cy,r,(dist%2==0 and 40 or 20),DOTTED,HUD_X+2,HUD_X+HUD_WIDTH-2,linesMinY,linesMaxY,CUSTOM_COLOR,radio,rev) - end --- hashmarks - local startY = minY + 1 - local endY = maxY - 10 - local step = 18 - lcd.setColor(CUSTOM_COLOR,lcd.RGB(120,120,120)) - -- hSpeed - local roundHSpeed = math.floor((telemetry.hSpeed*UNIT_HSPEED_SCALE*0.1/5)+0.5)*5; - local offset = math.floor((telemetry.hSpeed*UNIT_HSPEED_SCALE*0.1-roundHSpeed)*0.2*step); - local ii = 0; - local yy = 0 - for j=roundHSpeed+10,roundHSpeed-10,-5 - do - yy = startY + (ii*step) + offset - if yy >= startY and yy < endY then - lcd.drawLine(HUD_X + 1, yy+9, HUD_X + 5, yy+9, SOLID, CUSTOM_COLOR) - lcd.drawNumber(HUD_X + 8, yy, j, SMLSIZE+CUSTOM_COLOR) - end - ii=ii+1; - end - -- altitude - local roundAlt = math.floor((telemetry.homeAlt*UNIT_ALT_SCALE/5)+0.5)*5; - offset = math.floor((telemetry.homeAlt*UNIT_ALT_SCALE-roundAlt)*0.2*step); - ii = 0; - yy = 0 - for j=roundAlt+10,roundAlt-10,-5 - do - yy = startY + (ii*step) + offset - if yy >= startY and yy < endY then - lcd.drawLine(HUD_X + HUD_WIDTH - 15, yy+8, HUD_X + HUD_WIDTH -10, yy+8, SOLID, CUSTOM_COLOR) - lcd.drawNumber(HUD_X + HUD_WIDTH - 16, yy, j, SMLSIZE+RIGHT+CUSTOM_COLOR) - end - ii=ii+1; - end - lcd.setColor(CUSTOM_COLOR,COLOR_WHITE) - ------------------------------------- - -- hud bitmap - ------------------------------------- - lcd.drawBitmap(utils.getBitmap("hud_160x90c"),(LCD_W-HUD_WIDTH)/2,HUD_Y) --160x90 - ------------------------------------- - -- vario bitmap - ------------------------------------- - local varioMax = 5 - local varioSpeed = math.min(math.abs(0.1*telemetry.vSpeed),5) - local varioH = varioSpeed/varioMax*35 - if telemetry.vSpeed > 0 then - varioY = VARIO_Y + 35 - varioH - else - varioY = VARIO_Y + 55 - end - --00ae10 - lcd.setColor(CUSTOM_COLOR,lcd.RGB(255, 0xce, 0)) --yellow - -- lcd.setColor(CUSTOM_COLOR,lcd.RGB(00, 0xED, 0x32)) --green - -- lcd.setColor(CUSTOM_COLOR,lcd.RGB(50, 50, 50)) --dark grey - lcd.drawFilledRectangle(VARIO_X, varioY, VARIO_W, varioH, CUSTOM_COLOR, 0) - - ------------------------------------- - -- left and right indicators on HUD - ------------------------------------- - -- DATA - lcd.setColor(CUSTOM_COLOR,COLOR_TEXT) - -- altitude - local alt = utils.getMaxValue(telemetry.homeAlt,MINMAX_ALT) * UNIT_ALT_SCALE - if math.abs(alt) > 999 then - lcd.setColor(CUSTOM_COLOR,lcd.RGB(00, 0xED, 0x32)) --green - lcd.drawNumber(HUD_X+HUD_WIDTH+1,HUD_Y_MID-10,alt,CUSTOM_COLOR+RIGHT) - elseif math.abs(alt) >= 10 then - lcd.setColor(CUSTOM_COLOR,lcd.RGB(00, 0xED, 0x32)) --green - lcd.drawNumber(HUD_X+HUD_WIDTH+1,HUD_Y_MID-14,alt,MIDSIZE+CUSTOM_COLOR+RIGHT) - else - lcd.setColor(CUSTOM_COLOR,lcd.RGB(00, 0xED, 0x32)) --green - lcd.drawNumber(HUD_X+HUD_WIDTH+1,HUD_Y_MID-14,alt*10,MIDSIZE+PREC1+CUSTOM_COLOR+RIGHT) - end - -- telemetry.hSpeed is in dm/s - local hSpeed = utils.getMaxValue(telemetry.hSpeed,MAX_HSPEED) * 0.1 * UNIT_HSPEED_SCALE - if (math.abs(hSpeed) >= 10) then - lcd.drawNumber(HUD_X+2,HUD_Y_MID-14,hSpeed,MIDSIZE+CUSTOM_COLOR) - else - lcd.drawNumber(HUD_X+2,HUD_Y_MID-14,hSpeed*10,MIDSIZE+CUSTOM_COLOR+PREC1) - end -#ifdef HUDTIMER - hudDrawTime = hudDrawTime + (getTime() - hudStart) - hudDrawCounter = hudDrawCounter + 1 -#endif - -- min/max arrows - if status.showMinMaxValues == true then - drawLib.drawVArrow(HUD_X+50, HUD_Y_MID-9,true,false,utils) - drawLib.drawVArrow(HUD_X+HUD_WIDTH-57, HUD_Y_MID-9,true,false,utils) - end - -- compass ribbon - drawLib.drawCompassRibbon(YAW_Y,myWidget,conf,telemetry,status,battery,utils,YAW_WIDTH,YAW_X_MIN,YAW_X_MAX,YAW_STEPWIDTH,false) -end - -local function background(myWidget,conf,telemetry,status,utils) -end - -return {drawHud=drawHud,background=background} \ No newline at end of file diff --git a/HORUS/SOURCES/PP/lib/hud_russian_2.lua b/HORUS/SOURCES/PP/lib/hud_russian_2.lua deleted file mode 100644 index eaff8366..00000000 --- a/HORUS/SOURCES/PP/lib/hud_russian_2.lua +++ /dev/null @@ -1,194 +0,0 @@ -#include "includes/yaapu_inc.lua" -#include "includes/layout_2_inc.lua" - -#define HUD_RUSSIAN_R2 20 - -#define VARIO_X 310 -#define VARIO_Y HUD_Y -#define VARIO_H HUD_HEIGHT/2 -#define VARIO_W 10 - -#define LEFTWIDTH 38 -#define RIGHTWIDTH 38 - -#define HUD_WIDTH 158 -#define HUD_HEIGHT 90 -#define HUD_X (LCD_W-HUD_WIDTH)/2 -#define HUD_Y 24 -#define HUD_Y_MID 69 - ------------------------ --- COMPASS RIBBON ------------------------ -#define YAW_X (LCD_W-140)/2 -#define YAW_Y 120 -#define YAW_WIDTH 140 - -#define YAWICON_Y 3 -#define YAWTEXT_Y 16 -#define YAW_STEPWIDTH 15 -#define YAW_SYMBOLS 16 -#define YAW_X_MIN (LCD_W-YAW_WIDTH)/2 -#define YAW_X_MAX (LCD_W+YAW_WIDTH)/2 - -#define R2 25 - - --- model and opentx version -local ver, radio, maj, minor, rev = getVersion() -#ifdef HUDTIMER -local hudDrawTime = 0 -local hudDrawCounter = 0 -#endif - -local function drawHud(myWidget,drawLib,conf,telemetry,status,battery,utils) -#ifdef HUDTIMER - local hudStart = getTime() -#endif - - local r = -telemetry.roll - local cx,cy,dx,dy - local yPos = TOPBAR_Y + TOPBAR_HEIGHT + 8 - ----------------------- - -- artificial horizon - ----------------------- - -- no roll ==> segments are vertical, offsets are multiples of R2 - if ( telemetry.roll == 0) then - dx=0 - dy=telemetry.pitch - else - -- center line offsets - dx = math.cos(math.rad(90 - r)) * -telemetry.pitch - dy = math.sin(math.rad(90 - r)) * telemetry.pitch - end - local rollX = math.floor(HUD_X + HUD_WIDTH/2) - ----------------------- - -- dark color for "ground" - ----------------------- - -- 140x110 - local minY = HUD_Y - local maxY = HUD_Y + HUD_HEIGHT - - local minX = HUD_X + 1 - local maxX = HUD_X + HUD_WIDTH - - local ox = HUD_X + HUD_WIDTH/2 + dx + 5 - local oy = HUD_Y_MID + dy - local yy = 0 - - --lcd.setColor(CUSTOM_COLOR,lcd.RGB(179, 204, 255)) - lcd.setColor(CUSTOM_COLOR,lcd.RGB(0x7b, 0x9d, 0xff)) -- default blue - lcd.drawFilledRectangle(minX,minY,HUD_WIDTH,maxY-minY,CUSTOM_COLOR) - -- angle of the line passing on point(ox,oy) - local angle = math.tan(math.rad(-telemetry.roll)) - -- for each pixel of the hud base/top draw vertical black - -- lines from hud border to horizon line - -- horizon line moves with pitch/roll - --lcd.setColor(CUSTOM_COLOR,lcd.RGB(77, 153, 0)) - --lcd.setColor(CUSTOM_COLOR,lcd.RGB(102, 51, 0)) - lcd.setColor(CUSTOM_COLOR,lcd.RGB(0x63, 0x30, 0x00)) --623000 old brown - if math.abs(telemetry.roll) < 90 then - if oy > minY and oy < maxY then - lcd.drawFilledRectangle(minX,oy,HUD_WIDTH,maxY-oy + 1,CUSTOM_COLOR) - elseif oy <= minY then - lcd.drawFilledRectangle(minX,minY,HUD_WIDTH,maxY-minY,CUSTOM_COLOR) - end - else - --inverted - if oy > minY and oy < maxY then - lcd.drawFilledRectangle(minX,minY,HUD_WIDTH,oy-minY + 1,CUSTOM_COLOR) - elseif oy >= maxY then - lcd.drawFilledRectangle(minX,minY,HUD_WIDTH,maxY-minY,CUSTOM_COLOR) - end - end - -- --- parallel lines above and below horizon - lcd.setColor(CUSTOM_COLOR,lcd.RGB(255, 255, 255)) - -- - local hx = math.cos(math.rad(90 - r)) * -(telemetry.pitch%45) - local hy = math.sin(math.rad(90 - r)) * (telemetry.pitch%45) - - --drawLineWithClipping(rollX - hx, HUD_Y_MID + hy,r,50,SOLID,HUD_X,HUD_X + HUD_WIDTH,minY,maxY,CUSTOM_COLOR) - - for line=0,4 - do - -- - local deltax = math.cos(math.rad(90 - r)) * HUD_RUSSIAN_R2 * line - local deltay = math.sin(math.rad(90 - r)) * HUD_RUSSIAN_R2 * line - -- - drawLib.drawLineWithClipping(rollX - deltax + hx, HUD_Y_MID + deltay + hy,r,50,DOTTED,HUD_X,HUD_X + HUD_WIDTH,minY,maxY,CUSTOM_COLOR,radio,rev) - drawLib.drawLineWithClipping(rollX + deltax + hx, HUD_Y_MID - deltay + hy,r,50,DOTTED,HUD_X,HUD_X + HUD_WIDTH,minY,maxY,CUSTOM_COLOR,radio,rev) - end - - local xx = math.cos(math.rad(r)) * 70 * 0.5 - local yy = math.sin(math.rad(r)) * 70 * 0.5 - -- - local x0 = rollX - xx - local y0 = HUD_Y_MID - yy - -- - local x1 = rollX + xx - local y1 = HUD_Y_MID + yy - -- - drawLib.drawLineWithClipping(x0,y0,r + 90,70,SOLID,HUD_X,HUD_X + HUD_WIDTH,minY,maxY,CUSTOM_COLOR,radio,rev) - drawLib.drawLineWithClipping(x1,y1,r + 90,70,SOLID,HUD_X,HUD_X + HUD_WIDTH,minY,maxY,CUSTOM_COLOR,radio,rev) - ------------------------------------- - -- hud bitmap - ------------------------------------- - lcd.drawBitmap(utils.getBitmap("hud_160x90_rus"),(LCD_W-HUD_WIDTH)/2,HUD_Y) --160x90 - ------------------------------------- - -- vario bitmap - ------------------------------------- - local varioMax = 5 - local varioSpeed = math.min(math.abs(0.1*telemetry.vSpeed),5) - local varioH = varioSpeed/varioMax*35 - if telemetry.vSpeed > 0 then - varioY = VARIO_Y + 35 - varioH - else - varioY = VARIO_Y + 55 - end - --00ae10 - lcd.setColor(CUSTOM_COLOR,lcd.RGB(255, 0xce, 0)) --yellow - -- lcd.setColor(CUSTOM_COLOR,lcd.RGB(00, 0xED, 0x32)) --green - -- lcd.setColor(CUSTOM_COLOR,lcd.RGB(50, 50, 50)) --dark grey - lcd.drawFilledRectangle(VARIO_X, varioY, VARIO_W, varioH, CUSTOM_COLOR, 0) - ------------------------------------- - -- left and right indicators on HUD - ------------------------------------- - -- DATA - -- altitude - local alt = utils.getMaxValue(telemetry.homeAlt,MINMAX_ALT) * UNIT_ALT_SCALE - if math.abs(alt) > 999 then - lcd.setColor(CUSTOM_COLOR,COLOR_GREEN) - lcd.drawNumber(HUD_X+HUD_WIDTH - 42,HUD_Y_MID-10,alt,CUSTOM_COLOR) - elseif math.abs(alt) >= 10 then - lcd.setColor(CUSTOM_COLOR,COLOR_GREEN) - lcd.drawNumber(HUD_X+HUD_WIDTH - 42,HUD_Y_MID-14,alt,MIDSIZE+CUSTOM_COLOR) - else - lcd.setColor(CUSTOM_COLOR,COLOR_GREEN) - lcd.drawNumber(HUD_X+HUD_WIDTH - 42,HUD_Y_MID-14,alt*10,MIDSIZE+PREC1+CUSTOM_COLOR) - end - lcd.setColor(CUSTOM_COLOR,COLOR_GREEN) - -- telemetry.hSpeed is in dm/s - local hSpeed = utils.getMaxValue(telemetry.hSpeed,MAX_HSPEED) * 0.1 * UNIT_HSPEED_SCALE - if (math.abs(hSpeed) >= 10) then - lcd.drawNumber(HUD_X+44,HUD_Y_MID-14,hSpeed,MIDSIZE+RIGHT+CUSTOM_COLOR) - else - lcd.drawNumber(HUD_X+44,HUD_Y_MID-14,hSpeed*10,MIDSIZE+RIGHT+CUSTOM_COLOR+PREC1) - end -#ifdef HUDTIMER - hudDrawTime = hudDrawTime + (getTime() - hudStart) - hudDrawCounter = hudDrawCounter + 1 -#endif - -- min/max arrows - if status.showMinMaxValues == true then - drawLib.drawVArrow(HUD_X+50, HUD_Y_MID-9,true,false,utils) - drawLib.drawVArrow(HUD_X+HUD_WIDTH-57, HUD_Y_MID-9,true,false,utils) - end - -- compass ribbon - drawLib.drawCompassRibbon(YAW_Y,myWidget,conf,telemetry,status,battery,utils,YAW_WIDTH,YAW_X_MIN,YAW_X_MAX,YAW_STEPWIDTH) -end - -local function background(myWidget,conf,telemetry,status,utils) -end - -return {drawHud=drawHud,background=background} diff --git a/HORUS/SOURCES/PP/lib/hud_small_2.lua b/HORUS/SOURCES/PP/lib/hud_small_2.lua deleted file mode 100644 index 501e47fc..00000000 --- a/HORUS/SOURCES/PP/lib/hud_small_2.lua +++ /dev/null @@ -1,143 +0,0 @@ -#include "includes/yaapu_inc.lua" -#include "includes/layout_2_inc.lua" - -#define VARIO_X 275 -#define VARIO_Y 20 - -#define LEFTWIDTH 38 -#define RIGHTWIDTH 38 - -#define HUD_Y 30 -#define HUD_HEIGHT 70 -#define HUD_WIDTH 92 -#define HUD_X (LCD_W-HUD_WIDTH)/2 -#define HUD_Y_MID HUD_Y+HUD_HEIGHT/2 - ------------------------ --- COMPASS RIBBON ------------------------ -#define YAW_X (LCD_W-140)/2 -#define YAW_Y 115 -#define YAW_WIDTH 140 - -#define YAWICON_Y 3 -#define YAWTEXT_Y 16 -#define YAW_STEPWIDTH 15 -#define YAW_SYMBOLS 16 -#define YAW_X_MIN (LCD_W-YAW_WIDTH)/2 -#define YAW_X_MAX (LCD_W+YAW_WIDTH)/2 - -#define R2 11 - - --- model and opentx version -local ver, radio, maj, minor, rev = getVersion() - -#ifdef HUDTIMER -local hudDrawTime = 0 -local hudDrawCounter = 0 -#endif - -local function drawHud(myWidget,drawLib,conf,telemetry,status,battery,utils)--getMaxValue,getBitmap,drawBlinkBitmap) -#ifdef HUDTIMER - local hudStart = getTime() -#endif - - local r = -telemetry.roll - local cx,cy,dx,dy,ccx,ccy,cccx,cccy - local yPos = TOPBAR_Y + TOPBAR_HEIGHT + 8 - ----------------------- - -- artificial horizon - ----------------------- - -- no roll ==> segments are vertical, offsets are multiples of R2 - if ( telemetry.roll == 0) then - dx=0 - dy=telemetry.pitch - cx=0 - cy=R2 - ccx=0 - ccy=2*R2 - cccx=0 - cccy=3*R2 - else - -- center line offsets - dx = math.cos(math.rad(90 - r)) * -telemetry.pitch - dy = math.sin(math.rad(90 - r)) * telemetry.pitch - -- 1st line offsets - cx = math.cos(math.rad(90 - r)) * R2 - cy = math.sin(math.rad(90 - r)) * R2 - -- 2nd line offsets - ccx = math.cos(math.rad(90 - r)) * 2 * R2 - ccy = math.sin(math.rad(90 - r)) * 2 * R2 - -- 3rd line offsets - cccx = math.cos(math.rad(90 - r)) * 3 * R2 - cccy = math.sin(math.rad(90 - r)) * 3 * R2 - end - local rollX = math.floor(HUD_X + HUD_WIDTH/2) - ----------------------- - -- dark color for "ground" - ----------------------- - -- 90x70 - local minY = HUD_Y - local maxY = HUD_Y+HUD_HEIGHT - -- - local minX = HUD_X - local maxX = HUD_X + HUD_WIDTH - -- - local ox = HUD_X + HUD_WIDTH/2 + dx - -- - local oy = HUD_Y_MID + dy - local yy = 0 - - --lcd.setColor(CUSTOM_COLOR,lcd.RGB(0x0d, 0x68, 0xb1)) -- bighud blue - lcd.setColor(CUSTOM_COLOR,lcd.RGB(0x7b, 0x9d, 0xff)) -- default blue - lcd.drawFilledRectangle(minX,minY,maxX-minX,maxY - minY,CUSTOM_COLOR) - -- HUD - #include "includes/hud_algo_inc.lua" - - -- parallel lines above and below horizon - local linesMaxY = maxY-1 - local linesMinY = minY+1 - lcd.setColor(CUSTOM_COLOR,COLOR_WHITE) - -- +/- 90 deg - for dist=1,8 - do - drawLib.drawLineWithClipping(rollX + dx - dist*cx,dy + HUD_Y_MID + dist*cy,r,(dist%2==0 and 40 or 20),DOTTED,HUD_X+2,HUD_X+HUD_WIDTH-2,linesMinY,linesMaxY,CUSTOM_COLOR,radio,rev) - drawLib.drawLineWithClipping(rollX + dx + dist*cx,dy + HUD_Y_MID - dist*cy,r,(dist%2==0 and 40 or 20),DOTTED,HUD_X+2,HUD_X+HUD_WIDTH-2,linesMinY,linesMaxY,CUSTOM_COLOR,radio,rev) - end - ------------------------------------- - -- hud bitmap - ------------------------------------- - lcd.drawBitmap(utils.getBitmap("hud_90x70a"),(LCD_W-106)/2,HUD_Y-10) --106x90 - ------------------------------------- - -- vario bitmap - ------------------------------------- - local varioMax = 5 - local varioSpeed = math.min(math.abs(0.1*telemetry.vSpeed),5) - local varioH = 0 - if telemetry.vSpeed > 0 then - varioY = VARIO_Y+46 - varioSpeed/varioMax*40 - else - varioY = VARIO_Y+45 - end - lcd.setColor(CUSTOM_COLOR,lcd.RGB(255, 0xce, 0)) - lcd.drawFilledRectangle(VARIO_X+26, varioY, 7, varioSpeed/varioMax*39, CUSTOM_COLOR, 0) - lcd.drawBitmap(utils.getBitmap("variogauge_90"),VARIO_X,VARIO_Y) - - if telemetry.vSpeed > 0 then - lcd.drawBitmap(utils.getBitmap("varioline"),VARIO_X+21,varioY-1) - else - lcd.drawBitmap(utils.getBitmap("varioline"),VARIO_X+21,VARIO_Y+44 + varioSpeed/varioMax*39) - end -#ifdef HUDTIMER - hudDrawTime = hudDrawTime + (getTime() - hudStart) - hudDrawCounter = hudDrawCounter + 1 -#endif - -- compass ribbon - drawLib.drawCompassRibbon(YAW_Y,myWidget,conf,telemetry,status,battery,utils,YAW_WIDTH,YAW_X_MIN,YAW_X_MAX,YAW_STEPWIDTH) -end - -local function background(myWidget,conf,telemetry,status,utils) -end - -return {drawHud=drawHud,background=background} \ No newline at end of file diff --git a/HORUS/SOURCES/PP/lib/layout_1.lua b/HORUS/SOURCES/PP/lib/layout_1.lua deleted file mode 100644 index d524629d..00000000 --- a/HORUS/SOURCES/PP/lib/layout_1.lua +++ /dev/null @@ -1,149 +0,0 @@ -#include "includes/yaapu_inc.lua" -#include "includes/layout_1_inc.lua" - -#define SENSOR1_X 80 -#define SENSOR1_Y 203 -#define SENSOR1_XLABEL 80 -#define SENSOR1_YLABEL 193 - -#define SENSOR2_X 160 -#define SENSOR2_Y 203 -#define SENSOR2_XLABEL 160 -#define SENSOR2_YLABEL 193 - -#define SENSOR3_X 240 -#define SENSOR3_Y 203 -#define SENSOR3_XLABEL 240 -#define SENSOR3_YLABEL 193 - -#define SENSOR4_X 320 -#define SENSOR4_Y 203 -#define SENSOR4_XLABEL 320 -#define SENSOR4_YLABEL 193 - -#define SENSOR5_X 400 -#define SENSOR5_Y 203 -#define SENSOR5_XLABEL 400 -#define SENSOR5_YLABEL 193 - -#define SENSOR6_X 480 -#define SENSOR6_Y 203 -#define SENSOR6_XLABEL 480 -#define SENSOR6_YLABEL 193 - --------------------------- --- CUSTOM SENSORS SUPPORT --------------------------- -#define SENSOR_LABEL 1 -#define SENSOR_NAME 2 -#define SENSOR_PREC 3 -#define SENSOR_UNIT 4 -#define SENSOR_MULT 5 -#define SENSOR_MAX 6 -#define SENSOR_FONT 7 -#define SENSOR_WARN 8 -#define SENSOR_CRIT 9 - -local customSensorXY = { - { SENSOR1_XLABEL, SENSOR1_YLABEL, SENSOR1_X, SENSOR1_Y}, - { SENSOR2_XLABEL, SENSOR2_YLABEL, SENSOR2_X, SENSOR2_Y}, - { SENSOR3_XLABEL, SENSOR3_YLABEL, SENSOR3_X, SENSOR3_Y}, - { SENSOR4_XLABEL, SENSOR4_YLABEL, SENSOR4_X, SENSOR4_Y}, - { SENSOR5_XLABEL, SENSOR5_YLABEL, SENSOR5_X, SENSOR5_Y}, - { SENSOR6_XLABEL, SENSOR6_YLABEL, SENSOR6_X, SENSOR6_Y}, -} - -local function drawCustomSensors(x,customSensors,utils,status) - --lcd.setColor(CUSTOM_COLOR,lcd.RGB(0,75,128)) - lcd.setColor(CUSTOM_COLOR,COLOR_SENSORS) - lcd.drawFilledRectangle(0,194,LCD_W,35,CUSTOM_COLOR) - lcd.setColor(CUSTOM_COLOR,COLOR_GREY) - lcd.drawLine(1,228,LCD_W-2,228,SOLID,CUSTOM_COLOR) - - local label,data,prec,mult,flags,sensorConfig - for i=1,6 - do - if customSensors.sensors[i] ~= nil then - sensorConfig = customSensors.sensors[i] - - if sensorConfig[SENSOR_UNIT] == "" then - label = string.format("%s",sensorConfig[SENSOR_LABEL]) - else - label = string.format("%s(%s)",sensorConfig[SENSOR_LABEL],sensorConfig[SENSOR_UNIT]) - end - -- draw sensor label - lcd.setColor(CUSTOM_COLOR,COLOR_SENSORS_LABEL) - lcd.drawText(x+customSensorXY[i][1], customSensorXY[i][2],label, SMLSIZE+RIGHT+CUSTOM_COLOR) - - mult = sensorConfig[SENSOR_PREC] == 0 and 1 or ( sensorConfig[SENSOR_PREC] == 1 and 10 or 100 ) - prec = mult == 1 and 0 or (mult == 10 and 32 or 48) - - local sensorName = sensorConfig[SENSOR_NAME]..(status.showMinMaxValues == true and sensorConfig[SENSOR_MAX] or "") - local sensorValue = getValue(sensorName) - local value = (sensorValue+(mult == 100 and 0.005 or 0))*mult*sensorConfig[SENSOR_MULT] - - -- default font size - flags = sensorConfig[SENSOR_FONT] == 1 and 0 or MIDSIZE - - -- for sensor 3,4,5,6 reduce font if necessary - if math.abs(value)*mult > 99999 then - flags = 0 - end - - local color = COLOR_SENSORS_TEXT - local sign = sensorConfig[SENSOR_MAX] == "+" and 1 or -1 - -- max tracking, high values are critical - if math.abs(value) ~= 0 and status.showMinMaxValues == false then - color = ( sensorValue*sign > sensorConfig[SENSOR_CRIT]*sign and lcd.RGB(255,70,0) or (sensorValue*sign > sensorConfig[SENSOR_WARN]*sign and COLOR_WARN or COLOR_SENSORS_TEXT)) - end - - lcd.setColor(CUSTOM_COLOR,color) - - local voffset = flags==0 and 6 or 0 - -- if a lookup table exists use it! - if customSensors.lookups[i] ~= nil and customSensors.lookups[i][value] ~= nil then - lcd.drawText(x+customSensorXY[i][3], customSensorXY[i][4]+voffset, customSensors.lookups[i][value] or value, flags+RIGHT+CUSTOM_COLOR) - else - lcd.drawNumber(x+customSensorXY[i][3], customSensorXY[i][4]+voffset, value, flags+RIGHT+prec+CUSTOM_COLOR) - end - end - end -end - -local function draw(myWidget,drawLib,conf,telemetry,status,battery,alarms,frame,utils,customSensors,gpsStatuses,leftPanel,centerPanel,rightPanel) - lcd.setColor(CUSTOM_COLOR,COLOR_LINES) - centerPanel.drawHud(myWidget,drawLib,conf,telemetry,status,battery,utils) - --lcd.setColor(CUSTOM_COLOR,COLOR_YELLOW) - drawLib.drawRArrow(HOMEDIR_X,HOMEDIR_Y,HOMEDIR_R,math.floor(telemetry.homeAngle - telemetry.yaw),CUSTOM_COLOR)--HomeDirection(telemetry) - -- with dual battery default is to show aggregate view - if status.batt2sources.fc or status.batt2sources.vs then - if status.showDualBattery == false then - -- dual battery: aggregate view - rightPanel.drawPane(380,drawLib,conf,telemetry,status,alarms,battery,BATT_IDALL,gpsStatuses,utils) - -- left pane info - leftPanel.drawPane(0,drawLib,conf,telemetry,status,alarms,battery,BATT_IDALL,gpsStatuses,utils) - else - -- dual battery:battery 1 right pane - rightPanel.drawPane(380,drawLib,conf,telemetry,status,alarms,battery,BATT_ID1,gpsStatuses,utils) - -- dual battery:battery 2 left pane - rightPanel.drawPane(0,drawLib,conf,telemetry,status,alarms,battery,BATT_ID2,gpsStatuses,utils) - end - else - -- battery 1 right pane in single battery mode - rightPanel.drawPane(380,drawLib,conf,telemetry,status,alarms,battery,BATT_ID1,gpsStatuses,utils) - -- left pane info in single battery mode - leftPanel.drawPane(0,drawLib,conf,telemetry,status,alarms,battery,BATT_IDALL,gpsStatuses,utils) - end - utils.drawTopBar() - local msgRows = 4 - if customSensors ~= nil then - msgRows = 1 - -- draw custom sensors - drawCustomSensors(0,customSensors,utils,status) - end - drawLib.drawStatusBar(msgRows,conf,telemetry,status,battery,alarms,frame,utils,gpsStatuses) - drawLib.drawFailsafe(telemetry,utils) - drawLib.drawArmStatus(status,telemetry,utils) -end - -return {draw=draw} diff --git a/HORUS/SOURCES/PP/lib/layout_2.lua b/HORUS/SOURCES/PP/lib/layout_2.lua deleted file mode 100644 index a7191767..00000000 --- a/HORUS/SOURCES/PP/lib/layout_2.lua +++ /dev/null @@ -1,68 +0,0 @@ -#include "includes/yaapu_inc.lua" -#include "includes/layout_2_inc.lua" - -local function drawExtendedStatusBar(drawLib,conf,telemetry,status,battery,alarms,frame,utils,gpsStatuses) - -- LEFT label - lcd.setColor(CUSTOM_COLOR,COLOR_LABEL) - lcd.drawText(ALT_XLABEL,ALT_YLABEL,"Alt("..UNIT_ALT_LABEL..")",SMLSIZE+CUSTOM_COLOR+RIGHT) - lcd.drawText(VSPEED_XLABEL,VSPEED_YLABEL,"VSI("..UNIT_VSPEED_LABEL..")",SMLSIZE+CUSTOM_COLOR+RIGHT) - - lcd.setColor(CUSTOM_COLOR,COLOR_TEXT) - -- altitude - local alt = utils.getMaxValue(telemetry.homeAlt,MINMAX_ALT) * UNIT_ALT_SCALE - if math.abs(alt) > 999 then - lcd.drawNumber(ALT_X,ALT_Y,alt,ALT_FLAGS+CUSTOM_COLOR) - elseif math.abs(alt) >= 10 then - lcd.drawNumber(ALT_X,ALT_Y,alt,ALT_FLAGS+CUSTOM_COLOR) - else - lcd.drawNumber(ALT_X,ALT_Y,alt*10,ALT_FLAGS+PREC1+CUSTOM_COLOR) - end - -- vertical speed - lcd.setColor(CUSTOM_COLOR,COLOR_TEXT) - local vSpeed = utils.getMaxValue(telemetry.vSpeed,MAX_VSPEED) * 0.1 * UNIT_VSPEED_SCALE - if (math.abs(telemetry.vSpeed) >= 10) then - lcd.drawNumber(VSPEED_X,VSPEED_Y, vSpeed ,VSPEED_FLAGS+CUSTOM_COLOR) - else - lcd.drawNumber(VSPEED_X,VSPEED_Y,vSpeed*10,VSPEED_FLAGS+PREC1+CUSTOM_COLOR) - end - -- min/max arrows - if status.showMinMaxValues == true then - drawLib.drawVArrow(3, ALT_Y + 3,true,false,utils) - drawLib.drawVArrow(VSPEED_X-70, VSPEED_Y + 3,true,false,utils) - end - -end - -local function draw(myWidget,drawLib,conf,telemetry,status,battery,alarms,frame,utils,customSensors,gpsStatuses,leftPanel,centerPanel,rightPanel) - if leftPanel ~= nil and centerPanel ~= nil and rightPanel ~= nil then - lcd.setColor(CUSTOM_COLOR,COLOR_LINES) - drawLib.drawRArrow(HOMEDIR_X,HOMEDIR_Y,HOMEDIR_R,math.floor(telemetry.homeAngle - telemetry.yaw),CUSTOM_COLOR)--HomeDirection(telemetry) - centerPanel.drawHud(myWidget,drawLib,conf,telemetry,status,battery,utils,customSensors) - -- with dual battery default is to show aggregate view - if status.batt2sources.fc or status.batt2sources.vs then - if status.showDualBattery == false then - -- dual battery: aggregate view - rightPanel.drawPane(285,drawLib,conf,telemetry,status,alarms,battery,BATT_IDALL,gpsStatuses,utils,customSensors) - -- left panel - leftPanel.drawPane(0,drawLib,conf,telemetry,status,alarms,battery,BATT_IDALL,gpsStatuses,utils,customSensors) - else - -- dual battery:battery 1 right pane - rightPanel.drawPane(285,drawLib,conf,telemetry,status,alarms,battery,BATT_ID1,gpsStatuses,utils,customSensors) - -- dual battery:battery 2 left pane - rightPanel.drawPane(-37,drawLib,conf,telemetry,status,alarms,battery,BATT_ID2,gpsStatuses,utils,customSensors) - end - else - -- battery 1 right pane in single battery mode - rightPanel.drawPane(285,drawLib,conf,telemetry,status,alarms,battery,BATT_ID1,gpsStatuses,utils,customSensors) - -- left panel - leftPanel.drawPane(0,drawLib,conf,telemetry,status,alarms,battery,BATT_IDALL,gpsStatuses,utils,customSensors) - end - end - drawLib.drawStatusBar(3,conf,telemetry,status,battery,alarms,frame,utils,gpsStatuses) - drawExtendedStatusBar(drawLib,conf,telemetry,status,battery,alarms,frame,utils,gpsStatuses) - utils.drawTopBar() - drawLib.drawFailsafe(telemetry,utils) - drawLib.drawArmStatus(status,telemetry,utils) -end - -return {draw=draw} diff --git a/HORUS/SOURCES/PP/lib/layout_map.lua b/HORUS/SOURCES/PP/lib/layout_map.lua deleted file mode 100644 index 585b7b44..00000000 --- a/HORUS/SOURCES/PP/lib/layout_map.lua +++ /dev/null @@ -1,507 +0,0 @@ -#include "includes/yaapu_inc.lua" ---[[ - for info see https://github.com/heldersepu/GMapCatcher - - Notes: - - tiles need to be resized down to 100x100 from original size of 256x256 - - at max zoom level (-2) 1 tile = 100px = 76.5m -]]-- - --------------------------- --- MINI HUD --------------------------- -#define HUD_Y 24 -#define HUD_H 48 -#define HUD_W 48 -#define HUD_X 21 -#define HUD_Y_MID 48 -#define R2 10 - --------------------------- --- MAP properties --------------------------- -#define MAP_W 300 -#define MAP_H 200 -#define MAP_X (LCD_W-MAP_W)/2 -#define MAP_Y 18 - - -#define HOME_R 10 -#define VEHICLE_R 17 -#define SAMPLES 10 -#define DIST_SAMPLES 10 - - -#define TXT_X_LEFT 10 -#define TXT_Y_LEFT 50 -#define TXT_X_RIGHT 410 -#define TXT_Y_RIGHT 15 -#define TXT_ALIGN 0 - --- model and opentx version -local ver, radio, maj, minor, rev = getVersion() - --- map support -local posUpdated = false -local myScreenX, myScreenY -local homeScreenX, homeScreenY -local estimatedHomeScreenX, estimatedHomeScreenY -local tile_x,tile_y,offset_x,offset_y -local tiles = {} -local mapBitmapByPath = {} -local nomap = nil -local world_tiles -local tiles_per_radian -local tile_dim -local scaleLen -local scaleLabel -local posHistory = {} -local homeNeedsRefresh = true -local sample = 0 -local sampleCount = 0 -local lastPosUpdate = getTime() -local lastPosSample = getTime() -local lastHomePosUpdate = getTime() -local lastZoomLevel = -99 -local estimatedHomeGps = { - lat = nil, - lon = nil -} - -local lastProcessCycle = getTime() -local processCycle = 0 - -local avgDistSamples = {} -local avgDist = 0; -local avgDistSum = 0; -local avgDistSample = 0; -local avgDistSampleCount = 0; -local avgDistLastSampleTime = getTime(); -avgDistSamples[0] = 0 - -#define MAP_MAX_ZOOM_LEVEL 17 - -#define TILES_X 3 -#define TILES_Y 2 - -#define TILES_WIDTH 100 -#define TILES_HEIGHT 100 -#define TILES_DIM 76.5 - -#define TILES_IDX_BMP 1 -#define TILES_IDX_PATH 2 - -local function tiles_on_level(level) - return bit32.lshift(1,MAP_MAX_ZOOM_LEVEL - level) -end - -local function coord_to_tiles(lat,lon) - local x = world_tiles / 360 * (lon + 180) - local e = math.sin(lat * (1/180 * math.pi)) - local y = world_tiles / 2 + 0.5 * math.log((1+e)/(1-e)) * -1 * tiles_per_radian - return math.floor(x % world_tiles), math.floor(y % world_tiles), math.floor((x - math.floor(x)) * TILES_WIDTH), math.floor((y - math.floor(y)) * TILES_HEIGHT) -end - -local function tiles_to_path(tile_x, tile_y, level) - local path = string.format("/%d/%d/%d/%d/s_%d.png", level, tile_x/1024, tile_x%1024, tile_y/1024, tile_y%1024) - collectgarbage() - collectgarbage() - return path -end - -local function getTileBitmap(conf,tilePath) - local fullPath = "/SCRIPTS/YAAPU/MAPS/"..conf.mapType..tilePath - -- check cache - if mapBitmapByPath[tilePath] ~= nil then - return mapBitmapByPath[tilePath] - end - - local bmp = Bitmap.open(fullPath) - local w,h = Bitmap.getSize(bmp) - - if w > 0 then - mapBitmapByPath[tilePath] = bmp - return bmp - else - if nomap == nil then - nomap = Bitmap.open("/SCRIPTS/YAAPU/MAPS/nomap.png") - end - mapBitmapByPath[tilePath] = nomap - return nomap - end -end - -local function loadAndCenterTiles(conf,tile_x,tile_y,offset_x,offset_y,width,level) - -- determine if upper or lower center tile - local yy = 2 - if offset_y > TILES_HEIGHT/2 then - yy = 1 - end - for x=1,TILES_X - do - for y=1,TILES_Y - do - local tile_path = tiles_to_path(tile_x+x-2, tile_y+y-yy, level) - local idx = width*(y-1)+x - - if tiles[idx] == nil then - tiles[idx] = tile_path - else - if tiles[idx] ~= tile_path then - tiles[idx] = nil - collectgarbage() - collectgarbage() - tiles[idx] = tile_path - end - end - end - end - -- release unused cached images - for path, bmp in pairs(mapBitmapByPath) do - local remove = true - for i=1,#tiles - do - if tiles[i] == path then - remove = false - end - end - if remove then - mapBitmapByPath[path]=nil - end - end - -- force a call to destroyBitmap() - collectgarbage() - collectgarbage() -end - -local function drawTiles(conf,drawLib,width,xmin,xmax,ymin,ymax,color,level) - for x=1,TILES_X - do - for y=1,TILES_Y - do - local idx = width*(y-1)+x - if tiles[idx] ~= nil then - lcd.drawBitmap(getTileBitmap(conf,tiles[idx]), xmin+(x-1)*TILES_WIDTH, ymin+(y-1)*TILES_HEIGHT) - end - end - end - if conf.enableMapGrid then - -- draw grid - for x=1,TILES_X-1 - do - lcd.drawLine(xmin+x*TILES_WIDTH,ymin,xmin+x*TILES_WIDTH,ymax,DOTTED,color) - end - - for y=1,TILES_Y-1 - do - lcd.drawLine(xmin,ymin+y*TILES_HEIGHT,xmax,ymin+y*TILES_HEIGHT,DOTTED,color) - end - end - -- draw 50m or 150ft line at max zoom - lcd.setColor(CUSTOM_COLOR,COLOR_WHITE) - lcd.drawLine(xmin+5,ymin+TILES_Y*TILES_HEIGHT-13,xmin+5+scaleLen,ymin+TILES_Y*TILES_HEIGHT-13,SOLID,CUSTOM_COLOR) - lcd.drawText(xmin+5,ymin+TILES_Y*TILES_HEIGHT-27,scaleLabel,SMLSIZE+CUSTOM_COLOR) -end - -local function getScreenCoordinates(minX,minY,tile_x,tile_y,offset_x,offset_y,level) - -- is this tile on screen ? - local tile_path = tiles_to_path(tile_x,tile_y,level) - local onScreen = false - - for x=1,TILES_X - do - for y=1,TILES_Y - do - local idx = TILES_X*(y-1)+x - if tiles[idx] == tile_path then - -- ok it's on screen - return minX + (x-1)*TILES_WIDTH + offset_x, minY + (y-1)*TILES_HEIGHT + offset_y - end - end - end - -- force offscreen up - return LCD_W/2, -10 -end - -local function drawHud(myWidget,drawLib,conf,telemetry,status,battery,utils)--getMaxValue,getBitmap,drawBlinkBitmap) - local r = -telemetry.roll - local cx,cy,dx,dy,ccx,ccy,cccx,cccy - local yPos = TOPBAR_Y + TOPBAR_HEIGHT + 8 - ----------------------- - -- artificial horizon - ----------------------- - -- no roll ==> segments are vertical, offsets are multiples of R2 - if ( telemetry.roll == 0) then - dx=0 - dy=telemetry.pitch * 0.75 - cx=0 - cy=R2 - ccx=0 - ccy=2*R2 - cccx=0 - cccy=3*R2 - else - -- center line offsets - dx = math.cos(math.rad(90 - r)) * -telemetry.pitch * 0.75 - dy = math.sin(math.rad(90 - r)) * telemetry.pitch * 0.75 - -- 1st line offsets - cx = math.cos(math.rad(90 - r)) * R2 - cy = math.sin(math.rad(90 - r)) * R2 - end - ----------------------- - -- dark color for "ground" - ----------------------- - -- 90x70 - local minY = HUD_Y - local maxY = HUD_Y+HUD_H - -- - local minX = HUD_X - local maxX = HUD_X + HUD_W - -- - local ox = HUD_X + HUD_W/2 + dx - -- - local oy = HUD_Y_MID + dy - local yy = 0 - - --lcd.setColor(CUSTOM_COLOR,lcd.RGB(0x0d, 0x68, 0xb1)) -- bighud blue - lcd.setColor(CUSTOM_COLOR,lcd.RGB(0x7b, 0x9d, 0xff)) -- default blue - lcd.drawFilledRectangle(minX,minY,maxX-minX,maxY - minY,CUSTOM_COLOR) - -- HUD - #include "includes/hud_algo_inc.lua" - -- parallel lines above and below horizon - local linesMaxY = maxY-1 - local linesMinY = minY+1 - local rollX = math.floor(HUD_X + HUD_W/2) - lcd.setColor(CUSTOM_COLOR,COLOR_WHITE) - -- +/- 90 deg - for dist=1,8 - do - drawLib.drawLineWithClipping(rollX + dx - dist*cx,dy + HUD_Y_MID + dist*cy,r,(dist%2==0 and 40 or 20),DOTTED,HUD_X+2,HUD_X+HUD_W-2,linesMinY,linesMaxY,CUSTOM_COLOR,radio,rev) - drawLib.drawLineWithClipping(rollX + dx + dist*cx,dy + HUD_Y_MID - dist*cy,r,(dist%2==0 and 40 or 20),DOTTED,HUD_X+2,HUD_X+HUD_W-2,linesMinY,linesMaxY,CUSTOM_COLOR,radio,rev) - end - ------------------------------------- - -- hud bitmap - ------------------------------------- - lcd.drawBitmap(utils.getBitmap("hud_48x48a"),HUD_X-2,HUD_Y-3) -end - -local function drawMap(myWidget,drawLib,conf,telemetry,status,battery,utils,level) -#ifdef TESTMODE - -- move hor - if getValue("ch1") > 100 then - telemetry.lon = telemetry.lon + 0.000005 - elseif getValue("ch1") < -100 then - telemetry.lon = telemetry.lon - 0.000005 - end - -- move ver - if getValue("ch2") > 100 then - telemetry.lat = telemetry.lat > 0 and telemetry.lat + 0.000005 or telemetry.lat - 0.000005 - elseif getValue("ch2") < -100 then - telemetry.lat = telemetry.lat > 0 and telemetry.lat - 0.000005 or telemetry.lat + 0.000005 - end -#endif - local minY = MAP_Y - local maxY = minY+TILES_Y*TILES_HEIGHT - - local minX = MAP_X - local maxX = minX+TILES_X*TILES_WIDTH - - if telemetry.lat ~= nil and telemetry.lon ~= nil then - -- position update - if getTime() - lastPosUpdate > 50 then - posUpdated = true - lastPosUpdate = getTime() - -- current vehicle tile coordinates - tile_x,tile_y,offset_x,offset_y = coord_to_tiles(telemetry.lat,telemetry.lon) - -- viewport relative coordinates - myScreenX,myScreenY = getScreenCoordinates(minX,minY,tile_x,tile_y,offset_x,offset_y,level) - -- check if offscreen - local myCode = drawLib.computeOutCode(myScreenX, myScreenY, minX+VEHICLE_R, minY+VEHICLE_R, maxX-VEHICLE_R, maxY-VEHICLE_R); - - -- center vehicle on screen - if myCode > 0 then - loadAndCenterTiles(conf, tile_x, tile_y, offset_x, offset_y, TILES_X, level) - -- after centering screen position needs to be computed again - tile_x,tile_y,offset_x,offset_y = coord_to_tiles(telemetry.lat,telemetry.lon) - myScreenX,myScreenY = getScreenCoordinates(minX,minY,tile_x,tile_y,offset_x,offset_y,level) - end - end - - -- home position update - if getTime() - lastHomePosUpdate > 50 and posUpdated then - lastHomePosUpdate = getTime() - if homeNeedsRefresh then - -- update home, schedule estimated home update - homeNeedsRefresh = false - if telemetry.homeLat ~= nil then - -- current vehicle tile coordinates - tile_x,tile_y,offset_x,offset_y = coord_to_tiles(telemetry.homeLat,telemetry.homeLon) - -- viewport relative coordinates - homeScreenX,homeScreenY = getScreenCoordinates(minX,minY,tile_x,tile_y,offset_x,offset_y,level) - end - else - -- update estimated home, schedule home update - homeNeedsRefresh = true - estimatedHomeGps.lat,estimatedHomeGps.lon = utils.getHomeFromAngleAndDistance(telemetry) - if estimatedHomeGps.lat ~= nil then - local t_x,t_y,o_x,o_y = coord_to_tiles(estimatedHomeGps.lat,estimatedHomeGps.lon) - -- viewport relative coordinates - estimatedHomeScreenX,estimatedHomeScreenY = getScreenCoordinates(minX,minY,t_x,t_y,o_x,o_y,level) - end - end - collectgarbage() - collectgarbage() - end - - -- position history sampling - if getTime() - lastPosSample > 50 and posUpdated then - lastPosSample = getTime() - posUpdated = false - -- points history - local path = tiles_to_path(tile_x, tile_y, level) - posHistory[sample] = { path, offset_x, offset_y } - collectgarbage() - collectgarbage() - sampleCount = sampleCount+1 - sample = sampleCount%SAMPLES - end - - -- draw map tiles - lcd.setColor(CUSTOM_COLOR,COLOR_YELLOW) - drawTiles(conf,drawLib,TILES_X,minX,maxX,minY,maxY,CUSTOM_COLOR,level) - -- draw home - if telemetry.homeLat ~= nil and telemetry.homeLon ~= nil and homeScreenX ~= nil then - local homeCode = drawLib.computeOutCode(homeScreenX, homeScreenY, minX+11, minY+10, maxX-11, maxY-10); - if homeCode == 0 then - lcd.drawBitmap(utils.getBitmap("homeorange"),homeScreenX-11,homeScreenY-10) - end - end - -- draw vehicle - if myScreenX ~= nil then - lcd.setColor(CUSTOM_COLOR,COLOR_WHITE) - drawLib.drawRArrow(myScreenX,myScreenY,VEHICLE_R-5,telemetry.yaw,CUSTOM_COLOR) - lcd.setColor(CUSTOM_COLOR,COLOR_BLACK) - drawLib.drawRArrow(myScreenX,myScreenY,VEHICLE_R,telemetry.yaw,CUSTOM_COLOR) - end - -- draw gps trace - lcd.setColor(CUSTOM_COLOR,COLOR_YELLOW) - for p=0, math.min(sampleCount-1,SAMPLES-1) - do - if p ~= (sampleCount-1)%SAMPLES then - for x=1,TILES_X - do - for y=1,TILES_Y - do - local idx = TILES_X*(y-1)+x - -- check if tile is on screen - if tiles[idx] == posHistory[p][1] then - lcd.drawFilledRectangle(minX + (x-1)*TILES_WIDTH + posHistory[p][2], minY + (y-1)*TILES_HEIGHT + posHistory[p][3],3,3,CUSTOM_COLOR) - end - end - end - end - end - -- DEBUG - lcd.setColor(CUSTOM_COLOR,COLOR_WHITE) - lcd.drawText(MAP_X+5,MAP_Y+5,string.format("zoom:%d",level),SMLSIZE+CUSTOM_COLOR) - lcd.setColor(CUSTOM_COLOR,COLOR_TEXT) - - -- LEFT --- - - -- ALT - lcd.setColor(CUSTOM_COLOR,COLOR_LABEL) - lcd.drawText(TXT_X_LEFT, TXT_Y_LEFT+25, "Alt("..UNIT_ALT_LABEL..")", SMLSIZE+TXT_ALIGN+CUSTOM_COLOR) - lcd.setColor(CUSTOM_COLOR,COLOR_TEXT) - lcd.drawNumber(TXT_X_LEFT,TXT_Y_LEFT+37,telemetry.homeAlt*UNIT_ALT_SCALE,MIDSIZE+CUSTOM_COLOR+TXT_ALIGN) - -- SPEED - lcd.setColor(CUSTOM_COLOR,COLOR_LABEL) - lcd.drawText(TXT_X_LEFT, TXT_Y_LEFT+60, "Spd("..UNIT_HSPEED_LABEL..")", SMLSIZE+TXT_ALIGN+CUSTOM_COLOR) - lcd.setColor(CUSTOM_COLOR,COLOR_TEXT) - lcd.drawNumber(TXT_X_LEFT,TXT_Y_LEFT+72,telemetry.hSpeed*0.1* UNIT_HSPEED_SCALE,MIDSIZE+CUSTOM_COLOR+TXT_ALIGN) - -- VSPEED - lcd.setColor(CUSTOM_COLOR,COLOR_LABEL) - lcd.drawText(TXT_X_LEFT, TXT_Y_LEFT+95, "VSI("..UNIT_VSPEED_LABEL..")", SMLSIZE+TXT_ALIGN+CUSTOM_COLOR) - lcd.setColor(CUSTOM_COLOR,COLOR_TEXT) - lcd.drawNumber(TXT_X_LEFT,TXT_Y_LEFT+107, telemetry.vSpeed*0.1*UNIT_VSPEED_SCALE, MIDSIZE+CUSTOM_COLOR+TXT_ALIGN) - -- DIST - lcd.setColor(CUSTOM_COLOR,COLOR_LABEL) - lcd.drawText(TXT_X_LEFT, TXT_Y_LEFT+130, "Dist("..UNIT_DIST_LABEL..")", SMLSIZE+TXT_ALIGN+CUSTOM_COLOR) - lcd.setColor(CUSTOM_COLOR,COLOR_TEXT) - lcd.drawNumber(TXT_X_LEFT, TXT_Y_LEFT+142, telemetry.homeDist*UNIT_DIST_SCALE, MIDSIZE+TXT_ALIGN+CUSTOM_COLOR) - - -- RIGHT - -- CELL - if battery[BATT_CELL] * 0.01 < 10 then - lcd.drawNumber(TXT_X_RIGHT, TXT_Y_RIGHT+5, battery[BATT_CELL] + 0.5, PREC2+TXT_ALIGN+MIDSIZE+CUSTOM_COLOR) - else - lcd.drawNumber(TXT_X_RIGHT, TXT_Y_RIGHT+5, (battery[BATT_CELL] + 0.5)*0.1, PREC1+TXT_ALIGN+MIDSIZE+CUSTOM_COLOR) - end - lcd.drawText(TXT_X_RIGHT+50, TXT_Y_RIGHT+6, status.battsource, SMLSIZE+CUSTOM_COLOR) - lcd.drawText(TXT_X_RIGHT+50, TXT_Y_RIGHT+16, "V", SMLSIZE+CUSTOM_COLOR) - -- aggregate batt % - local perc = battery[BATT_PERC] - local strperc = string.format("%2d%%",perc) - lcd.drawText(TXT_X_RIGHT+65, TXT_Y_RIGHT+30, strperc, MIDSIZE+CUSTOM_COLOR+RIGHT) - -- Tracker - lcd.setColor(CUSTOM_COLOR,COLOR_LABEL) - lcd.drawText(TXT_X_RIGHT, TXT_Y_RIGHT+70, "Tracker", SMLSIZE+TXT_ALIGN+CUSTOM_COLOR) - lcd.setColor(CUSTOM_COLOR,COLOR_TEXT) - lcd.drawText(TXT_X_RIGHT, TXT_Y_RIGHT+82, string.format("%d@",(telemetry.homeAngle - 180) < 0 and telemetry.homeAngle + 180 or telemetry.homeAngle - 180), MIDSIZE+TXT_ALIGN+CUSTOM_COLOR) - -- HDG - lcd.setColor(CUSTOM_COLOR,COLOR_LABEL) - lcd.drawText(TXT_X_RIGHT, TXT_Y_RIGHT+110, "Heading", SMLSIZE+TXT_ALIGN+CUSTOM_COLOR) - lcd.setColor(CUSTOM_COLOR,COLOR_TEXT) - lcd.drawText(TXT_X_RIGHT, TXT_Y_RIGHT+122, string.format("%d@",telemetry.yaw), MIDSIZE+TXT_ALIGN+CUSTOM_COLOR) - -- home - lcd.setColor(CUSTOM_COLOR,COLOR_YELLOW) - drawLib.drawRArrow(TXT_X_RIGHT+28,TXT_Y_RIGHT+175,22,math.floor(telemetry.homeAngle - telemetry.yaw),CUSTOM_COLOR) - end - lcd.setColor(CUSTOM_COLOR,COLOR_TEXT) -#ifdef HUDTIMER - hudDrawTime = hudDrawTime + (getTime() - hudStart) - hudDrawCounter = hudDrawCounter + 1 -#endif -end - -local initDone = false - -local function init(utils,level) - if level ~= lastZoomLevel then - utils.clearTable(tiles) - - utils.clearTable(mapBitmapByPath) - - utils.clearTable(posHistory) - sample = 0 - sampleCount = 0 - - world_tiles = tiles_on_level(level) - tiles_per_radian = world_tiles / (2 * math.pi) - tile_dim = (40075017/world_tiles) * unitScale -- m or ft - - scaleLen = ((unitScale==1 and 1 or 3)*50*(level+3)/tile_dim)*TILES_WIDTH - scaleLabel = tostring((unitScale==1 and 1 or 3)*50*(level+3))..unitLabel - - lastZoomLevel = level - end -end - -local function changeZoomLevel(level) - -end - -local function draw(myWidget,drawLib,conf,telemetry,status,battery,alarms,frame,utils,customSensors,gpsStatuses,leftPanel,centerPanel,rightPanel) - -- initialize maps - init(utils,status.mapZoomLevel) - drawMap(myWidget,drawLib,conf,telemetry,status,battery,utils,status.mapZoomLevel) - drawHud(myWidget,drawLib,conf,telemetry,status,battery,utils) - utils.drawTopBar() - drawLib.drawStatusBar(2,conf,telemetry,status,battery,alarms,frame,utils,gpsStatuses) - drawLib.drawArmStatus(status,telemetry,utils) - drawLib.drawFailsafe(telemetry,utils) -end - -local function background(myWidget,conf,telemetry,status,utils) -end - -return {draw=draw,background=background,changeZoomLevel=changeZoomLevel} diff --git a/HORUS/SOURCES/PP/lib/left_1.lua b/HORUS/SOURCES/PP/lib/left_1.lua deleted file mode 100644 index 11c10652..00000000 --- a/HORUS/SOURCES/PP/lib/left_1.lua +++ /dev/null @@ -1,85 +0,0 @@ -#include "includes/yaapu_inc.lua" -#include "includes/layout_1_inc.lua" - -#define ALTASL_X 90 -#define ALTASL_Y 37 -#define ALTASL_XLABEL 90 -#define ALTASL_YLABEL 25 - -#define HOMEDIST_X 90 -#define HOMEDIST_Y 82 -#define HOMEDIST_XLABEL 90 -#define HOMEDIST_YLABEL 70 -#define HOMEDIST_ARROW_WIDTH 8 - -#define TOTDIST_X 90 -#define TOTDIST_Y 129 -#define TOTDIST_XLABEL 90 -#define TOTDIST_YLABEL 117 - -local function drawPane(x,drawLib,conf,telemetry,status,alarms,battery,battId,gpsStatuses,utils) - lcd.setColor(CUSTOM_COLOR,COLOR_TEXT) - if conf.rangeFinderMax > 0 then - flags = 0 - local rng = telemetry.range - rng = utils.getMaxValue(rng,MAX_RANGE) - lcd.setColor(CUSTOM_COLOR,COLOR_LABEL) - lcd.drawText(ALTASL_XLABEL, ALTASL_YLABEL, "Range("..UNIT_ALT_LABEL..")", SMLSIZE+CUSTOM_COLOR+RIGHT) - lcd.setColor(CUSTOM_COLOR,COLOR_RED) - if rng > conf.rangeFinderMax and status.showMinMaxValues == false then - lcd.drawFilledRectangle(ALTASL_X-65, ALTASL_Y+4,65,21,CUSTOM_COLOR) - end - lcd.setColor(CUSTOM_COLOR,COLOR_TEXT) - lcd.drawText(ALTASL_X, ALTASL_Y, string.format("%.1f",rng*0.01*UNIT_ALT_SCALE), MIDSIZE+RIGHT+CUSTOM_COLOR) - else - flags = BLINK - -- always display gps altitude even without 3d lock - local alt = telemetry.gpsAlt/10 - if telemetry.gpsStatus > 2 then - flags = 0 - -- update max only with 3d or better lock - alt = utils.getMaxValue(alt,MAX_GPSALT) - end - if status.showMinMaxValues == true then - flags = 0 - end - lcd.setColor(CUSTOM_COLOR,COLOR_LABEL) - lcd.drawText(ALTASL_XLABEL, ALTASL_YLABEL, "AltAsl("..UNIT_ALT_LABEL..")", SMLSIZE+CUSTOM_COLOR+RIGHT) - local stralt = string.format("%d",alt*UNIT_ALT_SCALE) - lcd.setColor(CUSTOM_COLOR,COLOR_TEXT) - lcd.drawText(ALTASL_X, ALTASL_Y, stralt, MIDSIZE+flags+RIGHT+CUSTOM_COLOR) - end - -- LABELS - lcd.setColor(CUSTOM_COLOR,COLOR_LABEL) - drawLib.drawHomeIcon(HOMEDIST_XLABEL - 70, HOMEDIST_YLABEL,utils) - lcd.drawText(HOMEDIST_XLABEL, HOMEDIST_YLABEL, "Dist("..UNIT_DIST_LABEL..")", SMLSIZE+RIGHT+CUSTOM_COLOR) - lcd.drawText(TOTDIST_XLABEL, TOTDIST_YLABEL, "Travel("..UNIT_DIST_LONG_LABEL..")", SMLSIZE+RIGHT+CUSTOM_COLOR) - -- VALUES - lcd.setColor(CUSTOM_COLOR,COLOR_TEXT) - -- home distance - flags = 0 - if telemetry.homeAngle == -1 then - flags = BLINK - end - local dist = utils.getMaxValue(telemetry.homeDist,MAX_DIST) - if status.showMinMaxValues == true then - flags = 0 - end - local strdist = string.format("%d",dist*UNIT_DIST_SCALE) - --lcd.setColor(CUSTOM_COLOR,COLOR_YELLOW) --yellow - lcd.setColor(CUSTOM_COLOR,COLOR_TEXT) - lcd.drawText(HOMEDIST_X, HOMEDIST_Y, strdist, MIDSIZE+flags+RIGHT+CUSTOM_COLOR) - -- total distance - lcd.setColor(CUSTOM_COLOR,COLOR_TEXT) - lcd.drawNumber(TOTDIST_X, TOTDIST_Y, telemetry.totalDist*UNIT_DIST_LONG_SCALE*100, PREC2+MIDSIZE+RIGHT+CUSTOM_COLOR) - - if status.showMinMaxValues == true then - drawLib.drawVArrow(4, ALTASL_Y + 4,true,false,utils) - drawLib.drawVArrow(4, HOMEDIST_Y + 4 ,true,false,utils) - end -end - -local function background(myWidget,conf,telemetry,status,utils) -end - -return {drawPane=drawPane,background=background} \ No newline at end of file diff --git a/HORUS/SOURCES/PP/lib/left_2.lua b/HORUS/SOURCES/PP/lib/left_2.lua deleted file mode 100644 index c544a54f..00000000 --- a/HORUS/SOURCES/PP/lib/left_2.lua +++ /dev/null @@ -1,107 +0,0 @@ -#include "includes/yaapu_inc.lua" -#include "includes/layout_2_inc.lua" - -#define ALTASL_X 73 -#define ALTASL_Y 33+8 -#define ALTASL_XLABEL 73 -#define ALTASL_YLABEL 21+8 - -#define HOMEDIST_X 155 -#define HOMEDIST_Y 41 -#define HOMEDIST_XLABEL 155 -#define HOMEDIST_YLABEL 29 -#define HOMEDIST_FLAGS MIDSIZE -#define HOMEDIST_ARROW_WIDTH 8 - -#define TOTDIST_X 155 -#define TOTDIST_Y 107 -#define TOTDIST_XLABEL 155 -#define TOTDIST_YLABEL 95 -#define TOTDIST_FLAGS MIDSIZE - -#define HSPEED_X 73 -#define HSPEED_Y 107 -#define HSPEED_XLABEL 73 -#define HSPEED_YLABEL 95 -#define HSPEED_XDIM 48 -#define HSPEED_YDIM 33 -#define HSPEED_FLAGS MIDSIZE -#define HSPEED_ARROW_WIDTH 10 - -#define EFF_X 155 -#define EFF_Y 150 -#define EFF_YW 165 -#define EFF_FLAGS SMLSIZE -#define EFF_FLAGSW MIDSIZE - -local function drawPane(x,drawLib,conf,telemetry,status,alarms,battery,battId,gpsStatuses,utils) - lcd.setColor(CUSTOM_COLOR,COLOR_TEXT) - if conf.rangeFinderMax > 0 then - local rng = telemetry.range - rng = utils.getMaxValue(rng,MAX_RANGE) - lcd.setColor(CUSTOM_COLOR,COLOR_LABEL) - lcd.drawText(ALTASL_XLABEL, ALTASL_YLABEL, "Rng("..UNIT_ALT_LABEL..")", SMLSIZE+CUSTOM_COLOR+RIGHT) - if rng > conf.rangeFinderMax and status.showMinMaxValues == false then - lcd.setColor(CUSTOM_COLOR,COLOR_RED) - lcd.drawFilledRectangle(ALTASL_X-65, ALTASL_Y+4,65,21,CUSTOM_COLOR) - end - lcd.setColor(CUSTOM_COLOR,COLOR_TEXT) - lcd.drawText(ALTASL_X, ALTASL_Y, string.format("%.1f",rng*0.01*UNIT_ALT_SCALE), MIDSIZE+RIGHT+CUSTOM_COLOR) - else - flags = BLINK - -- always display gps altitude even without 3d lock - local alt = telemetry.gpsAlt/10 - if telemetry.gpsStatus > 2 then - flags = 0 - -- update max only with 3d or better lock - alt = utils.getMaxValue(alt,MAX_GPSALT) - end - if status.showMinMaxValues == true then - flags = 0 - end - lcd.setColor(CUSTOM_COLOR,COLOR_LABEL) - lcd.drawText(ALTASL_XLABEL, ALTASL_YLABEL, "AltAsl("..UNIT_ALT_LABEL..")", SMLSIZE+CUSTOM_COLOR+RIGHT) - local stralt = string.format("%d",alt*UNIT_ALT_SCALE) - lcd.setColor(CUSTOM_COLOR,COLOR_TEXT) - lcd.drawText(ALTASL_X, ALTASL_Y, stralt, MIDSIZE+flags+RIGHT+CUSTOM_COLOR) - end - -- LABELS - lcd.setColor(CUSTOM_COLOR,COLOR_LABEL) - drawLib.drawHomeIcon(HOMEDIST_XLABEL - 68, HOMEDIST_YLABEL,utils) - lcd.drawText(HOMEDIST_XLABEL, HOMEDIST_YLABEL, "Dist("..UNIT_DIST_LABEL..")", SMLSIZE+RIGHT+CUSTOM_COLOR) - lcd.drawText(HSPEED_XLABEL, HSPEED_YLABEL, "Spd("..UNIT_HSPEED_LABEL..")", SMLSIZE+RIGHT+CUSTOM_COLOR) - lcd.drawText(TOTDIST_XLABEL, TOTDIST_YLABEL, "Travel("..UNIT_DIST_LONG_LABEL..")", EFF_FLAGS+RIGHT+CUSTOM_COLOR) - -- VALUES - lcd.setColor(CUSTOM_COLOR,COLOR_TEXT) - -- home distance - flags = 0 - if telemetry.homeAngle == -1 then - flags = BLINK - end - local dist = utils.getMaxValue(telemetry.homeDist,MAX_DIST) - if status.showMinMaxValues == true then - flags = 0 - end - local strdist = string.format("%d",dist*UNIT_DIST_SCALE) - lcd.setColor(CUSTOM_COLOR,COLOR_TEXT) - --lcd.setColor(CUSTOM_COLOR,COLOR_YELLOW) --yellow - lcd.drawText(HOMEDIST_X, HOMEDIST_Y, strdist, HOMEDIST_FLAGS+flags+RIGHT+CUSTOM_COLOR) - -- total distance - lcd.setColor(CUSTOM_COLOR,COLOR_TEXT) - lcd.drawNumber(TOTDIST_X, TOTDIST_Y, telemetry.totalDist*UNIT_DIST_LONG_SCALE*100, PREC2+TOTDIST_FLAGS+RIGHT+CUSTOM_COLOR) - -- hspeed - local speed = utils.getMaxValue(telemetry.hSpeed,MAX_HSPEED) - - lcd.drawNumber(HSPEED_X,HSPEED_Y,speed * UNIT_HSPEED_SCALE,HSPEED_FLAGS+RIGHT+PREC1+CUSTOM_COLOR) - - if status.showMinMaxValues == true then - drawLib.drawVArrow(4, ALTASL_Y + 4,true,false,utils) - drawLib.drawVArrow(HOMEDIST_X-70, HOMEDIST_Y + 4 ,true,false,utils) - drawLib.drawVArrow(4,HSPEED_Y+4,true,false,utils) - end -end - -local function background(myWidget,conf,telemetry,status,utils) -end - -return {drawPane=drawPane,background=background} \ No newline at end of file diff --git a/HORUS/SOURCES/PP/lib/left_m2f_1.lua b/HORUS/SOURCES/PP/lib/left_m2f_1.lua deleted file mode 100644 index 2ea756fc..00000000 --- a/HORUS/SOURCES/PP/lib/left_m2f_1.lua +++ /dev/null @@ -1,155 +0,0 @@ -#include "includes/yaapu_inc.lua" -#include "includes/layout_1_inc.lua" - -#define ALTASL_X 88 -#define ALTASL_Y 33 -#define ALTASL_XLABEL 25 -#define ALTASL_YLABEL 21 - -#define HSPEED_X 88 -#define HSPEED_Y 74 -#define HSPEED_XLABEL 88 -#define HSPEED_YLABEL 63 -#define HSPEED_FLAGS MIDSIZE+RIGHT - -#define HOMEDIST_X 88 -#define HOMEDIST_Y 113 -#define HOMEDIST_XLABEL 88 -#define HOMEDIST_YLABEL 102 -#define HOMEDIST_FLAGS MIDSIZE -#define HOMEDIST_ARROW_WIDTH 8 - -#define TOTDIST_X 69 -#define TOTDIST_Y 134 -#define TOTDIST_XLABEL 88 -#define TOTDIST_YLABEL 138 -#define TOTDIST_FLAGS 0 - -#define WPN_X 68 -#define WPN_Y 164 -#define WPN_XLABEL 88 -#define WPN_YLABEL 154 -#define WPN_FLAGS MIDSIZE - -#define WPB_X 80 -#define WPB_Y 180 -#define WPB_R 9 - -#define WPD_X 165 -#define WPD_Y 164 -#define WPD_XLABEL 165 -#define WPD_YLABEL 154 -#define WPD_FLAGS MIDSIZE+RIGHT - -#define THROTTLE_X 315 -#define THROTTLE_Y 164 -#define THROTTLE_XLABEL 315 -#define THROTTLE_YLABEL 154 - -local function drawPane(x,drawLib,conf,telemetry,status,alarms,battery,battId,gpsStatuses,utils)--,getMaxValue,getBitmap,drawBlinkBitmap,lcdBacklightOn) - --lcd.setColor(CUSTOM_COLOR,lcd.RGB(0,33,56)) - --lcd.drawFilledRectangle(x + 3,21,93,203,CUSTOM_COLOR) - if conf.rangeFinderMax > 0 then - local rng = telemetry.range - rng = utils.getMaxValue(rng,MAX_RANGE) - lcd.setColor(CUSTOM_COLOR,COLOR_LABEL) - lcd.drawText(ALTASL_XLABEL, ALTASL_YLABEL, "Range("..UNIT_ALT_LABEL..")", SMLSIZE+CUSTOM_COLOR) - if rng > conf.rangeFinderMax and status.showMinMaxValues == false then - lcd.setColor(CUSTOM_COLOR,COLOR_RED) - lcd.drawFilledRectangle(ALTASL_X-65, ALTASL_Y+4,65,21,CUSTOM_COLOR) - end - lcd.setColor(CUSTOM_COLOR,COLOR_TEXT) - lcd.drawText(ALTASL_X, ALTASL_Y, string.format("%.1f",rng*0.01*UNIT_ALT_SCALE), MIDSIZE+flags+RIGHT+CUSTOM_COLOR) - else - flags = BLINK - -- always display gps altitude even without 3d lock - local alt = telemetry.gpsAlt/10 - if telemetry.gpsStatus > 2 then - flags = 0 - -- update max only with 3d or better lock - alt = utils.getMaxValue(alt,MAX_GPSALT) - end - if status.showMinMaxValues == true then - flags = 0 - end - lcd.setColor(CUSTOM_COLOR,COLOR_LABEL) - lcd.drawText(ALTASL_XLABEL, ALTASL_YLABEL, "AltAsl("..UNIT_ALT_LABEL..")", SMLSIZE+CUSTOM_COLOR) - local stralt = string.format("%d",alt*UNIT_ALT_SCALE) - lcd.setColor(CUSTOM_COLOR,COLOR_TEXT) - lcd.drawText(ALTASL_X, ALTASL_Y, stralt, MIDSIZE+flags+RIGHT+CUSTOM_COLOR) - end - -- LABELS - lcd.setColor(CUSTOM_COLOR,COLOR_LABEL) - lcd.drawText(HOMEDIST_X, HOMEDIST_YLABEL, "Dist("..UNIT_DIST_LABEL..")", SMLSIZE+RIGHT+CUSTOM_COLOR) - --lcd.drawText(TOTDIST_XLABEL, TOTDIST_YLABEL, "Dist("..UNIT_DIST_LONG_LABEL..")", SMLSIZE+RIGHT+CUSTOM_COLOR) - lcd.drawText(WPN_XLABEL, WPN_YLABEL, "WPN", SMLSIZE+RIGHT+CUSTOM_COLOR) - lcd.drawText(WPD_XLABEL, WPD_YLABEL, "WPD("..UNIT_DIST_LABEL..")", SMLSIZE+RIGHT+CUSTOM_COLOR) - -- drawn on HUD bottom left - lcd.drawText(HSPEED_XLABEL, HSPEED_YLABEL, "ASpd("..UNIT_HSPEED_LABEL..")", SMLSIZE+CUSTOM_COLOR+RIGHT) - lcd.drawText(THROTTLE_XLABEL, THROTTLE_YLABEL, "Thr(%)", SMLSIZE+CUSTOM_COLOR+RIGHT) - -- VALUES - lcd.setColor(CUSTOM_COLOR,COLOR_TEXT) - -- home distance - drawLib.drawHomeIcon(2, HOMEDIST_YLABEL + 18,utils) - flags = 0 - if telemetry.homeAngle == -1 then - flags = BLINK - end - local dist = utils.getMaxValue(telemetry.homeDist,MAX_DIST) - if status.showMinMaxValues == true then - flags = 0 - end - lcd.setColor(CUSTOM_COLOR,lcd.RGB(255, 0xce, 0)) --yellow - local strdist = string.format("%d",dist*UNIT_DIST_SCALE) - lcd.setColor(CUSTOM_COLOR,COLOR_YELLOW) - lcd.drawText(HOMEDIST_X, HOMEDIST_Y, strdist, HOMEDIST_FLAGS+flags+RIGHT+CUSTOM_COLOR) - -- total distance - lcd.setColor(CUSTOM_COLOR,COLOR_TEXT) - lcd.drawText(TOTDIST_XLABEL, TOTDIST_YLABEL, UNIT_DIST_LONG_LABEL, SMLSIZE+RIGHT+CUSTOM_COLOR) - lcd.drawNumber(TOTDIST_X, TOTDIST_Y, telemetry.totalDist*UNIT_DIST_LONG_SCALE*100, TOTDIST_FLAGS+RIGHT+CUSTOM_COLOR+PREC2) - -- wp number - lcd.drawNumber(WPN_X, WPN_Y, telemetry.wpNumber,WPN_FLAGS+RIGHT+CUSTOM_COLOR) - -- wp distance - lcd.drawNumber(WPD_X, WPD_Y, telemetry.wpDistance * UNIT_DIST_SCALE,WPD_FLAGS+CUSTOM_COLOR) - -- airspeed - lcd.drawNumber(HSPEED_X,HSPEED_Y,telemetry.airspeed * UNIT_HSPEED_SCALE,HSPEED_FLAGS+PREC1+CUSTOM_COLOR) - -- throttle % - lcd.drawNumber(THROTTLE_X,THROTTLE_Y,telemetry.throttle,MIDSIZE+RIGHT+CUSTOM_COLOR) - -- LINES - lcd.setColor(CUSTOM_COLOR,COLOR_LINES) --yellow - -- wp bearing - drawLib.drawRArrow(WPB_X,WPB_Y,WPB_R,telemetry.wpBearing*45,CUSTOM_COLOR) - -- - if status.showMinMaxValues == true then - drawLib.drawVArrow(3, ALTASL_Y+4,true,false,utils) - drawLib.drawVArrow(3, HOMEDIST_Y+4 ,true,false,utils) - end -end - -local function background(myWidget,conf,telemetry,status,utils) - -- RC CHANNELS - --[[ - if conf.enableRCChannels == true then - for i=1,#telemetry.rcchannels do - setTelemetryValue(Thr_ID, Thr_SUBID, Thr_INSTANCE + i, telemetry.rcchannels[i], 13 , Thr_PRECISION , "RC"..i) - end - end - --]] - - -- VFR - setTelemetryValue(ASpd_ID, ASpd_SUBID, ASpd_INSTANCE, telemetry.airspeed*0.1, 4 , ASpd_PRECISION , ASpd_NAME) - setTelemetryValue(BAlt_ID, BAlt_SUBID, BAlt_INSTANCE, telemetry.baroAlt*10, 9 , BAlt_PRECISION , BAlt_NAME) - setTelemetryValue(Thr_ID, Thr_SUBID, Thr_INSTANCE, telemetry.throttle, 13 , Thr_PRECISION , Thr_NAME) - - -- WP - setTelemetryValue(WPN_ID, WPN_SUBID, WPN_INSTANCE, telemetry.wpNumber, 0 , WPN_PRECISION , WPN_NAME) - setTelemetryValue(WPD_ID, WPD_SUBID, WPD_INSTANCE, telemetry.wpDistance, 9 , WPD_PRECISION , WPD_NAME) - - -- crosstrack error and wp bearing not exposed as OpenTX variables by default - --[[ - setTelemetryValue(WPX_ID, WPX_SUBID, WPX_INSTANCE, telemetry.wpXTError, 9 , WPX_PRECISION , WPX_NAME) - setTelemetryValue(WPB_ID, WPB_SUBID, WPB_INSTANCE, telemetry.wpBearing, 20 , WPB_PRECISION , WPB_NAME) - --]] -end - -return {drawPane=drawPane,background=background} \ No newline at end of file diff --git a/HORUS/SOURCES/PP/lib/left_m2f_2.lua b/HORUS/SOURCES/PP/lib/left_m2f_2.lua deleted file mode 100644 index efb29faa..00000000 --- a/HORUS/SOURCES/PP/lib/left_m2f_2.lua +++ /dev/null @@ -1,154 +0,0 @@ -#include "includes/yaapu_inc.lua" -#include "includes/layout_2_inc.lua" - -#define ALTASL_X 68 -#define ALTASL_Y 31 -#define ALTASL_XLABEL 8 -#define ALTASL_YLABEL 20 - -#define HOMEDIST_X 153 -#define HOMEDIST_Y 31 -#define HOMEDIST_XLABEL 69 -#define HOMEDIST_YLABEL 20 -#define HOMEDIST_FLAGS MIDSIZE -#define HOMEDIST_ARROW_WIDTH 8 - -#define TOTDIST_X 152 -#define TOTDIST_Y 54 -#define TOTDIST_XLABEL 69 -#define TOTDIST_YLABEL 54 -#define TOTDIST_FLAGS SMLSIZE - -#define THROTTLE_X 153 -#define THROTTLE_Y 122 -#define THROTTLE_YW 134 -#define THROTTLE_FLAGS SMLSIZE -#define THROTTLE_FLAGSW MIDSIZE - -#define WPN_X 57 -#define WPN_Y 87 -#define WPN_XLABEL 69 -#define WPN_YLABEL 76 -#define WPN_FLAGS MIDSIZE - -#define WPB_X 67 -#define WPB_Y 100 -#define WPB_R 10 - -#define WPD_X 153 -#define WPD_Y 87 -#define WPD_XLABEL 153 -#define WPD_YLABEL 76 -#define WPD_FLAGS MIDSIZE - -#define HSPEED_X 68 -#define HSPEED_Y 134 -#define HSPEED_XLABEL 69 -#define HSPEED_YLABEL 122 -#define HSPEED_XDIM 48 -#define HSPEED_YDIM 33 -#define HSPEED_FLAGS MIDSIZE -#define HSPEED_ARROW_WIDTH 10 - -local function drawPane(x,drawLib,conf,telemetry,status,alarms,battery,battId,gpsStatuses,utils)--,getMaxValue,getBitmap,drawBlinkBitmap,lcdBacklightOn) - if conf.rangeFinderMax > 0 then - local rng = telemetry.range - rng = utils.getMaxValue(rng,MAX_RANGE) - lcd.setColor(CUSTOM_COLOR,COLOR_LABEL) - lcd.drawText(ALTASL_XLABEL, ALTASL_YLABEL, "Range("..UNIT_ALT_LABEL..")", SMLSIZE+CUSTOM_COLOR) - if rng > conf.rangeFinderMax and status.showMinMaxValues == false then - lcd.setColor(CUSTOM_COLOR,COLOR_RED) - lcd.drawFilledRectangle(ALTASL_X-65, ALTASL_Y+4,65,21,CUSTOM_COLOR) - end - lcd.setColor(CUSTOM_COLOR,COLOR_TEXT) - lcd.drawText(ALTASL_X, ALTASL_Y, string.format("%.1f",rng*0.01*UNIT_ALT_SCALE), MIDSIZE+RIGHT+CUSTOM_COLOR) - else - flags = BLINK - -- always display gps altitude even without 3d lock - local alt = telemetry.gpsAlt/10 - if telemetry.gpsStatus > 2 then - flags = 0 - -- update max only with 3d or better lock - alt = utils.getMaxValue(alt,MAX_GPSALT) - end - if status.showMinMaxValues == true then - flags = 0 - end - lcd.setColor(CUSTOM_COLOR,COLOR_LABEL) - lcd.drawText(ALTASL_XLABEL, ALTASL_YLABEL, "AltAsl("..UNIT_ALT_LABEL..")", SMLSIZE+CUSTOM_COLOR) - local stralt = string.format("%d",alt*UNIT_ALT_SCALE) - lcd.setColor(CUSTOM_COLOR,COLOR_TEXT) - lcd.drawText(ALTASL_X, ALTASL_Y, stralt, MIDSIZE+flags+RIGHT+CUSTOM_COLOR) - end - -- LABELS - lcd.setColor(CUSTOM_COLOR,COLOR_LABEL) - lcd.drawText(HOMEDIST_X, HOMEDIST_YLABEL, "Dist("..UNIT_DIST_LABEL..")", SMLSIZE+RIGHT+CUSTOM_COLOR) - lcd.drawText(HSPEED_XLABEL, HSPEED_YLABEL, "AS("..UNIT_HSPEED_LABEL..")", SMLSIZE+RIGHT+CUSTOM_COLOR) - lcd.drawText(WPN_XLABEL, WPN_YLABEL, "WPN", SMLSIZE+RIGHT+CUSTOM_COLOR) - lcd.drawText(WPD_XLABEL, WPD_YLABEL, "WPD("..UNIT_DIST_LABEL..")", SMLSIZE+RIGHT+CUSTOM_COLOR) - lcd.drawText(THROTTLE_X, THROTTLE_Y, "THR(%)", THROTTLE_FLAGS+RIGHT+CUSTOM_COLOR) - -- VALUES - lcd.setColor(CUSTOM_COLOR,COLOR_TEXT) - -- home distance - drawLib.drawHomeIcon(HOMEDIST_XLABEL + 15, HOMEDIST_YLABEL + 2,utils) - flags = 0 - if telemetry.homeAngle == -1 then - flags = BLINK - end - local dist = utils.getMaxValue(telemetry.homeDist,MAX_DIST) - if status.showMinMaxValues == true then - flags = 0 - end - local strdist = string.format("%d",dist*UNIT_DIST_SCALE) - --lcd.setColor(CUSTOM_COLOR,COLOR_YELLOW) - lcd.drawText(HOMEDIST_X, HOMEDIST_Y, strdist, HOMEDIST_FLAGS+flags+RIGHT+CUSTOM_COLOR) - -- total distance - strdist = string.format("%.02f%s", telemetry.totalDist*UNIT_DIST_LONG_SCALE,UNIT_DIST_LONG_LABEL) - lcd.setColor(CUSTOM_COLOR,COLOR_TEXT) - lcd.drawText(TOTDIST_X, TOTDIST_Y, strdist, TOTDIST_FLAGS+RIGHT+CUSTOM_COLOR) - -- airspeed - lcd.drawNumber(HSPEED_X,HSPEED_Y,telemetry.airspeed * UNIT_HSPEED_SCALE,HSPEED_FLAGS+RIGHT+PREC1+CUSTOM_COLOR) - -- wp number - lcd.drawNumber(WPN_X, WPN_Y, telemetry.wpNumber,WPN_FLAGS+RIGHT+CUSTOM_COLOR) - -- wp distance - lcd.drawNumber(WPD_X, WPD_Y, telemetry.wpDistance * UNIT_DIST_SCALE,WPD_FLAGS+RIGHT+CUSTOM_COLOR) - -- throttle % - lcd.drawNumber(THROTTLE_X,THROTTLE_YW,telemetry.throttle,THROTTLE_FLAGSW+RIGHT+CUSTOM_COLOR) - -- LINES - lcd.setColor(CUSTOM_COLOR,COLOR_LINES) --yellow - -- wp bearing - drawLib.drawRArrow(WPB_X,WPB_Y,WPB_R,telemetry.wpBearing*45,CUSTOM_COLOR) - -- - if status.showMinMaxValues == true then - drawLib.drawVArrow(ALTASL_X-70, ALTASL_Y+4,true,false,utils) - drawLib.drawVArrow(HOMEDIST_X-78, HOMEDIST_Y+4 ,true,false,utils) - end -end - -local function background(myWidget,conf,telemetry,status,utils) - -- RC CHANNELS - --[[ - if conf.enableRCChannels == true then - for i=1,#telemetry.rcchannels do - setTelemetryValue(Thr_ID, Thr_SUBID, Thr_INSTANCE + i, telemetry.rcchannels[i], 13 , Thr_PRECISION , "RC"..i) - end - end - --]] - - -- VFR - setTelemetryValue(ASpd_ID, ASpd_SUBID, ASpd_INSTANCE, telemetry.airspeed*0.1, 4 , ASpd_PRECISION , ASpd_NAME) - setTelemetryValue(BAlt_ID, BAlt_SUBID, BAlt_INSTANCE, telemetry.baroAlt*10, 9 , BAlt_PRECISION , BAlt_NAME) - setTelemetryValue(Thr_ID, Thr_SUBID, Thr_INSTANCE, telemetry.throttle, 13 , Thr_PRECISION , Thr_NAME) - - -- WP - setTelemetryValue(WPN_ID, WPN_SUBID, WPN_INSTANCE, telemetry.wpNumber, 0 , WPN_PRECISION , WPN_NAME) - setTelemetryValue(WPD_ID, WPD_SUBID, WPD_INSTANCE, telemetry.wpDistance, 9 , WPD_PRECISION , WPD_NAME) - - -- crosstrack error and wp bearing not exposed as OpenTX variables by default - --[[ - setTelemetryValue(WPX_ID, WPX_SUBID, WPX_INSTANCE, telemetry.wpXTError, 9 , WPX_PRECISION , WPX_NAME) - setTelemetryValue(WPB_ID, WPB_SUBID, WPB_INSTANCE, telemetry.wpBearing, 20 , WPB_PRECISION , WPB_NAME) - --]] -end - -return {drawPane=drawPane,background=background} \ No newline at end of file diff --git a/HORUS/SOURCES/PP/lib/plane.lua b/HORUS/SOURCES/PP/lib/plane.lua deleted file mode 100644 index c26cf910..00000000 --- a/HORUS/SOURCES/PP/lib/plane.lua +++ /dev/null @@ -1,57 +0,0 @@ ---[[ -enum FlightMode { - MANUAL = 0, - CIRCLE = 1, - STABILIZE = 2, - TRAINING = 3, - ACRO = 4, - FLY_BY_WIRE_A = 5, - FLY_BY_WIRE_B = 6, - CRUISE = 7, - AUTOTUNE = 8, - AUTO = 10, - RTL = 11, - LOITER = 12, - TAKEOFF = 13, - AVOID_ADSB = 14, - GUIDED = 15, - INITIALISING = 16, - QSTABILIZE = 17, - QHOVER = 18, - QLOITER = 19, - QLAND = 20, - QRTL = 21, - QAUTOTUNE = 22, - QACRO = 23 -}; ---]] - -local flightModes = {} --- plane flight modes -flightModes[0]="" -flightModes[1]="Manual" -flightModes[2]="Circle" -flightModes[3]="Stabilize" -flightModes[4]="Training" -flightModes[5]="Acro" -flightModes[6]="FlyByWireA" -flightModes[7]="FlyByWireB" -flightModes[8]="Cruise" -flightModes[9]="Autotune" -flightModes[10]="" -flightModes[11]="Auto" -flightModes[12]="RTL" -flightModes[13]="Loiter" -flightModes[14]="Takeoff" -flightModes[15]="AvoidADSB" -flightModes[16]="Guided" -flightModes[17]="Initializing" -flightModes[18]="QStabilize" -flightModes[19]="QHover" -flightModes[20]="QLoiter" -flightModes[21]="Qland" -flightModes[22]="QRTL" -flightModes[23]="QAutotune" -flightModes[24]="QAcro" --- -return {flightModes=flightModes} diff --git a/HORUS/SOURCES/PP/lib/plane_px4.lua b/HORUS/SOURCES/PP/lib/plane_px4.lua deleted file mode 100644 index f1bb2c01..00000000 --- a/HORUS/SOURCES/PP/lib/plane_px4.lua +++ /dev/null @@ -1,28 +0,0 @@ -local flightModes = {} --- plane flight modes -flightModes[0]="" -flightModes[1]="Manual" -flightModes[2]="AltCtl" --px4 specific -flightModes[3]="PosCtl" --px4 specific -flightModes[4]="Ready" --px4 specific -flightModes[5]="Takeoff" --px4 specific -flightModes[6]="Loiter" -flightModes[7]="Mission" --px4 specific -flightModes[8]="RTL" -flightModes[9]="Land" -flightModes[10]="RTGS" --px4 specific -flightModes[11]="Follow" -flightModes[12]="PrecLand" --px4 specific -flightModes[13]="" -flightModes[14]="Acro" -flightModes[15]="OffBoard" --px4 specific -flightModes[16]="Stabilize" -flightModes[17]="RAttitude" --px4 specific -flightModes[18]="Simple" --px4 specific -flightModes[19]="" -flightModes[20]="" -flightModes[21]="" -flightModes[22]="" -flightModes[23]="" --- -return {flightModes=flightModes} diff --git a/HORUS/SOURCES/PP/lib/reset.lua b/HORUS/SOURCES/PP/lib/reset.lua deleted file mode 100644 index 29b2d8d4..00000000 --- a/HORUS/SOURCES/PP/lib/reset.lua +++ /dev/null @@ -1,149 +0,0 @@ -#include "includes/yaapu_inc.lua" - -local function resetTelemetry(status,telemetry,battery,alarms,utils) - -- sport queue max pops to prevent looping forever - local i = 0 - -- empty sport queue - local a,b,c,d = sportTelemetryPop() - while a ~= null and i < 50 do - a,b,c,d = sportTelemetryPop() - i = i + 1 - end - ----------------------------- - -- TELEMETRY - ----------------------------- - -- AP STATUS - telemetry.flightMode = 0 - telemetry.simpleMode = 0 - telemetry.landComplete = 0 - telemetry.statusArmed = 0 - telemetry.battFailsafe = 0 - telemetry.ekfFailsafe = 0 - telemetry.imuTemp = 0 - -- GPS - telemetry.numSats = 0 - telemetry.gpsStatus = 0 - telemetry.gpsHdopC = 100 - telemetry.gpsAlt = 0 - -- BATT 1 - telemetry.batt1volt = 0 - telemetry.batt1current = 0 - telemetry.batt1mah = 0 - -- BATT 2 - telemetry.batt2volt = 0 - telemetry.batt2current = 0 - telemetry.batt2mah = 0 - -- HOME - telemetry.homeDist = 0 - telemetry.homeAlt = 0 - telemetry.homeAngle = -1 - -- VELANDYAW - telemetry.vSpeed = 0 - telemetry.hSpeed = 0 - telemetry.yaw = 0 - -- ROLLPITCH - telemetry.roll = 0 - telemetry.pitch = 0 - telemetry.range = 0 - -- PARAMS - telemetry.frameType = -1 - telemetry.batt1Capacity = 0 - telemetry.batt2Capacity = 0 - -- GPS - telemetry.lat = nil - telemetry.lon = nil - telemetry.homeLat = nil - telemetry.homeLon = nil - -- WP - telemetry.wpNumber = 0 - telemetry.wpDistance = 0 - telemetry.wpXTError = 0 - telemetry.wpBearing = 0 - telemetry.wpCommands = 0 - -- RC channels - telemetry.rcchannels = {} - -- VFR - telemetry.airspeed = 0 - telemetry.throttle = 0 - telemetry.baroAlt = 0 - -- - telemetry.totalDist = 0 - ----------------------------- - -- SCRIPT STATUS - ----------------------------- - -- FLVSS 1 - status.cell1min = 0 - status.cell1sum = 0 - -- FLVSS 2 - status.cell2min = 0 - status.cell2sum = 0 - -- FC 1 - status.cell1sumFC = 0 - status.cell1maxFC = 0 - -- FC 2 - status.cell2sumFC = 0 - status.cell2maxFC = 0 - -- BATT - status.cell1count = 0 - status.cell2count = 0 - - status.battsource = "na" - -- BATT 1 - status.batt1sources = { - vs = false, - fc = false - } - -- BATT 2 - status.batt2sources = { - vs = false, - fc = false - } - -- TELEMETRY - status.noTelemetryData = 1 - -- MESSAGES - status.msgBuffer = "" - status.lastMsgValue = 0 - status.lastMsgTime = 0 - -- FLIGHT TIME - status.lastTimerStart = 0 - status.timerRunning = 0 - status.flightTime = 0 - -- EVENTS - status.lastStatusArmed = 0 - status.lastGpsStatus = 0 - status.lastFlightMode = 0 - status.lastSimpleMode = 0 - -- battery levels - status.batLevel = 99 - status.battLevel1 = false - status.battLevel2 = false - status.lastBattLevel = 14 - -- messages - status.lastMessage = nil - status.lastMessageSeverity = 0 - status.lastMessageCount = 1 - status.messageCount = 0 - ------------------------- - -- BATTERY ARRAY - ------------------------- - battery = {0,0,0,0,0,0,0,0,0,0,0,0} - -- clear message queue - utils.clearTable(status.messages) - --- - status.messages = {} - -- reset alarms - alarms[1] = { false, 0 , false, ALARM_TYPE_MIN, 0, false, 0} --MIN_ALT - alarms[2] = { false, 0 , true, ALARM_TYPE_MAX, 0, false, 0 } --MAX_ALT - alarms[3] = { false, 0 , true, ALARM_TYPE_MAX, 0, false, 0 } --MAX_DIST - alarms[4] = { false, 0 , true, ALARM_TYPE_MAX, 0, false, 0 } --FS_EKF - alarms[5] = { false, 0 , true, ALARM_TYPE_MAX, 0, false, 0 } --FS_BAT - alarms[6] = { false, 0 , true, ALARM_TYPE_TIMER, 0, false, 0 } --FLIGTH_TIME - alarms[7] = { false, 0 , false, ALARM_TYPE_BATT, ALARM_TYPE_BATT_GRACE, false, 0 } --BATT L1 - alarms[8] = { false, 0 , false, ALARM_TYPE_BATT_CRT, ALARM_TYPE_BATT_GRACE, false, 0 } --BATT L2 - alarms[9] = { false, 0 , false, ALARM_TYPE_MAX, 0, false, 0 } --MAX_HDOP - -- stop and reset timer - model.setTimer(2,{mode=0}) - model.setTimer(2,{value=0}) -end - -return {resetTelemetry=resetTelemetry} \ No newline at end of file diff --git a/HORUS/SOURCES/PP/lib/right_1.lua b/HORUS/SOURCES/PP/lib/right_1.lua deleted file mode 100644 index 488938b6..00000000 --- a/HORUS/SOURCES/PP/lib/right_1.lua +++ /dev/null @@ -1,159 +0,0 @@ -#include "includes/yaapu_inc.lua" - -#define BATTCELL_X 75 -#define BATTCELL_Y 16 -#define BATTCELL_XV 76 -#define BATTCELL_YS 18 -#define BATTCELL_YV 32 -#define BATTCELL_FLAGS DBLSIZE+RIGHT -#define BATTCELL_XI 7 -#define BATTCELL_YI 20 - -#define BATTVOLT_X 75 -#define BATTVOLT_Y 48 -#define BATTVOLT_XV 75 -#define BATTVOLT_YV 58 -#define BATTVOLT_FLAGS RIGHT+MIDSIZE+PREC1 -#define BATTVOLT_FLAGSV SMLSIZE - -#define BATTCURR_X 75 -#define BATTCURR_Y 68 -#define BATTCURR_XA 76 -#define BATTCURR_YA 83 -#define BATTCURR_FLAGS DBLSIZE+RIGHT -#define BATTCURR_FLAGSA 0 - -#define BATTPERC_X 35 -#define BATTPERC_Y 101 -#define BATTPERC_YPERC 99 -#define BATTPERC_FLAGS MIDSIZE -#define BATTPERC_FLAGSPERC SMLSIZE - -#define BATTGAUGE_X 10 -#define BATTGAUGE_Y 105 -#define BATTGAUGE_WIDTH 80 -#define BATTGAUGE_HEIGHT 21 -#define BATTGAUGE_STEPS 10 - -#define BATTLABEL_X 90 -#define BATTLABEL_Y 126 -#define BATTLABEL_FLAGS SMLSIZE+RIGHT - -#define BATTMAH_X 90 -#define BATTMAH_Y 138 -#define BATTMAH_FLAGS 0 - -#define POWER_X 95 -#define POWER_Y 164 -#define POWER_XLABEL 95 -#define POWER_YLABEL 154 - -#define BATTEFF_X 12 -#define BATTEFF_Y 164 -#define BATTEFF_XLABEL 12 -#define BATTEFF_YLABEL 154 - --- offsets are: 1 celm, 4 batt, 7 curr, 10 mah, 13 cap, indexing starts at 1 ---[[ -BATT_CELL 1 -BATT_VOLT 4 -BATT_CURR 7 -BATT_MAH 10 -BATT_CAP 13 - -BATT_IDALL 0 -BATT_ID1 1 -BATT_ID2 2 ---]] -local function drawPane(x,drawLib,conf,telemetry,status,alarms,battery,battId,gpsStatuses,utils) - lcd.setColor(CUSTOM_COLOR,COLOR_TEXT) - local perc = battery[BATT_PERC+battId] - -- battery min cell - local flags = 0 - -- - lcd.setColor(CUSTOM_COLOR,COLOR_TEXT) -- white - if status.showMinMaxValues == false then - if status.battLevel2 == false and alarms[ALARMS_BATT_L2][ALARM_START] > 0 then - utils.drawBlinkBitmap("cell_red_blink_86x30",x+BATTCELL_XI,BATTCELL_YI) - utils.lcdBacklightOn() - elseif status.battLevel2 == true then - lcd.drawBitmap(utils.getBitmap("cell_red_86x30"),x+BATTCELL_XI,BATTCELL_YI) - elseif status.battLevel1 == false and alarms[ALARMS_BATT_L1][ALARM_START] > 0 then - --lcd.setColor(CUSTOM_COLOR,COLOR_BLACK) -- black - utils.drawBlinkBitmap("cell_orange_blink_86x30",x+BATTCELL_XI,BATTCELL_YI) - utils.lcdBacklightOn() - elseif status.battLevel1 == true then - lcd.drawBitmap(utils.getBitmap("cell_orange_86x30"),x+BATTCELL_XI,BATTCELL_YI) - lcd.setColor(CUSTOM_COLOR,COLOR_BLACK) -- black - end - end - flags = CUSTOM_COLOR - --PREC2 forces a math.floor() whereas a math.round() is required, math.round(f) = math.floor(f+0.5) - if battery[BATT_CELL+battId] * 0.01 < 10 then - lcd.drawNumber(x+BATTCELL_X+2, BATTCELL_Y, battery[BATT_CELL+battId] + 0.5, PREC2+BATTCELL_FLAGS+flags) - else - lcd.drawNumber(x+BATTCELL_X+2, BATTCELL_Y, (battery[BATT_CELL+battId] + 0.5)*0.1, PREC1+BATTCELL_FLAGS+flags) - end - - local lx = x+BATTCELL_XV - lcd.drawText(lx, BATTCELL_YV, "V", flags) - lcd.drawText(lx, BATTCELL_YS, status.battsource, flags) - - lcd.setColor(CUSTOM_COLOR,COLOR_TEXT) -- white - -- battery voltage - drawLib.drawNumberWithDim(x+BATTVOLT_X,BATTVOLT_Y,x+BATTVOLT_XV, BATTVOLT_YV, battery[BATT_VOLT+battId],"V",BATTVOLT_FLAGS+CUSTOM_COLOR,BATTVOLT_FLAGSV+CUSTOM_COLOR) - -- battery current - local lowAmp = battery[BATT_CURR+battId]*0.1 < 10 - drawLib.drawNumberWithDim(x+BATTCURR_X,BATTCURR_Y,x+BATTCURR_XA,BATTCURR_YA,battery[BATT_CURR+battId]*(lowAmp and 1 or 0.1),"A",BATTCURR_FLAGS+CUSTOM_COLOR+(lowAmp and PREC1 or 0),BATTCURR_FLAGSA+CUSTOM_COLOR) - -- display capacity bar % - lcd.setColor(CUSTOM_COLOR,lcd.RGB(255,255, 255)) - lcd.drawFilledRectangle(x+BATTGAUGE_X, BATTGAUGE_Y,BATTGAUGE_WIDTH,BATTGAUGE_HEIGHT,CUSTOM_COLOR) - if perc > 50 then - lcd.setColor(CUSTOM_COLOR,lcd.RGB(0, 255, 0)) - elseif perc <= 50 and perc > 25 then - lcd.setColor(CUSTOM_COLOR,lcd.RGB(255, 204, 0)) -- yellow - else - lcd.setColor(CUSTOM_COLOR,lcd.RGB(255,0, 0)) - end - lcd.drawGauge(x+BATTGAUGE_X, BATTGAUGE_Y,BATTGAUGE_WIDTH,BATTGAUGE_HEIGHT,perc,100,CUSTOM_COLOR) - -- battery percentage - lcd.setColor(CUSTOM_COLOR,COLOR_BLACK) -- black - - local strperc = string.format("%02d%%",perc) - lcd.drawText(x+BATTPERC_X, BATTPERC_Y, strperc, BATTPERC_FLAGS+CUSTOM_COLOR) - - -- battery mah - lcd.setColor(CUSTOM_COLOR,COLOR_TEXT) - local strmah = string.format("%.02f/%.01f",battery[BATT_MAH+battId]/1000,battery[BATT_CAP+battId]/1000) - --lcd.drawText(x+BATTMAH_X, BATTMAH_Y+2, "Ah", SMLSIZE+RIGHT+CUSTOM_COLOR) - lcd.drawText(x+BATTMAH_X, BATTMAH_Y, strmah, BATTMAH_FLAGS+RIGHT+CUSTOM_COLOR) - - lcd.setColor(CUSTOM_COLOR,COLOR_LABEL) - lcd.drawText(x+BATTLABEL_X,BATTLABEL_Y,battId == 0 and "B1+B2(Ah)" or (battId == 1 and "B1(Ah)" or "B2(Ah)"),BATTLABEL_FLAGS+CUSTOM_COLOR) - if battId < 2 then - -- labels - lcd.drawText(x+BATTEFF_XLABEL, BATTEFF_YLABEL, "Eff(mAh)", SMLSIZE+CUSTOM_COLOR+RIGHT) - lcd.drawText(x+POWER_XLABEL, POWER_YLABEL, "Power(W)", SMLSIZE+CUSTOM_COLOR+RIGHT) - -- data - lcd.setColor(CUSTOM_COLOR,COLOR_TEXT) - local speed = utils.getMaxValue(telemetry.hSpeed,MAX_HSPEED) - -- efficiency for indipendent batteries makes sense only for battery 1 - local eff = speed > 2 and (conf.battConf == BATTCONF_OTHER and battery[BATT_CURR+1] or battery[BATT_CURR])*1000/(speed*UNIT_HSPEED_SCALE) or 0 - eff = ( conf.battConf == BATTCONF_OTHER and battId == 2) and 0 or eff - lcd.drawNumber(x+BATTEFF_X,BATTEFF_Y,eff,(eff > 99999 and 0 or MIDSIZE)+RIGHT+CUSTOM_COLOR) - -- power - local power = battery[BATT_VOLT+battId]*battery[BATT_CURR+battId]*0.01 - lcd.drawNumber(x+POWER_X,POWER_Y,power,MIDSIZE+RIGHT+CUSTOM_COLOR) - --lcd.drawText(x+POWER_X,POWER_Y,string.format("%dW",power),MIDSIZE+CUSTOM_COLOR) - end - if status.showMinMaxValues == true then - drawLib.drawVArrow(x+BATTCELL_X+11, BATTCELL_Y + 8,false,true,utils) - drawLib.drawVArrow(x+BATTVOLT_X+11,BATTVOLT_Y + 3, false,true,utils) - drawLib.drawVArrow(x+BATTCURR_X+11,BATTCURR_Y + 10,true,false,utils) - end -end - -local function background(myWidget,conf,telemetry,status,utils) -end - -return {drawPane=drawPane,background=background} \ No newline at end of file diff --git a/HORUS/SOURCES/PP/lib/right_2.lua b/HORUS/SOURCES/PP/lib/right_2.lua deleted file mode 100644 index 73200521..00000000 --- a/HORUS/SOURCES/PP/lib/right_2.lua +++ /dev/null @@ -1,156 +0,0 @@ -#include "includes/yaapu_inc.lua" - -#define BATTCELL_X 41 -#define BATTCELL_Y 13 -#define BATTCELL_XV 175 -#define BATTCELL_YV 23 -#define BATTCELL_YS 58 -#define BATTCELL_FLAGS XXLSIZE - -#define BATTVOLT_X 105 -#define BATTVOLT_Y 79 -#define BATTVOLT_XV 103 -#define BATTVOLT_YV 79 -#define BATTVOLT_FLAGS DBLSIZE+PREC1+RIGHT -#define BATTVOLT_FLAGSV SMLSIZE - -#define BATTCURR_X 178 -#define BATTCURR_Y 79 -#define BATTCURR_XA 176 -#define BATTCURR_YA 79 -#define BATTCURR_FLAGS DBLSIZE+RIGHT -#define BATTCURR_FLAGSA SMLSIZE - -#define BATTPERC_X 98 -#define BATTPERC_Y 114 -#define BATTPERC_YPERC 117 -#define BATTPERC_FLAGS MIDSIZE -#define BATTPERC_FLAGSPERC SMLSIZE - -#define BATTGAUGE_X 43 -#define BATTGAUGE_Y 117 -#define BATTGAUGE_WIDTH 147 -#define BATTGAUGE_HEIGHT 23 -#define BATTGAUGE_STEPS 10 - -#define BATTMAH_X 183 -#define BATTMAH_Y 140 -#define BATTMAH_FLAGS MIDSIZE - -#define BATTEFF_X 478 -#define BATTEFF_Y 178 -#define BATTEFF_XLABEL 478 -#define BATTEFF_YLABEL 165 -#define BATTEFF_FLAGS SMLSIZE -#define BATTEFF_FLAGSW MIDSIZE - -#define POWER_X 395 -#define POWER_Y 178 -#define POWER_XLABEL 395 -#define POWER_YLABEL 165 - --- offsets are: 1 celm, 4 batt, 7 curr, 10 mah, 13 cap, indexing starts at 1 ---[[ -BATT_CELL 1 -BATT_VOLT 4 -BATT_CURR 7 -BATT_MAH 10 -BATT_CAP 13 - -BATT_IDALL 0 -BATT_ID1 1 -BATT_ID2 2 ---]] -local function drawPane(x,drawLib,conf,telemetry,status,alarms,battery,battId,gpsStatuses,utils) - lcd.setColor(CUSTOM_COLOR,COLOR_TEXT) - local perc = battery[BATT_PERC+battId] - -- battery min cell - local flags = 0 - -- - lcd.setColor(CUSTOM_COLOR,COLOR_TEXT) -- white - if status.showMinMaxValues == false then - if status.battLevel2 == false and alarms[ALARMS_BATT_L2][ALARM_START] > 0 then - utils.drawBlinkBitmap("cell_red",x+BATTCELL_X - 2,BATTCELL_Y + 7) - utils.lcdBacklightOn() - elseif status.battLevel2 == true then - lcd.drawBitmap(utils.getBitmap("cell_red"),x+BATTCELL_X - 2,BATTCELL_Y + 7) - elseif status.battLevel1 == false and alarms[ALARMS_BATT_L1][ALARM_START] > 0 then - --lcd.setColor(CUSTOM_COLOR,COLOR_BLACK) -- black - utils.drawBlinkBitmap("cell_orange_blink",x+BATTCELL_X - 2,BATTCELL_Y + 7) - utils.lcdBacklightOn() - elseif status.battLevel1 == true then - lcd.drawBitmap(utils.getBitmap("cell_orange"),x+BATTCELL_X - 2,BATTCELL_Y + 7) - lcd.setColor(CUSTOM_COLOR,COLOR_BLACK) -- black - end - end - flags = CUSTOM_COLOR - --PREC2 forces a math.floor() whereas a math.round() is required, math.round(f) = math.floor(f+0.5) - if battery[BATT_CELL+battId] * 0.01 < 10 then - lcd.drawNumber(x+BATTCELL_X+2, BATTCELL_Y, battery[BATT_CELL+battId] + 0.5, PREC2+BATTCELL_FLAGS+flags) - else - lcd.drawNumber(x+BATTCELL_X+2, BATTCELL_Y, (battery[BATT_CELL+battId] + 0.5)*0.1, PREC1+BATTCELL_FLAGS+flags) - end - - --lcd.drawNumber(x+BATTCELL_X+2, BATTCELL_Y, battery[BATT_CELL+battId] + 0.5, BATTCELL_FLAGS+flags) - local lx = x+BATTCELL_XV - lcd.drawText(lx, BATTCELL_YV, "V", flags) - lcd.drawText(lx, BATTCELL_YS, status.battsource, flags) - - lcd.setColor(CUSTOM_COLOR,COLOR_TEXT) -- white - -- battery voltage - drawLib.drawNumberWithDim(x+BATTVOLT_X,BATTVOLT_Y,x+BATTVOLT_XV, BATTVOLT_YV, battery[BATT_VOLT+battId],"V",BATTVOLT_FLAGS+CUSTOM_COLOR,BATTVOLT_FLAGSV+CUSTOM_COLOR) - -- battery current - drawLib.drawNumberWithDim(x+BATTCURR_X,BATTCURR_Y,x+BATTCURR_XA,BATTCURR_YA,battery[BATT_CURR+battId]*(battery[BATT_CURR+battId] >= 100 and 0.1 or 1),"A",BATTCURR_FLAGS+CUSTOM_COLOR+(battery[BATT_CURR+battId] >= 100 and 0 or PREC1),BATTCURR_FLAGSA+CUSTOM_COLOR) - -- display capacity bar % - if perc > 50 then - lcd.setColor(CUSTOM_COLOR,lcd.RGB(0, 255, 0)) - elseif perc <= 50 and perc > 25 then - lcd.setColor(CUSTOM_COLOR,lcd.RGB(255, 204, 0)) -- yellow - else - lcd.setColor(CUSTOM_COLOR,lcd.RGB(255,0, 0)) - end - lcd.drawBitmap(utils.getBitmap("gauge_bg"),x+BATTGAUGE_X-2,BATTGAUGE_Y-2) - lcd.drawGauge(x+BATTGAUGE_X, BATTGAUGE_Y,BATTGAUGE_WIDTH,BATTGAUGE_HEIGHT,perc,100,CUSTOM_COLOR) - -- battery percentage - lcd.setColor(CUSTOM_COLOR,COLOR_BLACK) -- black - - local strperc = string.format("%02d%%",perc) - lcd.drawText(x+BATTPERC_X, BATTPERC_Y, strperc, BATTPERC_FLAGS+CUSTOM_COLOR) - - -- battery mah - lcd.setColor(CUSTOM_COLOR,COLOR_TEXT) - local strmah = string.format("%.02f/%.01f",battery[BATT_MAH+battId]/1000,battery[BATT_CAP+battId]/1000) - lcd.drawText(x+BATTMAH_X, BATTMAH_Y+6, "Ah", RIGHT+CUSTOM_COLOR) - lcd.drawText(x+BATTMAH_X - 22, BATTMAH_Y, strmah, BATTMAH_FLAGS+RIGHT+CUSTOM_COLOR) - - lcd.setColor(CUSTOM_COLOR,COLOR_DARK_GREY) - lcd.drawText(x+190,124,battId == 0 and "B1+B2" or (battId == 1 and "B1" or "B2"),SMLSIZE+CUSTOM_COLOR+RIGHT) - - if battId < 2 then - -- RIGHT labels - lcd.setColor(CUSTOM_COLOR,COLOR_LABEL) - lcd.drawText(BATTEFF_XLABEL, BATTEFF_YLABEL, "Eff(mAh)", BATTEFF_FLAGS+RIGHT+CUSTOM_COLOR) - lcd.drawText(POWER_XLABEL, POWER_YLABEL, "Power(W)", SMLSIZE+CUSTOM_COLOR+RIGHT) - --data - lcd.setColor(CUSTOM_COLOR,COLOR_TEXT) - -- efficiency for indipendent batteries makes sense only for battery 1 - local speed = utils.getMaxValue(telemetry.hSpeed,MAX_HSPEED) - local eff = speed > 2 and (conf.battConf == BATTCONF_OTHER and battery[BATT_CURR+1] or battery[BATT_CURR])*1000/(speed*UNIT_HSPEED_SCALE) or 0 - eff = ( conf.battConf == BATTCONF_OTHER and battId == 2) and 0 or eff - lcd.drawNumber(BATTEFF_X,BATTEFF_Y,eff,BATTEFF_FLAGSW+RIGHT+CUSTOM_COLOR) - -- power - local power = battery[BATT_VOLT]*(conf.battConf == BATTCONF_OTHER and battery[BATT_CURR+1] or battery[BATT_CURR])*0.01 - lcd.drawNumber(POWER_X,POWER_Y,power,MIDSIZE+RIGHT+CUSTOM_COLOR) - end - - if status.showMinMaxValues == true then - drawLib.drawVArrow(x+BATTCELL_X+140, BATTCELL_Y + 27,false,true,utils) - drawLib.drawVArrow(x+BATTVOLT_X+4,BATTVOLT_Y + 10, false,true,utils) - drawLib.drawVArrow(x+BATTCURR_X+3,BATTCURR_Y + 10,true,false,utils) - end -end - -local function background(myWidget,conf,telemetry,status,utils) -end - -return {drawPane=drawPane,background=background} \ No newline at end of file diff --git a/HORUS/SOURCES/PP/lib/right_custom_2.lua b/HORUS/SOURCES/PP/lib/right_custom_2.lua deleted file mode 100644 index 342573be..00000000 --- a/HORUS/SOURCES/PP/lib/right_custom_2.lua +++ /dev/null @@ -1,245 +0,0 @@ -#include "includes/yaapu_inc.lua" - -#define BATTCELL_X 110 -#define BATTCELL_Y 16 -#define BATTCELL_XV 180 -#define BATTCELL_YV 19 -#define BATTCELL_YS 35 -#define BATTCELL_FLAGS DBLSIZE - -#define BATTVOLT_X 110 -#define BATTVOLT_Y 48 -#define BATTVOLT_XV 110 -#define BATTVOLT_YV 46 -#define BATTVOLT_FLAGS MIDSIZE+PREC1+RIGHT -#define BATTVOLT_FLAGSV SMLSIZE - -#define BATTCURR_X 178 -#define BATTCURR_Y 48 -#define BATTCURR_XA 178 -#define BATTCURR_YA 48 -#define BATTCURR_FLAGS MIDSIZE+RIGHT+PREC1 -#define BATTCURR_FLAGSA SMLSIZE - -#define BATTPERC_X 63 -#define BATTPERC_Y 27 -#define BATTPERC_FLAGS 0 -#define BATTPERC_FLAGSPERC SMLSIZE - -#define BATTGAUGE_X 47 -#define BATTGAUGE_Y 29 -#define BATTGAUGE_WIDTH 58 -#define BATTGAUGE_HEIGHT 16 -#define BATTGAUGE_STEPS 10 - -#define BATTMAH_X 180 -#define BATTMAH_Y 71 -#define BATTMAH_FLAGS 0 - -#define BATTEFF_X 191 -#define BATTEFF_Y 93 -#define BATTEFF_YW 105 -#define BATTEFF_FLAGS SMLSIZE -#define BATTEFF_FLAGSW 0 - -#define SENSOR1_X 110 -#define SENSOR1_Y 102 -#define SENSOR1_XLABEL 110 -#define SENSOR1_YLABEL 91 - -#define SENSOR2_X 196 -#define SENSOR2_Y 102 -#define SENSOR2_XLABEL 196 -#define SENSOR2_YLABEL 91 - -#define SENSOR3_X 110 -#define SENSOR3_Y 133 -#define SENSOR3_XLABEL 110 -#define SENSOR3_YLABEL 124 - -#define SENSOR4_X 196 -#define SENSOR4_Y 133 -#define SENSOR4_XLABEL 196 -#define SENSOR4_YLABEL 124 - -#define SENSOR5_X 110 -#define SENSOR5_Y 174 -#define SENSOR5_XLABEL 110 -#define SENSOR5_YLABEL 164 - -#define SENSOR6_X 196 -#define SENSOR6_Y 174 -#define SENSOR6_XLABEL 196 -#define SENSOR6_YLABEL 164 - - --------------------------- --- CUSTOM SENSORS SUPPORT --------------------------- -#define SENSOR_LABEL 1 -#define SENSOR_NAME 2 -#define SENSOR_PREC 3 -#define SENSOR_UNIT 4 -#define SENSOR_MULT 5 -#define SENSOR_MAX 6 -#define SENSOR_FONT 7 -#define SENSOR_WARN 8 -#define SENSOR_CRIT 9 - -local customSensorXY = { - { SENSOR1_XLABEL, SENSOR1_YLABEL, SENSOR1_X, SENSOR1_Y}, - { SENSOR2_XLABEL, SENSOR2_YLABEL, SENSOR2_X, SENSOR2_Y}, - { SENSOR3_XLABEL, SENSOR3_YLABEL, SENSOR3_X, SENSOR3_Y}, - { SENSOR4_XLABEL, SENSOR4_YLABEL, SENSOR4_X, SENSOR4_Y}, - { SENSOR5_XLABEL, SENSOR5_YLABEL, SENSOR5_X, SENSOR5_Y}, - { SENSOR6_XLABEL, SENSOR6_YLABEL, SENSOR6_X, SENSOR6_Y}, -} - -local function drawCustomSensors(x,customSensors,utils,status) - if customSensors == nil then - return - end - - local label,data,prec,mult,flags,sensorConfig - for i=1,6 - do - if customSensors.sensors[i] ~= nil then - sensorConfig = customSensors.sensors[i] - - if sensorConfig[SENSOR_UNIT] == "" then - label = string.format("%s",sensorConfig[SENSOR_LABEL]) - else - label = string.format("%s(%s)",sensorConfig[SENSOR_LABEL],sensorConfig[SENSOR_UNIT]) - end - -- draw sensor label - lcd.setColor(CUSTOM_COLOR,COLOR_LABEL) - lcd.drawText(x+customSensorXY[i][1], customSensorXY[i][2],label, SMLSIZE+RIGHT+CUSTOM_COLOR) - - mult = sensorConfig[SENSOR_PREC] == 0 and 1 or ( sensorConfig[SENSOR_PREC] == 1 and 10 or 100 ) - prec = mult == 1 and 0 or (mult == 10 and 32 or 48) - - local sensorName = sensorConfig[SENSOR_NAME]..(status.showMinMaxValues == true and sensorConfig[SENSOR_MAX] or "") - local sensorValue = getValue(sensorName) - local value = (sensorValue+(mult == 100 and 0.005 or 0))*mult*sensorConfig[SENSOR_MULT] - - -- default font size - flags = (i<=2 and MIDSIZE or (sensorConfig[SENSOR_FONT] == 1 and MIDSIZE or DBLSIZE)) - - -- for sensor 3,4,5,6 reduce font if necessary - if i>2 and math.abs(value)*mult > 99999 then - flags = MIDSIZE - end - - local color = COLOR_TEXT - local sign = sensorConfig[SENSOR_MAX] == "+" and 1 or -1 - - -- max tracking, high values are critical - if math.abs(value) ~= 0 and status.showMinMaxValues == false then - color = ( sensorValue*sign > sensorConfig[SENSOR_CRIT]*sign and COLOR_CRIT or (sensorValue*sign > sensorConfig[SENSOR_WARN]*sign and COLOR_WARN or COLOR_TEXT)) - end - - lcd.setColor(CUSTOM_COLOR,color) - - local voffset = (i>2 and flags==MIDSIZE) and 5 or 0 - -- if a lookup table exists use it! - if customSensors.lookups[i] ~= nil and customSensors.lookups[i][value] ~= nil then - lcd.drawText(x+customSensorXY[i][3], customSensorXY[i][4]+voffset, customSensors.lookups[i][value] or value, flags+RIGHT+CUSTOM_COLOR) - else - lcd.drawNumber(x+customSensorXY[i][3], customSensorXY[i][4]+voffset, value, flags+RIGHT+prec+CUSTOM_COLOR) - end - end - end -end - --- offsets are: 1 celm, 4 batt, 7 curr, 10 mah, 13 cap, indexing starts at 1 ---[[ -BATT_CELL 1 -BATT_VOLT 4 -BATT_CURR 7 -BATT_MAH 10 -BATT_CAP 13 - -BATT_IDALL 0 -BATT_ID1 1 -BATT_ID2 2 ---]] -local function drawPane(x,drawLib,conf,telemetry,status,alarms,battery,battId,gpsStatuses,utils,customSensors) - lcd.setColor(CUSTOM_COLOR,COLOR_TEXT) - local perc = battery[BATT_PERC+battId] - -- battery min cell - local flags = 0 - -- - lcd.setColor(CUSTOM_COLOR,COLOR_TEXT) -- white - if status.showMinMaxValues == false then - if status.battLevel2 == false and alarms[ALARMS_BATT_L2][ALARM_START] > 0 then - utils.drawBlinkBitmap("cell_red_small",x+BATTCELL_X+1,BATTCELL_Y + 7) - utils.lcdBacklightOn() - elseif status.battLevel2 == true then - lcd.drawBitmap(utils.getBitmap("cell_red_small"),x+BATTCELL_X+1,BATTCELL_Y + 7) - elseif status.battLevel1 == false and alarms[ALARMS_BATT_L1][ALARM_START] > 0 then - --lcd.setColor(CUSTOM_COLOR,COLOR_BLACK) -- black - utils.drawBlinkBitmap("cell_orange_small_blink",x+BATTCELL_X+1,BATTCELL_Y + 7) - utils.lcdBacklightOn() - elseif status.battLevel1 == true then - lcd.drawBitmap(utils.getBitmap("cell_orange_small"),x+BATTCELL_X+1,BATTCELL_Y + 7) - lcd.setColor(CUSTOM_COLOR,COLOR_BLACK) -- black - end - end - flags = CUSTOM_COLOR - --PREC2 forces a math.floor() whereas a math.round() is required, math.round(f) = math.floor(f+0.5) - if battery[BATT_CELL+battId] * 0.01 < 10 then - lcd.drawNumber(x+BATTCELL_X+2, BATTCELL_Y, battery[BATT_CELL+battId] + 0.5, PREC2+BATTCELL_FLAGS+flags) - else - lcd.drawNumber(x+BATTCELL_X+2, BATTCELL_Y, (battery[BATT_CELL+battId] + 0.5)*0.1, PREC1+BATTCELL_FLAGS+flags) - end - local lx = x+BATTCELL_XV - lcd.drawText(lx, BATTCELL_YV, "V", SMLSIZE+flags) - lcd.drawText(lx-2, BATTCELL_YS, status.battsource, SMLSIZE+flags) - - lcd.setColor(CUSTOM_COLOR,COLOR_TEXT) -- white - -- battery voltage - drawLib.drawNumberWithDim(x+BATTVOLT_X,BATTVOLT_Y,x+BATTVOLT_XV, BATTVOLT_YV, battery[BATT_VOLT+battId],"V",BATTVOLT_FLAGS+CUSTOM_COLOR,BATTVOLT_FLAGSV+CUSTOM_COLOR) - -- battery current - drawLib.drawNumberWithDim(x+BATTCURR_X,BATTCURR_Y,x+BATTCURR_XA,BATTCURR_YA,battery[BATT_CURR+battId],"A",BATTCURR_FLAGS+CUSTOM_COLOR,BATTCURR_FLAGSA+CUSTOM_COLOR) - -- display capacity bar % - if perc > 50 then - lcd.setColor(CUSTOM_COLOR,lcd.RGB(0, 255, 0)) - elseif perc <= 50 and perc > 25 then - lcd.setColor(CUSTOM_COLOR,lcd.RGB(255, 204, 0)) -- yellow - else - lcd.setColor(CUSTOM_COLOR,lcd.RGB(255,0, 0)) - end - lcd.drawBitmap(utils.getBitmap("gauge_bg_small"),x+BATTGAUGE_X,BATTGAUGE_Y) - lcd.drawGauge(x+BATTGAUGE_X, BATTGAUGE_Y,BATTGAUGE_WIDTH,BATTGAUGE_HEIGHT,perc,100,CUSTOM_COLOR) - -- battery percentage - lcd.setColor(CUSTOM_COLOR,COLOR_BLACK) -- black - - local strperc = string.format("%02d%%",perc) - lcd.drawText(x+BATTPERC_X, BATTPERC_Y, strperc, BATTPERC_FLAGS+CUSTOM_COLOR) - - -- battery mah - lcd.setColor(CUSTOM_COLOR,COLOR_TEXT) - local strmah = string.format("%.02f/%.01f",battery[BATT_MAH+battId]/1000,battery[BATT_CAP+battId]/1000) - lcd.drawText(x+BATTMAH_X, BATTMAH_Y+4, "Ah", SMLSIZE+RIGHT+CUSTOM_COLOR) - lcd.drawText(x+BATTMAH_X - 22, BATTMAH_Y, strmah, BATTMAH_FLAGS+RIGHT+CUSTOM_COLOR) - - lcd.setColor(CUSTOM_COLOR,COLOR_DARK_GREY) - --lcd.drawText(475,124,battId == 0 and "B1+B2" or (battId == 1 and "B1" or "B2"),SMLSIZE+CUSTOM_COLOR+RIGHT) - lcd.drawBitmap(utils.getBitmap("battbox_small"),x+42,21) - - -- do no show custom sensors when displaying 2nd battery info - if battId < 2 then - drawCustomSensors(x,customSensors,utils,status) - end - - if status.showMinMaxValues == true then - drawLib.drawVArrow(LCD_W-12, BATTCELL_Y + 8,false,true,utils) - drawLib.drawVArrow(x+BATTVOLT_X+5,BATTVOLT_Y + 6, false,true,utils) - drawLib.drawVArrow(x+BATTCURR_X+4,BATTCURR_Y + 6,true,false,utils) - end -end - -local function background(myWidget,conf,telemetry,status,utils) -end - -return {drawPane=drawPane,background=background} \ No newline at end of file diff --git a/HORUS/SOURCES/PP/lib/rover.lua b/HORUS/SOURCES/PP/lib/rover.lua deleted file mode 100644 index 1abb7481..00000000 --- a/HORUS/SOURCES/PP/lib/rover.lua +++ /dev/null @@ -1,47 +0,0 @@ ---[[ - // Auto Pilot modes - // ---------------- - enum Number { - MANUAL = 0, - ACRO = 1, - STEERING = 3, - HOLD = 4, - LOITER = 5, - FOLLOW = 6, - SIMPLE = 7, - AUTO = 10, - RTL = 11, - SMART_RTL = 12, - GUIDED = 15, - INITIALISING = 16 - }; ---]] - -local flightModes = {} - --- rover modes -flightModes[0]="" -flightModes[1]="Manual" -flightModes[2]="Acro" -flightModes[3]="" -flightModes[4]="Steering" -flightModes[5]="Hold" -flightModes[6]="Loiter" -flightModes[7]="Follow" -flightModes[8]="Simple" -flightModes[9]="" -flightModes[10]="" -flightModes[11]="Auto" -flightModes[12]="RTL" -flightModes[13]="SmartRTL" -flightModes[14]="" -flightModes[15]="" -flightModes[16]="Guided" -flightModes[17]="Initializing" -flightModes[18]="" -flightModes[19]="" -flightModes[20]="" -flightModes[21]="" -flightModes[22]="" --- -return {flightModes=flightModes} diff --git a/HORUS/SOURCES/PP/menu.lua b/HORUS/SOURCES/PP/menu.lua deleted file mode 100644 index 862e1eb0..00000000 --- a/HORUS/SOURCES/PP/menu.lua +++ /dev/null @@ -1,462 +0,0 @@ -#include "includes/yaapu_inc.lua" - -------------------------------------- --- UNITS Scales from Ardupilot OSD code /ardupilot/libraries/AP_OSD/AP_OSD_Screen.cpp -------------------------------------- ---[[ - static const float scale_metric[UNIT_TYPE_LAST] = { - 1.0, //ALTITUDE m - 3.6, //SPEED km/hr - 1.0, //VSPEED m/s - 1.0, //DISTANCE m - 1.0/1000, //DISTANCE_LONG km - 1.0, //TEMPERATURE C - }; - static const float scale_imperial[UNIT_TYPE_LAST] = { - 3.28084, //ALTITUDE ft - 2.23694, //SPEED mph - 3.28084, //VSPEED ft/s - 3.28084, //DISTANCE ft - 1.0/1609.34, //DISTANCE_LONG miles - 1.8, //TEMPERATURE F - }; - static const float scale_SI[UNIT_TYPE_LAST] = { - 1.0, //ALTITUDE m - 1.0, //SPEED m/s - 1.0, //VSPEED m/s - 1.0, //DISTANCE m - 1.0/1000, //DISTANCE_LONG km - 1.0, //TEMPERATURE C - }; - static const float scale_aviation[UNIT_TYPE_LAST] = { - 3.28084, //ALTITUDE Ft - 1.94384, //SPEED Knots - 196.85, //VSPEED ft/min - 3.28084, //DISTANCE ft - 0.000539957, //DISTANCE_LONG Nm - 1.0, //TEMPERATURE C - }; ---]] ---[[ - -TYPEVALUE - menu option to select a numeric value -{description, type,name,default value,min,max,uit of measure,precision,increment step, , } -example {"batt alert level 1:", TYPEVALUE, "V1", 375, 0,5000,"V",PREC2,5,"L2",350 }, - -TYPECOMBO - menu option to select a value from a list -{description, type, name, default, label list, value list, , } -example {"center pane layout:", TYPECOMBO, "CPANE", 1, { "hud","radar" }, { 1, 2 },"CPANE",1 }, - ---]] --- -local menuItems = { - {"voice language:", TYPECOMBO, "L1", 1, { "english", "italian", "french", "german" } , {"en","it","fr","de"} }, - {"batt alert level 1:", TYPEVALUE, "V1", 375, 0,5000,"V",PREC2,5 }, - {"batt alert level 2:", TYPEVALUE, "V2", 350, 0,5000,"V",PREC2,5 }, - {"batt[1] capacity override:", TYPEVALUE, "B1", 0, 0,5000,"Ah",PREC2,10 }, - {"batt[2] capacity override:", TYPEVALUE, "B2", 0, 0,5000,"Ah",PREC2,10 }, - {"disable all sounds:", TYPECOMBO, "S1", 1, { "no", "yes" }, { false, true } }, - {"disable msg beep:", TYPECOMBO, "S2", 1, { "no", "info", "all" }, { 1, 2, 3 } }, - {"enable haptic:", TYPECOMBO, "VIBR", 1, { "no", "yes" }, { false, true } }, - {"default voltage source:", TYPECOMBO, "VS", 1, { "auto", "FLVSS", "fc" }, { nil, "vs", "fc" } }, - {"timer alert every:", TYPEVALUE, "T1", 0, 0,600,"min",PREC1,5 }, - {"min altitude alert:", TYPEVALUE, "A1", 0, 0,500,"m",PREC1,5 }, - {"max altitude alert:", TYPEVALUE, "A2", 0, 0,10000,"m",0,1 }, - {"max distance alert:", TYPEVALUE, "D1", 0, 0,100000,"m",0,10 }, - {"repeat alerts every:", TYPEVALUE, "T2", 10, 5,600,"sec",0,5 }, - {"dual battery config:", TYPECOMBO, "BC", 1, { "par", "ser", "other" }, { 1, 2, 3 } }, - {"batt[1] cell count override:", TYPEVALUE, "CC", 0, 0,12," cells",0,1 }, - {"batt[2] cell count override:", TYPEVALUE, "CC2", 0, 0,12," cells",0,1 }, - {"rangefinder max:", TYPEVALUE, "RM", 0, 0,10000," cm",0,10 }, - {"air/groundspeed unit:", TYPECOMBO, "HSPD", 1, { "m/s", "km/h", "mph", "kn" }, { 1, 3.6, 2.23694, 1.94384} }, - {"vertical speed unit:", TYPECOMBO, "VSPD", 1, { "m/s", "ft/s", "ft/min" }, { 1, 3.28084, 196.85} }, - {"widget layout:", TYPECOMBO, "WL", 1, { "default","legacy"}, { 1, 2 } }, - {"center panel:", TYPECOMBO, "CPANE", 1, { "option 1","option 2","option 3","option 4" }, { 1, 2, 3, 4 } }, - {"right panel:", TYPECOMBO, "RPANE", 1, { "option 1","option 2","option 3","option 4" }, { 1, 2, 3, 4 } }, - {"left panel:", TYPECOMBO, "LPANE", 1, { "option 1","option 2","option 3","option 4" }, { 1 , 2, 3, 4 } }, - {"enable px4 flightmodes:", TYPECOMBO, "PX4", 1, { "no", "yes" }, { false, true } }, - {"screen toggle channel:", TYPEVALUE, "STC", 0, 0, 32,nil,0,1 }, - {"map zoom level:", TYPEVALUE, "MAPZ", -2, -2, 17,nil,0,1 }, - {"map type:", TYPECOMBO, "MAPT", 1, { "satellite", "map", "terrain" }, { "sat_tiles", "tiles", "ter_tiles" } }, - {"map grid lines:", TYPECOMBO, "MAPG", 1, { "yes", "no" }, { true, false } }, - {"map zoom channel:", TYPEVALUE, "ZTC", 0, 0, 32,nil,0,1 }, -} - -local menu = { - selectedItem = 1, - editSelected = false, - offset = 0, - updated = true, -- if true menu needs a call to updateMenuItems() - wrapOffset = 0, -- changes according to enabled/disabled features and panels -} - -local basePath = "/SCRIPTS/YAAPU/" -local libBasePath = basePath.."LIB/" - -local widgetLayoutFiles = {"layout_1","layout_2"} - -local centerPanelFiles = {} -local rightPanelFiles = {} -local leftPanelFiles = {} - ------------------------------------------- --- returns item's VALUE,LABEL,IDX ------------------------------------------- -local function getMenuItemByName(items,name) - for idx=1,#items - do - -- items[idx][3] is the menu item's name as it appears in the config file - if items[idx][3] == name then - if items[idx][2] == TYPECOMBO then - -- return item's value, label, index - return items[idx][6][items[idx][4]], items[idx][5][items[idx][4]], idx - else - -- return item's value, label, index - return items[idx][4], name, idx - end - end - end - return nil -end - -local function updateMenuItems() - if menu.updated == true then - local value, name, idx = getMenuItemByName(menuItems,"WL") - if value == 1 then - --------------------- - -- large hud layout - --------------------- - value, name, idx = getMenuItemByName(menuItems,"CPANE") - menuItems[idx][5] = { "default"}; - menuItems[idx][6] = { 1 }; - - if menuItems[idx][4] > #menuItems[idx][5] then - menuItems[idx][4] = 1 - end - - value, name, idx = getMenuItemByName(menuItems,"RPANE") - menuItems[idx][5] = { "default" }; - menuItems[idx][6] = { 1 }; - - if menuItems[idx][4] > #menuItems[idx][5] then - menuItems[idx][4] = 1 - end - - value, name, idx = getMenuItemByName(menuItems,"LPANE") - menuItems[idx][5] = { "default","mav2passthru" }; - menuItems[idx][6] = { 1, 2 }; - - if menuItems[idx][4] > #menuItems[idx][5] then - menuItems[idx][4] = 1 - end - - centerPanelFiles = {"hud_1", "hud_nav_1" } - rightPanelFiles = {"right_1" } - leftPanelFiles = {"left_1", "left_m2f_1" } - - elseif value == 2 then - --------------------- - -- legacy layout - --------------------- - value, name, idx = getMenuItemByName(menuItems,"CPANE") - menuItems[idx][5] = { "default", "russian hud", "compact hud" }; - menuItems[idx][6] = { 1, 2, 3 }; - - if menuItems[idx][4] > #menuItems[idx][5] then - menuItems[idx][4] = 1 - end - - value, name, idx = getMenuItemByName(menuItems,"RPANE") - menuItems[idx][5] = { "default", "custom sensors" }; - menuItems[idx][6] = { 1, 2 }; - - if menuItems[idx][4] > #menuItems[idx][5] then - menuItems[idx][4] = 1 - end - - value, name, idx = getMenuItemByName(menuItems,"LPANE") - menuItems[idx][5] = { "default","mav2passthru" }; - menuItems[idx][6] = { 1, 2 }; - - if menuItems[idx][4] > #menuItems[idx][5] then - menuItems[idx][4] = 1 - end - - centerPanelFiles = {"hud_2", "hud_russian_2", "hud_small_2" } - rightPanelFiles = {"right_2", "right_custom_2" } - leftPanelFiles = {"left_2", "left_m2f_2" } - end - - menu.updated = false - collectgarbage() - collectgarbage() - end -end - -local -function getConfigFilename() - local info = model.getInfo() - return "/SCRIPTS/YAAPU/CFG/" .. string.lower(string.gsub(info.name, "[%c%p%s%z]", "")..".cfg") -end - -local function applyConfigValues(conf) - if menu.updated == true then - updateMenuItems() - menu.updated = false - end - conf.language = getMenuItemByName(menuItems,"L1") - conf.battAlertLevel1 = getMenuItemByName(menuItems,"V1") - conf.battAlertLevel2 = getMenuItemByName(menuItems,"V2") - conf.battCapOverride1 = getMenuItemByName(menuItems,"B1") - conf.battCapOverride2 = getMenuItemByName(menuItems,"B2") - conf.disableAllSounds = getMenuItemByName(menuItems,"S1") - conf.disableMsgBeep = getMenuItemByName(menuItems,"S2") - conf.enableHaptic = getMenuItemByName(menuItems,"VIBR") - conf.timerAlert = math.floor(getMenuItemByName(menuItems,"T1")*0.1*60) - conf.minAltitudeAlert = getMenuItemByName(menuItems,"A1")*0.1 - conf.maxAltitudeAlert = getMenuItemByName(menuItems,"A2") - conf.maxDistanceAlert = getMenuItemByName(menuItems,"D1") - conf.repeatAlertsPeriod = getMenuItemByName(menuItems,"T2") - conf.battConf = getMenuItemByName(menuItems,"BC") - conf.cell1Count = getMenuItemByName(menuItems,"CC") - conf.cell2Count = getMenuItemByName(menuItems,"CC2") - conf.rangeFinderMax = getMenuItemByName(menuItems,"RM") - conf.horSpeedMultiplier, conf.horSpeedLabel = getMenuItemByName(menuItems,"HSPD") - conf.vertSpeedMultiplier, conf.vertSpeedLabel = getMenuItemByName(menuItems,"VSPD") - -- Layout configuration - conf.widgetLayout = getMenuItemByName(menuItems,"WL") - conf.widgetLayoutFilename = widgetLayoutFiles[conf.widgetLayout] - - conf.centerPanel = getMenuItemByName(menuItems,"CPANE") - conf.centerPanelFilename = centerPanelFiles[conf.centerPanel] - - conf.rightPanel = getMenuItemByName(menuItems,"RPANE") - conf.rightPanelFilename = rightPanelFiles[conf.rightPanel] - - conf.leftPanel = getMenuItemByName(menuItems,"LPANE") - conf.leftPanelFilename = leftPanelFiles[conf.leftPanel] - - conf.enablePX4Modes = getMenuItemByName(menuItems,"PX4") - - conf.mapZoomLevel = getMenuItemByName(menuItems,"MAPZ") - conf.mapType = getMenuItemByName(menuItems,"MAPT") - - local chInfo = getFieldInfo("ch"..getMenuItemByName(menuItems,"STC")) - conf.screenToggleChannelId = (chInfo == nil and -1 or chInfo['id']) - - chInfo = getFieldInfo("ch"..getMenuItemByName(menuItems,"ZTC")) - conf.mapToggleChannelId = (chInfo == nil and -1 or chInfo['id']) - - conf.enableMapGrid = getMenuItemByName(menuItems,"MAPG") - - -- set default voltage source - if getMenuItemByName(menuItems,"VS") ~= nil then - conf.defaultBattSource = getMenuItemByName(menuItems,"VS") - end - - menu.editSelected = false - collectgarbage() - collectgarbage() -end - -local function loadConfig(conf) - local cfg = io.open(getConfigFilename(),"r") - if cfg ~= nil then - local str = io.read(cfg,500) - io.close(cfg) - if string.len(str) > 0 then - for i=1,#menuItems - do - local value = string.match(str, menuItems[i][3]..":([-%d]+)") - collectgarbage() - if value ~= nil then - menuItems[i][4] = tonumber(value) - -- check if the value read from file is compatible with available options - if menuItems[i][2] == TYPECOMBO and tonumber(value) > #menuItems[i][5] then - --if not force default - menuItems[i][4] = 1 - end - end - end - end - end - -- menu was loaded apply required changes - menu.updated = true - -- when run standalone there's nothing to update :-) - if conf ~= nil then - applyConfigValues(conf) - end -end - -local function saveConfig(conf) - local myConfig = "" - for i=1,#menuItems - do - myConfig = myConfig..menuItems[i][3]..":"..menuItems[i][4] - if i < #menuItems then - myConfig = myConfig.."," - end - end - local cfg = assert(io.open(getConfigFilename(),"w")) - if cfg ~= nil then - io.write(cfg,myConfig) - io.close(cfg) - end - myConfig = nil - collectgarbage() - collectgarbage() - -- when run standalone there's nothing to update :-) - if conf ~= nil then - applyConfigValues(conf) - end - model.setGlobalVariable(CONF_GV,CONF_FM_GV,1) -end - -local function drawConfigMenuBars() - lcd.setColor(CUSTOM_COLOR,COLOR_BARS) - local itemIdx = string.format("%d/%d",menu.selectedItem,#menuItems) - lcd.drawFilledRectangle(0,TOPBAR_Y, LCD_W, 20, CUSTOM_COLOR) - lcd.drawRectangle(0, TOPBAR_Y, LCD_W, 20, CUSTOM_COLOR) - lcd.drawFilledRectangle(0,BOTTOMBAR_Y, LCD_W, 20, CUSTOM_COLOR) - lcd.drawRectangle(0, BOTTOMBAR_Y, LCD_W, 20, CUSTOM_COLOR) - lcd.setColor(CUSTOM_COLOR,COLOR_TEXT) - lcd.drawText(2,0,VERSION,CUSTOM_COLOR) - lcd.drawText(2,BOTTOMBAR_Y+1,getConfigFilename(),CUSTOM_COLOR) - lcd.drawText(BOTTOMBAR_WIDTH,BOTTOMBAR_Y+1,itemIdx,CUSTOM_COLOR+RIGHT) -end - -local function incMenuItem(idx) - if menuItems[idx][2] == TYPEVALUE then - menuItems[idx][4] = menuItems[idx][4] + menuItems[idx][9] - if menuItems[idx][4] > menuItems[idx][6] then - menuItems[idx][4] = menuItems[idx][6] - end - else - menuItems[idx][4] = menuItems[idx][4] + 1 - if menuItems[idx][4] > #menuItems[idx][5] then - menuItems[idx][4] = 1 - end - end -end - -local function decMenuItem(idx) - if menuItems[idx][2] == TYPEVALUE then - menuItems[idx][4] = menuItems[idx][4] - menuItems[idx][9] - if menuItems[idx][4] < menuItems[idx][5] then - menuItems[idx][4] = menuItems[idx][5] - end - else - menuItems[idx][4] = menuItems[idx][4] - 1 - if menuItems[idx][4] < 1 then - menuItems[idx][4] = #menuItems[idx][5] - end - end -end - -local function drawItem(idx,flags) - lcd.setColor(CUSTOM_COLOR,COLOR_TEXT) - if menuItems[idx][2] == TYPEVALUE then - if menuItems[idx][4] == 0 and menuItems[idx][5] >= 0 then - lcd.drawText(MENU_ITEM_X,MENU_Y + (idx-menu.offset-1)*20, "---",flags+CUSTOM_COLOR) - else - lcd.drawNumber(MENU_ITEM_X,MENU_Y + (idx-menu.offset-1)*20, menuItems[idx][4],flags+menuItems[idx][8]+CUSTOM_COLOR) - if menuItems[idx][7] ~= nil then - lcd.drawText(MENU_ITEM_X + 50,MENU_Y + (idx-menu.offset-1)*20, menuItems[idx][7],flags+CUSTOM_COLOR) - end - end - else - lcd.drawText(MENU_ITEM_X,MENU_Y + (idx-menu.offset-1)*20, menuItems[idx][5][menuItems[idx][4]],flags+CUSTOM_COLOR) - end -end - -local function drawConfigMenu(event) - drawConfigMenuBars() - updateMenuItems() - if event == EVT_ENTER_BREAK then - if menu.editSelected == true then - -- confirm modified value - saveConfig() - end - menu.editSelected = not menu.editSelected - menu.updated = true - elseif menu.editSelected and (event == EVT_PLUS_BREAK or event == EVT_ROT_LEFT or event == EVT_PLUS_REPT) then - incMenuItem(menu.selectedItem) - elseif menu.editSelected and (event == EVT_MINUS_BREAK or event == EVT_ROT_RIGHT or event == EVT_MINUS_REPT) then - decMenuItem(menu.selectedItem) - elseif not menu.editSelected and (event == EVT_PLUS_BREAK or event == EVT_ROT_LEFT) then - menu.selectedItem = (menu.selectedItem - 1) - if menu.offset >= menu.selectedItem then - menu.offset = menu.offset - 1 - end - elseif not menu.editSelected and (event == EVT_MINUS_BREAK or event == EVT_ROT_RIGHT) then - menu.selectedItem = (menu.selectedItem + 1) - if menu.selectedItem - MENU_PAGESIZE > menu.offset then - menu.offset = menu.offset + 1 - end - end - --wrap - if menu.selectedItem > #menuItems then - menu.selectedItem = 1 - menu.offset = 0 - elseif menu.selectedItem < 1 then - menu.selectedItem = #menuItems - menu.offset = #menuItems - MENU_PAGESIZE - end - -- - for m=1+menu.offset,math.min(#menuItems,MENU_PAGESIZE+menu.offset) do - lcd.setColor(CUSTOM_COLOR,COLOR_TEXT) - lcd.drawText(2,MENU_Y + (m-menu.offset-1)*20, menuItems[m][1],CUSTOM_COLOR) - if m == menu.selectedItem then - if menu.editSelected then - drawItem(m,INVERS+BLINK) - else - drawItem(m,INVERS) - end - else - drawItem(m,0) - end - end -end - -#ifdef COMPILE -local function compileLayouts() - local files = { - "layout_1", "layout_2", "layout_map", - - "hud_1", - "right_1", - "left_1", "left_m2f_1", - - "hud_2", "hud_russian_2", "hud_small_2", - "right_2", "right_custom_2", - "left_2", "left_m2f_2", - } - - -- compile all layouts for all panes - for i=1,#files do - loadScript(libBasePath..files[i]..".lua","c") - end -end -#endif - --------------------------- --- RUN --------------------------- -local function run(event) - lcd.setColor(CUSTOM_COLOR, COLOR_BG) -- hex 0x084c7b -- 073f66 - lcd.clear(CUSTOM_COLOR) - --------------------- - -- CONFIG MENU - --------------------- - drawConfigMenu(event) - return 0 -end - -local function init() - loadConfig() -end - --------------------------------------------------------------------------------- --- SCRIPT END --------------------------------------------------------------------------------- -return {run=run, init=init, loadConfig=loadConfig, compileLayouts=compileLayouts, menuItems=menuItems} \ No newline at end of file diff --git a/HORUS/SOURCES/PP/yaapu.lua b/HORUS/SOURCES/PP/yaapu.lua deleted file mode 100644 index 18a06e38..00000000 --- a/HORUS/SOURCES/PP/yaapu.lua +++ /dev/null @@ -1,2317 +0,0 @@ -#include "includes/yaapu_inc.lua" - -local frameNames = {} --- copter -frameNames[0] = "GEN" -frameNames[2] = "QUAD" -frameNames[3] = "COAX" -frameNames[4] = "HELI" -frameNames[13] = "HEX" -frameNames[14] = "OCTO" -frameNames[15] = "TRI" -frameNames[29] = "DODE" --- plane -frameNames[1] = "WING" -frameNames[16] = "FLAP" -frameNames[19] = "VTOL2" -frameNames[20] = "VTOL4" -frameNames[20] = "VTOL4" -frameNames[21] = "VTOLT" -frameNames[22] = "VTOL" -frameNames[23] = "VTOL" -frameNames[24] = "VTOL" -frameNames[25] = "VTOL" -frameNames[28] = "FOIL" --- rover -frameNames[10] = "ROV" --- boat -frameNames[11] = "BOAT" - -local currentModel = nil -local frameTypes = {} -local frameType = nil - ---[[ - MAV_TYPE_GENERIC=0, /* Generic micro air vehicle. | */ - MAV_TYPE_FIXED_WING=1, /* Fixed wing aircraft. | */ - MAV_TYPE_QUADROTOR=2, /* Quadrotor | */ - MAV_TYPE_COAXIAL=3, /* Coaxial helicopter | */ - MAV_TYPE_HELICOPTER=4, /* Normal helicopter with tail rotor. | */ - MAV_TYPE_ANTENNA_TRACKER=5, /* Ground installation | */ - MAV_TYPE_GCS=6, /* Operator control unit / ground control station | */ - MAV_TYPE_AIRSHIP=7, /* Airship, controlled | */ - MAV_TYPE_FREE_BALLOON=8, /* Free balloon, uncontrolled | */ - MAV_TYPE_ROCKET=9, /* Rocket | */ - MAV_TYPE_GROUND_ROVER=10, /* Ground rover | */ - MAV_TYPE_SURFACE_BOAT=11, /* Surface vessel, boat, ship | */ - MAV_TYPE_SUBMARINE=12, /* Submarine | */ - MAV_TYPE_HEXAROTOR=13, /* Hexarotor | */ - MAV_TYPE_OCTOROTOR=14, /* Octorotor | */ - MAV_TYPE_TRICOPTER=15, /* Tricopter | */ - MAV_TYPE_FLAPPING_WING=16, /* Flapping wing | */ - MAV_TYPE_KITE=17, /* Kite | */ - MAV_TYPE_ONBOARD_CONTROLLER=18, /* Onboard companion controller | */ - MAV_TYPE_VTOL_DUOROTOR=19, /* Two-rotor VTOL using control surfaces in vertical operation in addition. Tailsitter. | */ - MAV_TYPE_VTOL_QUADROTOR=20, /* Quad-rotor VTOL using a V-shaped quad config in vertical operation. Tailsitter. | */ - MAV_TYPE_VTOL_TILTROTOR=21, /* Tiltrotor VTOL | */ - MAV_TYPE_VTOL_RESERVED2=22, /* VTOL reserved 2 | */ - MAV_TYPE_VTOL_RESERVED3=23, /* VTOL reserved 3 | */ - MAV_TYPE_VTOL_RESERVED4=24, /* VTOL reserved 4 | */ - MAV_TYPE_VTOL_RESERVED5=25, /* VTOL reserved 5 | */ - MAV_TYPE_GIMBAL=26, /* Onboard gimbal | */ - MAV_TYPE_ADSB=27, /* Onboard ADSB peripheral | */ - MAV_TYPE_PARAFOIL=28, /* Steerable, nonrigid airfoil | */ - MAV_TYPE_DODECAROTOR=29, /* Dodecarotor | */ -]]-- - --- copter -frameTypes[0] = "c" -frameTypes[2] = "c" -frameTypes[3] = "c" -frameTypes[4] = "c" -frameTypes[13] = "c" -frameTypes[14] = "c" -frameTypes[15] = "c" -frameTypes[29] = "c" --- plane -frameTypes[1] = "p" -frameTypes[16] = "p" -frameTypes[19] = "p" -frameTypes[20] = "p" -frameTypes[21] = "p" -frameTypes[22] = "p" -frameTypes[23] = "p" -frameTypes[24] = "p" -frameTypes[25] = "p" -frameTypes[28] = "p" --- rover -frameTypes[10] = "r" --- boat -frameTypes[11] = "b" - -#ifdef TESTMODE --- undefined -frameTypes[5] = "" -frameTypes[6] = "" -frameTypes[7] = "" -frameTypes[8] = "" -frameTypes[9] = "" -frameTypes[12] = "" -frameTypes[17] = "" -frameTypes[18] = "" -frameTypes[26] = "" -frameTypes[27] = "" -frameTypes[30] = "" -#endif --TESTMODE - -local soundFileBasePath = "/SOUNDS/yaapu0" -local gpsStatuses = {} - -gpsStatuses[0]="NoGPS" -gpsStatuses[1]="NoLock" -gpsStatuses[2]="2D" -gpsStatuses[3]="3D" -gpsStatuses[4]="DGPS" -gpsStatuses[5]="RTK" -gpsStatuses[6]="RTK" - ---[[ -0 MAV_SEVERITY_EMERGENCY System is unusable. This is a "panic" condition. -1 MAV_SEVERITY_ALERT Action should be taken immediately. Indicates error in non-critical systems. -2 MAV_SEVERITY_CRITICAL Action must be taken immediately. Indicates failure in a primary system. -3 MAV_SEVERITY_ERROR Indicates an error in secondary/redundant systems. -4 MAV_SEVERITY_WARNING Indicates about a possible future error if this is not resolved within a given timeframe. Example would be a low battery warning. -5 MAV_SEVERITY_NOTICE An unusual event has occured, though not an error condition. This should be investigated for the root cause. -6 MAV_SEVERITY_INFO Normal operational messages. Useful for logging. No action is required for these messages. -7 MAV_SEVERITY_DEBUG Useful non-operational messages that can assist in debugging. These should not occur during normal operation. ---]] - -local mavSeverity = {} -mavSeverity[0]="EMR" -mavSeverity[1]="ALR" -mavSeverity[2]="CRT" -mavSeverity[3]="ERR" -mavSeverity[4]="WRN" -mavSeverity[5]="NOT" -mavSeverity[6]="INF" -mavSeverity[7]="DBG" - ------------------------------- --- TELEMETRY DATA ------------------------------- -local telemetry = {} --- STATUS -telemetry.flightMode = 0 -telemetry.simpleMode = 0 -telemetry.landComplete = 0 -telemetry.statusArmed = 0 -telemetry.battFailsafe = 0 -telemetry.ekfFailsafe = 0 -telemetry.imuTemp = 0 --- GPS -telemetry.numSats = 0 -telemetry.gpsStatus = 0 -telemetry.gpsHdopC = 100 -telemetry.gpsAlt = 0 --- BATT 1 -telemetry.batt1volt = 0 -telemetry.batt1current = 0 -telemetry.batt1mah = 0 --- BATT 2 -telemetry.batt2volt = 0 -telemetry.batt2current = 0 -telemetry.batt2mah = 0 --- HOME -telemetry.homeDist = 0 -telemetry.homeAlt = 0 -telemetry.homeAngle = -1 --- VELANDYAW -telemetry.vSpeed = 0 -telemetry.hSpeed = 0 -telemetry.yaw = 0 --- ROLLPITCH -telemetry.roll = 0 -telemetry.pitch = 0 -telemetry.range = 0 --- PARAMS -telemetry.frameType = -1 -telemetry.batt1Capacity = 0 -telemetry.batt2Capacity = 0 --- GPS -telemetry.lat = nil -telemetry.lon = nil -telemetry.homeLat = nil -telemetry.homeLon = nil --- WP -telemetry.wpNumber = 0 -telemetry.wpDistance = 0 -telemetry.wpXTError = 0 -telemetry.wpBearing = 0 -telemetry.wpCommands = 0 --- RC channels -telemetry.rcchannels = {} --- VFR -telemetry.airspeed = 0 -telemetry.throttle = 0 -telemetry.baroAlt = 0 --- Total distance -telemetry.totalDist = 0 --------------------------------- --- STATUS DATA --------------------------------- -local status = {} --- FLVSS 1 -status.cell1min = 0 -status.cell1sum = 0 --- FLVSS 2 -status.cell2min = 0 -status.cell2sum = 0 --- FC 1 -status.cell1sumFC = 0 -status.cell1maxFC = 0 --- FC 2 -status.cell2sumFC = 0 -status.cell2maxFC = 0 --------------------------------- -status.cell1count = 0 -status.cell2count = 0 - -status.battsource = "na" - -status.batt1sources = { - vs = false, - fc = false -} -status.batt2sources = { - vs = false, - fc = false -} --- FLIGHT TIME -status.lastTimerStart = 0 -status.timerRunning = 0 -status.flightTime = 0 --- EVENTS -status.lastStatusArmed = 0 -status.lastGpsStatus = 0 -status.lastFlightMode = 0 -status.lastSimpleMode = 0 --- battery levels -status.batLevel = 99 -status.battLevel1 = false -status.battLevel2 = false -status.lastBattLevel = 14 --- MESSAGES -status.messages = {} -status.msgBuffer = "" -status.lastMsgValue = 0 -status.lastMsgTime = 0 -status.lastMessage = nil -status.lastMessageSeverity = 0 -status.lastMessageCount = 1 -status.messageCount = 0 --- LINK STATUS -status.noTelemetryData = 1 -status.hideNoTelemetry = false -status.showDualBattery = false -status.showMinMaxValues = false --- MAP -status.screenTogglePage = 1 -status.mapZoomLevel = 1 --- FLIGHTMODE -status.strFlightMode = nil -status.modelString = nil ---------------------------- --- BATTERY TABLE ---------------------------- -local battery = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0} ---------------------------- --- LIBRARY LOADING ---------------------------- -local basePath = "/SCRIPTS/YAAPU/" -local libBasePath = basePath.."LIB/" - --- loadable modules -local drawLibFile = "draw" -local menuLibFile = "menu" - -local frame = {} -local drawLib = {} -local utils = {} - -------------------------------- --- MAIN SCREEN LAYOUT -------------------------------- -local layout = nil -local centerPanel = nil -local rightPanel = nil -local leftPanel = nil -------------------------------- --- MP SCREEN LAYOUT -------------------------------- -local mapLayout = nil - -local customSensors = nil - -local backlightLastTime = 0 -local resetPending = false - -local alarms = { - --{ notified, alarm_start, armed, type(0=min,1=max,2=timer,3=batt), grace, ready, last_alarm} - { false, 0 , false, ALARM_TYPE_MIN, 0, false, 0}, --MIN_ALT - { false, 0 , false, ALARM_TYPE_MAX, 0, false, 0 }, --MAX_ALT - { false, 0 , false, ALARM_TYPE_MAX, 0, false, 0 }, --MAX_DIST - { false, 0 , true, ALARM_TYPE_MAX, 0, false, 0 }, --FS_EKF - { false, 0 , true, ALARM_TYPE_MAX, 0, false, 0 }, --FS_BAT - { false, 0 , true, ALARM_TYPE_TIMER, 0, false, 0 }, --FLIGTH_TIME - { false, 0 , false, ALARM_TYPE_BATT, ALARM_TYPE_BATT_GRACE, false, 0 }, --BATT L1 - { false, 0 , false, ALARM_TYPE_BATT_CRT, ALARM_TYPE_BATT_GRACE, false, 0 }, --BATT L2 - { false, 0 , false, ALARM_TYPE_MAX, 0, false, 0 } --MAX_HDOP -} - -local transitions = { - --{ last_value, last_changed, transition_done, delay } - { 0, 0, false, 30 }, -} - --- SYNTH GPS DIST SUPPORT -local prevDist = 0 -local lastSpeed = 0 -local lastYaw = 0 -local lastUpdateTotDist = 0 - -local paramId,paramValue - -local batLevels = {0,5,10,15,20,25,30,40,50,60,70,80,90} --- Blinking bitmap support -local bitmaps = {} -local blinktime = getTime() -local blinkon = false - -local minmaxValues = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0} - -#ifdef LOGTELEMETRY -local logfile -local logfilename -#endif --LOGTELEMETRY - -#ifdef TESTMODE --- TEST MODE -local thrOut = 0 -#endif --TESTMODE --- model and opentx version -local ver, radio, maj, minor, rev = getVersion() - -local opentx = tonumber(maj..minor..rev) --- widget selected page -local currentPage = 0 --------------------------------------------------------------------------------- --- CONFIGURATION MENU --------------------------------------------------------------------------------- -local conf = { - language = "en", - defaultBattSource = "na", -- auto - battAlertLevel1 = 0, - battAlertLevel2 = 0, - battCapOverride1 = 0, - battCapOverride2 = 0, - disableAllSounds = false, - disableMsgBeep = 1, - enableHaptic = false, - timerAlert = 0, - repeatAlertsPeriod = 10, - minAltitudeAlert = 0, - maxAltitudeAlert = 0, - maxDistanceAlert = 0, - battConf = BATTCONF_PARALLEL, -- 1=parallel,2=other - cell1Count = 0, - cell2Count = 0, - rangeMax=0, - horSpeedMultiplier=1, - vertSpeedMultiplier=1, - horSpeedLabel = "m/s", - vertSpeedLabel = "m/s", - maxHdopAlert = 2, - enablePX4Modes = false, - centerPanel = 1, - rightPanel = 1, - leftPanel = 1, - widgetLayout = 1, - widgetLayoutFilename = nil, - centerPanelFilename = nil, - rightPanelFilename = nil, - leftPanelFilename = nil, - mapType = "sat_tiles", - mapZoomLevel = -2, - enableMapGrid = true, - screenToggleChannelId = nil, - mapToggleChannelId = nil, -} - -------------------------- --- message hash support -------------------------- -local shortHashes = { - -- 16 bytes hashes - {554623408}, -- "554623408.wav", "Takeoff complete" - {3025044912}, -- "3025044912.wav", "SmartRTL deactiv" - {3956583920}, -- "3956583920.wav", "EKF2 IMU0 is usi" - {1309405592}, -- "1309405592.wav", "EKF3 IMU0 is usi" - {4091124880,true}, -- "4091124880.wav", "Reached command " - {3311875476,true}, -- "3311875476.wav", "Reached waypoint" - {1997782032,true}, -- "1997782032.wav", "Passed waypoint " -} - -local shortHash = nil -local parseShortHash = false -local hashByteIndex = 0 -local hash = 2166136261 - -local loadCycle = 0 - -utils.doLibrary = function(filename) -#ifdef LOADSCRIPT - local f = assert(loadScript(libBasePath..filename..".lua")) -#else -#ifdef LOAD_LUA - local f = assert(loadfile(libBasePath..filename..".lua")) -#else - local f = assert(loadfile(libBasePath..filename..".luac")) -#endif -#endif - collectgarbage() - collectgarbage() - return f() -end ------------------------------ --- clears the loaded table --- and recovers memory ------------------------------ -utils.clearTable = function(t) - if type(t)=="table" then - for i,v in pairs(t) do - if type(v) == "table" then - utils.clearTable(v) - end - t[i] = nil - end - end - t = nil - collectgarbage() - collectgarbage() - maxmem = 0 -end - -local function loadConfig() - -- load menu library - menuLib = loadMenuLib() - menuLib.loadConfig(conf) -#ifdef COMPILE - menuLib.compileLayouts() -#endif - -- ok configuration loaded - status.battsource = conf.defaultBattSource - -- unload libraries - utils.clearTable(menuLib) - utils.clearTable(layout) - layout = nil - utils.clearTable(centerPanel) - centerPanel = nil - utils.clearTable(rightPanel) - rightPanel = nil - utils.clearTable(leftPanel) - leftPanel = nil - utils.clearTable(mapLayout) - mapLayout = nil - collectgarbage() - collectgarbage() -end - -utils.getBitmap = function(name) - if bitmaps[name] == nil then - bitmaps[name] = Bitmap.open("/SCRIPTS/YAAPU/IMAGES/"..name..".png") - end - return bitmaps[name],Bitmap.getSize(bitmaps[name]) -end - -utils.unloadBitmap = function(name) - if bitmaps[name] ~= nil then - bitmaps[name] = nil - -- force call to luaDestroyBitmap() - collectgarbage() - collectgarbage() - end -end - -utils.lcdBacklightOn = function() - model.setGlobalVariable(BACKLIGHT_GV,0,1) - backlightLastTime = getTime()/100 -- seconds -end - -utils.playSound = function(soundFile,skipHaptic) - if conf.enableHaptic and skipHaptic == nil then - playHaptic(15,0) - end - if conf.disableAllSounds then - return - end - utils.lcdBacklightOn() - playFile(soundFileBasePath .."/"..conf.language.."/".. soundFile..".wav") -end - ----------------------------------------------- --- sound file has same name as flightmode all lowercase with .wav extension ----------------------------------------------- -utils.playSoundByFlightMode = function(flightMode) - if conf.enableHaptic then - playHaptic(15,0) - end - if conf.disableAllSounds then - return - end - if frame.flightModes then - if frame.flightModes[flightMode] ~= nil then - utils.lcdBacklightOn() - -- rover sound files differ because they lack "flight" word - playFile(soundFileBasePath.."/"..conf.language.."/".. string.lower(frame.flightModes[flightMode]) .. ((frameTypes[telemetry.frameType]=="r" or frameTypes[telemetry.frameType]=="b") and "_r.wav" or ".wav")) - end - end -end - -#ifdef LOGTELEMETRY -local function getLogFilename(date) - local info = model.getInfo() - local modelName = string.lower(string.gsub(info.name, "[%c%p%s%z]", "")) - return string.format("/LOGS/%s-%04d%02d%02d_%02d%02d%02d.plog",modelName,date.year,date.mon,date.day,date.hour,date.min,date.sec) -end -#endif --LOGTELEMETRY - -#define MAX_MESSAGES 20 - -local function formatMessage(severity,msg) - local clippedMsg = msg - - if #msg > 50 then - clippedMsg = string.sub(msg,1,50) - msg = nil - collectgarbage() - collectgarbage() - end - - if status.lastMessageCount > 1 then - return string.format("%02d:%s (x%d) %s", status.messageCount, mavSeverity[severity], status.lastMessageCount, clippedMsg) - else - return string.format("%02d:%s %s", status.messageCount, mavSeverity[severity], clippedMsg) - end -end - -utils.pushMessage = function(severity, msg) - if conf.enableHaptic then - playHaptic(15,0) - end - if conf.disableAllSounds == false then - if ( severity < 5 and conf.disableMsgBeep < 3) then - utils.playSound("../err",true) - else - if conf.disableMsgBeep < 2 then - utils.playSound("../inf",true) - end - end - end - - if msg == status.lastMessage then - status.lastMessageCount = status.lastMessageCount + 1 - else - status.lastMessageCount = 1 - status.messageCount = status.messageCount + 1 - end - if status.messages[(status.messageCount-1) % MAX_MESSAGES] == nil then - status.messages[(status.messageCount-1) % MAX_MESSAGES] = {} - end - status.messages[(status.messageCount-1) % MAX_MESSAGES][1] = formatMessage(severity,msg) - status.messages[(status.messageCount-1) % MAX_MESSAGES][2] = severity - - status.lastMessage = msg - status.lastMessageSeverity = severity - -- Collect Garbage - collectgarbage() - collectgarbage() -end - -#ifdef HAVERSINE -utils.haversine = function(lat1, lon1, lat2, lon2) - lat1 = lat1 * math.pi / 180 - lon1 = lon1 * math.pi / 180 - lat2 = lat2 * math.pi / 180 - lon2 = lon2 * math.pi / 180 - - lat_dist = lat2-lat1 - lon_dist = lon2-lon1 - lat_hsin = math.pow(math.sin(lat_dist/2),2) - lon_hsin = math.pow(math.sin(lon_dist/2),2) - - a = lat_hsin + math.cos(lat1) * math.cos(lat2) * lon_hsin - return 2 * 6372.8 * math.asin(math.sqrt(a)) * 1000 -end -#endif --HAVERSINE - -utils.getHomeFromAngleAndDistance = function(telemetry) ---[[ - la1,lo1 coordinates of first point - d be distance (m), - R as radius of Earth (m), - Ad be the angular distance i.e d/R and - θ be the bearing in deg - - la2 = asin(sin la1 * cos Ad + cos la1 * sin Ad * cos θ), and - lo2 = lo1 + atan2(sin θ * sin Ad * cos la1 , cos Ad – sin la1 * sin la2) ---]] - if telemetry.lat == nil or telemetry.lon == nil then - return nil,nil - end - - local lat1 = math.rad(telemetry.lat) - local lon1 = math.rad(telemetry.lon) - local Ad = telemetry.homeDist/(6371000) --meters - local lat2 = math.asin( math.sin(lat1) * math.cos(Ad) + math.cos(lat1) * math.sin(Ad) * math.cos( math.rad(telemetry.homeAngle)) ) - local lon2 = lon1 + math.atan2( math.sin( math.rad(telemetry.homeAngle) ) * math.sin(Ad) * math.cos(lat1) , math.cos(Ad) - math.sin(lat1) * math.sin(lat2)) - return math.deg(lat2), math.deg(lon2) -end - - -utils.decToDMS = function(dec,lat) - local D = math.floor(math.abs(dec)) - local M = (math.abs(dec) - D)*60 - local S = (math.abs((math.abs(dec) - D)*60) - M)*60 - return D .. string.format("\64%04.2f", M) .. (lat and (dec >= 0 and "E" or "W") or (dec >= 0 and "N" or "S")) -end - -utils.decToDMSFull = function(dec,lat) - local D = math.floor(math.abs(dec)) - local M = math.floor((math.abs(dec) - D)*60) - local S = (math.abs((math.abs(dec) - D)*60) - M)*60 - return D .. string.format("\64%d'%04.1f", M, S) .. (lat and (dec >= 0 and "E" or "W") or (dec >= 0 and "N" or "S")) -end - -utils.updateTotalDist = function() - if telemetry.armingStatus == 0 then - lastUpdateTotDist = getTime() - return - end - local delta = getTime() - lastUpdateTotDist - local avgSpeed = (telemetry.hSpeed + lastSpeed)/2 - lastUpdateTotDist = getTime() - lastSpeed = telemetry.hSpeed - if avgSpeed * 0.1 > 1 then - telemetry.totalDist = telemetry.totalDist + (avgSpeed * 0.1 * delta * 0.01) --hSpeed dm/s, getTime()/100 secs - end -end - -utils.drawBlinkBitmap = function(bitmap,x,y) - if blinkon == true then - lcd.drawBitmap(utils.getBitmap(bitmap),x,y) - end -end - -local function getSensorsConfigFilename() - local info = model.getInfo() - return "/SCRIPTS/YAAPU/CFG/" .. string.lower(string.gsub(info.name, "[%c%p%s%z]", "").."_sensors.lua") -end - --------------------------- --- CUSTOM SENSORS SUPPORT --------------------------- -#define SENSOR_LABEL 1 -#define SENSOR_NAME 2 -#define SENSOR_PREC 3 -#define SENSOR_UNIT 4 -#define SENSOR_MULT 5 -#define SENSOR_MAX 6 -#define SENSOR_FONT 7 -#define SENSOR_WARN 8 -#define SENSOR_CRIT 9 - -utils.loadCustomSensors = function() - local success, sensorScript = pcall(loadScript,getSensorsConfigFilename()) - if success then - if sensorScript == nil then - customSensors = nil - return - end - collectgarbage() - customSensors = sensorScript() - -- handle nil values for warning and critical levels - for i=1,6 - do - if customSensors.sensors[i] ~= nil then - local sign = customSensors.sensors[i][SENSOR_MAX] == "+" and 1 or -1 - if customSensors.sensors[i][SENSOR_CRIT] == nil then - customSensors.sensors[i][SENSOR_CRIT] = math.huge*sign - end - if customSensors.sensors[i][SENSOR_WARN] == nil then - customSensors.sensors[i][SENSOR_WARN] = math.huge*sign - end - end - end - collectgarbage() - collectgarbage() - else - customSensors = nil - end -end - -local function startTimer() - status.lastTimerStart = getTime()/100 - model.setTimer(2,{mode=1}) -end - -local function stopTimer() - model.setTimer(2,{mode=0}) - status.lastTimerStart = 0 -end - -#ifdef TESTMODE ------------------------------------------------------ --- TEST MODE ------------------------------------------------------ -local function symTimer() - thrOut = getValue("thr") - if (thrOut > 0 ) then - telemetry.landComplete = 1 - else - telemetry.landComplete = 0 - end -end - -local function symGPS() - thrOut = getValue("thr") - if thrOut > 500 then - telemetry.numSats = 15 - telemetry.gpsStatus = 4 - telemetry.gpsHdopC = 6 - telemetry.ekfFailsafe = 0 - telemetry.battFailsafe = 0 - status.noTelemetryData = 0 - telemetry.statusArmed = 1 - elseif thrOut > 200 then - telemetry.numSats = 12 - telemetry.gpsStatus = 3 - telemetry.gpsHdopC = 25 - telemetry.ekfFailsafe = 0 - telemetry.battFailsafe = 1 - status.noTelemetryData = 0 - telemetry.statusArmed = 1 - elseif thrOut < 200 and thrOut > 0 then - status.vnumSats = 13 - telemetry.gpsStatus = 5 - telemetry.gpsHdopC = 1000 - telemetry.ekfFailsafe = 1 - telemetry.battFailsafe = 0 - status.noTelemetryData = 0 - telemetry.statusArmed = 1 - elseif thrOut > -500 then - telemetry.numSats = 6 - telemetry.gpsStatus = 1 - telemetry.gpsHdopC = 120 - telemetry.ekfFailsafe = 0 - telemetry.battFailsafe = 0 - status.noTelemetryData = 0 - telemetry.statusArmed = 0 - else - telemetry.numSats = 0 - telemetry.gpsStatus = 0 - telemetry.gpsHdopC = 100 - telemetry.ekfFailsafe = 0 - telemetry.battFailsafe = 0 - status.noTelemetryData = 1 - telemetry.statusArmed = 0 - end -end - -local function symFrameType() - local ch11 = getValue("ch11") - if ch11 < -300 then - telemetry.frameType = 2 - elseif ch11 < 300 then - telemetry.frameType = 1 - else - telemetry.frameType = 10 - end -end - -local function symBatt() - thrOut = getValue("thr") - if (thrOut > -500 ) then -#ifdef DEMO - if telemetry.battFailsafe == 1 then - minmaxValues[MIN_BATT1_FC] = CELLCOUNT * 3.40 * 10 - minmaxValues[MIN_BATT2_FC] = CELLCOUNT * 3.43 * 10 - minmaxValues[MAX_CURR] = 341 + 335 - minmaxValues[MAX_CURR1] = 341 - minmaxValues[MAX_CURR2] = 335 - minmaxValues[MAX_POWER] = (CELLCOUNT * 3.43)*(34.1 + 33.5) - -- battery voltage - telemetry.batt1current = 235 - telemetry.batt1volt = CELLCOUNT * 3.43 * 10 - telemetry.batt1Capacity = 5200 - telemetry.batt1mah = 4400 -#ifdef BATT2TEST - telemetry.batt2current = 238 - telemetry.batt2volt = CELLCOUNT * 3.44 * 10 - telemetry.batt2Capacity = 5200 - telemetry.batt2mah = 4500 -#endif --BATT2TEST - else - minmaxValues[MIN_BATT1_FC] = CELLCOUNT * 3.75 * 10 - minmaxValues[MIN_BATT2_FC] = CELLCOUNT * 3.77 * 10 - minmaxValues[MAX_CURR] = 341+335 - minmaxValues[MAX_CURR1] = 341 - minmaxValues[MAX_CURR2] = 335 - minmaxValues[MAX_POWER] = (CELLCOUNT * 3.89)*(34.1+33.5) - -- battery voltage - telemetry.batt1current = 235 - telemetry.batt1volt = CELLCOUNT * 3.87 * 10 - telemetry.batt1Capacity = 5200 - telemetry.batt1mah = 2800 -#ifdef BATT2TEST - telemetry.batt2current = 238 - telemetry.batt2volt = CELLCOUNT * 3.89 * 10 - telemetry.batt2Capacity = 5200 - telemetry.batt2mah = 2700 -#endif --BATT2TEST - end -#else --DEMO - -- battery voltage - telemetry.batt1current = 100 + ((thrOut)*0.01 * 30) - telemetry.batt1volt = CELLCOUNT * (32 + 10*math.abs(thrOut)*0.001) - telemetry.batt1Capacity = 5200 - telemetry.batt1mah = math.abs(1000*(thrOut/200)) -#ifdef BATT2TEST - telemetry.batt2current = 100 + ((thrOut)*0.01 * 30) - telemetry.batt2volt = CELLCOUNT * (32 + 10*math.abs(thrOut)*0.001) - telemetry.batt2Capacity = 5200 - telemetry.batt2mah = math.abs(1000*(thrOut/200)) -#endif --BATT2TEST -#endif --DEMO - -- flightmode -#ifdef DEMO - telemetry.flightMode = 1 - minmaxValues[MAX_GPSALT] = 270*0.1 - minmaxValues[MAX_DIST] = 130 - telemetry.gpsAlt = 200 - telemetry.homeDist = 95 -#else --DEMO - telemetry.flightMode = math.floor(20 * math.abs(thrOut)*0.001) - telemetry.gpsAlt = math.floor(10 * math.abs(thrOut)*0.1) - telemetry.homeDist = math.floor(10 * math.abs(thrOut)*0.1) -#endif --DEMO - else - telemetry.batt1mah = 0 - end -#ifdef NOCURRENT - minmaxValues[MAX_CURR] = 0 - minmaxValues[MAX_CURR1] = 0 - minmaxValues[MAX_CURR2] = 0 - minmaxValues[MAX_POWER] = 0 - -- battery voltage - telemetry.batt1current = 0 - telemetry.batt1Capacity = 5200 - telemetry.batt1mah = 0 -#ifdef BATT2TEST - telemetry.batt2current = 0 - telemetry.batt2Capacity = 5200 - telemetry.batt2mah = 0 -#endif --BATT2TEST -#endif --NOCURRENT -end - --- simulates attitude by using channel 1 for roll, channel 2 for pitch and channel 4 for yaw -local function symAttitude() -#ifdef DEMO - telemetry.roll = 14 - telemetry.pitch = -0.8 - telemetry.yaw = 33 -#else --DEMO - local rollCh = 0 - local pitchCh = 0 - local yawCh = 0 - -- roll [-1024,1024] ==> [-180,180] - rollCh = getValue("ch1") * 0.088 * 2 - -- clipping - rollCH = rollCh > 0 and math.min(rollCh,180) or math.max(rollCh,-180) - -- pitch [1024,-1024] ==> [-90,90] - pitchCh = getValue("ch2") * 0.088 -- -90<-->90) - -- clipping - pitchCh = pitchCh > 0 and math.min(pitchCh,90) or math.max(pitchCh,-90) - -- yaw [-1024,1024] ==> [0,360] - yawCh = getValue("ch10") - if ( yawCh >= 0) then - yawCh = yawCh * 0.175 - else - yawCh = 360 + (yawCh * 0.175) - end - telemetry.roll = rollCh - telemetry.pitch = pitchCh - telemetry.yaw = yawCh -#endif --DEMO -end - -local function symHome() - local yawCh = 0 - local S2Ch = 0 - -- home angle in deg [0-360] - S2Ch = getValue("ch12") - yawCh = getValue("ch4") -#ifdef DEMO - minmaxValues[MINMAX_ALT] = 45 - minmaxValues[MAX_VSPEED] = 4 - minmaxValues[MAX_HSPEED] = 77 - telemetry.homeAlt = 24 - telemetry.vSpeed = 24 - telemetry.hSpeed = 34 -#else --DEMO - telemetry.homeAlt = yawCh * 0.1 - telemetry.range = 10 * yawCh * 0.1 - telemetry.vSpeed = yawCh * 0.1 - telemetry.hSpeed = telemetry.vSpeed - telemetry.throttle = math.abs(yawCh/10) -#endif --DEMO - if ( yawCh >= 0) then - yawCh = yawCh * 0.175 - else - yawCh = 360 + (yawCh * 0.175) - end - telemetry.yaw = yawCh - if ( S2Ch >= 0) then - S2Ch = S2Ch * 0.175 - else - S2Ch = 360 + (S2Ch * 0.175) - end - if (thrOut > 0 ) then - telemetry.homeAngle = S2Ch - else - telemetry.homeAngle = -1 - end - telemetry.wpNumber = math.min(telemetry.homeDist,1023) - telemetry.wpDistance = telemetry.homeDist - telemetry.totalDist = telemetry.homeDist * 100 - telemetry.wpBearing = (telemetry.yaw / 45) % 8 -end - -local function symMode() - symGPS() - symAttitude() - symTimer() - symHome() - symBatt() - symFrameType() -end -#endif --TESTMODE - ------------------------------------------------------------------ --- TELEMETRY ------------------------------------------------------------------ -#ifdef LOGTELEMETRY -local lastAttiLogTime = 0 -#endif --LOGTELEMETRY - -local function processTelemetry(DATA_ID,VALUE) - if DATA_ID == 0x5006 then -- ROLLPITCH - -- roll [0,1800] ==> [-180,180] - telemetry.roll = (math.min(bit32.extract(VALUE,0,11),1800) - 900) * 0.2 - -- pitch [0,900] ==> [-90,90] - telemetry.pitch = (math.min(bit32.extract(VALUE,11,10),900) - 450) * 0.2 - -- number encoded on 11 bits: 10 bits for digits + 1 for 10^power - telemetry.range = bit32.extract(VALUE,22,10) * (10^bit32.extract(VALUE,21,1)) -- cm - elseif DATA_ID == 0x5005 then -- VELANDYAW - telemetry.vSpeed = bit32.extract(VALUE,1,7) * (10^bit32.extract(VALUE,0,1)) * (bit32.extract(VALUE,8,1) == 1 and -1 or 1)-- dm/s - telemetry.hSpeed = bit32.extract(VALUE,10,7) * (10^bit32.extract(VALUE,9,1)) -- dm/s - telemetry.yaw = bit32.extract(VALUE,17,11) * 0.2 - elseif DATA_ID == 0x5001 then -- AP STATUS - telemetry.flightMode = bit32.extract(VALUE,0,5) - telemetry.simpleMode = bit32.extract(VALUE,5,2) - telemetry.landComplete = bit32.extract(VALUE,7,1) - telemetry.statusArmed = bit32.extract(VALUE,8,1) - telemetry.battFailsafe = bit32.extract(VALUE,9,1) - telemetry.ekfFailsafe = bit32.extract(VALUE,10,2) - -- IMU temperature: 0 means temp =< 19°, 63 means temp => 82° - telemetry.imuTemp = bit32.extract(VALUE,26,6) + 19 -- C° - elseif DATA_ID == 0x5002 then -- GPS STATUS - telemetry.numSats = bit32.extract(VALUE,0,4) - -- offset 4: NO_GPS = 0, NO_FIX = 1, GPS_OK_FIX_2D = 2, GPS_OK_FIX_3D or GPS_OK_FIX_3D_DGPS or GPS_OK_FIX_3D_RTK_FLOAT or GPS_OK_FIX_3D_RTK_FIXED = 3 - -- offset 14: 0: no advanced fix, 1: GPS_OK_FIX_3D_DGPS, 2: GPS_OK_FIX_3D_RTK_FLOAT, 3: GPS_OK_FIX_3D_RTK_FIXED - telemetry.gpsStatus = bit32.extract(VALUE,4,2) + bit32.extract(VALUE,14,2) - telemetry.gpsHdopC = bit32.extract(VALUE,7,7) * (10^bit32.extract(VALUE,6,1)) -- dm - telemetry.gpsAlt = bit32.extract(VALUE,24,7) * (10^bit32.extract(VALUE,22,2)) * (bit32.extract(VALUE,31,1) == 1 and -1 or 1)-- dm - elseif DATA_ID == 0x5003 then -- BATT - telemetry.batt1volt = bit32.extract(VALUE,0,9) - -- telemetry max is 51.1V, 51.2 is reported as 0.0, 52.3 is 0.1...60 is 88 - -- if 12S and V > 51.1 ==> Vreal = 51.2 + telemetry.batt1volt - if conf.cell1Count == 12 and telemetry.batt1volt < 240 then - -- assume a 2Vx12 as minimum acceptable "real" voltage - telemetry.batt1volt = 512 + telemetry.batt1volt - end - telemetry.batt1current = bit32.extract(VALUE,10,7) * (10^bit32.extract(VALUE,9,1)) - telemetry.batt1mah = bit32.extract(VALUE,17,15) -#ifdef BATT2TEST - telemetry.batt2volt = bit32.extract(VALUE,0,9) - -- telemetry max is 51.1V, 51.2 is reported as 0.0, 52.3 is 0.1...60 is 88 - -- if 12S and V > 51.1 ==> Vreal = 51.2 + telemetry.batt1volt - if conf.cell2Count == 12 and telemetry.batt2volt < 240 then - -- assume a 2Vx12 as minimum acceptable "real" voltage - telemetry.batt2volt = 512 + telemetry.batt2volt - end - telemetry.batt2current = bit32.extract(VALUE,10,7) * (10^bit32.extract(VALUE,9,1)) - telemetry.batt2mah = bit32.extract(VALUE,17,15) -#endif --BATT2TEST - elseif DATA_ID == 0x5008 then -- BATT2 - telemetry.batt2volt = bit32.extract(VALUE,0,9) - -- telemetry max is 51.1V, 51.2 is reported as 0.0, 52.3 is 0.1...60 is 88 - -- if 12S and V > 51.1 ==> Vreal = 51.2 + telemetry.batt1volt - if conf.cell2Count == 12 and telemetry.batt2volt < 240 then - -- assume a 2Vx12 as minimum acceptable "real" voltage - telemetry.batt2volt = 512 + telemetry.batt2volt - end - telemetry.batt2current = bit32.extract(VALUE,10,7) * (10^bit32.extract(VALUE,9,1)) - telemetry.batt2mah = bit32.extract(VALUE,17,15) - elseif DATA_ID == 0x5004 then -- HOME - telemetry.homeDist = bit32.extract(VALUE,2,10) * (10^bit32.extract(VALUE,0,2)) - telemetry.homeAlt = bit32.extract(VALUE,14,10) * (10^bit32.extract(VALUE,12,2)) * 0.1 * (bit32.extract(VALUE,24,1) == 1 and -1 or 1) - telemetry.homeAngle = bit32.extract(VALUE, 25, 7) * 3 - elseif DATA_ID == 0x5000 then -- MESSAGES - if VALUE ~= status.lastMsgValue then - status.lastMsgValue = VALUE - local c - local msgEnd = false - for i=3,0,-1 - do - c = bit32.extract(VALUE,i*8,7) - if c ~= 0 then - status.msgBuffer = status.msgBuffer .. string.char(c) - collectgarbage() - collectgarbage() - hash = bit32.bxor(hash, c) - hash = (hash * 16777619) % 2^32 - hashByteIndex = hashByteIndex+1 - -- check if this hash matches any 16bytes prefix hash - if hashByteIndex == 16 then - for i=1,#shortHashes - do - if hash == shortHashes[i][1] then - shortHash = hash - -- check if needs parsing - parseShortHash = shortHashes[i][2] == nil and false or true - break; - end - end - end - else - msgEnd = true; - break; - end - end - if msgEnd then - local severity = (bit32.extract(VALUE,7,1) * 1) + (bit32.extract(VALUE,15,1) * 2) + (bit32.extract(VALUE,23,1) * 4) -#ifdef HASHDEBUG - utils.pushMessage( severity, (shortHash == nil and "H:" or "SH:") .. tostring(shortHash == nil and hash or shortHash) .. " "..status.msgBuffer) -#else - utils.pushMessage( severity, status.msgBuffer) -#endif - -- try to play the hash sound file without checking - -- for existence, OpenTX will gracefully ignore it :-) - utils.playSound(tostring(shortHash == nil and hash or shortHash),true) - -- if required parse parameter and play it! - if parseShortHash then - local param = string.match(status.msgBuffer, ".*#(%d+).*") - collectgarbage() - if param ~= nil then - playNumber(tonumber(param),0) - collectgarbage() - end - end - -- reset hash for next string - parseShortHash = false - shortHash = nil - hash = 2166136261 - hashByteIndex = 0 - status.msgBuffer = nil - -- recover memory - collectgarbage() - collectgarbage() - status.msgBuffer = "" - end - end - elseif DATA_ID == 0x5007 then -- PARAMS - paramId = bit32.extract(VALUE,24,4) - paramValue = bit32.extract(VALUE,0,24) - if paramId == 1 then - telemetry.frameType = paramValue - elseif paramId == 4 then - telemetry.batt1Capacity = paramValue -#ifdef BATT2TEST - telemetry.batt2Capacity = paramValue -#endif --BATT2TEST - elseif paramId == 5 then - telemetry.batt2Capacity = paramValue - elseif paramId == 6 then - telemetry.wpCommands = paramValue - end - elseif DATA_ID == 0x5009 then -- WAYPOINTS @1Hz - telemetry.wpNumber = bit32.extract(VALUE,0,10) -- wp index - telemetry.wpDistance = bit32.extract(VALUE,12,10) * (10^bit32.extract(VALUE,10,2)) -- meters - telemetry.wpXTError = bit32.extract(VALUE,23,4) * (10^bit32.extract(VALUE,22,1)) * (bit32.extract(VALUE,27,1) == 1 and -1 or 1)-- meters - telemetry.wpBearing = bit32.extract(VALUE,29,3) -- offset from cog with 45° resolution - --[[ - elseif DATA_ID == 0x50F1 then -- RC CHANNELS - -- channels 1 - 32 - local offset = bit32.extract(VALUE,0,4) * 4 - rcchannels[1 + offset] = 100 * (bit32.extract(VALUE,4,6)/63) * (bit32.extract(VALUE,10,1) == 1 and -1 or 1) - rcchannels[2 + offset] = 100 * (bit32.extract(VALUE,11,6)/63) * (bit32.extract(VALUE,17,1) == 1 and -1 or 1) - rcchannels[3 + offset] = 100 * (bit32.extract(VALUE,18,6)/63) * (bit32.extract(VALUE,24,1) == 1 and -1 or 1) - rcchannels[4 + offset] = 100 * (bit32.extract(VALUE,25,6)/63) * (bit32.extract(VALUE,31,1) == 1 and -1 or 1) - --]] - elseif DATA_ID == 0x50F2 then -- VFR - telemetry.airspeed = bit32.extract(VALUE,1,7) * (10^bit32.extract(VALUE,0,1)) -- dm/s - telemetry.throttle = bit32.extract(VALUE,8,7) - telemetry.baroAlt = bit32.extract(VALUE,17,10) * (10^bit32.extract(VALUE,15,2)) * 0.1 * (bit32.extract(VALUE,27,1) == 1 and -1 or 1) - end -end - -#ifdef TESTMODE -local function telemetryEnabled(status) - return true -end -#else --TESTMODE -local function telemetryEnabled() - if getRSSI() == 0 then - status.noTelemetryData = 1 - end - return status.noTelemetryData == 0 -end -#endif --TESTMODE - -utils.getMaxValue = function(value,idx) - minmaxValues[idx] = math.max(value,minmaxValues[idx]) - return status.showMinMaxValues == true and minmaxValues[idx] or value -end - -local function calcMinValue(value,min) - return min == 0 and value or math.min(value,min) -end - --- returns the actual minimun only if both are > 0 -local function getNonZeroMin(v1,v2) - return v1 == 0 and v2 or ( v2 == 0 and v1 or math.min(v1,v2)) -end - -local function calcCellCount() - -- cellcount override from menu - local c1 = 0 - local c2 = 0 - - if conf.cell1Count ~= nil and conf.cell1Count > 0 then - c1 = conf.cell1Count - elseif status.batt1sources.vs == true and status.cell1count > 1 then - c1 = status.cell1count - else - c1 = math.floor( ((status.cell1maxFC*0.1) / CELLFULL) + 1) - end - - if conf.cell2Count ~= nil and conf.cell2Count > 0 then - c2 = conf.cell2Count - elseif status.batt2sources.vs == true and status.cell2count > 1 then - c2 = status.cell2count - else - c2 = math.floor(((status.cell2maxFC*0.1)/CELLFULL) + 1) - end - - return c1,c2 -end - -local function getBatt1Capacity() - return conf.battCapOverride1 > 0 and conf.battCapOverride1*10 or telemetry.batt1Capacity -end - -local function getBatt2Capacity() - -- this is a fix for passthrough telemetry reporting batt2 capacity > 0 even if BATT2_MONITOR = 0 - return conf.battCapOverride2 > 0 and conf.battCapOverride2*10 or ( status.batt2sources.fc and telemetry.batt2Capacity or 0 ) -end - --- gets the voltage based on source and min value, battId = [1|2] -local function getMinVoltageBySource(source, cell, cellFC, battId) - -- offset 0 for cell voltage, 2 for pack voltage - local offset = 0 - -- - if cell > CELLFULL*2 or cellFC > CELLFULL*2 then - offset = 2 - end - -- - if source == "vs" then - return status.showMinMaxValues == true and minmaxValues[2+offset+battId] or cell - elseif source == "fc" then - -- FC only tracks batt1 and batt2 no cell voltage tracking - local minmax = (offset == 2 and minmaxValues[battId] or minmaxValues[battId]/calcCellCount()) - return status.showMinMaxValues == true and minmax or cellFC - end - -- - return 0 -end - -local function calcFLVSSBatt(battIdx) - local cellMin,cellSum,cellCount - local battSources = battIdx == 1 and status.batt1sources or status.batt2sources - -#ifdef FLVSS2TEST - local cellResult = battIdx == 1 and getValue("Cels") or getValue("Cels") -#else - local cellResult = battIdx == 1 and getValue("Cels") or getValue("Cel2") -#endif - - if type(cellResult) == "table" then - cellMin = CELLFULL - cellSum = 0 - -- cellcount is global and shared - cellCount = #cellResult - for i, v in pairs(cellResult) do - cellSum = cellSum + v - if cellMin > v then - cellMin = v - end - end - -- if connected after scritp started - if battSources.vs == false then - status.battsource = "na" - end - if status.battsource == "na" then - status.battsource = "vs" - end - battSources.vs = true - else - battSources.vs = false - cellMin = 0 - cellSum = 0 - end - return cellMin,cellSum,cellCount -end - -local function calcBattery() - ------------ - -- FLVSS 1 - ------------ - status.cell1min, status.cell1sum, status.cell1count = calcFLVSSBatt(1) --1 = Cels - - ------------ - -- FLVSS 2 - ------------ - status.cell2min, status.cell2sum, status.cell2count = calcFLVSSBatt(2) --2 = Cel2 - - -------------------------------- - -- flight controller battery 1 - -------------------------------- - if telemetry.batt1volt > 0 then - status.cell1sumFC = telemetry.batt1volt*0.1 - status.cell1maxFC = math.max(telemetry.batt1volt,status.cell1maxFC) - if status.battsource == "na" then - status.battsource = "fc" - end - status.batt1sources.fc = true - else - status.batt1sources.fc = false - status.cell1sumFC = 0 - end - -------------------------------- - -- flight controller battery 2 - -------------------------------- - if telemetry.batt2volt > 0 then - status.cell2sumFC = telemetry.batt2volt*0.1 - status.cell2maxFC = math.max(telemetry.batt2volt,status.cell2maxFC) - if status.battsource == "na" then - status.battsource = "fc" - end - status.batt2sources.fc = true - else - status.batt2sources.fc = false - status.cell2sumFC = 0 - end - -- batt fc - minmaxValues[MIN_BATT1_FC] = calcMinValue(status.cell1sumFC,minmaxValues[MIN_BATT1_FC]) - minmaxValues[MIN_BATT2_FC] = calcMinValue(status.cell2sumFC,minmaxValues[MIN_BATT2_FC]) - -- cell flvss - minmaxValues[MIN_CELL1_VS] = calcMinValue(status.cell1min,minmaxValues[MIN_CELL1_VS]) - minmaxValues[MIN_CELL2_VS] = calcMinValue(status.cell2min,minmaxValues[MIN_CELL2_VS]) - -- batt flvss - minmaxValues[MIN_BATT1_VS] = calcMinValue(status.cell1sum,minmaxValues[MIN_BATT1_VS]) - minmaxValues[MIN_BATT2_VS] = calcMinValue(status.cell2sum,minmaxValues[MIN_BATT2_VS]) - -- - ------------------------------------------ - -- table to pass battery info to panes - -- offsets are: 1 celm, 4 batt, 7 curr, 10 mah, 13 cap, indexing starts at 1 - -- value = offset + [0 aggregate|1 for batt 1| 2 for batt2] - -- batt2 = 4 + 2 = 6 - ------------------------------------------ - -- Note: these can be calculated. not necessary to track them as min/max - -- cell1minFC = cell1sumFC/calcCellCount() - -- cell2minFC = cell2sumFC/calcCellCount() - -- cell1minA2 = cell1sumA2/calcCellCount() - -- - local count1,count2 = calcCellCount() - - battery[BATT_CELL+1] = getMinVoltageBySource(status.battsource, status.cell1min, status.cell1sumFC/count1, 1)*100 --cel1m - battery[BATT_CELL+2] = getMinVoltageBySource(status.battsource, status.cell2min, status.cell2sumFC/count2, 2)*100 --cel2m - battery[BATT_CELL] = (conf.battConf == BATTCONF_OTHER and battery[2] or getNonZeroMin(battery[2], battery[3]) ) - - battery[BATT_VOLT+1] = getMinVoltageBySource(status.battsource, status.cell1sum, status.cell1sumFC, 1)*10 --batt1 - battery[BATT_VOLT+2] = getMinVoltageBySource(status.battsource, status.cell2sum, status.cell2sumFC, 2)*10 --batt2 - battery[BATT_VOLT] = (conf.battConf == BATTCONF_OTHER and battery[5] or (conf.battConf == BATTCONF_SERIAL and battery[5]+battery[6] or getNonZeroMin(battery[5],battery[6]))) - - battery[BATT_CURR] = utils.getMaxValue((conf.battConf == BATTCONF_OTHER and telemetry.batt1current or telemetry.batt1current + telemetry.batt2current),MAX_CURR) - battery[BATT_CURR+1] = utils.getMaxValue(telemetry.batt1current,MAX_CURR1) --curr1 - battery[BATT_CURR+2] = utils.getMaxValue(telemetry.batt2current,MAX_CURR2) --curr2 - - battery[BATT_MAH] = (conf.battConf == BATTCONF_OTHER and telemetry.batt1mah or telemetry.batt1mah + telemetry.batt2mah) - battery[BATT_MAH+1] = telemetry.batt1mah --mah1 - battery[BATT_MAH+2] = telemetry.batt2mah --mah2 - - battery[BATT_CAP] = (conf.battConf == BATTCONF_PARALLEL and getBatt1Capacity() + getBatt2Capacity() or getBatt1Capacity()) - battery[BATT_CAP+1] = getBatt1Capacity() --cap1 - battery[BATT_CAP+2] = getBatt2Capacity() --cap2 - - for battId=0,2 - do - if (battery[BATT_CAP+battId] > 0) then - battery[BATT_PERC+battId] = (1 - (battery[BATT_MAH+battId]/battery[BATT_CAP+battId]))*100 - if battery[BATT_PERC+battId] > 99 then - battery[BATT_PERC+battId] = 99 - elseif battery[BATT_PERC+battId] < 0 then - battery[BATT_PERC+battId] = 0 - end - else - battery[BATT_PERC+battId] = 99 - end - end - - if status.showDualBattery == true and conf.battConf == BATTCONF_PARALLEL then - -- dual parallel battery: do I have also dual current monitor? - if battery[BATT_CURR+1] > 0 and battery[BATT_CURR+2] == 0 then - -- special case: assume 1 power brick is monitoring batt1+batt2 in parallel - battery[BATT_CURR+1] = battery[BATT_CURR+1]/2 --curr1 - battery[BATT_CURR+2] = battery[BATT_CURR+1] --curr2 - -- - battery[BATT_MAH+1] = battery[BATT_MAH+1]/2 --mah1 - battery[BATT_MAH+2] = battery[BATT_MAH+1] --mah2 - -- - battery[BATT_CAP+1] = battery[BATT_CAP+1]/2 --cap1 - battery[BATT_CAP+2] = battery[BATT_CAP+1] --cap2 - -- - battery[BATT_PERC+1] = battery[BATT_PERC+1]/2 --perc1 - battery[BATT_PERC+2] = battery[BATT_PERC+1] --perc2 - end - end -end - -local function checkLandingStatus() - if ( status.timerRunning == 0 and telemetry.landComplete == 1 and status.lastTimerStart == 0) then - startTimer() - end - if (status.timerRunning == 1 and telemetry.landComplete == 0 and status.lastTimerStart ~= 0) then - stopTimer() - -- play landing complete anly if motorts are armed - if telemetry.statusArmed == 1 then - utils.playSound("landing") - end - end - status.timerRunning = telemetry.landComplete -end - -local resetLib = {} - -local function reset() - -- ERRORE reset da kill CPU limit!!!!!!!! - -- 2 stage reset - if resetPending == false then - -- initialize status - if resetLib.resetWidget == nil then - resetLib = utils.doLibrary("reset") - collectgarbage() - collectgarbage() - end - -- reset frame - utils.clearTable(frame.frameTypes) - -- reset widget pages - currentPage = 0 - - minmaxValues = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0} - - status.showMinMaxValues = false - status.showDualBattery = false - status.strFlightMode = nil - status.modelString = nil - - frame = {} - -- reset all - resetLib.resetTelemetry(status,telemetry,battery,alarms,utils) - -- release resources - utils.clearTable(resetLib) - -- force load model config - model.setGlobalVariable(CONF_GV,CONF_FM_GV,1) - collectgarbage() - collectgarbage() - utils.pushMessage(6,"telemetry reset done!") - resetPending = true - else - -- custom sensors - utils.clearTable(customSensors) - customSensors = nil - utils.loadCustomSensors() - -- done - utils.playSound("yaapu") - collectgarbage() - collectgarbage() - resetPending = false - end -end - -local function calcFlightTime() - -- update local variable with timer 3 value - if ( model.getTimer(2).value < status.flightTime and telemetry.statusArmed == 0) then - reset() - end - if (model.getTimer(2).value < status.flightTime and telemetry.statusArmed == 1) then - model.setTimer(2,{value=status.flightTime}) - utils.pushMessage(4,"Reset ignored while armed") - end - status.flightTime = model.getTimer(2).value -end - -local function setSensorValues() - if (not telemetryEnabled()) then - return - end - local battmah = telemetry.batt1mah - local battcapacity = getBatt1Capacity() - if telemetry.batt2mah > 0 then - battcapacity = getBatt1Capacity() + getBatt2Capacity() - battmah = telemetry.batt1mah + telemetry.batt2mah - end - - local perc = 0 - - if (battcapacity > 0) then - perc = math.min(math.max((1 - (battmah/battcapacity))*100,0),99) - end - - setTelemetryValue(Fuel_ID, Fuel_SUBID, Fuel_INSTANCE, perc, 13 , Fuel_PRECISION , Fuel_NAME) - setTelemetryValue(VFAS_ID, VFAS_SUBID, VFAS_INSTANCE, getNonZeroMin(telemetry.batt1volt,telemetry.batt2volt)*10, 1 , VFAS_PRECISION , VFAS_NAME) - setTelemetryValue(CURR_ID, CURR_SUBID, CURR_INSTANCE, telemetry.batt1current+telemetry.batt2current, 2 , CURR_PRECISION , CURR_NAME) - setTelemetryValue(VSpd_ID, VSpd_SUBID, VSpd_INSTANCE, telemetry.vSpeed, 5 , VSpd_PRECISION , VSpd_NAME) - setTelemetryValue(GSpd_ID, GSpd_SUBID, GSpd_INSTANCE, telemetry.hSpeed*0.1, 5 , GSpd_PRECISION , GSpd_NAME) - setTelemetryValue(Alt_ID, Alt_SUBID, Alt_INSTANCE, telemetry.homeAlt*10, 9 , Alt_PRECISION , Alt_NAME) - setTelemetryValue(GAlt_ID, GAlt_SUBID, GAlt_INSTANCE, math.floor(telemetry.gpsAlt*0.1), 9 , GAlt_PRECISION , GAlt_NAME) - setTelemetryValue(Hdg_ID, Hdg_SUBID, Hdg_INSTANCE, math.floor(telemetry.yaw), 20 , Hdg_PRECISION , Hdg_NAME) - setTelemetryValue(IMUTmp_ID, IMUTmp_SUBID, IMUTmp_INSTANCE, telemetry.imuTemp, 11 , IMUTmp_PRECISION , IMUTmp_NAME) - setTelemetryValue(ARM_ID, ARM_SUBID, ARM_INSTANCE, telemetry.statusArmed*100, 0 , ARM_PRECISION , ARM_NAME) -end - -utils.drawTopBar = function() - lcd.setColor(CUSTOM_COLOR,COLOR_BARS) - -- black bar - lcd.drawFilledRectangle(0,0, LCD_W, 18, CUSTOM_COLOR) - -- frametype and model name - lcd.setColor(CUSTOM_COLOR,COLOR_TEXT) - if status.modelString ~= nil then - lcd.drawText(2, RSSI_Y, status.modelString, CUSTOM_COLOR) - end - -- flight time - local time = getDateTime() - local strtime = string.format("%02d:%02d:%02d",time.hour,time.min,time.sec) - lcd.drawText(LCD_W, RSSI_Y+4, strtime, SMLSIZE+RIGHT+CUSTOM_COLOR) - -- RSSI - if telemetryEnabled() == false then - lcd.setColor(CUSTOM_COLOR,COLOR_RED) - lcd.drawText(RSSI_X-23, RSSI_Y, "NO TELEM", RSSI_FLAGS+CUSTOM_COLOR) - else - lcd.drawText(RSSI_X, RSSI_Y, "RS:", RSSI_FLAGS+CUSTOM_COLOR) -#ifdef DEMO - lcd.drawText(RSSI_X + 30,RSSI_Y, 87, RSSI_FLAGS+CUSTOM_COLOR) -#else --DEMO - lcd.drawText(RSSI_X + 30,RSSI_Y, getRSSI(), RSSI_FLAGS+CUSTOM_COLOR) -#endif --DEMO - end - lcd.setColor(CUSTOM_COLOR,COLOR_TEXT) - -- tx voltage - local vtx = string.format("Tx:%.1fv",getValue(getFieldInfo("tx-voltage").id)) - lcd.drawText(TXVOLTAGE_X,TXVOLTAGE_Y, vtx, TXVOLTAGE_FLAGS+CUSTOM_COLOR) -end - -local function drawMessageScreen() - for i=0,#status.messages do - if status.messages[(status.messageCount + i) % (#status.messages+1)][2] == 4 then - lcd.setColor(CUSTOM_COLOR,lcd.RGB(255,255,0)) - elseif status.messages[(status.messageCount + i) % (#status.messages+1)][2] < 4 then - --lcd.setColor(CUSTOM_COLOR,COLOR_RED) - lcd.setColor(CUSTOM_COLOR,lcd.RGB(255,70,0)) - else - lcd.setColor(CUSTOM_COLOR,COLOR_TEXT) - end - lcd.drawText(0,2+13*i, status.messages[(status.messageCount + i) % (#status.messages+1)][1],SMLSIZE+CUSTOM_COLOR) - end - - lcd.setColor(CUSTOM_COLOR,COLOR_BG) - lcd.drawFilledRectangle(405,0,75,272,CUSTOM_COLOR) - - #define TXT_X 410 - #define TXT_ALIGN 0 - lcd.setColor(CUSTOM_COLOR,COLOR_TEXT) - -- print info on the right - -- CELL - if battery[BATT_CELL] * 0.01 < 10 then - lcd.drawNumber(TXT_X, 0, battery[BATT_CELL] + 0.5, PREC2+TXT_ALIGN+MIDSIZE+CUSTOM_COLOR) - else - lcd.drawNumber(TXT_X, 0, (battery[BATT_CELL] + 0.5)*0.1, PREC1+TXT_ALIGN+MIDSIZE+CUSTOM_COLOR) - end - lcd.drawText(TXT_X+50, 1, status.battsource, SMLSIZE+CUSTOM_COLOR) - lcd.drawText(TXT_X+50, 11, "V", SMLSIZE+CUSTOM_COLOR) - -- ALT - lcd.setColor(CUSTOM_COLOR,COLOR_LABEL) - lcd.drawText(TXT_X, 25, "Alt("..UNIT_ALT_LABEL..")", SMLSIZE+TXT_ALIGN+CUSTOM_COLOR) - lcd.setColor(CUSTOM_COLOR,COLOR_TEXT) - lcd.drawNumber(TXT_X,37,telemetry.homeAlt*UNIT_ALT_SCALE,MIDSIZE+CUSTOM_COLOR+TXT_ALIGN) - -- SPEED - lcd.setColor(CUSTOM_COLOR,COLOR_LABEL) - lcd.drawText(TXT_X, 60, "Spd("..UNIT_HSPEED_LABEL..")", SMLSIZE+TXT_ALIGN+CUSTOM_COLOR) - lcd.setColor(CUSTOM_COLOR,COLOR_TEXT) - lcd.drawNumber(TXT_X,72,telemetry.hSpeed*0.1* UNIT_HSPEED_SCALE,MIDSIZE+CUSTOM_COLOR+TXT_ALIGN) - -- VSPEED - lcd.setColor(CUSTOM_COLOR,COLOR_LABEL) - lcd.drawText(TXT_X, 95, "VSI("..UNIT_VSPEED_LABEL..")", SMLSIZE+TXT_ALIGN+CUSTOM_COLOR) - lcd.setColor(CUSTOM_COLOR,COLOR_TEXT) - lcd.drawNumber(TXT_X,107, telemetry.vSpeed*0.1*UNIT_VSPEED_SCALE, MIDSIZE+CUSTOM_COLOR+TXT_ALIGN) - -- DIST - lcd.setColor(CUSTOM_COLOR,COLOR_LABEL) - lcd.drawText(TXT_X, 130, "Dist("..UNIT_DIST_LABEL..")", SMLSIZE+TXT_ALIGN+CUSTOM_COLOR) - lcd.setColor(CUSTOM_COLOR,COLOR_TEXT) - lcd.drawNumber(TXT_X, 142, telemetry.homeDist*UNIT_DIST_SCALE, MIDSIZE+TXT_ALIGN+CUSTOM_COLOR) - -- HDG - lcd.setColor(CUSTOM_COLOR,COLOR_LABEL) - lcd.drawText(TXT_X, 165, "Heading", SMLSIZE+TXT_ALIGN+CUSTOM_COLOR) - lcd.setColor(CUSTOM_COLOR,COLOR_TEXT) - lcd.drawNumber(TXT_X, 177, telemetry.yaw, MIDSIZE+TXT_ALIGN+CUSTOM_COLOR) - -- HOMEDIR - lcd.setColor(CUSTOM_COLOR,COLOR_YELLOW) - drawLib.drawRArrow(442,235,22,math.floor(telemetry.homeAngle - telemetry.yaw),CUSTOM_COLOR)--HomeDirection(telemetry) -end - -#ifdef COMPASS_ROSE -#define COMPASS_CHARSIZE 10 -#define COMPASS_RADIUS 30 -#define COMPASS_LINE 5 - -local compassPoints = {} - -compassPoints[0] = "N" -compassPoints[1] = nil -compassPoints[2] = "E" -compassPoints[3] = nil -compassPoints[4] = "S" -compassPoints[5] = nil -compassPoints[6] = "W" -compassPoints[7] = nil - -local function drawCompassRose() - local hw = math.floor(YAW_WIDTH/2) - local yawRounded = roundTo(telemetry.yaw,1) - local homeRounded = roundTo(telemetry.homeAngle,1) - local minY = TOPBAR_Y + TOPBAR_HEIGHT - 1 - local Hdy = math.sin(math.rad(270+homeRounded-yawRounded))*COMPASS_RADIUS - local Hdx = math.cos(math.rad(270+homeRounded-yawRounded))*COMPASS_RADIUS - for ang=0,7 - do - local Rdy = math.sin(math.rad(45*ang+270-yawRounded))*COMPASS_RADIUS - local Rdx = math.cos(math.rad(45*ang+270-yawRounded))*COMPASS_RADIUS - local Ldy = math.sin(math.rad(45*ang+270-yawRounded))*(COMPASS_RADIUS-COMPASS_LINE) - local Ldx = math.cos(math.rad(45*ang+270-yawRounded))*(COMPASS_RADIUS-COMPASS_LINE) - if compassPoints[ang] == nil then - lcd.drawLine(HOMEDIR_X+Ldx,HOMEDIR_Y+Ldy,HOMEDIR_X+Rdx,HOMEDIR_Y+Rdy,SOLID,2) - else - lcd.drawText(HOMEDIR_X+Rdx-(COMPASS_CHARSIZE/2),HOMEDIR_Y+Rdy-(COMPASS_CHARSIZE/2),compassPoints[ang],0) - end - end - drawLib.drawHomeIcon(HOMEDIR_X+Hdx-(COMPASS_CHARSIZE/2),HOMEDIR_Y+Hdy-(COMPASS_CHARSIZE/2),utils) - -- - local xx = 0 - if ( telemetry.yaw < 10) then - xx = 1 - elseif (telemetry.yaw < 100) then - xx = -8 - else - xx = -12 - end - lcd.drawNumber(HOMEDIR_X + xx - 5, HOMEDIR_Y - COMPASS_RADIUS - 24, telemetry.yaw, INVERS) -end -#endif ---------------------------------- --- This function checks alarm condition and as long as the condition persists it plays --- a warning sound. ---------------------------------- -utils.checkAlarm = function(level,value,idx,sign,sound,delay) - -- once landed reset all alarms except battery alerts - if status.timerRunning == 0 then - if alarms[idx][ALARM_TYPE] == ALARM_TYPE_MIN then - alarms[idx] = { false, 0, false, ALARM_TYPE_MIN, 0, false, 0} - elseif alarms[idx][ALARM_TYPE] == ALARM_TYPE_MAX then - alarms[idx] = { false, 0, true, ALARM_TYPE_MAX, 0, false, 0} - elseif alarms[idx][ALARM_TYPE] == ALARM_TYPE_TIMER then - alarms[idx] = { false, 0, true, ALARM_TYPE_TIMER, 0, false, 0} - elseif alarms[idx][ALARM_TYPE] == ALARM_TYPE_BATT then - alarms[idx] = { false, 0 , false, ALARM_TYPE_BATT, ALARM_TYPE_BATT_GRACE, false, 0} - elseif alarms[idx][ALARM_TYPE] == ALARM_TYPE_BATT_CRT then - alarms[idx] = { false, 0 , false, ALARM_TYPE_BATT_CRT, ALARM_TYPE_BATT_GRACE, false, 0} - end - -- reset done - return - end - -- if needed arm the alarm only after value has reached level - if alarms[idx][ALARM_ARMED] == false and level > 0 and -1 * sign*value > -1 * sign*level then - alarms[idx][ALARM_ARMED] = true - end - - if alarms[idx][ALARM_TYPE] == ALARM_TYPE_TIMER then - if status.flightTime > 0 and math.floor(status.flightTime) % delay == 0 then - if alarms[idx][ALARM_NOTIFIED] == false then - alarms[idx][ALARM_NOTIFIED] = true - utils.playSound(sound) - playDuration(status.flightTime,(status.flightTime > 3600 and 1 or 0)) -- minutes,seconds - end - else - alarms[idx][ALARM_NOTIFIED] = false - end - else - if alarms[idx][ALARM_ARMED] == true then - if level > 0 and sign*value > sign*level then - -- value is outside level - if alarms[idx][ALARM_START] == 0 then - -- first time outside level after last reset - alarms[idx][ALARM_START] = status.flightTime - -- status: START - end - else - -- value back to normal ==> reset - alarms[idx][ALARM_START] = 0 - alarms[idx][ALARM_NOTIFIED] = false - alarms[idx][ALARM_READY] = false - -- status: RESET - end - if alarms[idx][ALARM_START] > 0 and (status.flightTime ~= alarms[idx][ALARM_START]) and (status.flightTime - alarms[idx][ALARM_START]) >= alarms[idx][ALARM_GRACE] then - -- enough time has passed after START - alarms[idx][ALARM_READY] = true - -- status: READY - end - - if alarms[idx][ALARM_READY] == true and alarms[idx][ALARM_NOTIFIED] == false then - utils.playSound(sound) - alarms[idx][ALARM_NOTIFIED] = true - alarms[idx][ALARM_LAST_ALARM] = status.flightTime - -- status: BEEP - end - -- all but battery alarms - if alarms[idx][ALARM_TYPE] ~= ALARM_TYPE_BATT then - if alarms[idx][ALARM_READY] == true and status.flightTime ~= alarms[idx][ALARM_LAST_ALARM] and (status.flightTime - alarms[idx][ALARM_LAST_ALARM]) % delay == 0 then - alarms[idx][ALARM_NOTIFIED] = false - -- status: REPEAT - end - end - end - end -end - -local function loadFlightModes() - if frame.flightModes then - return - end - if telemetry.frameType ~= -1 then - if frameTypes[telemetry.frameType] == "c" then - frame = utils.doLibrary(conf.enablePX4Modes and "copter_px4" or "copter") - elseif frameTypes[telemetry.frameType] == "p" then - frame = utils.doLibrary(conf.enablePX4Modes and "plane_px4" or "plane") - elseif frameTypes[telemetry.frameType] == "r" or frameTypes[telemetry.frameType] == "b" then - frame = utils.doLibrary("rover") - end - collectgarbage() - collectgarbage() - maxmem = 0 - end -end - ---------------------------------- --- This function checks state transitions and only returns true if a specific delay has passed --- new transitions reset the delay timer ---------------------------------- -local function checkTransition(idx,value) - if value ~= transitions[idx][TRANSITION_LASTVALUE] then - -- value has changed - transitions[idx][TRANSITION_LASTVALUE] = value - transitions[idx][TRANSITION_LASTCHANGED] = getTime() - transitions[idx][TRANSITION_DONE] = false - -- status: RESET - return false - end - if transitions[idx][TRANSITION_DONE] == false and (getTime() - transitions[idx][TRANSITION_LASTCHANGED]) > transitions[idx][TRANSITION_DELAY] then - -- enough time has passed after RESET - transitions[idx][TRANSITION_DONE] = true - -- status: FIRE - return true; - end -end - -local function checkEvents(celm) - loadFlightModes() - - -- silence alarms when showing min/max values - if status.showMinMaxValues == false then - utils.checkAlarm(conf.minAltitudeAlert,telemetry.homeAlt,ALARMS_MIN_ALT,-1,"minalt",conf.repeatAlertsPeriod) - utils.checkAlarm(conf.maxAltitudeAlert,telemetry.homeAlt,ALARMS_MAX_ALT,1,"maxalt",conf.repeatAlertsPeriod) - utils.checkAlarm(conf.maxDistanceAlert,telemetry.homeDist,ALARMS_MAX_DIST,1,"maxdist",conf.repeatAlertsPeriod) - utils.checkAlarm(1,2*telemetry.ekfFailsafe,ALARMS_FS_EKF,1,"ekf",conf.repeatAlertsPeriod) - utils.checkAlarm(1,2*telemetry.battFailsafe,ALARMS_FS_BATT,1,"lowbat",conf.repeatAlertsPeriod) - utils.checkAlarm(conf.timerAlert,status.flightTime,ALARMS_TIMER,1,"timealert",conf.timerAlert) - end - - -- default is use battery 1 - local capacity = getBatt1Capacity() - local mah = telemetry.batt1mah - -- only if dual battery has been detected use battery 2 - if (status.batt2sources.fc or status.batt2sources.vs) and conf.battConf == BATTCONF_PARALLEL then - capacity = capacity + getBatt2Capacity() - mah = mah + telemetry.batt2mah - end - - if (capacity > 0) then - status.batLevel = (1 - (mah/capacity))*100 - else - status.batLevel = 99 - end - - for l=1,13 do - -- trigger alarm as as soon as it falls below level + 1 (i.e 91%,81%,71%,...) - if status.batLevel <= batLevels[l] + 1 and l < status.lastBattLevel then - status.lastBattLevel = l - utils.playSound("bat"..batLevels[l]) - break - end - end - - if telemetry.statusArmed == 1 and status.lastStatusArmed == 0 then - status.lastStatusArmed = telemetry.statusArmed - utils.playSound("armed") - -- reset home on arming - telemetry.homeLat = nil - telemetry.homeLon = nil - elseif telemetry.statusArmed == 0 and status.lastStatusArmed == 1 then - status.lastStatusArmed = telemetry.statusArmed - utils.playSound("disarmed") - end - - if telemetry.gpsStatus > 2 and status.lastGpsStatus <= 2 then - status.lastGpsStatus = telemetry.gpsStatus - utils.playSound("gpsfix") - elseif telemetry.gpsStatus <= 2 and status.lastGpsStatus > 2 then - status.lastGpsStatus = telemetry.gpsStatus - utils.playSound("gpsnofix") - end - - -- home detecting code - if telemetry.homeLat == nil then - if telemetry.gpsStatus > 2 and telemetry.homeAngle ~= -1 then - telemetry.homeLat, telemetry.homeLon = utils.getHomeFromAngleAndDistance(telemetry) - end - end - - -- flightmode transitions have a grace period to prevent unwanted flightmode call out - -- on quick radio mode switches - if telemetry.frameType ~= -1 and checkTransition(TRANSITIONS_FLIGHTMODE,telemetry.flightMode) then - utils.playSoundByFlightMode(telemetry.flightMode) - end - - if telemetry.simpleMode ~= status.lastSimpleMode then - if telemetry.simpleMode == 0 then - utils.playSound( status.lastSimpleMode == 1 and "simpleoff" or "ssimpleoff" ) - else - utils.playSound( telemetry.simpleMode == 1 and "simpleon" or "ssimpleon" ) - end - status.lastSimpleMode = telemetry.simpleMode - end -end - -local function checkCellVoltage(celm) - -- check alarms - utils.checkAlarm(conf.battAlertLevel1,celm,ALARMS_BATT_L1,-1,"batalert1",conf.repeatAlertsPeriod) - utils.checkAlarm(conf.battAlertLevel2,celm,ALARMS_BATT_L2,-1,"batalert2",conf.repeatAlertsPeriod) - -- cell bgcolor is sticky but gets triggered with alarms - if status.battLevel1 == false then status.battLevel1 = alarms[ALARMS_BATT_L1][ALARM_NOTIFIED] end - if status.battLevel2 == false then status.battLevel2 = alarms[ALARMS_BATT_L2][ALARM_NOTIFIED] end -end - -local function cycleBatteryInfo() - if status.showDualBattery == false and (status.batt2sources.fc or status.batt2sources.vs) and conf.battConf ~= BATTCONF_SERIAL then - status.showDualBattery = true - return - end - status.battsource = status.battsource == "vs" and "fc" or "vs" -end --------------------------------------------------------------------------------- --- MAIN LOOP --------------------------------------------------------------------------------- --- -local bgclock = 0 -#ifdef BGTELERATE -local bgtelecounter = 0 -local bgtelerate = 0 -local bgtelestart = 0 -#endif --BGTELERATE - -------------------------------- --- running at 20Hz (every 50ms) -------------------------------- -local timer2Hz = getTime() -local function backgroundTasks(myWidget,telemetryLoops) - -- FAST: this runs at 60Hz (every 16ms) - for i=1,telemetryLoops - do - local sensor_id,frame_id,data_id,value = sportTelemetryPop() - - if frame_id == 0x10 then - status.noTelemetryData = 0 - -- no telemetry dialog only shown once - status.hideNoTelemetry = true - processTelemetry(data_id,value) -#ifdef LOGTELEMETRY - -- log pitch and roll at max 3Hz - if lastAttiLogTime == 0 then - io.write(logfile, getTime(),";" , flightTime, ";", data_id, ";", value, "\r\n") - lastAttiLogTime = getTime() - elseif DATA_ID == 0x5006 and getTime() - lastAttiLogTime > 33 then -- 330ms - io.write(logfile, getTime(),";" , flightTime, ";", data_id, ";", value, "\r\n") - lastAttiLogTime = getTime() - else - io.write(logfile, getTime(),";" , flightTime, ";", data_id, ";", value, "\r\n") - end -#endif --LOGTELEMETRY - end -#ifdef BGTELERATE - ------------------------ - -- CALC BG TELE PROCESSING RATE - ------------------------ - -- skip first iteration - local now = getTime() - - if bgtelecounter == 0 then - bgtelestart = now - else - bgtelerate = bgtelerate*0.8 + 100*0.2*bgtelecounter/(now - bgtelestart + 1) - end - -- - bgtelecounter=bgtelecounter+1 - - if now - bgtelestart > 1000 then - bgtelecounter = 0 - end -#endif --BGTELERATE - end - -- SLOW: this runs around 2.5Hz - if bgclock % 2 == 1 then - calcFlightTime() - -- update gps telemetry data - local gpsData = getValue("GPS") - - if type(gpsData) == "table" and gpsData.lat ~= nil and gpsData.lon ~= nil then - telemetry.lat = gpsData.lat - telemetry.lon = gpsData.lon - end - --export OpenTX sensor values - setSensorValues() - -- update total distance as often as po - utils.updateTotalDist() - - if getTime() - timer2Hz > 50 then - status.screenTogglePage = utils.getScreenTogglePage(myWidget,conf,status) - status.mapZoomLevel = utils.getMapZoomLevel(myWidget,conf,status) - timer2Hz = getTime() - end - - -- flight mode - if frame.flightModes then - status.strFlightMode = frame.flightModes[telemetry.flightMode] - if status.strFlightMode ~= nil and telemetry.simpleMode > 0 then - local strSimpleMode = telemetry.simpleMode == 1 and "(S)" or "(SS)" - status.strFlightMode = string.format("%s%s",status.strFlightMode,strSimpleMode) - end - end - - -- top bar model frame and name - if status.modelString == nil then - -- frametype and model name - local info = model.getInfo() - local fn = frameNames[telemetry.frameType] - local strmodel = info.name - if fn ~= nil then - status.modelString = fn..": "..info.name - end - end - end - - -- SLOWER: this runs around 1.25Hz but not when the previous block runs - -- because bgclock%4 == 0 is always different than bgclock%2==1 - if bgclock % 4 == 0 then - -- update battery - calcBattery() - -- prepare celm based on status.battsource - local count1,count2 = calcCellCount() - local cellVoltage = 0 - - if conf.battConf == BATTCONF_OTHER then - -- alarms are based on battery 1 - cellVoltage = 100*(status.battsource == "vs" and status.cell1min or status.cell1sumFC/count1) - else - -- alarms are based on battery 1 and battery 2 - cellVoltage = 100*(status.battsource == "vs" and getNonZeroMin(status.cell1min,status.cell2min) or getNonZeroMin(status.cell1sumFC/count1,status.cell2sumFC/count2)) - end - - checkEvents(cellVoltage) - checkLandingStatus() - -- no need for alarms if reported voltage is 0 - if cellVoltage > 0 then - checkCellVoltage(cellVoltage) - end - -- aggregate value - minmaxValues[MAX_CURR] = math.max((conf.battConf == BATTCONF_OTHER and telemetry.batt1current or telemetry.batt1current+telemetry.batt2current), minmaxValues[MAX_CURR]) - - -- indipendent values - minmaxValues[MAX_CURR1] = math.max(telemetry.batt1current,minmaxValues[MAX_CURR1]) - minmaxValues[MAX_CURR2] = math.max(telemetry.batt2current,minmaxValues[MAX_CURR2]) - - -- reset backlight panel - if (model.getGlobalVariable(BACKLIGHT_GV,0) > 0 and getTime()/100 - backlightLastTime > BACKLIGHT_DURATION) then - model.setGlobalVariable(BACKLIGHT_GV,0,0) - end - -- reload config - if (model.getGlobalVariable(CONF_GV,CONF_FM_GV) > 0) then - loadConfig() - model.setGlobalVariable(CONF_GV,CONF_FM_GV,0) - end - -- call custom panel background functions - if leftPanel ~= nil then - leftPanel.background(myWidget,conf,telemetry,status,utils) - end - if centerPanel ~= nil then - centerPanel.background(myWidget,conf,telemetry,status,utils) - end - if rightPanel ~= nil then - rightPanel.background(myWidget,conf,telemetry,status,utils) - end - - bgclock = 0 - end - bgclock = bgclock+1 - -- blinking support - if (getTime() - blinktime) > 65 then - blinkon = not blinkon - blinktime = getTime() -#ifdef LOGTELEMETRY - -- flush - pcall(io.close,logfile) - logfile = io.open(logfilename,"a") -#endif --LOGTELEMETRY - end - collectgarbage() - collectgarbage() - return 0 -end - -local showSensorPage = false -local showMessages = false - -local function init() -#ifdef COMPILE - loadScript("/SCRIPTS/YAAPU/menu.lua","c") - loadScript(libBasePath.."reset.lua","c") - loadScript(libBasePath.."copter.lua","c") - loadScript(libBasePath.."plane.lua","c") - loadScript(libBasePath.."copter_px4.lua","c") - loadScript(libBasePath.."plane_px4.lua","c") - loadScript(libBasePath.."rover.lua","c") - loadScript(libBasePath..drawLibFile..".lua","c") -#endif - -- initialize flight timer - model.setTimer(2,{mode=0}) -#ifdef TESTMODE - telemetry.lat = -35.362864 - telemetry.lon = 149.165491 -#else - model.setTimer(2,{value=0}) -#endif --- load configuration at boot and only refresh if GV(8,8) = 1 - loadConfig() - -- load draw library - drawLib = utils.doLibrary(drawLibFile) - - currentModel = model.getInfo().name - -- load custom sensors - utils.loadCustomSensors() - -- ok done - utils.pushMessage(7,VERSION) -#ifdef TESTMODE -#ifdef DEMO - utils.pushMessage(6,"APM:Copter V3.5.4 (284349c3) QUAD") - utils.pushMessage(6,"Calibrating barometer") - utils.pushMessage(6,"Initialising APM") - utils.pushMessage(6,"Barometer calibration complete") - utils.pushMessage(6,"EKF2 IMU0 initial yaw alignment complete") - utils.pushMessage(6,"EKF2 IMU1 initial yaw alignment complete") - utils.pushMessage(6,"GPS 1: detected as u-blox at 115200 baud") - utils.pushMessage(6,"EKF2 IMU0 tilt alignment complete") - utils.pushMessage(6,"EKF2 IMU1 tilt alignment complete") - utils.pushMessage(6,"u-blox 1 HW: 00080000 SW: 2.01 (75331)") - utils.pushMessage(4,"Bad AHRS") -#else -- add some more messages to force memory allocation :-) -#ifdef TESTMESSAGES - utils.pushMessage(6,"APM:Copter V3.5.4 (284349c3) QUAD") - utils.pushMessage(6,"Calibrating barometer") - utils.pushMessage(6,"Initialising APM") - utils.pushMessage(6,"Barometer calibration complete") - utils.pushMessage(6,"EKF2 IMU0 initial yaw alignment complete") - utils.pushMessage(6,"EKF2 IMU1 initial yaw alignment complete") -#endif --TESTMESSAGES -#endif --DEMO -#endif --TESTMODE -#ifdef LOGTELEMETRY - logfilename = getLogFilename(getDateTime()) - logfile = io.open(logfilename,"a") - io.write(logfile, "counter;f_time;data_id;value\r\n") - utils.pushMessage(7,logfilename) -#endif --LOGTELEMETRY - utils.playSound("yaapu") - -- fix for generalsettings lazy loading... - unitScale = getGeneralSettings().imperial == 0 and 1 or 3.28084 - unitLabel = getGeneralSettings().imperial == 0 and "m" or "ft" - unitLongScale = getGeneralSettings().imperial == 0 and 1/1000 or 1/1609.34 - unitLongLabel = getGeneralSettings().imperial == 0 and "km" or "mi" -end - --------------------------------------------------------------------------------- --- 4 pages --- page 1 single battery view --- page 2 message history --- page 3 min max --- page 4 dual battery view --- page 5 map view -local options = { - { "page", VALUE, 1, 1, 5}, -} --- shared init flag -local initDone = 0 --- This function is runned once at the creation of the widget -local function create(zone, options) - -- this vars are widget scoped, each instance has its own set - local vars = { - #ifdef HUDRATE - hudcounter = 0, - hudrate = 0, - hudstart = 0, - #endif --HUDRATE - } - -- all local vars are shared between widget instances - -- init() needs to be called only once! - if initDone == 0 then - init() - initDone = 1 - end - -- - return { zone=zone, options=options, vars=vars } -end --- This function allow updates when you change widgets settings -local function update(myWidget, options) - myWidget.options = options - -- reload menu settings - loadConfig() -end - -local function fullScreenRequired(myWidget) - lcd.setColor(CUSTOM_COLOR,lcd.RGB(255, 0, 0)) - lcd.drawText(myWidget.zone.x,myWidget.zone.y,"Yaapu requires",SMLSIZE+CUSTOM_COLOR) - lcd.drawText(myWidget.zone.x,myWidget.zone.y+16,"full screen",SMLSIZE+CUSTOM_COLOR) -end - - -utils.getScreenTogglePage = function(myWidget,conf,status) -#ifdef TESTMODE - local screenChValue = getValue(conf.screenToggleChannelId) -#else - local screenChValue = status.hideNoTelemetry == false and 0 or getValue(conf.screenToggleChannelId) -#endif --TESTMODE - - if conf.screenToggleChannelId > -1 then - if screenChValue < -600 then - -- message history - return 2 - end - - if screenChValue > 600 then - -- map view - return 5 - end - end - return myWidget.options.page -end - -utils.getMapZoomLevel = function(myWidget,conf,status) - local chValue = getValue(conf.mapToggleChannelId) - - if conf.mapToggleChannelId > -1 then - if chValue >= 600 then - return conf.mapZoomLevel + 2 - end - - if chValue > - 600 and chValue < 600 then - return conf.mapZoomLevel + 1 - end - end - return conf.mapZoomLevel -end - --- called when widget instance page changes -local function onChangePage(myWidget) -#ifdef BGTELERATE - bgtelecounter = 0 -#endif --BGTELERATE - -- reset HUD counters - myWidget.vars.hudcounter = 0 - collectgarbage() - collectgarbage() -end - --- Called when script is hidden @20Hz -local function background(myWidget) - -- when page 1 goes to background run bg tasks - if myWidget.options.page == 1 then - -- run bg tasks - backgroundTasks(myWidget,12) - return - end - -- when page 3 goes to background hide minmax values - if myWidget.options.page == 3 then - status.showMinMaxValues = false - return - end - -- when page 4 goes to background hide dual battery view - if myWidget.options.page == 4 then - status.showDualBattery = false - return - end -end - -local slowTimer = getTime() - --- Called when script is visible -local function drawFullScreen(myWidget) -#ifdef HUDRATE - ------------------------ - -- CALC HUD REFRESH RATE - ------------------------ - -- skip first iteration - local hudnow = getTime() - - if myWidget.vars.hudcounter == 0 then - myWidget.vars.hudstart = hudnow - else - myWidget.vars.hudrate = myWidget.vars.hudrate*0.8 + 100*(myWidget.vars.hudcounter/(hudnow - myWidget.vars.hudstart + 1))*0.2 - end - -- - myWidget.vars.hudcounter=myWidget.vars.hudcounter+1 - - if hudnow - myWidget.vars.hudstart + 1 > 1000 then - myWidget.vars.hudcounter = 0 - end -#endif --HUDRATE - if getTime() - slowTimer > 50 then - -- reset phase 2 if reset pending - if resetPending == true then - reset() - else - -- frametype and model name - local info = model.getInfo() - -- model change event - if currentModel ~= info.name then - currentModel = info.name - -- trigger reset phase 1 - reset() - end - end - - if myWidget.options.page == 3 then - -- when page 3 goes to foreground show minmax values - status.showMinMaxValues = true - elseif myWidget.options.page == 4 then - -- when page 4 goes to foreground show dual battery view - status.showDualBattery = true - end - - -- check if current widget page changed - if currentPage ~= myWidget.options.page then - currentPage = myWidget.options.page - onChangePage(myWidget) - end - - slowTimer = getTime() - end - - -- when page 1 goes to foreground run bg tasks - if myWidget.options.page == 1 then - -- run bg tasks only if we are not resetting, this prevent cpu limit kill - if resetPending == false then - backgroundTasks(myWidget,12) - end - end - -- -#ifdef TESTMODE - symMode() -#endif --TESTMODE - - lcd.setColor(CUSTOM_COLOR, COLOR_BG) - if myWidget.options.page == 2 or status.screenTogglePage == 2 then - ------------------------------------ - -- Widget Page 2 is message history - ------------------------------------ - -- message history has black background - lcd.setColor(CUSTOM_COLOR, COLOR_BLACK) - lcd.clear(CUSTOM_COLOR) - - drawMessageScreen() - elseif myWidget.options.page == 5 or status.screenTogglePage == 5 then - ------------------------------------ - -- Widget Page 5 is map - ------------------------------------ - lcd.clear(CUSTOM_COLOR) - - if mapLayout ~= nil then - mapLayout.draw(myWidget,drawLib,conf,telemetry,status,battery,alarms,frame,utils,customSensors,gpsStatuses,leftPanel,centerPanel,rightPanel) - else - -- Layout start - if loadCycle == 3 then - mapLayout = utils.doLibrary("layout_map") - end - end - else - lcd.clear(CUSTOM_COLOR) - - if layout ~= nil then - layout.draw(myWidget,drawLib,conf,telemetry,status,battery,alarms,frame,utils,customSensors,gpsStatuses,leftPanel,centerPanel,rightPanel) - else - -- Layout start - if leftPanel == nil and loadCycle == 1 then - leftPanel = utils.doLibrary(conf.leftPanelFilename) - end - - if centerPanel == nil and loadCycle == 2 then - centerPanel = utils.doLibrary(conf.centerPanelFilename) - end - - if rightPanel == nil and loadCycle == 4 then - rightPanel = utils.doLibrary(conf.rightPanelFilename) - end - - if layout == nil and loadCycle == 6 and leftPanel ~= nil and centerPanel ~= nil and rightPanel ~= nil then - layout = utils.doLibrary(conf.widgetLayoutFilename) - end - - lcd.setColor(CUSTOM_COLOR,COLOR_WHITE) - lcd.drawFilledRectangle(88,74, 304, 84, CUSTOM_COLOR) - lcd.setColor(CUSTOM_COLOR,COLOR_BARS_2) - lcd.drawFilledRectangle(90,76, 300, 80, CUSTOM_COLOR) - lcd.setColor(CUSTOM_COLOR,COLOR_TEXT) - lcd.drawText(155, 95, "loading...", DBLSIZE+CUSTOM_COLOR) - end - -- Layout END - end - -- no telemetry/minmax outer box - if telemetryEnabled() == false then - -- no telemetry inner box - if not status.hideNoTelemetry then - drawLib.drawNoTelemetryData(status,telemetry,utils,telemetryEnabled) - end - utils.drawBlinkBitmap("warn",0,0) - else - if status.showMinMaxValues == true then - utils.drawBlinkBitmap("minmax",0,0) - end - end - drawLib.drawFailsafe(telemetry,utils) - - loadCycle=(loadCycle+1)%8 -#ifdef HUDRATE - lcd.setColor(CUSTOM_COLOR,COLOR_YELLOW) - local hudrateTxt = string.format("%.1ffps",myWidget.vars.hudrate) - lcd.drawText(212,3,hudrateTxt,SMLSIZE+CUSTOM_COLOR+RIGHT) -#endif --HUDRATE -#ifdef BGTELERATE - lcd.setColor(CUSTOM_COLOR,COLOR_YELLOW) - local bgtelerateTxt = string.format("%.0fHz",math.floor(bgtelerate+0.5)) - lcd.drawText(260,3,bgtelerateTxt,SMLSIZE+RIGHT+CUSTOM_COLOR) -#endif --BGTELERATE -#ifdef MEMDEBUG - lcd.setColor(CUSTOM_COLOR,lcd.RGB(255,0,0)) - maxmem = math.max(maxmem,collectgarbage("count")*1024) - -- test with absolute coordinates - lcd.drawNumber(480,LCD_H-14,maxmem,SMLSIZE+MENU_TITLE_COLOR+RIGHT) -#endif - collectgarbage() - collectgarbage() -end - -function refresh(myWidget) - if myWidget.zone.h < 250 then - fullScreenRequired(myWidget) - return - end - drawFullScreen(myWidget) -end - -return { name="Yaapu", options=options, create=create, update=update, background=background, refresh=refresh } \ No newline at end of file diff --git a/HORUS/SOURCES/README.md b/HORUS/SOURCES/README.md index 8f4ee6c1..f1246de7 100644 --- a/HORUS/SOURCES/README.md +++ b/HORUS/SOURCES/README.md @@ -1,5 +1,4 @@ Note -- files in the PP folder have to be preprocessed first with /TOOLS/pp.lua prior to compiling in OpenTX companion - files in the SRC folder are ready to be copied to the root of your virtual SD Card in OpenTX companion for compilation diff --git a/HORUS/SOURCES/SRC/SCRIPTS/TOOLS/Yaapu Config.lua b/HORUS/SOURCES/SRC/SCRIPTS/TOOLS/Yaapu Config.lua index b527b7d8..7febe298 100644 --- a/HORUS/SOURCES/SRC/SCRIPTS/TOOLS/Yaapu Config.lua +++ b/HORUS/SOURCES/SRC/SCRIPTS/TOOLS/Yaapu Config.lua @@ -3,6 +3,8 @@ -- -- Copyright (C) 2018-2019. Alessandro Apostoli -- https://github.com/yaapu +-- OlliW MavSDK additions by Risto Kõiva +-- https://github.com/rotorman -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -36,6 +38,7 @@ --------------------- -- enable splash screen for no telemetry data --#define SPLASH +-- enable battery percentage based on voltage -- enable code to draw a compass rose vs a compass ribbon --#define COMPASS_ROSE @@ -54,14 +57,15 @@ --#define TESTMODE -- enable debug of generated hash or short hash string --#define HASHDEBUG - +-- enable MESSAGES DEBUG +--#define DEBUG_MESSAGES --------------------- -- DEBUG REFRESH RATES --------------------- -- calc and show hud refresh rate --#define HUDRATE -- calc and show telemetry process rate ---#define BGTELERATE +-- #define BGTELERATE --------------------- -- SENSOR IDS @@ -95,24 +99,7 @@ -- CONF REFRESH GV --------------------------------- ---------------------------------- --- ALARMS ---------------------------------- ---[[ - ALARM_TYPE_MIN needs arming (min has to be reached first), value below level for grace, once armed is periodic, reset on landing - ALARM_TYPE_MAX no arming, value above level for grace, once armed is periodic, reset on landing - ALARM_TYPE_TIMER no arming, fired periodically, spoken time, reset on landing - ALARM_TYPE_BATT needs arming (min has to be reached first), value below level for grace, no reset on landing -{ - 1 = notified, - 2 = alarm start, - 3 = armed, - 4 = type(0=min,1=max,2=timer,3=batt), - 5 = grace duration - 6 = ready - 7 = last alarm -} ---]]-- +-- -- -- @@ -125,7 +112,9 @@ --#define HUD_ALGO1 -- enable optimized hor bars HUD drawing --#define HUD_ALGO2 --- enable hor bars HUD drawing +-- enable hor bars HUD drawing, 2 px resolution +-- enable hor bars HUD drawing, 1 px resolution +--#define HUD_ALGO4 @@ -151,9 +140,6 @@ local unitLongLabel = getGeneralSettings().imperial == 0 and "km" or "mi" -- offsets are: 1 celm, 4 batt, 7 curr, 10 mah, 13 cap, indexing starts at 1 -- ------------------------ --- LIBRARY LOADING ------------------------ ---------------------- --- COLORS @@ -176,13 +162,6 @@ local unitLongLabel = getGeneralSettings().imperial == 0 and "km" or "mi" -------------------------- - - - - - - - ------------------------------------- -- UNITS Scales from Ardupilot OSD code /ardupilot/libraries/AP_OSD/AP_OSD_Screen.cpp ------------------------------------- @@ -219,48 +198,53 @@ local unitLongLabel = getGeneralSettings().imperial == 0 and "km" or "mi" 0.000539957, //DISTANCE_LONG Nm 1.0, //TEMPERATURE C }; ---]]--[[ - -TYPEVALUE - menu option to select a numeric value -{description, type,name,default value,min,max,uit of measure,precision,increment step, , } -example {"batt alert level 1:", TYPEVALUE, "V1", 375, 0,5000,"V",PREC2,5,"L2",350 }, +--]] +-- +local menuItems = { + {"voice language:", "L1", 1, { "english", "italian", "french", "german" } , {"en","it","fr","de"} }, + {"batt alert level 1:", "V1", 375, 0,5000,"V",PREC2,5 }, + {"batt alert level 2:", "V2", 350, 0,5000,"V",PREC2,5 }, + {"batt[1] capacity override:", "B1", 0, 0,5000,"Ah",PREC2,10 }, + {"batt[2] capacity override:", "B2", 0, 0,5000,"Ah",PREC2,10 }, + {"batt[1] cell count override:", "CC", 0, 0,12," cells",0,1 }, + {"batt[2] cell count override:", "CC2", 0, 0,12," cells",0,1 }, + {"dual battery config:", "BC", 1, { "parallel", "series", "dual with alert on B1", "dual with alert on B2", "volts on B1, curr on B2", "volts on B2, curr on B1" }, { 1, 2, 3, 4, 5, 6 } }, + {"enable battery % by voltage:", "BPBV", 1, { "no", "yes" }, { false, true } }, + {"default voltage source:", "VS", 1, { "auto", "FLVSS", "fc" }, { nil, "vs", "fc" } }, + {"disable all sounds:", "S1", 1, { "no", "yes" }, { false, true } }, + {"disable incoming msg beep:", "S2", 1, { "no", "only for INF severity", "always" }, { 1, 2, 3 } }, + {"enable haptic:", "VIBR", 1, { "no", "yes" }, { false, true } }, + {"timer alert every:", "T1", 0, 0,600,"min",PREC1,5 }, + {"min altitude alert:", "A1", 0, 0,500,"m",PREC1,5 }, + {"max altitude alert:", "A2", 0, 0,10000,"m",0,1 }, + {"max distance alert:", "D1", 0, 0,100000,"m",0,10 }, + {"repeat alerts every:", "T2", 10, 5,600,"sec",0,5 }, + {"rangefinder max:", "RM", 0, 0,10000," cm",0,10 }, + {"air/groundspeed unit:", "HSPD", 1, { "m/s", "km/h", "mph", "kn" }, { 1, 3.6, 2.23694, 1.94384} }, + {"vertical speed unit:", "VSPD", 1, { "m/s", "ft/s", "ft/min" }, { 1, 3.28084, 196.85} }, + {"widget layout:", "WL", 1, { "default","legacy"}, { 1, 2 } }, + {"center panel:", "CPANE", 1, { "option 1","option 2","option 3","option 4" }, { 1, 2, 3, 4 } }, + {"right panel:", "RPANE", 1, { "option 1","option 2","option 3","option 4","option 5","option 6" }, { 1, 2, 3, 4, 5, 6 } }, + {"left panel:", "LPANE", 1, { "option 1","option 2","option 3","option 4" }, { 1 , 2, 3, 4 } }, + {"enable PX4 flightmodes:", "PX4", 1, { "no", "yes" }, { false, true } }, + {"enable CRSF support:", "CRSF", 1, { "no", "yes" }, { false, true } }, + {"enable OlliW MavSDK support:", "MAVSDK", 1, { "no", "yes" }, { false, true } }, + {"emulated page channel:", "STC", 0, 0, 32,nil,0,1 }, + {"emulated wheel channel:", "SWC", 0, 0, 32,nil,0,1 }, + {"GPS coordinates format:", "GPS", 1, { "DMS", "decimal" }, { 1, 2 } }, + {"map provider:", "MAPP", 1, { "GMapCatcher", "Google" }, { 1, 2 } }, + {"map type:", "MAPT", 1, { "satellite", "map", "terrain" }, { "sat_tiles", "tiles", "ter_tiles" } }, + {"map min zoom level:", "MAPmZ", -2, -2, 17,nil,0,1 }, + {"map max zoom level:", "MAPMZ", 17, -2, 17,nil,0,1 }, + {"map grid lines:", "MAPG", 1, { "yes", "no" }, { true, false } }, + {"use radio GPS for home:", "TXGPS", 1, { "no", "yes" }, { false, true } }, +} -TYPECOMBO - menu option to select a value from a list -{description, type, name, default, label list, value list, , } -example {"center pane layout:", TYPECOMBO, "CPANE", 1, { "hud","radar" }, { 1, 2 },"CPANE",1 }, +local menuItemsByName = {} ---]]-- -local menuItems = { - {"voice language:", 1, "L1", 1, { "english", "italian", "french", "german" } , {"en","it","fr","de"} }, - {"batt alert level 1:", 0, "V1", 375, 0,5000,"V",PREC2,5 }, - {"batt alert level 2:", 0, "V2", 350, 0,5000,"V",PREC2,5 }, - {"batt[1] capacity override:", 0, "B1", 0, 0,5000,"Ah",PREC2,10 }, - {"batt[2] capacity override:", 0, "B2", 0, 0,5000,"Ah",PREC2,10 }, - {"disable all sounds:", 1, "S1", 1, { "no", "yes" }, { false, true } }, - {"disable msg beep:", 1, "S2", 1, { "no", "info", "all" }, { 1, 2, 3 } }, - {"enable haptic:", 1, "VIBR", 1, { "no", "yes" }, { false, true } }, - {"default voltage source:", 1, "VS", 1, { "auto", "FLVSS", "fc" }, { nil, "vs", "fc" } }, - {"timer alert every:", 0, "T1", 0, 0,600,"min",PREC1,5 }, - {"min altitude alert:", 0, "A1", 0, 0,500,"m",PREC1,5 }, - {"max altitude alert:", 0, "A2", 0, 0,10000,"m",0,1 }, - {"max distance alert:", 0, "D1", 0, 0,100000,"m",0,10 }, - {"repeat alerts every:", 0, "T2", 10, 5,600,"sec",0,5 }, - {"dual battery config:", 1, "BC", 1, { "par", "ser", "other" }, { 1, 2, 3 } }, - {"batt[1] cell count override:", 0, "CC", 0, 0,12," cells",0,1 }, - {"batt[2] cell count override:", 0, "CC2", 0, 0,12," cells",0,1 }, - {"rangefinder max:", 0, "RM", 0, 0,10000," cm",0,10 }, - {"air/groundspeed unit:", 1, "HSPD", 1, { "m/s", "km/h", "mph", "kn" }, { 1, 3.6, 2.23694, 1.94384} }, - {"vertical speed unit:", 1, "VSPD", 1, { "m/s", "ft/s", "ft/min" }, { 1, 3.28084, 196.85} }, - {"widget layout:", 1, "WL", 1, { "default","legacy"}, { 1, 2 } }, - {"center panel:", 1, "CPANE", 1, { "option 1","option 2","option 3","option 4" }, { 1, 2, 3, 4 } }, - {"right panel:", 1, "RPANE", 1, { "option 1","option 2","option 3","option 4" }, { 1, 2, 3, 4 } }, - {"left panel:", 1, "LPANE", 1, { "option 1","option 2","option 3","option 4" }, { 1 , 2, 3, 4 } }, - {"enable px4 flightmodes:", 1, "PX4", 1, { "no", "yes" }, { false, true } }, - {"screen toggle channel:", 0, "STC", 0, 0, 32,nil,0,1 }, - {"map zoom level:", 0, "MAPZ", -2, -2, 17,nil,0,1 }, - {"map type:", 1, "MAPT", 1, { "satellite", "map", "terrain" }, { "sat_tiles", "tiles", "ter_tiles" } }, - {"map grid lines:", 1, "MAPG", 1, { "yes", "no" }, { true, false } }, - {"map zoom channel:", 0, "ZTC", 0, 0, 32,nil,0,1 }, +-- map from NEW to OLD settings +local mapNewToOldItemCfg = { + ["SWC"] = "ZTC" -- ZTC was replaced by SWC } local menu = { @@ -284,20 +268,18 @@ local leftPanelFiles = {} -- returns item's VALUE,LABEL,IDX ------------------------------------------ local function getMenuItemByName(items,name) - for idx=1,#items - do - -- items[idx][3] is the menu item's name as it appears in the config file - if items[idx][3] == name then - if items[idx][2] == 1 then - -- return item's value, label, index - return items[idx][6][items[idx][4]], items[idx][5][items[idx][4]], idx - else - -- return item's value, label, index - return items[idx][4], name, idx - end - end + local itemIdx = menuItemsByName[name] + local item = items[itemIdx] + if item == nil then + return nil + end + if type(item[4]) == "table" then + -- return item's value, label, index + return item[5][item[3]], item[4][item[3]], itemIdx + else + -- return item's value, label, index + return item[3], name, itemIdx end - return nil end local function updateMenuItems() @@ -307,60 +289,62 @@ local function updateMenuItems() --------------------- -- large hud layout --------------------- + value, name, idx = getMenuItemByName(menuItems,"CPANE") - menuItems[idx][5] = { "default"}; - menuItems[idx][6] = { 1 }; + menuItems[idx][4] = { "default" }; + menuItems[idx][5] = { 1 }; - if menuItems[idx][4] > #menuItems[idx][5] then - menuItems[idx][4] = 1 + if menuItems[idx][3] > #menuItems[idx][4] then + menuItems[idx][3] = 1 end value, name, idx = getMenuItemByName(menuItems,"RPANE") - menuItems[idx][5] = { "default" }; - menuItems[idx][6] = { 1 }; + menuItems[idx][4] = { "default", "batt% by voltage", "tether", "hybrid"}; + menuItems[idx][5] = { 1, 2, 3, 4 }; - if menuItems[idx][4] > #menuItems[idx][5] then - menuItems[idx][4] = 1 + if menuItems[idx][3] > #menuItems[idx][4] then + menuItems[idx][3] = 1 end value, name, idx = getMenuItemByName(menuItems,"LPANE") - menuItems[idx][5] = { "default","mav2passthru" }; - menuItems[idx][6] = { 1, 2 }; + menuItems[idx][4] = { "default", "MavSDK/Mav2PT" }; + menuItems[idx][5] = { 1, 2 }; - if menuItems[idx][4] > #menuItems[idx][5] then - menuItems[idx][4] = 1 + if menuItems[idx][3] > #menuItems[idx][4] then + menuItems[idx][3] = 1 end - centerPanelFiles = {"hud_1", "hud_nav_1" } - rightPanelFiles = {"right_1" } - leftPanelFiles = {"left_1", "left_m2f_1" } + centerPanelFiles = { "hud_1" } + rightPanelFiles = { "right_1", "right_battperc_1", "right_tether_1", "right_hybrid_1" } + leftPanelFiles = { "left_1", "left_m2f_1" } elseif value == 2 then --------------------- -- legacy layout --------------------- + value, name, idx = getMenuItemByName(menuItems,"CPANE") - menuItems[idx][5] = { "default", "russian hud", "compact hud" }; - menuItems[idx][6] = { 1, 2, 3 }; + menuItems[idx][4] = { "default", "russian hud", "compact hud " }; + menuItems[idx][5] = { 1, 2, 3 }; - if menuItems[idx][4] > #menuItems[idx][5] then - menuItems[idx][4] = 1 + if menuItems[idx][3] > #menuItems[idx][4] then + menuItems[idx][3] = 1 end value, name, idx = getMenuItemByName(menuItems,"RPANE") - menuItems[idx][5] = { "default", "custom sensors" }; - menuItems[idx][6] = { 1, 2 }; + menuItems[idx][4] = { "default", "custom sensors" }; + menuItems[idx][5] = { 1, 2 }; - if menuItems[idx][4] > #menuItems[idx][5] then - menuItems[idx][4] = 1 + if menuItems[idx][3] > #menuItems[idx][4] then + menuItems[idx][3] = 1 end value, name, idx = getMenuItemByName(menuItems,"LPANE") - menuItems[idx][5] = { "default","mav2passthru" }; - menuItems[idx][6] = { 1, 2 }; + menuItems[idx][4] = { "default", "MavSDK/Mav2PT" }; + menuItems[idx][5] = { 1, 2 }; - if menuItems[idx][4] > #menuItems[idx][5] then - menuItems[idx][4] = 1 + if menuItems[idx][3] > #menuItems[idx][4] then + menuItems[idx][3] = 1 end centerPanelFiles = {"hud_2", "hud_russian_2", "hud_small_2" } @@ -368,14 +352,67 @@ local function updateMenuItems() leftPanelFiles = {"left_2", "left_m2f_2" } end + value, name, idx = getMenuItemByName(menuItems,"MAPP") + + if value == nil then + return + end + + local value2, name2, idx2 = getMenuItemByName(menuItems,"MAPT") + + if value2 ~= nil then + if value == 1 then --GMapCatcher + menuItems[idx2][4] = { "satellite", "map", "terrain" } + menuItems[idx2][5] = { "sat_tiles", "tiles", "ter_tiles" } + elseif value == 2 then -- Google + menuItems[idx2][4] = { "GoogleSatelliteMap", "GoogleHybridMap", "GoogleMap", "GoogleTerrainMap" } + menuItems[idx2][5] = { "GoogleSatelliteMap", "GoogleHybridMap", "GoogleMap", "GoogleTerrainMap" } + end + end + + value2, name2, idx2 = getMenuItemByName(menuItems,"MAPmZ") + + if value2 ~= nil then + if value == 1 then -- GMapCatcher + menuItems[idx2][4] = -2 + menuItems[idx2][5] = 17 + else -- Google + menuItems[idx2][4] = 1 + menuItems[idx2][5] = 20 + end + -- check that the selected value is in range of the appropriate map product + if menuItems[idx2][3] < menuItems[idx2][4] then + menuItems[idx2][3] = menuItems[idx2][4] + end + if menuItems[idx2][3] > menuItems[idx2][5] then + menuItems[idx2][3] = menuItems[idx2][5] + end + end + + value2, name2, idx2 = getMenuItemByName(menuItems,"MAPMZ") + + if value2 ~= nil then + if value == 1 then -- GMapCatcher + menuItems[idx2][4] = -2 + menuItems[idx2][5] = 17 + else -- Google + menuItems[idx2][4] = 1 + menuItems[idx2][5] = 20 + end + -- check that the selected value is in range of the appropriate map product + if menuItems[idx2][3] < menuItems[idx2][4] then + menuItems[idx2][3] = menuItems[idx2][4] + end + if menuItems[idx2][3] > menuItems[idx2][5] then + menuItems[idx2][3] = menuItems[idx2][5] + end + end + menu.updated = false - collectgarbage() - collectgarbage() end end -local -function getConfigFilename() +local function getConfigFilename() local info = model.getInfo() return "/SCRIPTS/YAAPU/CFG/" .. string.lower(string.gsub(info.name, "[%c%p%s%z]", "")..".cfg") end @@ -416,56 +453,76 @@ local function applyConfigValues(conf) conf.leftPanel = getMenuItemByName(menuItems,"LPANE") conf.leftPanelFilename = leftPanelFiles[conf.leftPanel] - conf.enablePX4Modes = getMenuItemByName(menuItems,"PX4") + conf.enableCRSF = getMenuItemByName(menuItems,"CRSF") + conf.enableMavSDK = getMenuItemByName(menuItems,"MAVSDK") + + conf.mapZoomMin = getMenuItemByName(menuItems,"MAPmZ") + conf.mapZoomMax = getMenuItemByName(menuItems,"MAPMZ") - conf.mapZoomLevel = getMenuItemByName(menuItems,"MAPZ") conf.mapType = getMenuItemByName(menuItems,"MAPT") local chInfo = getFieldInfo("ch"..getMenuItemByName(menuItems,"STC")) conf.screenToggleChannelId = (chInfo == nil and -1 or chInfo['id']) - chInfo = getFieldInfo("ch"..getMenuItemByName(menuItems,"ZTC")) - conf.mapToggleChannelId = (chInfo == nil and -1 or chInfo['id']) + chInfo = getFieldInfo("ch"..getMenuItemByName(menuItems,"SWC")) + conf.screenWheelChannelId = (chInfo == nil and -1 or chInfo['id']) conf.enableMapGrid = getMenuItemByName(menuItems,"MAPG") + conf.mapProvider = getMenuItemByName(menuItems,"MAPP") -- set default voltage source if getMenuItemByName(menuItems,"VS") ~= nil then conf.defaultBattSource = getMenuItemByName(menuItems,"VS") end + conf.gpsFormat = getMenuItemByName(menuItems,"GPS") + conf.enableBattPercByVoltage = getMenuItemByName(menuItems,"BPBV") + conf.enableTxGPS = getMenuItemByName(menuItems,"TXGPS") menu.editSelected = false - collectgarbage() - collectgarbage() end local function loadConfig(conf) + local cfg_found = false + local cfg_string local cfg = io.open(getConfigFilename(),"r") + if cfg ~= nil then - local str = io.read(cfg,500) + cfg_string = io.read(cfg,500) io.close(cfg) - if string.len(str) > 0 then - for i=1,#menuItems - do - local value = string.match(str, menuItems[i][3]..":([-%d]+)") - collectgarbage() - if value ~= nil then - menuItems[i][4] = tonumber(value) - -- check if the value read from file is compatible with available options - if menuItems[i][2] == 1 and tonumber(value) > #menuItems[i][5] then - --if not force default - menuItems[i][4] = 1 - end + if string.len(cfg_string) > 0 then + cfg_found = true + end + end + + for i=1,#menuItems + do + menuItemsByName[tostring(menuItems[i][2])] = i + if cfg_found then + local value = string.match(cfg_string, menuItems[i][2]..":([-%d]+)") + if value == nil then + -- check if it was replaced by an older settings + local oldCfg = mapNewToOldItemCfg[menuItems[i][2]] + if oldCfg ~= nil then + value = string.match(cfg_string, oldCfg..":([-%d]+)") + end + end + if value ~= nil then + menuItems[i][3] = tonumber(value) + -- check if the value read from file is compatible with available options + if type(menuItems[i][4]) == "table" and tonumber(value) > #menuItems[i][4] then + --if not force default + menuItems[i][3] = 1 end end end end - -- menu was loaded apply required changes - menu.updated = true + -- when run standalone there's nothing to update :-) if conf ~= nil then applyConfigValues(conf) + -- menu was loaded apply required changes + menu.updated = true end end @@ -473,7 +530,7 @@ local function saveConfig(conf) local myConfig = "" for i=1,#menuItems do - myConfig = myConfig..menuItems[i][3]..":"..menuItems[i][4] + myConfig = myConfig..menuItems[i][2]..":"..menuItems[i][3] if i < #menuItems then myConfig = myConfig.."," end @@ -484,8 +541,6 @@ local function saveConfig(conf) io.close(cfg) end myConfig = nil - collectgarbage() - collectgarbage() -- when run standalone there's nothing to update :-) if conf ~= nil then applyConfigValues(conf) @@ -494,59 +549,68 @@ local function saveConfig(conf) end local function drawConfigMenuBars() - lcd.setColor(CUSTOM_COLOR,0x0000) local itemIdx = string.format("%d/%d",menu.selectedItem,#menuItems) - lcd.drawFilledRectangle(0,0, LCD_W, 20, CUSTOM_COLOR) - lcd.drawRectangle(0, 0, LCD_W, 20, CUSTOM_COLOR) - lcd.drawFilledRectangle(0,LCD_H-20, LCD_W, 20, CUSTOM_COLOR) - lcd.drawRectangle(0, LCD_H-20, LCD_W, 20, CUSTOM_COLOR) - lcd.setColor(CUSTOM_COLOR,0xFFFF) - lcd.drawText(2,0,"Yaapu Telemetry Widget 1.8.1",CUSTOM_COLOR) - lcd.drawText(2,LCD_H-20+1,getConfigFilename(),CUSTOM_COLOR) - lcd.drawText(LCD_W,LCD_H-20+1,itemIdx,CUSTOM_COLOR+RIGHT) + lcd.drawFilledRectangle(0,0, LCD_W, 20, COLOR_THEME_SECONDARY1) + lcd.drawRectangle(0, 0, LCD_W, 20, COLOR_THEME_SECONDARY1) + lcd.drawFilledRectangle(0,LCD_H-20, LCD_W, 20, COLOR_THEME_SECONDARY1) + lcd.drawRectangle(0, LCD_H-20, LCD_W, 20, COLOR_THEME_SECONDARY1) + lcd.drawText(2,0,"Yaapu v1.9.3b4 (OlliW MavSDK support by Risto)",COLOR_THEME_PRIMARY2) + lcd.drawText(2,LCD_H-20+1,getConfigFilename(),COLOR_THEME_PRIMARY2) + lcd.drawText(LCD_W,LCD_H-20+1,itemIdx,COLOR_THEME_PRIMARY2+RIGHT) end local function incMenuItem(idx) - if menuItems[idx][2] == 0 then - menuItems[idx][4] = menuItems[idx][4] + menuItems[idx][9] - if menuItems[idx][4] > menuItems[idx][6] then - menuItems[idx][4] = menuItems[idx][6] + if type(menuItems[idx][4]) == "table" then + menuItems[idx][3] = menuItems[idx][3] + 1 + if menuItems[idx][3] > #menuItems[idx][4] then + menuItems[idx][3] = 1 end else - menuItems[idx][4] = menuItems[idx][4] + 1 - if menuItems[idx][4] > #menuItems[idx][5] then - menuItems[idx][4] = 1 + menuItems[idx][3] = menuItems[idx][3] + menuItems[idx][8] + if menuItems[idx][3] > menuItems[idx][5] then + menuItems[idx][3] = menuItems[idx][5] end end end local function decMenuItem(idx) - if menuItems[idx][2] == 0 then - menuItems[idx][4] = menuItems[idx][4] - menuItems[idx][9] - if menuItems[idx][4] < menuItems[idx][5] then - menuItems[idx][4] = menuItems[idx][5] + if type(menuItems[idx][4]) == "table" then + menuItems[idx][3] = menuItems[idx][3] - 1 + if menuItems[idx][3] < 1 then + menuItems[idx][3] = #menuItems[idx][4] end else - menuItems[idx][4] = menuItems[idx][4] - 1 - if menuItems[idx][4] < 1 then - menuItems[idx][4] = #menuItems[idx][5] + menuItems[idx][3] = menuItems[idx][3] - menuItems[idx][8] + if menuItems[idx][3] < menuItems[idx][4] then + menuItems[idx][3] = menuItems[idx][4] end end end local function drawItem(idx,flags) - lcd.setColor(CUSTOM_COLOR,0xFFFF) - if menuItems[idx][2] == 0 then - if menuItems[idx][4] == 0 and menuItems[idx][5] >= 0 then - lcd.drawText(300,25 + (idx-menu.offset-1)*20, "---",flags+CUSTOM_COLOR) + if type(menuItems[idx][4]) == "table" then + lcd.drawText(280, 25 + (idx-menu.offset-1)*20, menuItems[idx][4][menuItems[idx][3]], flags+COLOR_THEME_PRIMARY1) + else + if menuItems[idx][3] == 0 and menuItems[idx][4] >= 0 then + lcd.drawText(280,25 + (idx-menu.offset-1)*20, "---",flags+COLOR_THEME_PRIMARY1) else - lcd.drawNumber(300,25 + (idx-menu.offset-1)*20, menuItems[idx][4],flags+menuItems[idx][8]+CUSTOM_COLOR) - if menuItems[idx][7] ~= nil then - lcd.drawText(300 + 50,25 + (idx-menu.offset-1)*20, menuItems[idx][7],flags+CUSTOM_COLOR) + if menuItems[idx][6] ~= nil then + if (menuItems[idx][7] == PREC1) then + -- str = tostring(menuItems[idx][3]/10) + str = string.format("%.2f",menuItems[idx][3]/10) + else + if (menuItems[idx][7] == PREC2) then + -- str = tostring(menuItems[idx][3]/100) + str = string.format("%.2f",menuItems[idx][3]/100) + else + str = tostring(menuItems[idx][3]) + end + end + lcd.drawText(280, 25 + (idx-menu.offset-1)*20, str .. " " .. tostring(menuItems[idx][6]), flags+COLOR_THEME_PRIMARY1) + else + lcd.drawNumber(280, 25 + (idx-menu.offset-1)*20, menuItems[idx][3], flags+menuItems[idx][7]+COLOR_THEME_PRIMARY1) end end - else - lcd.drawText(300,25 + (idx-menu.offset-1)*20, menuItems[idx][5][menuItems[idx][4]],flags+CUSTOM_COLOR) end end @@ -585,8 +649,7 @@ local function drawConfigMenu(event) end -- for m=1+menu.offset,math.min(#menuItems,11+menu.offset) do - lcd.setColor(CUSTOM_COLOR,0xFFFF) - lcd.drawText(2,25 + (m-menu.offset-1)*20, menuItems[m][1],CUSTOM_COLOR) + lcd.drawText(2,25 + (m-menu.offset-1)*20, menuItems[m][1],COLOR_THEME_PRIMARY1) if m == menu.selectedItem then if menu.editSelected then drawItem(m,INVERS+BLINK) @@ -604,8 +667,7 @@ end -- RUN -------------------------- local function run(event) - lcd.setColor(CUSTOM_COLOR, 0x0AB1) -- hex 0x084c7b -- 073f66 - lcd.clear(CUSTOM_COLOR) + lcd.clear(COLOR_THEME_SECONDARY2) --------------------- -- CONFIG MENU --------------------- diff --git a/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/copter.lua b/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/copter.lua index cf18a422..b91d0262 100644 --- a/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/copter.lua +++ b/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/copter.lua @@ -23,8 +23,11 @@ FLOWHOLD = 22, // FLOWHOLD holds position with optical flow without rangefinder FOLLOW = 23, // follow attempts to follow another vehicle or ground station ZIGZAG = 24, // ZIGZAG mode is able to fly in a zigzag manner with predefined point A and point B + SYSTEMID = 25, // System ID mode produces automated system identification signals in the controllers + AUTOROTATE = 26, // Autonomous autorotation }; - --]] local flightModes = {} + --]] + local flightModes = {} -- copter flight modes flightModes[0]="" @@ -53,6 +56,7 @@ flightModes[23]="FlowHold" flightModes[24]="Follow" flightModes[25]="ZigZag" - flightModes[26]="Initializing" + flightModes[26]="SystemID" + flightModes[27]="Autorotate" return {flightModes=flightModes} diff --git a/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/copter_px4.lua b/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/copter_px4.lua index d143e236..d068aaf9 100644 --- a/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/copter_px4.lua +++ b/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/copter_px4.lua @@ -1,29 +1,86 @@ +--[[ + MavToPT 2.63 + + uint8_t PX4FlightModeNum(uint8_t main, uint8_t sub) { + switch(main) { + case 1: + return 0; // MANUAL + case 2: + return 1; // ALTITUDE + case 3: + return 2; // POSCTL + case 4: + switch(sub) { + case 1: + return 12; // AUTO READY + case 2: + return 13; // AUTO TAKEOFF + case 3: + return 14; // AUTO LOITER + case 4: + return 15; // AUTO MISSION + case 5: + return 16; // AUTO RTL + case 6: + return 17; // AUTO LAND + case 7: + return 18; // AUTO RTGS + case 8: + return 19; // AUTO FOLLOW ME + case 9: + return 20; // AUTO PRECLAND + default: + return 31; // AUTO UNKNOWN + } + case 5: + return 3; // ACRO + case 6: + return 4; // OFFBOARD + case 7: + return 5; // STABILIZED + case 8: + return 6; // RATTITUDE + case 9: + return 7; // SIMPLE + default: + return 11; // UNKNOWN + } + } +--]] local flightModes = {} -- plane flight modes -flightModes[0]="" -flightModes[1]="Manual" -flightModes[2]="AltCtl" --px4 specific -flightModes[3]="PosCtl" --px4 specific -flightModes[4]="Ready" --px4 specific -flightModes[5]="Takeoff" --px4 specific -flightModes[6]="Loiter" -flightModes[7]="Mission" --px4 specific -flightModes[8]="RTL" -flightModes[9]="Land" -flightModes[10]="RTGS" --px4 specific -flightModes[11]="Follow" -flightModes[12]="PrecLand" --px4 specific -flightModes[13]="" -flightModes[14]="Acro" -flightModes[15]="OffBoard" --px4 specific -flightModes[16]="Stabilize" -flightModes[17]="RAttitude" --px4 specific -flightModes[18]="Simple" --px4 specific -flightModes[19]="" -flightModes[20]="" -flightModes[21]="" -flightModes[22]="" -flightModes[23]="" --- +flightModes[0] = "Manual" +flightModes[1] = "AltCtl" --px4 specific +flightModes[2] = "PosCtl" --px4 specific +flightModes[3] = "Acro" +flightModes[4] = "OffBoard" --px4 specific +flightModes[5] = "Stabilize" +flightModes[6] = "RAttitude" --px4 specific +flightModes[7] = "Simple" --px4 specific +flightModes[8] = "" +flightModes[9] = "" +flightModes[10] = "" +flightModes[11] = "" +flightModes[12] = "Ready" --px4 specific +flightModes[13] = "Takeoff" --px4 specific +flightModes[14] = "Loiter" +flightModes[15] = "Mission" --px4 specific +flightModes[16] = "RTL" +flightModes[17] = "Land" +flightModes[18] = "" +flightModes[19] = "Follow" +flightModes[20] = "PrecLand" --px4 specific +flightModes[21] = "" +flightModes[22] = "" +flightModes[23] = "" +flightModes[24] = "" +flightModes[25] = "" +flightModes[26] = "" +flightModes[27] = "" +flightModes[28] = "" +flightModes[29] = "" +flightModes[30] = "" +flightModes[31] = "Unknown" + return {flightModes=flightModes} diff --git a/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/draw.lua b/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/draw.lua index d8d0c4ac..4e6585ac 100644 --- a/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/draw.lua +++ b/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/draw.lua @@ -3,6 +3,8 @@ -- -- Copyright (C) 2018-2019. Alessandro Apostoli -- https://github.com/yaapu +-- OlliW MavSDK additions by Risto Kõiva +-- https://github.com/rotorman -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -36,6 +38,7 @@ --------------------- -- enable splash screen for no telemetry data --#define SPLASH +-- enable battery percentage based on voltage -- enable code to draw a compass rose vs a compass ribbon --#define COMPASS_ROSE @@ -54,14 +57,15 @@ --#define TESTMODE -- enable debug of generated hash or short hash string --#define HASHDEBUG - +-- enable MESSAGES DEBUG +--#define DEBUG_MESSAGES --------------------- -- DEBUG REFRESH RATES --------------------- -- calc and show hud refresh rate --#define HUDRATE -- calc and show telemetry process rate ---#define BGTELERATE +-- #define BGTELERATE --------------------- -- SENSOR IDS @@ -95,24 +99,7 @@ -- CONF REFRESH GV --------------------------------- ---------------------------------- --- ALARMS ---------------------------------- ---[[ - ALARM_TYPE_MIN needs arming (min has to be reached first), value below level for grace, once armed is periodic, reset on landing - ALARM_TYPE_MAX no arming, value above level for grace, once armed is periodic, reset on landing - ALARM_TYPE_TIMER no arming, fired periodically, spoken time, reset on landing - ALARM_TYPE_BATT needs arming (min has to be reached first), value below level for grace, no reset on landing -{ - 1 = notified, - 2 = alarm start, - 3 = armed, - 4 = type(0=min,1=max,2=timer,3=batt), - 5 = grace duration - 6 = ready - 7 = last alarm -} ---]]-- +-- -- -- @@ -125,7 +112,9 @@ --#define HUD_ALGO1 -- enable optimized hor bars HUD drawing --#define HUD_ALGO2 --- enable hor bars HUD drawing +-- enable hor bars HUD drawing, 2 px resolution +-- enable hor bars HUD drawing, 1 px resolution +--#define HUD_ALGO4 @@ -136,6 +125,8 @@ -- MENU VALUE,COMBO -------------------------------------------------------------------------------- +local statusArmTimeout = 0 -- timeout counter for "armed" dialog + -------------------------- -- UNIT OF MEASURE -------------------------- @@ -144,16 +135,12 @@ local unitLabel = getGeneralSettings().imperial == 0 and "m" or "ft" local unitLongScale = getGeneralSettings().imperial == 0 and 1/1000 or 1/1609.34 local unitLongLabel = getGeneralSettings().imperial == 0 and "km" or "mi" - ----------------------- -- BATTERY ----------------------- -- offsets are: 1 celm, 4 batt, 7 curr, 10 mah, 13 cap, indexing starts at 1 -- ------------------------ --- LIBRARY LOADING ------------------------ ---------------------- --- COLORS @@ -176,15 +163,9 @@ local unitLongLabel = getGeneralSettings().imperial == 0 and "km" or "mi" -------------------------- - - - - - - - -- model and opentx version local ver, radio, maj, minor, rev = getVersion() +local yawRibbonPoints = {"N",nil,"NE",nil,"E",nil,"SE",nil,"S",nil,"SW",nil,"W",nil,"NW",nil} local drawLine = nil @@ -219,6 +200,16 @@ local function drawHomeIcon(x,y,utils) lcd.drawBitmap(utils.getBitmap("minihomeorange"),x,y) end +local function drawRadioIcon(x,y,utils) + if getTxGPS() == nil then + -- internalgps option not included in the OpenTX build - blink the red minircradio symbol + utils.drawBlinkBitmap("minircradiored",x,y) + else + -- draw solid minircradio + lcd.drawBitmap(utils.getBitmap("minircradioorange"),x,y) + end +end + local function computeOutCode(x,y,xmin,ymin,xmax,ymax) local code = 0; --initialised as being inside of hud -- @@ -332,6 +323,43 @@ local function drawRArrow(x,y,r,angle,color) drawLine(x3,y3,x4,y4,SOLID,color) end +--[[ + x,y = top,left + image = background image + gx,gy = gauge center point + r1 = gauge radius + r2 = gauge distance from center + perc = value % normalized between min, max + max = angle max +--]] +local function drawGauge(x, y, image, gx, gy, r1, r2, perc, max, color, utils) + local ang = (360-(max/2))+((perc*0.01)*max) + + if ang > 360 then + ang = ang - 360 + end + + local ra = math.rad(ang-90) + local ra_left = math.rad(ang-90-20) + local ra_right = math.rad(ang-90+20) + + -- tip of the triangle + local x1 = gx + r1 * math.cos(ra) + local y1 = gy + r1 * math.sin(ra) + -- bottom left + local x2 = gx + r2 * math.cos(ra_left) + local y2 = gy + r2 * math.sin(ra_left) + -- bottom right + local x3 = gx + r2 * math.cos(ra_right) + local y3 = gy + r2 * math.sin(ra_right) + + lcd.drawBitmap(utils.getBitmap(image), x, y) + + drawLine(x1,y1,x2,y2,SOLID,color) + drawLine(x1,y1,x3,y3,SOLID,color) + drawLine(x2,y2,x3,y3,SOLID,color) +end + local function drawFailsafe(telemetry,utils) if telemetry.ekfFailsafe > 0 then utils.drawBlinkBitmap("ekffailsafe",LCD_W/2 - 90,154) @@ -343,11 +371,24 @@ end local function drawArmStatus(status,telemetry,utils) -- armstatus - if telemetry.ekfFailsafe == 0 and telemetry.battFailsafe == 0 and status.timerRunning == 0 then - if (telemetry.statusArmed == 1) then - lcd.drawBitmap(utils.getBitmap("armed"),LCD_W/2 - 90,154) - else - utils.drawBlinkBitmap("disarmed",LCD_W/2 - 90,154) + if telemetry.ekfFailsafe == 0 and telemetry.battFailsafe == 0 then + if statusArmTimeout > 0 then + -- we are displaying "armed" + if statusArmTimeout < 10 then -- display "armed" for approx. 1.5 seconds + lcd.drawBitmap(utils.getBitmap("armed"),LCD_W/2 - 90,154) + statusArmTimeout = statusArmTimeout + 1 + else + statusArmTimeout = 0 + end + end + if status.timerRunning == 0 then + if (telemetry.statusArmed == 1) then + lcd.drawBitmap(utils.getBitmap("armed"),LCD_W/2 - 90,154) + statusArmTimeout = 1 -- trigger incrementing dialog timeout displaying "armed" + else + utils.drawBlinkBitmap("disarmed",LCD_W/2 - 90,154) + statusArmTimeout = 0 + end end end end @@ -355,16 +396,22 @@ end local function drawNoTelemetryData(status,telemetry,utils,telemetryEnabled) -- no telemetry data if (not telemetryEnabled()) then - lcd.setColor(CUSTOM_COLOR,0xFFFF) - lcd.drawFilledRectangle(88,74, 304, 84, CUSTOM_COLOR) - lcd.setColor(CUSTOM_COLOR,0xF800) - lcd.drawFilledRectangle(90,76, 300, 80, CUSTOM_COLOR) - lcd.setColor(CUSTOM_COLOR,0xFFFF) - lcd.drawText(110, 85, "no telemetry data", DBLSIZE+CUSTOM_COLOR) - lcd.drawText(130, 120, "Yaapu Telemetry Widget 1.8.1", SMLSIZE+CUSTOM_COLOR) + lcd.drawFilledRectangle(88,74, 304, 84, WHITE) + lcd.drawFilledRectangle(90,76, 300, 80, RED) + lcd.drawText(110, 85, "no telemetry data", DBLSIZE+WHITE) + lcd.drawText(123, 120, "Yaapu Telemetry Widget 1.9.3-beta4", SMLSIZE+WHITE) + lcd.drawText(100, 135, "with OlliW MavSDK >=v22 support by Risto", SMLSIZE+WHITE) end end +local function drawNoMavSDK() + lcd.drawFilledRectangle(88,74, 304, 84, WHITE) + lcd.drawFilledRectangle(90,76, 300, 80, RED) + lcd.drawText(113, 85, "OpenTX w/o MavSDK!", MIDSIZE+WHITE) + lcd.drawText(105, 120, "Please flash OlliW OpenTX (v22 or later)", SMLSIZE+WHITE) + lcd.drawText(120, 135, "or disable MavSDK in configuration", SMLSIZE+WHITE) +end + local function drawFilledRectangle(x,y,w,h,flags) if w > 0 and h > 0 then lcd.drawFilledRectangle(x,y,w,h,flags) @@ -372,102 +419,77 @@ local function drawFilledRectangle(x,y,w,h,flags) end -local yawRibbonPoints = {} --- -yawRibbonPoints[0]="N" -yawRibbonPoints[1]=nil -yawRibbonPoints[2]="NE" -yawRibbonPoints[3]=nil -yawRibbonPoints[4]="E" -yawRibbonPoints[5]=nil -yawRibbonPoints[6]="SE" -yawRibbonPoints[7]=nil -yawRibbonPoints[8]="S" -yawRibbonPoints[9]=nil -yawRibbonPoints[10]="SW" -yawRibbonPoints[11]=nil -yawRibbonPoints[12]="W" -yawRibbonPoints[13]=nil -yawRibbonPoints[14]="NW" -yawRibbonPoints[15]=nil - --- optimized yaw ribbon drawing +--[[ + based on olliw's improved version over mine :-) + https://github.com/olliw42/otxtelemetry +--]] local function drawCompassRibbon(y,myWidget,conf,telemetry,status,battery,utils,width,xMin,xMax,stepWidth,bigFont) - -- ribbon centered +/- 90 on yaw - local centerYaw = (telemetry.yaw + 270 - (bigFont and 16 or 10))%360 -- (-10 needed to center ribbon) - -- this is the first point left to be drawn on the compass ribbon - local nextPoint = math.floor(centerYaw/22.5) * 22.5 - -- x coord of first ribbon letter - local nextPointX = xMin + (nextPoint - centerYaw)/22.5 * stepWidth - -- - local i = (nextPoint / 22.5) % 16 - for idx=1,12 - do - local letterOffset = 1 - local lineOffset = 4 - if nextPointX >= xMin -3 and nextPointX < xMax then - if yawRibbonPoints[i] == nil then - lcd.setColor(CUSTOM_COLOR,0xFFFF) - lcd.drawLine(nextPointX + lineOffset, y+1, nextPointX + lineOffset, y+7, SOLID, CUSTOM_COLOR) - else - if #yawRibbonPoints[i] > 1 then - letterOffset = -5 - lineOffset = 2 + local minY = y+1 + local heading = telemetry.yaw + local minX = xMin + local maxX = xMax + local midX = (xMax + xMin)/2 + local tickNo = 4 --number of ticks on one side + local stepCount = (maxX - minX -24)/(2*tickNo) + local closestHeading = math.floor(heading/22.5) * 22.5 + local closestHeadingX = midX + (closestHeading - heading)/22.5 * stepCount + local tickIdx = (closestHeading/22.5 - tickNo) % 16 + local tickX = closestHeadingX - tickNo*stepCount + for i = 1,10 do + if tickX >= minX and tickX < maxX then + if yawRibbonPoints[tickIdx+1] == nil then + lcd.drawLine(tickX, minY, tickX, y+5, SOLID, WHITE) + else + lcd.drawText(tickX, minY-3, yawRibbonPoints[tickIdx+1], WHITE+SMLSIZE+CENTER) end - lcd.setColor(CUSTOM_COLOR,0xFFFF) - --lcd.setColor(CUSTOM_COLOR,0x7BCF) - lcd.drawText(nextPointX+letterOffset,y+(bigFont and -2 or 0),yawRibbonPoints[i],SMLSIZE+CUSTOM_COLOR) - end end - i = (i + 1) % 16 - nextPointX = nextPointX + stepWidth + tickIdx = (tickIdx + 1) % 16 + tickX = tickX + stepCount end -- home icon local homeOffset = 0 local angle = telemetry.homeAngle - telemetry.yaw - if angle < 0 then - angle = 360 + angle - end + if angle < 0 then angle = angle + 360 end if angle > 270 or angle < 90 then homeOffset = ((angle + 90) % 180)/180 * width - elseif angle >= 90 and angle <= 180 then + elseif angle >= 90 and angle < 180 then homeOffset = width end - drawHomeIcon(xMin + homeOffset -5,y + (bigFont and 28 or 20),utils) - -- yaw angle box - local xx = 0 - if ( telemetry.yaw < 10) then - xx = bigFont and 20 or 14 - elseif (telemetry.yaw < 100) then - xx = bigFont and 40 or 28 + if conf.enableTxGPS then + -- radio home + drawRadioIcon(xMin + homeOffset -5,minY + (bigFont and 28 or 20),utils) else - xx = bigFont and 60 or 42 + -- vehicle home + drawHomeIcon(xMin + homeOffset -5,minY + (bigFont and 28 or 20),utils) + end + + -- text box + local w = 60 -- 3 digits width + if heading < 0 then heading = heading + 360 end + if heading < 10 then + w = 20 + elseif heading < 100 then + w = 40 end - --lcd.drawNumber(LCD_W/2 + xx - 6, YAW_Y, telemetry.yaw, MIDSIZE+INVERS) - lcd.setColor(CUSTOM_COLOR,0x0000) - lcd.drawFilledRectangle(LCD_W/2 - (xx/2), y - 1, xx, bigFont and 28 or 20, CUSTOM_COLOR+SOLID) - lcd.drawRectangle(LCD_W/2 - (xx/2) - 1, y - 1, xx+2, bigFont and 28 or 20, CUSTOM_COLOR+SOLID) - lcd.setColor(CUSTOM_COLOR,0xFFFF) - lcd.drawNumber(LCD_W/2 - (xx/2), y - 6, telemetry.yaw, (bigFont and DBLSIZE or MIDSIZE)+CUSTOM_COLOR) + local scale = bigFont and 1 or 0.7 + lcd.drawFilledRectangle(midX - (w/2)*scale, minY-2, w*scale, 28*scale, BLACK+SOLID) + lcd.drawNumber(midX, bigFont and minY-6 or minY-2, heading, WHITE+(bigFont and DBLSIZE or 0)+CENTER) end local function drawStatusBar(maxRows,conf,telemetry,status,battery,alarms,frame,utils,gpsStatuses) local yDelta = (maxRows-1)*12 - lcd.setColor(CUSTOM_COLOR,0x0000) - lcd.drawFilledRectangle(0,229-yDelta,480,LCD_H-(229-yDelta),CUSTOM_COLOR) + lcd.drawFilledRectangle(0,229-yDelta,480,LCD_H-(229-yDelta),BLACK) -- flight time - lcd.setColor(CUSTOM_COLOR,0xFFFF) - lcd.drawTimer(LCD_W, 224-yDelta, model.getTimer(2).value, DBLSIZE+CUSTOM_COLOR+RIGHT) + lcd.drawTimer(LCD_W, 224-yDelta, model.getTimer(2).value, DBLSIZE+WHITE+RIGHT) -- flight mode - lcd.setColor(CUSTOM_COLOR,0xFFFF) if status.strFlightMode ~= nil then - lcd.drawText(1,230-yDelta,status.strFlightMode,MIDSIZE+CUSTOM_COLOR) + lcd.drawText(1,230-yDelta,status.strFlightMode,MIDSIZE+WHITE) end -- gps status, draw coordinatyes if good at least once if telemetry.lon ~= nil and telemetry.lat ~= nil then - lcd.drawText(370,227-yDelta,utils.decToDMSFull(telemetry.lat),SMLSIZE+CUSTOM_COLOR+RIGHT) - lcd.drawText(370,241-yDelta,utils.decToDMSFull(telemetry.lon,telemetry.lat),SMLSIZE+CUSTOM_COLOR+RIGHT) + lcd.drawText(370, 227-yDelta, telemetry.strLat, SMLSIZE+WHITE+RIGHT) + lcd.drawText(370, 241-yDelta, telemetry.strLon, SMLSIZE+WHITE+RIGHT) end -- gps status local hdop = telemetry.gpsHdopC @@ -488,17 +510,15 @@ local function drawStatusBar(maxRows,conf,telemetry,status,battery,alarms,frame, mult=0.1 end -- HDOP - lcd.drawNumber(270,226-yDelta, hdop*mult,DBLSIZE+flags+RIGHT+CUSTOM_COLOR) + lcd.drawNumber(270,226-yDelta, hdop*mult,DBLSIZE+flags+RIGHT+WHITE) -- SATS - lcd.setColor(CUSTOM_COLOR,0xFFFF) - lcd.drawText(170,226-yDelta, strStatus, SMLSIZE+CUSTOM_COLOR) + lcd.drawText(170,226-yDelta, strStatus, SMLSIZE+WHITE) - lcd.setColor(CUSTOM_COLOR,0xFFFF) - if telemetry.numSats == 15 then - lcd.drawNumber(170,235-yDelta, telemetry.numSats, MIDSIZE+CUSTOM_COLOR) - lcd.drawText(200,239-yDelta, "+", SMLSIZE+CUSTOM_COLOR) + if ((not conf.enableMavSDK) and (telemetry.numSats == 15)) then -- MavSDK can output also numSats > 15 + lcd.drawNumber(170,235-yDelta, telemetry.numSats, MIDSIZE+WHITE) + lcd.drawText(200,239-yDelta, "+", SMLSIZE+WHITE) else - lcd.drawNumber(170,235-yDelta,telemetry.numSats, MIDSIZE+CUSTOM_COLOR) + lcd.drawNumber(170,235-yDelta,telemetry.numSats, MIDSIZE+WHITE) end elseif telemetry.gpsStatus == 0 then utils.drawBlinkBitmap("nogpsicon",150,227-yDelta) @@ -507,34 +527,37 @@ local function drawStatusBar(maxRows,conf,telemetry,status,battery,alarms,frame, end local offset = math.min(maxRows,#status.messages+1) - + local colr for i=0,offset-1 do if status.messages[(status.messageCount + i - offset) % (#status.messages+1)][2] < 4 then - lcd.setColor(CUSTOM_COLOR,lcd.RGB(255,70,0)) + colr = lcd.RGB(255,70,0) elseif status.messages[(status.messageCount + i - offset) % (#status.messages+1)][2] == 4 then - lcd.setColor(CUSTOM_COLOR,lcd.RGB(255,255,0)) + colr = lcd.RGB(255,255,0) else - lcd.setColor(CUSTOM_COLOR,0xFFFF) + colr = WHITE end - lcd.drawText(1,(256-yDelta)+(12*i), status.messages[(status.messageCount + i - offset) % (#status.messages+1)][1],SMLSIZE+CUSTOM_COLOR) + lcd.drawText(1,(256-yDelta)+(12*i), status.messages[(status.messageCount + i - offset) % (#status.messages+1)][1],SMLSIZE+colr) end end return { drawNumberWithDim=drawNumberWithDim, drawHomeIcon=drawHomeIcon, + drawRadioIcon=drawRadioIcon, drawHArrow=drawHArrow, drawVArrow=drawVArrow, drawRArrow=drawRArrow, + drawGauge=drawGauge, computeOutCode=computeOutCode, drawLineWithClippingXY=drawLineWithClippingXY, drawLineWithClipping=drawLineWithClipping, drawFailsafe=drawFailsafe, drawArmStatus=drawArmStatus, drawNoTelemetryData=drawNoTelemetryData, + drawNoMavSDK=drawNoMavSDK, drawStatusBar=drawStatusBar, drawFilledRectangle=drawFilledRectangle, drawCompassRibbon=drawCompassRibbon, + --oldDrawCompassRibbon=oldDrawCompassRibbon, yawRibbonPoints=yawRibbonPoints } - diff --git a/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/hud_1.lua b/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/hud_1.lua index 40c8453c..26db1784 100644 --- a/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/hud_1.lua +++ b/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/hud_1.lua @@ -36,6 +36,7 @@ --------------------- -- enable splash screen for no telemetry data --#define SPLASH +-- enable battery percentage based on voltage -- enable code to draw a compass rose vs a compass ribbon --#define COMPASS_ROSE @@ -54,14 +55,15 @@ --#define TESTMODE -- enable debug of generated hash or short hash string --#define HASHDEBUG - +-- enable MESSAGES DEBUG +--#define DEBUG_MESSAGES --------------------- -- DEBUG REFRESH RATES --------------------- -- calc and show hud refresh rate --#define HUDRATE -- calc and show telemetry process rate ---#define BGTELERATE +-- #define BGTELERATE --------------------- -- SENSOR IDS @@ -95,24 +97,7 @@ -- CONF REFRESH GV --------------------------------- ---------------------------------- --- ALARMS ---------------------------------- ---[[ - ALARM_TYPE_MIN needs arming (min has to be reached first), value below level for grace, once armed is periodic, reset on landing - ALARM_TYPE_MAX no arming, value above level for grace, once armed is periodic, reset on landing - ALARM_TYPE_TIMER no arming, fired periodically, spoken time, reset on landing - ALARM_TYPE_BATT needs arming (min has to be reached first), value below level for grace, no reset on landing -{ - 1 = notified, - 2 = alarm start, - 3 = armed, - 4 = type(0=min,1=max,2=timer,3=batt), - 5 = grace duration - 6 = ready - 7 = last alarm -} ---]]-- +-- -- -- @@ -125,7 +110,9 @@ --#define HUD_ALGO1 -- enable optimized hor bars HUD drawing --#define HUD_ALGO2 --- enable hor bars HUD drawing +-- enable hor bars HUD drawing, 2 px resolution +-- enable hor bars HUD drawing, 1 px resolution +--#define HUD_ALGO4 @@ -151,9 +138,6 @@ local unitLongLabel = getGeneralSettings().imperial == 0 and "km" or "mi" -- offsets are: 1 celm, 4 batt, 7 curr, 10 mah, 13 cap, indexing starts at 1 -- ------------------------ --- LIBRARY LOADING ------------------------ ---------------------- --- COLORS @@ -175,13 +159,6 @@ local unitLongLabel = getGeneralSettings().imperial == 0 and "km" or "mi" -- CLIPPING ALGO DEFINES -------------------------- - - - - - - - --------------------------------- -- LAYOUT --------------------------------- @@ -215,28 +192,25 @@ local ver, radio, maj, minor, rev = getVersion() local function drawHud(myWidget,drawLib,conf,telemetry,status,battery,utils) local r = -telemetry.roll - local cx,cy,dx,dy,ccx,ccy,cccx,cccy + local cx,cy,dx,dy--,ccx,ccy,cccx,cccy local yPos = 0 + 20 + 8 + local scale = 1.85 -- 1.85 ----------------------- -- artificial horizon ----------------------- - -- no roll ==> segments are vertical, offsets are multiples of 21 + -- no roll ==> segments are vertical, offsets are multiples of 18.5 if ( telemetry.roll == 0 or math.abs(telemetry.roll) == 180) then dx=0 - dy=telemetry.pitch * 1.85 + dy=telemetry.pitch * scale cx=0 - cy=21 - ccx=0 - ccy=2*21 - cccx=0 - cccy=3*21 + cy=18.5 else -- center line offsets dx = math.cos(math.rad(90 - r)) * -telemetry.pitch - dy = math.sin(math.rad(90 - r)) * telemetry.pitch * 1.85 + dy = math.sin(math.rad(90 - r)) * telemetry.pitch * scale -- 1st line offsets - cx = math.cos(math.rad(90 - r)) * 21 - cy = math.sin(math.rad(90 - r)) * 21 + cx = math.cos(math.rad(90 - r)) * 18.5 + cy = math.sin(math.rad(90 - r)) * 18.5 end local rollX = math.floor((LCD_W-280)/2 + 280/2) ----------------------- @@ -253,21 +227,15 @@ local function drawHud(myWidget,drawLib,conf,telemetry,status,battery,utils) local oy = 85 + dy local yy = 0 - --lcd.setColor(CUSTOM_COLOR,lcd.RGB(0x7b, 0x9d, 0xff)) -- default blue 7B9DFF - --lcd.drawFilledRectangle(minX,minY,maxX-minX,maxY - minY,CUSTOM_COLOR) lcd.drawBitmap(utils.getBitmap("hud_bg_280x134"),(LCD_W-280)/2,18) --160x90 -- HUD - --lcd.setColor(CUSTOM_COLOR,lcd.RGB(77, 153, 0)) - --lcd.setColor(CUSTOM_COLOR,lcd.RGB(0x90, 0x63, 0x20)) --906320 bighud brown - lcd.setColor(CUSTOM_COLOR,lcd.RGB(0x63, 0x30, 0x00)) --623000 old brown - -- angle of the line passing on point(ox,oy) local angle = math.tan(math.rad(-telemetry.roll)) -- prevent divide by zero if telemetry.roll == 0 then - drawLib.drawFilledRectangle(minX,math.max(minY,dy+minY+(maxY-minY)/2),maxX-minX,math.min(maxY-minY,(maxY-minY)/2-dy+(math.abs(dy) > 0 and 1 or 0)),CUSTOM_COLOR) + drawLib.drawFilledRectangle(minX,math.max(minY,dy+minY+(maxY-minY)/2),maxX-minX,math.min(maxY-minY,(maxY-minY)/2-dy+(math.abs(dy) > 0 and 1 or 0)),lcd.RGB(0x63,0x30,0x00)) -- 0x623000 = old brown elseif math.abs(telemetry.roll) >= 180 then - drawLib.drawFilledRectangle(minX,minY,maxX-minX,math.min(maxY-minY,(maxY-minY)/2+dy),CUSTOM_COLOR) + drawLib.drawFilledRectangle(minX,minY,maxX-minX,math.min(maxY-minY,(maxY-minY)/2+dy),lcd.RGB(0x63,0x30,0x00)) -- 0x623000 = old brown else -- HUD drawn using horizontal bars of height 2 -- true if flying inverted @@ -286,7 +254,7 @@ local function drawHud(myWidget,drawLib,conf,telemetry,status,battery,utils) yy = minY + s*step xx = ox + (yy-oy)/angle if xx >= minX and xx <= maxX then - lcd.drawFilledRectangle(xx, yy, maxX-xx+1, step,CUSTOM_COLOR) + lcd.drawFilledRectangle(xx, yy, maxX-xx+1, step,lcd.RGB(0x63,0x30,0x00)) -- 0x623000 = old brown elseif xx < minX then yRect = inverted and math.max(yy,yRect)+step or math.min(yy,yRect) fillNeeded = true @@ -298,7 +266,7 @@ local function drawHud(myWidget,drawLib,conf,telemetry,status,battery,utils) yy = minY + s*step xx = ox + (yy-oy)/angle if xx >= minX and xx <= maxX then - lcd.drawFilledRectangle(minX, yy, xx-minX, step,CUSTOM_COLOR) + lcd.drawFilledRectangle(minX, yy, xx-minX, step,lcd.RGB(0x63,0x30,0x00)) -- 0x623000 = old brown elseif xx > maxX then yRect = inverted and math.max(yy,yRect)+step or math.min(yy,yRect) fillNeeded = true @@ -309,8 +277,7 @@ local function drawHud(myWidget,drawLib,conf,telemetry,status,battery,utils) if fillNeeded then local yMin = inverted and minY or yRect local height = inverted and yRect - minY or maxY-yRect - --lcd.setColor(CUSTOM_COLOR,0xF800) --623000 old brown - lcd.drawFilledRectangle(minX, yMin, maxX-minX, height ,CUSTOM_COLOR) + lcd.drawFilledRectangle(minX, yMin, maxX-minX, height,lcd.RGB(0x63,0x30,0x00)) -- 0x623000 = old brown end end @@ -318,14 +285,18 @@ local function drawHud(myWidget,drawLib,conf,telemetry,status,battery,utils) -- parallel lines above and below horizon local linesMaxY = maxY-2 local linesMinY = minY+10 - lcd.setColor(CUSTOM_COLOR,0xFFFF) -- +/- 90 deg - for dist=1,8 + for dist=1,6 do - drawLib.drawLineWithClipping(rollX + dx - dist*cx,dy + 85 + dist*cy,r,(dist%2==0 and 80 or 40),DOTTED,(LCD_W-280)/2+2,(LCD_W-280)/2+280-2,linesMinY,linesMaxY,CUSTOM_COLOR,radio,rev) - drawLib.drawLineWithClipping(rollX + dx + dist*cx,dy + 85 - dist*cy,r,(dist%2==0 and 80 or 40),DOTTED,(LCD_W-280)/2+2,(LCD_W-280)/2+280-2,linesMinY,linesMaxY,CUSTOM_COLOR,radio,rev) + drawLib.drawLineWithClipping(rollX + dx - dist*cx,dy + 85 + dist*cy,r,(dist%2==0 and 80 or 40),DOTTED,(LCD_W-280)/2+2,(LCD_W-280)/2+280-2,linesMinY,linesMaxY,WHITE,radio,rev) + drawLib.drawLineWithClipping(rollX + dx + dist*cx,dy + 85 - dist*cy,r,(dist%2==0 and 80 or 40),DOTTED,(LCD_W-280)/2+2,(LCD_W-280)/2+280-2,linesMinY,linesMaxY,WHITE,radio,rev) end + --[[ + -- horizon line + drawLib.drawLineWithClipping(rollX + dx,dy + HUD_Y_MID,r,200, SOLID, HUD_X+2,HUD_X+HUD_WIDTH-2,linesMinY,linesMaxY,lcd.RGB(160,160,160),radio,rev) + --]] + -- hashmarks local startY = minY + 1 local endY = maxY - 10 @@ -335,13 +306,12 @@ local function drawHud(myWidget,drawLib,conf,telemetry,status,battery,utils) local offset = math.floor((telemetry.hSpeed*conf.horSpeedMultiplier*0.1-roundHSpeed)*0.2*step); local ii = 0; local yy = 0 - lcd.setColor(CUSTOM_COLOR,lcd.RGB(120,120,120)) for j=roundHSpeed+20,roundHSpeed-20,-5 do yy = startY + (ii*step) + offset - 14 if yy >= startY and yy < endY then - lcd.drawLine((LCD_W-280)/2, yy+9, (LCD_W-280)/2 + 4, yy+9, SOLID, CUSTOM_COLOR) - lcd.drawNumber((LCD_W-280)/2 + 7, yy, j, SMLSIZE+CUSTOM_COLOR) + lcd.drawLine((LCD_W-280)/2, yy+9, (LCD_W-280)/2 + 4, yy+9, SOLID, lcd.RGB(120,120,120)) + lcd.drawNumber((LCD_W-280)/2 + 7, yy, j, SMLSIZE+lcd.RGB(120,120,120)) end ii=ii+1; end @@ -354,12 +324,11 @@ local function drawHud(myWidget,drawLib,conf,telemetry,status,battery,utils) do yy = startY + (ii*step) + offset - 14 if yy >= startY and yy < endY then - lcd.drawLine((LCD_W-280)/2 + 280 - 14, yy+8, (LCD_W-280)/2 + 280-10 , yy+8, SOLID, CUSTOM_COLOR) - lcd.drawNumber((LCD_W-280)/2 + 280 - 16, yy, j, SMLSIZE+RIGHT+CUSTOM_COLOR) + lcd.drawLine((LCD_W-280)/2 + 280 - 14, yy+8, (LCD_W-280)/2 + 280-10 , yy+8, SOLID, lcd.RGB(120,120,120)) + lcd.drawNumber((LCD_W-280)/2 + 280 - 16, yy, j, SMLSIZE+RIGHT+lcd.RGB(120,120,120)) end ii=ii+1; end - lcd.setColor(CUSTOM_COLOR,0xFFFF) ------------------------------------- -- hud bitmap @@ -379,34 +348,29 @@ local function drawHud(myWidget,drawLib,conf,telemetry,status,battery,utils) varioY = 85 + 15 end --00ae10 - lcd.setColor(CUSTOM_COLOR,lcd.RGB(255, 0xce, 0)) --yellow - --lcd.setColor(CUSTOM_COLOR,lcd.RGB(00, 0xED, 0x32)) --green - -- lcd.setColor(CUSTOM_COLOR,lcd.RGB(50, 50, 50)) --dark grey - --lcd.setColor(CUSTOM_COLOR,lcd.RGB(255, 255, 255)) --white - lcd.drawFilledRectangle(372, varioY, 8, varioH, CUSTOM_COLOR, 0) + lcd.drawFilledRectangle(372, varioY, 8, varioH, lcd.RGB(0xFF,0xCE,0x00), 0) -- yellow ------------------------------------- -- left and right indicators on HUD ------------------------------------- -- DATA - lcd.setColor(CUSTOM_COLOR,lcd.RGB(00, 0xED, 0x32)) --green -- altitude local alt = utils.getMaxValue(telemetry.homeAlt,11) * unitScale if math.abs(alt) > 999 or alt < -99 then - lcd.drawNumber((LCD_W-280)/2+280+1,85-16,alt,MIDSIZE+CUSTOM_COLOR+RIGHT) + lcd.drawNumber((LCD_W-280)/2+280+1,85-16,alt,MIDSIZE+lcd.RGB(0x00,0xED,0x32)+RIGHT) -- green elseif math.abs(alt) >= 10 then - lcd.drawNumber((LCD_W-280)/2+280+1,85-20,alt,DBLSIZE+CUSTOM_COLOR+RIGHT) + lcd.drawNumber((LCD_W-280)/2+280+1,85-20,alt,DBLSIZE+lcd.RGB(0x00,0xED,0x32)+RIGHT) -- green else - lcd.drawNumber((LCD_W-280)/2+280+1,85-20,alt*10,DBLSIZE+PREC1+CUSTOM_COLOR+RIGHT) + lcd.drawNumber((LCD_W-280)/2+280+1,85-20,alt*10,DBLSIZE+PREC1+lcd.RGB(0x00,0xED,0x32)+RIGHT) -- green end -- telemetry.hSpeed is in dm/s local hSpeed = utils.getMaxValue(telemetry.hSpeed,14) * 0.1 * conf.horSpeedMultiplier if (math.abs(hSpeed) >= 10) then - lcd.drawNumber((LCD_W-280)/2+2,85-20,hSpeed,DBLSIZE+CUSTOM_COLOR) + lcd.drawNumber((LCD_W-280)/2+2,85-20,hSpeed,DBLSIZE+lcd.RGB(0x00,0xED,0x32)) -- green else - lcd.drawNumber((LCD_W-280)/2+2,85-20,hSpeed*10,DBLSIZE+CUSTOM_COLOR+PREC1) + lcd.drawNumber((LCD_W-280)/2+2,85-20,hSpeed*10,DBLSIZE+lcd.RGB(0x00,0xED,0x32)+PREC1) -- green end - lcd.setColor(CUSTOM_COLOR,0xFFFF) + -- lcd.setColor(CUSTOM_COLOR,0xFFFF) -- min/max arrows if status.showMinMaxValues == true then drawLib.drawVArrow((LCD_W-280)/2+68, 85-12,true,false,utils) @@ -414,28 +378,25 @@ local function drawHud(myWidget,drawLib,conf,telemetry,status,battery,utils) end -- vspeed box - lcd.setColor(CUSTOM_COLOR,0xFFFF) - + -- lcd.setColor(CUSTOM_COLOR,0xFFFF) local vSpeed = utils.getMaxValue(telemetry.vSpeed,13) * 0.1 -- m/s local xx = math.abs(vSpeed*conf.vertSpeedMultiplier) > 999 and 4 or 3 xx = xx + (vSpeed*conf.vertSpeedMultiplier < 0 and 1 or 0) if math.abs(vSpeed*conf.vertSpeedMultiplier*10) > 99 then -- - lcd.drawNumber((LCD_W)/2 + (xx/2)*12, 127, vSpeed*conf.vertSpeedMultiplier, MIDSIZE+CUSTOM_COLOR+RIGHT) + lcd.drawNumber((LCD_W)/2 + (xx/2)*12, 127, vSpeed*conf.vertSpeedMultiplier, MIDSIZE+WHITE+RIGHT) else - lcd.drawNumber((LCD_W)/2 + (xx/2)*12, 127, vSpeed*conf.vertSpeedMultiplier*10, MIDSIZE+CUSTOM_COLOR+RIGHT+PREC1) + lcd.drawNumber((LCD_W)/2 + (xx/2)*12, 127, vSpeed*conf.vertSpeedMultiplier*10, MIDSIZE+WHITE+RIGHT+PREC1) end -- compass ribbon drawLib.drawCompassRibbon(18,myWidget,conf,telemetry,status,battery,utils,240,(LCD_W-240)/2,(LCD_W+240)/2,25,true) - -- pitch and roll - lcd.setColor(CUSTOM_COLOR,0xFE60) local xoffset = math.abs(telemetry.pitch) > 99 and 6 or 0 - lcd.drawNumber(248+xoffset,90,telemetry.pitch,CUSTOM_COLOR+SMLSIZE+RIGHT) - lcd.drawNumber(214,76,telemetry.roll,CUSTOM_COLOR+SMLSIZE+RIGHT) - lcd.setColor(CUSTOM_COLOR,0xFFFF) + lcd.drawNumber(248+xoffset,90,telemetry.pitch,lcd.RGB(0xFF,0xCE,0x00)+SMLSIZE+RIGHT) -- yellow + lcd.drawNumber(214,76,telemetry.roll,lcd.RGB(0xFF,0xCE,0x00)+SMLSIZE+RIGHT) + -- lcd.setColor(CUSTOM_COLOR,0xFFFF) end local function background(myWidget,conf,telemetry,status,utils) diff --git a/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/hud_2.lua b/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/hud_2.lua index f835dfb3..68422b59 100644 --- a/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/hud_2.lua +++ b/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/hud_2.lua @@ -36,6 +36,7 @@ --------------------- -- enable splash screen for no telemetry data --#define SPLASH +-- enable battery percentage based on voltage -- enable code to draw a compass rose vs a compass ribbon --#define COMPASS_ROSE @@ -54,14 +55,15 @@ --#define TESTMODE -- enable debug of generated hash or short hash string --#define HASHDEBUG - +-- enable MESSAGES DEBUG +--#define DEBUG_MESSAGES --------------------- -- DEBUG REFRESH RATES --------------------- -- calc and show hud refresh rate --#define HUDRATE -- calc and show telemetry process rate ---#define BGTELERATE +-- #define BGTELERATE --------------------- -- SENSOR IDS @@ -95,24 +97,7 @@ -- CONF REFRESH GV --------------------------------- ---------------------------------- --- ALARMS ---------------------------------- ---[[ - ALARM_TYPE_MIN needs arming (min has to be reached first), value below level for grace, once armed is periodic, reset on landing - ALARM_TYPE_MAX no arming, value above level for grace, once armed is periodic, reset on landing - ALARM_TYPE_TIMER no arming, fired periodically, spoken time, reset on landing - ALARM_TYPE_BATT needs arming (min has to be reached first), value below level for grace, no reset on landing -{ - 1 = notified, - 2 = alarm start, - 3 = armed, - 4 = type(0=min,1=max,2=timer,3=batt), - 5 = grace duration - 6 = ready - 7 = last alarm -} ---]]-- +-- -- -- @@ -125,7 +110,9 @@ --#define HUD_ALGO1 -- enable optimized hor bars HUD drawing --#define HUD_ALGO2 --- enable hor bars HUD drawing +-- enable hor bars HUD drawing, 2 px resolution +-- enable hor bars HUD drawing, 1 px resolution +--#define HUD_ALGO4 @@ -151,9 +138,6 @@ local unitLongLabel = getGeneralSettings().imperial == 0 and "km" or "mi" -- offsets are: 1 celm, 4 batt, 7 curr, 10 mah, 13 cap, indexing starts at 1 -- ------------------------ --- LIBRARY LOADING ------------------------ ---------------------- --- COLORS @@ -175,13 +159,6 @@ local unitLongLabel = getGeneralSettings().imperial == 0 and "km" or "mi" -- CLIPPING ALGO DEFINES -------------------------- - - - - - - - --------------------------------- -- LAYOUT --------------------------------- @@ -210,7 +187,7 @@ local ver, radio, maj, minor, rev = getVersion() local function drawHud(myWidget,drawLib,conf,telemetry,status,battery,utils) local r = -telemetry.roll - local cx,cy,dx,dy,ccx,ccy,cccx,cccy + local cx,cy,dx,dy--,ccx,ccy,cccx,cccy local yPos = 0 + 20 + 8 ----------------------- -- artificial horizon @@ -221,10 +198,10 @@ local function drawHud(myWidget,drawLib,conf,telemetry,status,battery,utils) dy=telemetry.pitch cx=0 cy=12 - ccx=0 - ccy=2*12 - cccx=0 - cccy=3*12 + --ccx=0 + --ccy=2*12 + --cccx=0 + --cccy=3*12 else -- center line offsets dx = math.cos(math.rad(90 - r)) * -telemetry.pitch @@ -233,11 +210,11 @@ local function drawHud(myWidget,drawLib,conf,telemetry,status,battery,utils) cx = math.cos(math.rad(90 - r)) * 12 cy = math.sin(math.rad(90 - r)) * 12 -- 2nd line offsets - ccx = math.cos(math.rad(90 - r)) * 2 * 12 - ccy = math.sin(math.rad(90 - r)) * 2 * 12 + --ccx = math.cos(math.rad(90 - r)) * 2 * 12 + --ccy = math.sin(math.rad(90 - r)) * 2 * 12 -- 3rd line offsets - cccx = math.cos(math.rad(90 - r)) * 3 * 12 - cccy = math.sin(math.rad(90 - r)) * 3 * 12 + --cccx = math.cos(math.rad(90 - r)) * 3 * 12 + --cccy = math.sin(math.rad(90 - r)) * 3 * 12 end local rollX = math.floor((LCD_W-160)/2 + 160/2) ----------------------- @@ -254,21 +231,15 @@ local function drawHud(myWidget,drawLib,conf,telemetry,status,battery,utils) local oy = 69 + dy local yy = 0 - --lcd.setColor(CUSTOM_COLOR,lcd.RGB(0x0d, 0x68, 0xb1)) -- bighud blue - lcd.setColor(CUSTOM_COLOR,lcd.RGB(0x7b, 0x9d, 0xff)) -- default blue - lcd.drawFilledRectangle(minX,minY,maxX-minX,maxY - minY,CUSTOM_COLOR) + lcd.drawFilledRectangle(minX,minY,maxX-minX,maxY - minY,lcd.RGB(0x7B,0x9D,0xFF)) -- default blue -- HUD - --lcd.setColor(CUSTOM_COLOR,lcd.RGB(77, 153, 0)) - --lcd.setColor(CUSTOM_COLOR,lcd.RGB(0x90, 0x63, 0x20)) --906320 bighud brown - lcd.setColor(CUSTOM_COLOR,lcd.RGB(0x63, 0x30, 0x00)) --623000 old brown - -- angle of the line passing on point(ox,oy) local angle = math.tan(math.rad(-telemetry.roll)) -- prevent divide by zero if telemetry.roll == 0 then - drawLib.drawFilledRectangle(minX,math.max(minY,dy+minY+(maxY-minY)/2),maxX-minX,math.min(maxY-minY,(maxY-minY)/2-dy+(math.abs(dy) > 0 and 1 or 0)),CUSTOM_COLOR) + drawLib.drawFilledRectangle(minX,math.max(minY,dy+minY+(maxY-minY)/2),maxX-minX,math.min(maxY-minY,(maxY-minY)/2-dy+(math.abs(dy) > 0 and 1 or 0)),lcd.RGB(0x63,0x30,0x00)) -- 0x623000 = old brown elseif math.abs(telemetry.roll) >= 180 then - drawLib.drawFilledRectangle(minX,minY,maxX-minX,math.min(maxY-minY,(maxY-minY)/2+dy),CUSTOM_COLOR) + drawLib.drawFilledRectangle(minX,minY,maxX-minX,math.min(maxY-minY,(maxY-minY)/2+dy),lcd.RGB(0x63,0x30,0x00)) -- 0x623000 = old brown else -- HUD drawn using horizontal bars of height 2 -- true if flying inverted @@ -287,7 +258,7 @@ local function drawHud(myWidget,drawLib,conf,telemetry,status,battery,utils) yy = minY + s*step xx = ox + (yy-oy)/angle if xx >= minX and xx <= maxX then - lcd.drawFilledRectangle(xx, yy, maxX-xx+1, step,CUSTOM_COLOR) + lcd.drawFilledRectangle(xx, yy, maxX-xx+1, step,lcd.RGB(0x63,0x30,0x00)) -- 0x623000 = old brown elseif xx < minX then yRect = inverted and math.max(yy,yRect)+step or math.min(yy,yRect) fillNeeded = true @@ -299,7 +270,7 @@ local function drawHud(myWidget,drawLib,conf,telemetry,status,battery,utils) yy = minY + s*step xx = ox + (yy-oy)/angle if xx >= minX and xx <= maxX then - lcd.drawFilledRectangle(minX, yy, xx-minX, step,CUSTOM_COLOR) + lcd.drawFilledRectangle(minX, yy, xx-minX, step,lcd.RGB(0x63,0x30,0x00)) -- 0x623000 = old brown elseif xx > maxX then yRect = inverted and math.max(yy,yRect)+step or math.min(yy,yRect) fillNeeded = true @@ -310,8 +281,7 @@ local function drawHud(myWidget,drawLib,conf,telemetry,status,battery,utils) if fillNeeded then local yMin = inverted and minY or yRect local height = inverted and yRect - minY or maxY-yRect - --lcd.setColor(CUSTOM_COLOR,0xF800) --623000 old brown - lcd.drawFilledRectangle(minX, yMin, maxX-minX, height ,CUSTOM_COLOR) + lcd.drawFilledRectangle(minX, yMin, maxX-minX, height,lcd.RGB(0x63,0x30,0x00)) -- 0x623000 = old brown end end @@ -319,18 +289,16 @@ local function drawHud(myWidget,drawLib,conf,telemetry,status,battery,utils) -- parallel lines above and below horizon local linesMaxY = maxY-1 local linesMinY = minY+1 - lcd.setColor(CUSTOM_COLOR,0xFFFF) -- +/- 90 deg for dist=1,8 do - drawLib.drawLineWithClipping(rollX + dx - dist*cx,dy + 69 + dist*cy,r,(dist%2==0 and 40 or 20),DOTTED,(LCD_W-160)/2+2,(LCD_W-160)/2+160-2,linesMinY,linesMaxY,CUSTOM_COLOR,radio,rev) - drawLib.drawLineWithClipping(rollX + dx + dist*cx,dy + 69 - dist*cy,r,(dist%2==0 and 40 or 20),DOTTED,(LCD_W-160)/2+2,(LCD_W-160)/2+160-2,linesMinY,linesMaxY,CUSTOM_COLOR,radio,rev) + drawLib.drawLineWithClipping(rollX + dx - dist*cx,dy + 69 + dist*cy,r,(dist%2==0 and 40 or 20),DOTTED,(LCD_W-160)/2+2,(LCD_W-160)/2+160-2,linesMinY,linesMaxY,WHITE,radio,rev) + drawLib.drawLineWithClipping(rollX + dx + dist*cx,dy + 69 - dist*cy,r,(dist%2==0 and 40 or 20),DOTTED,(LCD_W-160)/2+2,(LCD_W-160)/2+160-2,linesMinY,linesMaxY,WHITE,radio,rev) end -- hashmarks local startY = minY + 1 local endY = maxY - 10 local step = 18 - lcd.setColor(CUSTOM_COLOR,lcd.RGB(120,120,120)) -- hSpeed local roundHSpeed = math.floor((telemetry.hSpeed*conf.horSpeedMultiplier*0.1/5)+0.5)*5; local offset = math.floor((telemetry.hSpeed*conf.horSpeedMultiplier*0.1-roundHSpeed)*0.2*step); @@ -340,8 +308,8 @@ local function drawHud(myWidget,drawLib,conf,telemetry,status,battery,utils) do yy = startY + (ii*step) + offset if yy >= startY and yy < endY then - lcd.drawLine((LCD_W-160)/2 + 1, yy+9, (LCD_W-160)/2 + 5, yy+9, SOLID, CUSTOM_COLOR) - lcd.drawNumber((LCD_W-160)/2 + 8, yy, j, SMLSIZE+CUSTOM_COLOR) + lcd.drawLine((LCD_W-160)/2 + 1, yy+9, (LCD_W-160)/2 + 5, yy+9, SOLID, lcd.RGB(120,120,120)) + lcd.drawNumber((LCD_W-160)/2 + 8, yy, j, SMLSIZE+lcd.RGB(120,120,120)) end ii=ii+1; end @@ -354,12 +322,11 @@ local function drawHud(myWidget,drawLib,conf,telemetry,status,battery,utils) do yy = startY + (ii*step) + offset if yy >= startY and yy < endY then - lcd.drawLine((LCD_W-160)/2 + 160 - 15, yy+8, (LCD_W-160)/2 + 160 -10, yy+8, SOLID, CUSTOM_COLOR) - lcd.drawNumber((LCD_W-160)/2 + 160 - 16, yy, j, SMLSIZE+RIGHT+CUSTOM_COLOR) + lcd.drawLine((LCD_W-160)/2 + 160 - 15, yy+8, (LCD_W-160)/2 + 160 -10, yy+8, SOLID, lcd.RGB(120,120,120)) + lcd.drawNumber((LCD_W-160)/2 + 160 - 16, yy, j, SMLSIZE+RIGHT+lcd.RGB(120,120,120)) end ii=ii+1; end - lcd.setColor(CUSTOM_COLOR,0xFFFF) ------------------------------------- -- hud bitmap ------------------------------------- @@ -375,35 +342,27 @@ local function drawHud(myWidget,drawLib,conf,telemetry,status,battery,utils) else varioY = 24 + 55 end - --00ae10 - lcd.setColor(CUSTOM_COLOR,lcd.RGB(255, 0xce, 0)) --yellow - -- lcd.setColor(CUSTOM_COLOR,lcd.RGB(00, 0xED, 0x32)) --green - -- lcd.setColor(CUSTOM_COLOR,lcd.RGB(50, 50, 50)) --dark grey - lcd.drawFilledRectangle(310, varioY, 10, varioH, CUSTOM_COLOR, 0) + lcd.drawFilledRectangle(310, varioY, 10, varioH, lcd.RGB(0xFF,0xCE,0x00), 0) -- yellow ------------------------------------- -- left and right indicators on HUD ------------------------------------- -- DATA - lcd.setColor(CUSTOM_COLOR,0xFFFF) -- altitude local alt = utils.getMaxValue(telemetry.homeAlt,11) * unitScale if math.abs(alt) > 999 then - lcd.setColor(CUSTOM_COLOR,lcd.RGB(00, 0xED, 0x32)) --green - lcd.drawNumber((LCD_W-160)/2+160+1,69-10,alt,CUSTOM_COLOR+RIGHT) + lcd.drawNumber((LCD_W-160)/2+160+1,69-10,alt,lcd.RGB(0x00,0xED,0x32)+RIGHT) -- green elseif math.abs(alt) >= 10 then - lcd.setColor(CUSTOM_COLOR,lcd.RGB(00, 0xED, 0x32)) --green - lcd.drawNumber((LCD_W-160)/2+160+1,69-14,alt,MIDSIZE+CUSTOM_COLOR+RIGHT) + lcd.drawNumber((LCD_W-160)/2+160+1,69-14,alt,MIDSIZE+lcd.RGB(0x00,0xED,0x32)+RIGHT) -- green else - lcd.setColor(CUSTOM_COLOR,lcd.RGB(00, 0xED, 0x32)) --green - lcd.drawNumber((LCD_W-160)/2+160+1,69-14,alt*10,MIDSIZE+PREC1+CUSTOM_COLOR+RIGHT) + lcd.drawNumber((LCD_W-160)/2+160+1,69-14,alt*10,MIDSIZE+PREC1+lcd.RGB(0x00,0xED,0x32)+RIGHT) -- green end -- telemetry.hSpeed is in dm/s local hSpeed = utils.getMaxValue(telemetry.hSpeed,14) * 0.1 * conf.horSpeedMultiplier if (math.abs(hSpeed) >= 10) then - lcd.drawNumber((LCD_W-160)/2+2,69-14,hSpeed,MIDSIZE+CUSTOM_COLOR) + lcd.drawNumber((LCD_W-160)/2+2,69-14,hSpeed,MIDSIZE+WHITE) else - lcd.drawNumber((LCD_W-160)/2+2,69-14,hSpeed*10,MIDSIZE+CUSTOM_COLOR+PREC1) + lcd.drawNumber((LCD_W-160)/2+2,69-14,hSpeed*10,MIDSIZE+WHITE+PREC1) end -- min/max arrows if status.showMinMaxValues == true then diff --git a/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/hud_russian_2.lua b/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/hud_russian_2.lua index c6cc664b..ed1c2278 100644 --- a/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/hud_russian_2.lua +++ b/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/hud_russian_2.lua @@ -36,6 +36,7 @@ --------------------- -- enable splash screen for no telemetry data --#define SPLASH +-- enable battery percentage based on voltage -- enable code to draw a compass rose vs a compass ribbon --#define COMPASS_ROSE @@ -54,14 +55,15 @@ --#define TESTMODE -- enable debug of generated hash or short hash string --#define HASHDEBUG - +-- enable MESSAGES DEBUG +--#define DEBUG_MESSAGES --------------------- -- DEBUG REFRESH RATES --------------------- -- calc and show hud refresh rate --#define HUDRATE -- calc and show telemetry process rate ---#define BGTELERATE +-- #define BGTELERATE --------------------- -- SENSOR IDS @@ -95,24 +97,7 @@ -- CONF REFRESH GV --------------------------------- ---------------------------------- --- ALARMS ---------------------------------- ---[[ - ALARM_TYPE_MIN needs arming (min has to be reached first), value below level for grace, once armed is periodic, reset on landing - ALARM_TYPE_MAX no arming, value above level for grace, once armed is periodic, reset on landing - ALARM_TYPE_TIMER no arming, fired periodically, spoken time, reset on landing - ALARM_TYPE_BATT needs arming (min has to be reached first), value below level for grace, no reset on landing -{ - 1 = notified, - 2 = alarm start, - 3 = armed, - 4 = type(0=min,1=max,2=timer,3=batt), - 5 = grace duration - 6 = ready - 7 = last alarm -} ---]]-- +-- -- -- @@ -125,7 +110,9 @@ --#define HUD_ALGO1 -- enable optimized hor bars HUD drawing --#define HUD_ALGO2 --- enable hor bars HUD drawing +-- enable hor bars HUD drawing, 2 px resolution +-- enable hor bars HUD drawing, 1 px resolution +--#define HUD_ALGO4 @@ -151,9 +138,6 @@ local unitLongLabel = getGeneralSettings().imperial == 0 and "km" or "mi" -- offsets are: 1 celm, 4 batt, 7 curr, 10 mah, 13 cap, indexing starts at 1 -- ------------------------ --- LIBRARY LOADING ------------------------ ---------------------- --- COLORS @@ -175,13 +159,6 @@ local unitLongLabel = getGeneralSettings().imperial == 0 and "km" or "mi" -- CLIPPING ALGO DEFINES -------------------------- - - - - - - - --------------------------------- -- LAYOUT --------------------------------- @@ -241,39 +218,33 @@ local function drawHud(myWidget,drawLib,conf,telemetry,status,battery,utils) local oy = 69 + dy local yy = 0 - --lcd.setColor(CUSTOM_COLOR,lcd.RGB(179, 204, 255)) - lcd.setColor(CUSTOM_COLOR,lcd.RGB(0x7b, 0x9d, 0xff)) -- default blue - lcd.drawFilledRectangle(minX,minY,158,maxY-minY,CUSTOM_COLOR) + lcd.drawFilledRectangle(minX,minY,158,maxY-minY,lcd.RGB(0x7B,0x9D,0xFF)) -- default blue -- angle of the line passing on point(ox,oy) local angle = math.tan(math.rad(-telemetry.roll)) -- for each pixel of the hud base/top draw vertical black -- lines from hud border to horizon line -- horizon line moves with pitch/roll - --lcd.setColor(CUSTOM_COLOR,lcd.RGB(77, 153, 0)) - --lcd.setColor(CUSTOM_COLOR,lcd.RGB(102, 51, 0)) - lcd.setColor(CUSTOM_COLOR,lcd.RGB(0x63, 0x30, 0x00)) --623000 old brown if math.abs(telemetry.roll) < 90 then if oy > minY and oy < maxY then - lcd.drawFilledRectangle(minX,oy,158,maxY-oy + 1,CUSTOM_COLOR) + lcd.drawFilledRectangle(minX,oy,158,maxY-oy + 1,lcd.RGB(0x63,0x30,0x00)) -- 0x623000 = old brown elseif oy <= minY then - lcd.drawFilledRectangle(minX,minY,158,maxY-minY,CUSTOM_COLOR) + lcd.drawFilledRectangle(minX,minY,158,maxY-minY,lcd.RGB(0x63,0x30,0x00)) -- 0x623000 = old brown end else --inverted if oy > minY and oy < maxY then - lcd.drawFilledRectangle(minX,minY,158,oy-minY + 1,CUSTOM_COLOR) + lcd.drawFilledRectangle(minX,minY,158,oy-minY + 1,lcd.RGB(0x63,0x30,0x00)) -- 0x623000 = old brown elseif oy >= maxY then - lcd.drawFilledRectangle(minX,minY,158,maxY-minY,CUSTOM_COLOR) + lcd.drawFilledRectangle(minX,minY,158,maxY-minY,lcd.RGB(0x63,0x30,0x00)) -- 0x623000 = old brown end end -- -- parallel lines above and below horizon - lcd.setColor(CUSTOM_COLOR,lcd.RGB(255, 255, 255)) -- local hx = math.cos(math.rad(90 - r)) * -(telemetry.pitch%45) local hy = math.sin(math.rad(90 - r)) * (telemetry.pitch%45) - --drawLineWithClipping(rollX - hx, 69 + hy,r,50,SOLID,(LCD_W-158)/2,(LCD_W-158)/2 + 158,minY,maxY,CUSTOM_COLOR) + --drawLineWithClipping(rollX - hx, 69 + hy,r,50,SOLID,(LCD_W-158)/2,(LCD_W-158)/2 + 158,minY,maxY,WHITE) for line=0,4 do @@ -281,8 +252,8 @@ local function drawHud(myWidget,drawLib,conf,telemetry,status,battery,utils) local deltax = math.cos(math.rad(90 - r)) * 20 * line local deltay = math.sin(math.rad(90 - r)) * 20 * line -- - drawLib.drawLineWithClipping(rollX - deltax + hx, 69 + deltay + hy,r,50,DOTTED,(LCD_W-158)/2,(LCD_W-158)/2 + 158,minY,maxY,CUSTOM_COLOR,radio,rev) - drawLib.drawLineWithClipping(rollX + deltax + hx, 69 - deltay + hy,r,50,DOTTED,(LCD_W-158)/2,(LCD_W-158)/2 + 158,minY,maxY,CUSTOM_COLOR,radio,rev) + drawLib.drawLineWithClipping(rollX - deltax + hx, 69 + deltay + hy,r,50,DOTTED,(LCD_W-158)/2,(LCD_W-158)/2 + 158,minY,maxY,WHITE,radio,rev) + drawLib.drawLineWithClipping(rollX + deltax + hx, 69 - deltay + hy,r,50,DOTTED,(LCD_W-158)/2,(LCD_W-158)/2 + 158,minY,maxY,WHITE,radio,rev) end local xx = math.cos(math.rad(r)) * 70 * 0.5 @@ -294,8 +265,8 @@ local function drawHud(myWidget,drawLib,conf,telemetry,status,battery,utils) local x1 = rollX + xx local y1 = 69 + yy -- - drawLib.drawLineWithClipping(x0,y0,r + 90,70,SOLID,(LCD_W-158)/2,(LCD_W-158)/2 + 158,minY,maxY,CUSTOM_COLOR,radio,rev) - drawLib.drawLineWithClipping(x1,y1,r + 90,70,SOLID,(LCD_W-158)/2,(LCD_W-158)/2 + 158,minY,maxY,CUSTOM_COLOR,radio,rev) + drawLib.drawLineWithClipping(x0,y0,r + 90,70,SOLID,(LCD_W-158)/2,(LCD_W-158)/2 + 158,minY,maxY,WHITE,radio,rev) + drawLib.drawLineWithClipping(x1,y1,r + 90,70,SOLID,(LCD_W-158)/2,(LCD_W-158)/2 + 158,minY,maxY,WHITE,radio,rev) ------------------------------------- -- hud bitmap ------------------------------------- @@ -312,10 +283,7 @@ local function drawHud(myWidget,drawLib,conf,telemetry,status,battery,utils) varioY = 24 + 55 end --00ae10 - lcd.setColor(CUSTOM_COLOR,lcd.RGB(255, 0xce, 0)) --yellow - -- lcd.setColor(CUSTOM_COLOR,lcd.RGB(00, 0xED, 0x32)) --green - -- lcd.setColor(CUSTOM_COLOR,lcd.RGB(50, 50, 50)) --dark grey - lcd.drawFilledRectangle(310, varioY, 10, varioH, CUSTOM_COLOR, 0) + lcd.drawFilledRectangle(310, varioY, 10, varioH, lcd.RGB(0xFF,0xCE,0x00), 0) -- yellow ------------------------------------- -- left and right indicators on HUD ------------------------------------- @@ -323,22 +291,18 @@ local function drawHud(myWidget,drawLib,conf,telemetry,status,battery,utils) -- altitude local alt = utils.getMaxValue(telemetry.homeAlt,11) * unitScale if math.abs(alt) > 999 then - lcd.setColor(CUSTOM_COLOR,0x1FEA) - lcd.drawNumber((LCD_W-158)/2+158 - 42,69-10,alt,CUSTOM_COLOR) + lcd.drawNumber((LCD_W-158)/2+158 - 42,69-10,alt,lcd.RGB(0x19,0xFF,0x52)) -- 0x1FEA = 0x19FF52 = bright green elseif math.abs(alt) >= 10 then - lcd.setColor(CUSTOM_COLOR,0x1FEA) - lcd.drawNumber((LCD_W-158)/2+158 - 42,69-14,alt,MIDSIZE+CUSTOM_COLOR) + lcd.drawNumber((LCD_W-158)/2+158 - 42,69-14,alt,MIDSIZE+lcd.RGB(0x19,0xFF,0x52)) -- 0x1FEA = 0x19FF52 = bright green else - lcd.setColor(CUSTOM_COLOR,0x1FEA) - lcd.drawNumber((LCD_W-158)/2+158 - 42,69-14,alt*10,MIDSIZE+PREC1+CUSTOM_COLOR) + lcd.drawNumber((LCD_W-158)/2+158 - 42,69-14,alt*10,MIDSIZE+PREC1+lcd.RGB(0x19,0xFF,0x52)) -- 0x1FEA = 0x19FF52 = bright green end - lcd.setColor(CUSTOM_COLOR,0x1FEA) -- telemetry.hSpeed is in dm/s local hSpeed = utils.getMaxValue(telemetry.hSpeed,14) * 0.1 * conf.horSpeedMultiplier if (math.abs(hSpeed) >= 10) then - lcd.drawNumber((LCD_W-158)/2+44,69-14,hSpeed,MIDSIZE+RIGHT+CUSTOM_COLOR) + lcd.drawNumber((LCD_W-158)/2+44,69-14,hSpeed,MIDSIZE+RIGHT+lcd.RGB(0x19,0xFF,0x52)) -- 0x1FEA = 0x19FF52 = bright green else - lcd.drawNumber((LCD_W-158)/2+44,69-14,hSpeed*10,MIDSIZE+RIGHT+CUSTOM_COLOR+PREC1) + lcd.drawNumber((LCD_W-158)/2+44,69-14,hSpeed*10,MIDSIZE+RIGHT+lcd.RGB(0x19,0xFF,0x52)+PREC1) -- 0x1FEA = 0x19FF52 = bright green end -- min/max arrows if status.showMinMaxValues == true then diff --git a/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/hud_small_2.lua b/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/hud_small_2.lua index 1022d4ae..d07611c6 100644 --- a/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/hud_small_2.lua +++ b/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/hud_small_2.lua @@ -36,6 +36,7 @@ --------------------- -- enable splash screen for no telemetry data --#define SPLASH +-- enable battery percentage based on voltage -- enable code to draw a compass rose vs a compass ribbon --#define COMPASS_ROSE @@ -54,14 +55,15 @@ --#define TESTMODE -- enable debug of generated hash or short hash string --#define HASHDEBUG - +-- enable MESSAGES DEBUG +--#define DEBUG_MESSAGES --------------------- -- DEBUG REFRESH RATES --------------------- -- calc and show hud refresh rate --#define HUDRATE -- calc and show telemetry process rate ---#define BGTELERATE +-- #define BGTELERATE --------------------- -- SENSOR IDS @@ -95,24 +97,7 @@ -- CONF REFRESH GV --------------------------------- ---------------------------------- --- ALARMS ---------------------------------- ---[[ - ALARM_TYPE_MIN needs arming (min has to be reached first), value below level for grace, once armed is periodic, reset on landing - ALARM_TYPE_MAX no arming, value above level for grace, once armed is periodic, reset on landing - ALARM_TYPE_TIMER no arming, fired periodically, spoken time, reset on landing - ALARM_TYPE_BATT needs arming (min has to be reached first), value below level for grace, no reset on landing -{ - 1 = notified, - 2 = alarm start, - 3 = armed, - 4 = type(0=min,1=max,2=timer,3=batt), - 5 = grace duration - 6 = ready - 7 = last alarm -} ---]]-- +-- -- -- @@ -125,7 +110,9 @@ --#define HUD_ALGO1 -- enable optimized hor bars HUD drawing --#define HUD_ALGO2 --- enable hor bars HUD drawing +-- enable hor bars HUD drawing, 2 px resolution +-- enable hor bars HUD drawing, 1 px resolution +--#define HUD_ALGO4 @@ -151,9 +138,6 @@ local unitLongLabel = getGeneralSettings().imperial == 0 and "km" or "mi" -- offsets are: 1 celm, 4 batt, 7 curr, 10 mah, 13 cap, indexing starts at 1 -- ------------------------ --- LIBRARY LOADING ------------------------ ---------------------- --- COLORS @@ -175,13 +159,6 @@ local unitLongLabel = getGeneralSettings().imperial == 0 and "km" or "mi" -- CLIPPING ALGO DEFINES -------------------------- - - - - - - - --------------------------------- -- LAYOUT --------------------------------- @@ -257,21 +234,15 @@ local function drawHud(myWidget,drawLib,conf,telemetry,status,battery,utils)--ge local oy = 30+70/2 + dy local yy = 0 - --lcd.setColor(CUSTOM_COLOR,lcd.RGB(0x0d, 0x68, 0xb1)) -- bighud blue - lcd.setColor(CUSTOM_COLOR,lcd.RGB(0x7b, 0x9d, 0xff)) -- default blue - lcd.drawFilledRectangle(minX,minY,maxX-minX,maxY - minY,CUSTOM_COLOR) + lcd.drawFilledRectangle(minX,minY,maxX-minX,maxY - minY,lcd.RGB(0x7B,0x9D,0xFF)) -- default blue -- HUD - --lcd.setColor(CUSTOM_COLOR,lcd.RGB(77, 153, 0)) - --lcd.setColor(CUSTOM_COLOR,lcd.RGB(0x90, 0x63, 0x20)) --906320 bighud brown - lcd.setColor(CUSTOM_COLOR,lcd.RGB(0x63, 0x30, 0x00)) --623000 old brown - -- angle of the line passing on point(ox,oy) local angle = math.tan(math.rad(-telemetry.roll)) -- prevent divide by zero if telemetry.roll == 0 then - drawLib.drawFilledRectangle(minX,math.max(minY,dy+minY+(maxY-minY)/2),maxX-minX,math.min(maxY-minY,(maxY-minY)/2-dy+(math.abs(dy) > 0 and 1 or 0)),CUSTOM_COLOR) + drawLib.drawFilledRectangle(minX,math.max(minY,dy+minY+(maxY-minY)/2),maxX-minX,math.min(maxY-minY,(maxY-minY)/2-dy+(math.abs(dy) > 0 and 1 or 0)),lcd.RGB(0x63,0x30,0x00)) -- 0x623000 = old brown elseif math.abs(telemetry.roll) >= 180 then - drawLib.drawFilledRectangle(minX,minY,maxX-minX,math.min(maxY-minY,(maxY-minY)/2+dy),CUSTOM_COLOR) + drawLib.drawFilledRectangle(minX,minY,maxX-minX,math.min(maxY-minY,(maxY-minY)/2+dy),lcd.RGB(0x63,0x30,0x00)) -- 0x623000 = old brown else -- HUD drawn using horizontal bars of height 2 -- true if flying inverted @@ -290,7 +261,7 @@ local function drawHud(myWidget,drawLib,conf,telemetry,status,battery,utils)--ge yy = minY + s*step xx = ox + (yy-oy)/angle if xx >= minX and xx <= maxX then - lcd.drawFilledRectangle(xx, yy, maxX-xx+1, step,CUSTOM_COLOR) + lcd.drawFilledRectangle(xx, yy, maxX-xx+1, step,lcd.RGB(0x63,0x30,0x00)) -- 0x623000 = old brown elseif xx < minX then yRect = inverted and math.max(yy,yRect)+step or math.min(yy,yRect) fillNeeded = true @@ -302,7 +273,7 @@ local function drawHud(myWidget,drawLib,conf,telemetry,status,battery,utils)--ge yy = minY + s*step xx = ox + (yy-oy)/angle if xx >= minX and xx <= maxX then - lcd.drawFilledRectangle(minX, yy, xx-minX, step,CUSTOM_COLOR) + lcd.drawFilledRectangle(minX, yy, xx-minX, step,lcd.RGB(0x63,0x30,0x00)) -- 0x623000 = old brown elseif xx > maxX then yRect = inverted and math.max(yy,yRect)+step or math.min(yy,yRect) fillNeeded = true @@ -313,8 +284,7 @@ local function drawHud(myWidget,drawLib,conf,telemetry,status,battery,utils)--ge if fillNeeded then local yMin = inverted and minY or yRect local height = inverted and yRect - minY or maxY-yRect - --lcd.setColor(CUSTOM_COLOR,0xF800) --623000 old brown - lcd.drawFilledRectangle(minX, yMin, maxX-minX, height ,CUSTOM_COLOR) + lcd.drawFilledRectangle(minX, yMin, maxX-minX, height,lcd.RGB(0x63,0x30,0x00)) -- 0x623000 = old brown end end @@ -322,12 +292,11 @@ local function drawHud(myWidget,drawLib,conf,telemetry,status,battery,utils)--ge -- parallel lines above and below horizon local linesMaxY = maxY-1 local linesMinY = minY+1 - lcd.setColor(CUSTOM_COLOR,0xFFFF) -- +/- 90 deg for dist=1,8 do - drawLib.drawLineWithClipping(rollX + dx - dist*cx,dy + 30+70/2 + dist*cy,r,(dist%2==0 and 40 or 20),DOTTED,(LCD_W-92)/2+2,(LCD_W-92)/2+92-2,linesMinY,linesMaxY,CUSTOM_COLOR,radio,rev) - drawLib.drawLineWithClipping(rollX + dx + dist*cx,dy + 30+70/2 - dist*cy,r,(dist%2==0 and 40 or 20),DOTTED,(LCD_W-92)/2+2,(LCD_W-92)/2+92-2,linesMinY,linesMaxY,CUSTOM_COLOR,radio,rev) + drawLib.drawLineWithClipping(rollX + dx - dist*cx,dy + 30+70/2 + dist*cy,r,(dist%2==0 and 40 or 20),DOTTED,(LCD_W-92)/2+2,(LCD_W-92)/2+92-2,linesMinY,linesMaxY,WHITE,radio,rev) + drawLib.drawLineWithClipping(rollX + dx + dist*cx,dy + 30+70/2 - dist*cy,r,(dist%2==0 and 40 or 20),DOTTED,(LCD_W-92)/2+2,(LCD_W-92)/2+92-2,linesMinY,linesMaxY,WHITE,radio,rev) end ------------------------------------- -- hud bitmap @@ -344,8 +313,7 @@ local function drawHud(myWidget,drawLib,conf,telemetry,status,battery,utils)--ge else varioY = 20+45 end - lcd.setColor(CUSTOM_COLOR,lcd.RGB(255, 0xce, 0)) - lcd.drawFilledRectangle(275+26, varioY, 7, varioSpeed/varioMax*39, CUSTOM_COLOR, 0) + lcd.drawFilledRectangle(275+26, varioY, 7, varioSpeed/varioMax*39, lcd.RGB(0xFF,0xCE,0x00), 0) lcd.drawBitmap(utils.getBitmap("variogauge_90"),275,20) if telemetry.vSpeed > 0 then diff --git a/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/layout_1.lua b/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/layout_1.lua index 51aa5d23..983d08ad 100644 --- a/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/layout_1.lua +++ b/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/layout_1.lua @@ -36,6 +36,7 @@ --------------------- -- enable splash screen for no telemetry data --#define SPLASH +-- enable battery percentage based on voltage -- enable code to draw a compass rose vs a compass ribbon --#define COMPASS_ROSE @@ -54,14 +55,15 @@ --#define TESTMODE -- enable debug of generated hash or short hash string --#define HASHDEBUG - +-- enable MESSAGES DEBUG +--#define DEBUG_MESSAGES --------------------- -- DEBUG REFRESH RATES --------------------- -- calc and show hud refresh rate --#define HUDRATE -- calc and show telemetry process rate ---#define BGTELERATE +-- #define BGTELERATE --------------------- -- SENSOR IDS @@ -95,24 +97,7 @@ -- CONF REFRESH GV --------------------------------- ---------------------------------- --- ALARMS ---------------------------------- ---[[ - ALARM_TYPE_MIN needs arming (min has to be reached first), value below level for grace, once armed is periodic, reset on landing - ALARM_TYPE_MAX no arming, value above level for grace, once armed is periodic, reset on landing - ALARM_TYPE_TIMER no arming, fired periodically, spoken time, reset on landing - ALARM_TYPE_BATT needs arming (min has to be reached first), value below level for grace, no reset on landing -{ - 1 = notified, - 2 = alarm start, - 3 = armed, - 4 = type(0=min,1=max,2=timer,3=batt), - 5 = grace duration - 6 = ready - 7 = last alarm -} ---]]-- +-- -- -- @@ -125,7 +110,9 @@ --#define HUD_ALGO1 -- enable optimized hor bars HUD drawing --#define HUD_ALGO2 --- enable hor bars HUD drawing +-- enable hor bars HUD drawing, 2 px resolution +-- enable hor bars HUD drawing, 1 px resolution +--#define HUD_ALGO4 @@ -151,9 +138,6 @@ local unitLongLabel = getGeneralSettings().imperial == 0 and "km" or "mi" -- offsets are: 1 celm, 4 batt, 7 curr, 10 mah, 13 cap, indexing starts at 1 -- ------------------------ --- LIBRARY LOADING ------------------------ ---------------------- --- COLORS @@ -175,13 +159,6 @@ local unitLongLabel = getGeneralSettings().imperial == 0 and "km" or "mi" -- CLIPPING ALGO DEFINES -------------------------- - - - - - - - --------------------------------- -- LAYOUT --------------------------------- @@ -217,11 +194,8 @@ local customSensorXY = { } local function drawCustomSensors(x,customSensors,utils,status) - --lcd.setColor(CUSTOM_COLOR,lcd.RGB(0,75,128)) - lcd.setColor(CUSTOM_COLOR,0x0000) - lcd.drawFilledRectangle(0,194,LCD_W,35,CUSTOM_COLOR) - lcd.setColor(CUSTOM_COLOR,0x7BCF) - lcd.drawLine(1,228,LCD_W-2,228,SOLID,CUSTOM_COLOR) + lcd.drawFilledRectangle(0,194,LCD_W,35,BLACK) + lcd.drawLine(1,228,LCD_W-2,228,SOLID,lcd.RGB(0x7B,0x79,0x7B)) -- 0x7BCF = 0x7B797B = grey tone local label,data,prec,mult,flags,sensorConfig for i=1,6 @@ -235,8 +209,7 @@ local function drawCustomSensors(x,customSensors,utils,status) label = string.format("%s(%s)",sensorConfig[1],sensorConfig[4]) end -- draw sensor label - lcd.setColor(CUSTOM_COLOR,0x8C71) - lcd.drawText(x+customSensorXY[i][1], customSensorXY[i][2],label, SMLSIZE+RIGHT+CUSTOM_COLOR) + lcd.drawText(x+customSensorXY[i][1], customSensorXY[i][2],label, SMLSIZE+RIGHT+lcd.RGB(0x8C,0x8E,0x8C)) -- 0x8C71 = 0x8C8E8C = light grey mult = sensorConfig[3] == 0 and 1 or ( sensorConfig[3] == 1 and 10 or 100 ) prec = mult == 1 and 0 or (mult == 10 and 32 or 48) @@ -253,31 +226,27 @@ local function drawCustomSensors(x,customSensors,utils,status) flags = 0 end - local color = 0xFFFF + local color = WHITE local sign = sensorConfig[6] == "+" and 1 or -1 -- max tracking, high values are critical if math.abs(value) ~= 0 and status.showMinMaxValues == false then - color = ( sensorValue*sign > sensorConfig[9]*sign and lcd.RGB(255,70,0) or (sensorValue*sign > sensorConfig[8]*sign and 0xFE60 or 0xFFFF)) + color = ( sensorValue*sign > sensorConfig[9]*sign and lcd.RGB(255,70,0) or (sensorValue*sign > sensorConfig[8]*sign and lcd.RGB(0xFF,0xCE,0x00) or WHITE)) end - lcd.setColor(CUSTOM_COLOR,color) - local voffset = flags==0 and 6 or 0 -- if a lookup table exists use it! if customSensors.lookups[i] ~= nil and customSensors.lookups[i][value] ~= nil then - lcd.drawText(x+customSensorXY[i][3], customSensorXY[i][4]+voffset, customSensors.lookups[i][value] or value, flags+RIGHT+CUSTOM_COLOR) + lcd.drawText(x+customSensorXY[i][3], customSensorXY[i][4]+voffset, customSensors.lookups[i][value] or value, flags+RIGHT+color) else - lcd.drawNumber(x+customSensorXY[i][3], customSensorXY[i][4]+voffset, value, flags+RIGHT+prec+CUSTOM_COLOR) + lcd.drawNumber(x+customSensorXY[i][3], customSensorXY[i][4]+voffset, value, flags+RIGHT+prec+color) end end end end local function draw(myWidget,drawLib,conf,telemetry,status,battery,alarms,frame,utils,customSensors,gpsStatuses,leftPanel,centerPanel,rightPanel) - lcd.setColor(CUSTOM_COLOR,0xFFFF) centerPanel.drawHud(myWidget,drawLib,conf,telemetry,status,battery,utils) - --lcd.setColor(CUSTOM_COLOR,0xFE60) - drawLib.drawRArrow(240,174,20,math.floor(telemetry.homeAngle - telemetry.yaw),CUSTOM_COLOR)--HomeDirection(telemetry) + drawLib.drawRArrow(240,174,20,math.floor(telemetry.homeAngle - telemetry.yaw),WHITE)--HomeDirection(telemetry) -- with dual battery default is to show aggregate view if status.batt2sources.fc or status.batt2sources.vs then if status.showDualBattery == false then diff --git a/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/layout_2.lua b/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/layout_2.lua index 03d49498..d09bec82 100644 --- a/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/layout_2.lua +++ b/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/layout_2.lua @@ -36,6 +36,7 @@ --------------------- -- enable splash screen for no telemetry data --#define SPLASH +-- enable battery percentage based on voltage -- enable code to draw a compass rose vs a compass ribbon --#define COMPASS_ROSE @@ -54,14 +55,15 @@ --#define TESTMODE -- enable debug of generated hash or short hash string --#define HASHDEBUG - +-- enable MESSAGES DEBUG +--#define DEBUG_MESSAGES --------------------- -- DEBUG REFRESH RATES --------------------- -- calc and show hud refresh rate --#define HUDRATE -- calc and show telemetry process rate ---#define BGTELERATE +-- #define BGTELERATE --------------------- -- SENSOR IDS @@ -95,24 +97,7 @@ -- CONF REFRESH GV --------------------------------- ---------------------------------- --- ALARMS ---------------------------------- ---[[ - ALARM_TYPE_MIN needs arming (min has to be reached first), value below level for grace, once armed is periodic, reset on landing - ALARM_TYPE_MAX no arming, value above level for grace, once armed is periodic, reset on landing - ALARM_TYPE_TIMER no arming, fired periodically, spoken time, reset on landing - ALARM_TYPE_BATT needs arming (min has to be reached first), value below level for grace, no reset on landing -{ - 1 = notified, - 2 = alarm start, - 3 = armed, - 4 = type(0=min,1=max,2=timer,3=batt), - 5 = grace duration - 6 = ready - 7 = last alarm -} ---]]-- +-- -- -- @@ -125,7 +110,9 @@ --#define HUD_ALGO1 -- enable optimized hor bars HUD drawing --#define HUD_ALGO2 --- enable hor bars HUD drawing +-- enable hor bars HUD drawing, 2 px resolution +-- enable hor bars HUD drawing, 1 px resolution +--#define HUD_ALGO4 @@ -151,9 +138,6 @@ local unitLongLabel = getGeneralSettings().imperial == 0 and "km" or "mi" -- offsets are: 1 celm, 4 batt, 7 curr, 10 mah, 13 cap, indexing starts at 1 -- ------------------------ --- LIBRARY LOADING ------------------------ ---------------------- --- COLORS @@ -175,13 +159,6 @@ local unitLongLabel = getGeneralSettings().imperial == 0 and "km" or "mi" -- CLIPPING ALGO DEFINES -------------------------- - - - - - - - --------------------------------- -- LAYOUT --------------------------------- @@ -197,27 +174,24 @@ local unitLongLabel = getGeneralSettings().imperial == 0 and "km" or "mi" local function drawExtendedStatusBar(drawLib,conf,telemetry,status,battery,alarms,frame,utils,gpsStatuses) -- LEFT label - lcd.setColor(CUSTOM_COLOR,0x0000) - lcd.drawText(153,165,"Alt("..unitLabel..")",SMLSIZE+CUSTOM_COLOR+RIGHT) - lcd.drawText(68,165,"VSI("..conf.vertSpeedLabel..")",SMLSIZE+CUSTOM_COLOR+RIGHT) + lcd.drawText(153,165,"Alt("..unitLabel..")",SMLSIZE+BLACK+RIGHT) + lcd.drawText(68,165,"VSI("..conf.vertSpeedLabel..")",SMLSIZE+BLACK+RIGHT) - lcd.setColor(CUSTOM_COLOR,0xFFFF) -- altitude local alt = utils.getMaxValue(telemetry.homeAlt,11) * unitScale if math.abs(alt) > 999 then - lcd.drawNumber(153,178,alt,MIDSIZE+RIGHT+CUSTOM_COLOR) + lcd.drawNumber(153,178,alt,MIDSIZE+RIGHT+WHITE) elseif math.abs(alt) >= 10 then - lcd.drawNumber(153,178,alt,MIDSIZE+RIGHT+CUSTOM_COLOR) + lcd.drawNumber(153,178,alt,MIDSIZE+RIGHT+WHITE) else - lcd.drawNumber(153,178,alt*10,MIDSIZE+RIGHT+PREC1+CUSTOM_COLOR) + lcd.drawNumber(153,178,alt*10,MIDSIZE+RIGHT+PREC1+WHITE) end -- vertical speed - lcd.setColor(CUSTOM_COLOR,0xFFFF) local vSpeed = utils.getMaxValue(telemetry.vSpeed,13) * 0.1 * conf.vertSpeedMultiplier if (math.abs(telemetry.vSpeed) >= 10) then - lcd.drawNumber(68,178, vSpeed ,MIDSIZE+RIGHT+CUSTOM_COLOR) + lcd.drawNumber(68,178, vSpeed ,MIDSIZE+RIGHT+WHITE) else - lcd.drawNumber(68,178,vSpeed*10,MIDSIZE+RIGHT+PREC1+CUSTOM_COLOR) + lcd.drawNumber(68,178,vSpeed*10,MIDSIZE+RIGHT+PREC1+WHITE) end -- min/max arrows if status.showMinMaxValues == true then @@ -229,8 +203,7 @@ end local function draw(myWidget,drawLib,conf,telemetry,status,battery,alarms,frame,utils,customSensors,gpsStatuses,leftPanel,centerPanel,rightPanel) if leftPanel ~= nil and centerPanel ~= nil and rightPanel ~= nil then - lcd.setColor(CUSTOM_COLOR,0xFFFF) - drawLib.drawRArrow((LCD_W/2),180,22,math.floor(telemetry.homeAngle - telemetry.yaw),CUSTOM_COLOR)--HomeDirection(telemetry) + drawLib.drawRArrow((LCD_W/2),180,22,math.floor(telemetry.homeAngle - telemetry.yaw),WHITE)--HomeDirection(telemetry) centerPanel.drawHud(myWidget,drawLib,conf,telemetry,status,battery,utils,customSensors) -- with dual battery default is to show aggregate view if status.batt2sources.fc or status.batt2sources.vs then diff --git a/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/layout_map.lua b/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/layout_map.lua index 8a62ba97..2a899b05 100644 --- a/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/layout_map.lua +++ b/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/layout_map.lua @@ -36,6 +36,7 @@ --------------------- -- enable splash screen for no telemetry data --#define SPLASH +-- enable battery percentage based on voltage -- enable code to draw a compass rose vs a compass ribbon --#define COMPASS_ROSE @@ -54,14 +55,15 @@ --#define TESTMODE -- enable debug of generated hash or short hash string --#define HASHDEBUG - +-- enable MESSAGES DEBUG +--#define DEBUG_MESSAGES --------------------- -- DEBUG REFRESH RATES --------------------- -- calc and show hud refresh rate --#define HUDRATE -- calc and show telemetry process rate ---#define BGTELERATE +-- #define BGTELERATE --------------------- -- SENSOR IDS @@ -95,24 +97,7 @@ -- CONF REFRESH GV --------------------------------- ---------------------------------- --- ALARMS ---------------------------------- ---[[ - ALARM_TYPE_MIN needs arming (min has to be reached first), value below level for grace, once armed is periodic, reset on landing - ALARM_TYPE_MAX no arming, value above level for grace, once armed is periodic, reset on landing - ALARM_TYPE_TIMER no arming, fired periodically, spoken time, reset on landing - ALARM_TYPE_BATT needs arming (min has to be reached first), value below level for grace, no reset on landing -{ - 1 = notified, - 2 = alarm start, - 3 = armed, - 4 = type(0=min,1=max,2=timer,3=batt), - 5 = grace duration - 6 = ready - 7 = last alarm -} ---]]-- +-- -- -- @@ -125,7 +110,9 @@ --#define HUD_ALGO1 -- enable optimized hor bars HUD drawing --#define HUD_ALGO2 --- enable hor bars HUD drawing +-- enable hor bars HUD drawing, 2 px resolution +-- enable hor bars HUD drawing, 1 px resolution +--#define HUD_ALGO4 @@ -151,9 +138,6 @@ local unitLongLabel = getGeneralSettings().imperial == 0 and "km" or "mi" -- offsets are: 1 celm, 4 batt, 7 curr, 10 mah, 13 cap, indexing starts at 1 -- ------------------------ --- LIBRARY LOADING ------------------------ ---------------------- --- COLORS @@ -175,13 +159,6 @@ local unitLongLabel = getGeneralSettings().imperial == 0 and "km" or "mi" -- CLIPPING ALGO DEFINES -------------------------- - - - - - - - --[[ for info see https://github.com/heldersepu/GMapCatcher @@ -189,6 +166,7 @@ local unitLongLabel = getGeneralSettings().imperial == 0 and "km" or "mi" - tiles need to be resized down to 100x100 from original size of 256x256 - at max zoom level (-2) 1 tile = 100px = 76.5m ]] + -------------------------- -- MINI HUD -------------------------- @@ -242,26 +220,92 @@ local avgDistSampleCount = 0; local avgDistLastSampleTime = getTime(); avgDistSamples[0] = 0 +local coord_to_tiles = nil +local tiles_to_path = nil +local MinLatitude = -85.05112878; +local MaxLatitude = 85.05112878; +local MinLongitude = -180; +local MaxLongitude = 180; + -local function tiles_on_level(level) - return bit32.lshift(1,17 - level) +local function clip(n, min, max) + return math.min(math.max(n, min), max) +end + +local function tiles_on_level(conf,level) + if conf.mapProvider == 1 then + return bit32.lshift(1,17 - level) + else + return 2^level + end +end + +--[[ + total tiles on the web mercator projection = 2^zoom*2^zoom +--]] +local function get_tile_matrix_size_pixel(level) + local size = 2^level * 100 + return size, size end -local function coord_to_tiles(lat,lon) +--[[ + https://developers.google.com/maps/documentation/javascript/coordinates + https://github.com/judero01col/GMap.NET + + Questa funzione ritorna il pixel (assoluto) associato alle coordinate. + La proiezione di mercatore è una matrice di pixel, tanto più grande quanto è elevato il valore dello zoom. + zoom 1 = 1x1 tiles + zoom 2 = 2x2 tiles + zoom 3 = 4x4 tiles + ... + in cui ogni tile è di 256x256 px. + in generale la matrice ha dimensioni 2^(zoom-1)*2^(zoom-1) + Per risalire al singolo tile si divide per 256 (largezza del tile): + + tile_x = math.floor(x_coord/256) + tile_y = math.floor(y_coord/256) + + Le coordinate relative all'interno del tile si calcolano con l'operatore modulo a partire dall'angolo in alto a sx + + x_offset = x_coord%256 + y_offset = y_coord%256 + + Su filesystem il percorso è /tile_y/tile_x.png +--]] +local function google_coord_to_tiles(conf, lat, lng, level) + lat = clip(lat, MinLatitude, MaxLatitude) + lng = clip(lng, MinLongitude, MaxLongitude) + + local x = (lng + 180) / 360 + local sinLatitude = math.sin(lat * math.pi / 180) + local y = 0.5 - math.log((1 + sinLatitude) / (1 - sinLatitude)) / (4 * math.pi) + + local mapSizeX, mapSizeY = get_tile_matrix_size_pixel(level) + + -- absolute pixel coordinates on the mercator projection at this zoom level + local rx = clip(x * mapSizeX + 0.5, 0, mapSizeX - 1) + local ry = clip(y * mapSizeY + 0.5, 0, mapSizeY - 1) + -- return tile_x, tile_y, offset_x, offset_y + return math.floor(rx/100), math.floor(ry/100), math.floor(rx%100), math.floor(ry%100) +end + +local function gmapcacther_coord_to_tiles(conf, lat, lon, level) local x = world_tiles / 360 * (lon + 180) local e = math.sin(lat * (1/180 * math.pi)) local y = world_tiles / 2 + 0.5 * math.log((1+e)/(1-e)) * -1 * tiles_per_radian + -- return tile_x, tile_y, offset_x, offset_y return math.floor(x % world_tiles), math.floor(y % world_tiles), math.floor((x - math.floor(x)) * 100), math.floor((y - math.floor(y)) * 100) end -local function tiles_to_path(tile_x, tile_y, level) - local path = string.format("/%d/%d/%d/%d/s_%d.png", level, tile_x/1024, tile_x%1024, tile_y/1024, tile_y%1024) - collectgarbage() - collectgarbage() - return path +local function google_tiles_to_path(conf, tile_x, tile_y, level) + return string.format("/%d/%d/s_%d.jpg", level, tile_y, tile_x) +end + +local function gmapcatcher_tiles_to_path(conf, tile_x, tile_y, level) + return string.format("/%d/%d/%d/%d/s_%d.png", level, tile_x/1024, tile_x%1024, tile_y/1024, tile_y%1024) end local function getTileBitmap(conf,tilePath) @@ -296,16 +340,13 @@ local function loadAndCenterTiles(conf,tile_x,tile_y,offset_x,offset_y,width,lev do for y=1,2 do - local tile_path = tiles_to_path(tile_x+x-2, tile_y+y-yy, level) + local tile_path = tiles_to_path(conf, tile_x+x-2, tile_y+y-yy, level) local idx = width*(y-1)+x if tiles[idx] == nil then tiles[idx] = tile_path else if tiles[idx] ~= tile_path then - tiles[idx] = nil - collectgarbage() - collectgarbage() tiles[idx] = tile_path end end @@ -353,14 +394,13 @@ local function drawTiles(conf,drawLib,width,xmin,xmax,ymin,ymax,color,level) end end -- draw 50m or 150ft line at max zoom - lcd.setColor(CUSTOM_COLOR,0xFFFF) - lcd.drawLine(xmin+5,ymin+2*100-13,xmin+5+scaleLen,ymin+2*100-13,SOLID,CUSTOM_COLOR) - lcd.drawText(xmin+5,ymin+2*100-27,scaleLabel,SMLSIZE+CUSTOM_COLOR) + lcd.drawLine(xmin+5,ymin+2*100-13,xmin+5+scaleLen,ymin+2*100-13,SOLID,WHITE) + lcd.drawText(xmin+5,ymin+2*100-27,scaleLabel,SMLSIZE+WHITE) end -local function getScreenCoordinates(minX,minY,tile_x,tile_y,offset_x,offset_y,level) +local function getScreenCoordinates(conf,minX,minY,tile_x,tile_y,offset_x,offset_y,level) -- is this tile on screen ? - local tile_path = tiles_to_path(tile_x,tile_y,level) + local tile_path = tiles_to_path(conf, tile_x, tile_y, level) local onScreen = false for x=1,3 @@ -380,59 +420,50 @@ end local function drawHud(myWidget,drawLib,conf,telemetry,status,battery,utils)--getMaxValue,getBitmap,drawBlinkBitmap) local r = -telemetry.roll - local cx,cy,dx,dy,ccx,ccy,cccx,cccy + local cx,cy,dx,dy local yPos = 0 + 20 + 8 + local scale = 0.6 ----------------------- -- artificial horizon ----------------------- - -- no roll ==> segments are vertical, offsets are multiples of 10 + -- no roll ==> segments are vertical, offsets are multiples of 6.5 if ( telemetry.roll == 0) then dx=0 - dy=telemetry.pitch * 0.75 + dy=telemetry.pitch * scale cx=0 - cy=10 - ccx=0 - ccy=2*10 - cccx=0 - cccy=3*10 + cy=6.5 else -- center line offsets - dx = math.cos(math.rad(90 - r)) * -telemetry.pitch * 0.75 - dy = math.sin(math.rad(90 - r)) * telemetry.pitch * 0.75 + dx = math.cos(math.rad(90 - r)) * -telemetry.pitch * scale + dy = math.sin(math.rad(90 - r)) * telemetry.pitch * scale -- 1st line offsets - cx = math.cos(math.rad(90 - r)) * 10 - cy = math.sin(math.rad(90 - r)) * 10 + cx = math.cos(math.rad(90 - r)) * 6.5 + cy = math.sin(math.rad(90 - r)) * 6.5 end ----------------------- -- dark color for "ground" ----------------------- -- 90x70 - local minY = 24 - local maxY = 24+48 + local minY = 22 + local maxY = 22+42 -- - local minX = 21 - local maxX = 21 + 48 + local minX = 7 + local maxX = 7 + 76 -- - local ox = 21 + 48/2 + dx + local ox = 7 + 76/2 + dx -- - local oy = 48 + dy + local oy = 43 + dy local yy = 0 - --lcd.setColor(CUSTOM_COLOR,lcd.RGB(0x0d, 0x68, 0xb1)) -- bighud blue - lcd.setColor(CUSTOM_COLOR,lcd.RGB(0x7b, 0x9d, 0xff)) -- default blue - lcd.drawFilledRectangle(minX,minY,maxX-minX,maxY - minY,CUSTOM_COLOR) + lcd.drawFilledRectangle(minX,minY,maxX-minX,maxY - minY,lcd.RGB(0x7B,0x9D,0xFF)) -- default blue -- HUD - --lcd.setColor(CUSTOM_COLOR,lcd.RGB(77, 153, 0)) - --lcd.setColor(CUSTOM_COLOR,lcd.RGB(0x90, 0x63, 0x20)) --906320 bighud brown - lcd.setColor(CUSTOM_COLOR,lcd.RGB(0x63, 0x30, 0x00)) --623000 old brown - -- angle of the line passing on point(ox,oy) local angle = math.tan(math.rad(-telemetry.roll)) -- prevent divide by zero if telemetry.roll == 0 then - drawLib.drawFilledRectangle(minX,math.max(minY,dy+minY+(maxY-minY)/2),maxX-minX,math.min(maxY-minY,(maxY-minY)/2-dy+(math.abs(dy) > 0 and 1 or 0)),CUSTOM_COLOR) + drawLib.drawFilledRectangle(minX,math.max(minY,dy+minY+(maxY-minY)/2),maxX-minX,math.min(maxY-minY,(maxY-minY)/2-dy+(math.abs(dy) > 0 and 1 or 0)),lcd.RGB(0x63,0x30,0x00)) -- 0x623000 = old brown elseif math.abs(telemetry.roll) >= 180 then - drawLib.drawFilledRectangle(minX,minY,maxX-minX,math.min(maxY-minY,(maxY-minY)/2+dy),CUSTOM_COLOR) + drawLib.drawFilledRectangle(minX,minY,maxX-minX,math.min(maxY-minY,(maxY-minY)/2+dy),lcd.RGB(0x63,0x30,0x00)) -- 0x623000 = old brown else -- HUD drawn using horizontal bars of height 2 -- true if flying inverted @@ -451,7 +482,7 @@ local function drawHud(myWidget,drawLib,conf,telemetry,status,battery,utils)--ge yy = minY + s*step xx = ox + (yy-oy)/angle if xx >= minX and xx <= maxX then - lcd.drawFilledRectangle(xx, yy, maxX-xx+1, step,CUSTOM_COLOR) + lcd.drawFilledRectangle(xx, yy, maxX-xx+1, step,lcd.RGB(0x63,0x30,0x00)) -- 0x623000 = old brown elseif xx < minX then yRect = inverted and math.max(yy,yRect)+step or math.min(yy,yRect) fillNeeded = true @@ -463,7 +494,7 @@ local function drawHud(myWidget,drawLib,conf,telemetry,status,battery,utils)--ge yy = minY + s*step xx = ox + (yy-oy)/angle if xx >= minX and xx <= maxX then - lcd.drawFilledRectangle(minX, yy, xx-minX, step,CUSTOM_COLOR) + lcd.drawFilledRectangle(minX, yy, xx-minX, step,lcd.RGB(0x63,0x30,0x00)) -- 0x623000 = old brown elseif xx > maxX then yRect = inverted and math.max(yy,yRect)+step or math.min(yy,yRect) fillNeeded = true @@ -474,29 +505,31 @@ local function drawHud(myWidget,drawLib,conf,telemetry,status,battery,utils)--ge if fillNeeded then local yMin = inverted and minY or yRect local height = inverted and yRect - minY or maxY-yRect - --lcd.setColor(CUSTOM_COLOR,0xF800) --623000 old brown - lcd.drawFilledRectangle(minX, yMin, maxX-minX, height ,CUSTOM_COLOR) + lcd.drawFilledRectangle(minX, yMin, maxX-minX, height ,lcd.RGB(0x63,0x30,0x00)) -- 0x623000 = old brown end end -- parallel lines above and below horizon local linesMaxY = maxY-1 local linesMinY = minY+1 - local rollX = math.floor(21 + 48/2) - lcd.setColor(CUSTOM_COLOR,0xFFFF) + local rollX = math.floor(7 + 76/2) -- +/- 90 deg - for dist=1,8 + for dist=1,6 do - drawLib.drawLineWithClipping(rollX + dx - dist*cx,dy + 48 + dist*cy,r,(dist%2==0 and 40 or 20),DOTTED,21+2,21+48-2,linesMinY,linesMaxY,CUSTOM_COLOR,radio,rev) - drawLib.drawLineWithClipping(rollX + dx + dist*cx,dy + 48 - dist*cy,r,(dist%2==0 and 40 or 20),DOTTED,21+2,21+48-2,linesMinY,linesMaxY,CUSTOM_COLOR,radio,rev) + drawLib.drawLineWithClipping(rollX + dx - dist*cx,dy + 43 + dist*cy,r,(dist%2==0 and 40 or 20),DOTTED,7+2,7+76-2,linesMinY,linesMaxY,WHITE,radio,rev) + drawLib.drawLineWithClipping(rollX + dx + dist*cx,dy + 43 - dist*cy,r,(dist%2==0 and 40 or 20),DOTTED,7+2,7+76-2,linesMinY,linesMaxY,WHITE,radio,rev) end ------------------------------------- -- hud bitmap ------------------------------------- - lcd.drawBitmap(utils.getBitmap("hud_48x48a"),21-2,24-3) + lcd.drawBitmap(utils.getBitmap("hud_48x48a"),7-2+13,22-3-4) end local function drawMap(myWidget,drawLib,conf,telemetry,status,battery,utils,level) + if tiles_to_path == nil or coord_to_tiles == nil then + return + end + local minY = 18 local maxY = minY+2*100 @@ -509,9 +542,9 @@ local function drawMap(myWidget,drawLib,conf,telemetry,status,battery,utils,leve posUpdated = true lastPosUpdate = getTime() -- current vehicle tile coordinates - tile_x,tile_y,offset_x,offset_y = coord_to_tiles(telemetry.lat,telemetry.lon) + tile_x,tile_y,offset_x,offset_y = coord_to_tiles(conf,telemetry.lat,telemetry.lon,level) -- viewport relative coordinates - myScreenX,myScreenY = getScreenCoordinates(minX,minY,tile_x,tile_y,offset_x,offset_y,level) + myScreenX,myScreenY = getScreenCoordinates(conf,minX,minY,tile_x,tile_y,offset_x,offset_y,level) -- check if offscreen local myCode = drawLib.computeOutCode(myScreenX, myScreenY, minX+17, minY+17, maxX-17, maxY-17); @@ -519,8 +552,8 @@ local function drawMap(myWidget,drawLib,conf,telemetry,status,battery,utils,leve if myCode > 0 then loadAndCenterTiles(conf, tile_x, tile_y, offset_x, offset_y, 3, level) -- after centering screen position needs to be computed again - tile_x,tile_y,offset_x,offset_y = coord_to_tiles(telemetry.lat,telemetry.lon) - myScreenX,myScreenY = getScreenCoordinates(minX,minY,tile_x,tile_y,offset_x,offset_y,level) + tile_x,tile_y,offset_x,offset_y = coord_to_tiles(conf,telemetry.lat,telemetry.lon,level) + myScreenX,myScreenY = getScreenCoordinates(conf,minX,minY,tile_x,tile_y,offset_x,offset_y,level) end end @@ -532,22 +565,20 @@ local function drawMap(myWidget,drawLib,conf,telemetry,status,battery,utils,leve homeNeedsRefresh = false if telemetry.homeLat ~= nil then -- current vehicle tile coordinates - tile_x,tile_y,offset_x,offset_y = coord_to_tiles(telemetry.homeLat,telemetry.homeLon) + tile_x,tile_y,offset_x,offset_y = coord_to_tiles(conf,telemetry.homeLat,telemetry.homeLon,level) -- viewport relative coordinates - homeScreenX,homeScreenY = getScreenCoordinates(minX,minY,tile_x,tile_y,offset_x,offset_y,level) + homeScreenX,homeScreenY = getScreenCoordinates(conf,minX,minY,tile_x,tile_y,offset_x,offset_y,level) end else -- update estimated home, schedule home update homeNeedsRefresh = true estimatedHomeGps.lat,estimatedHomeGps.lon = utils.getHomeFromAngleAndDistance(telemetry) if estimatedHomeGps.lat ~= nil then - local t_x,t_y,o_x,o_y = coord_to_tiles(estimatedHomeGps.lat,estimatedHomeGps.lon) + local t_x,t_y,o_x,o_y = coord_to_tiles(conf,estimatedHomeGps.lat,estimatedHomeGps.lon,level) -- viewport relative coordinates - estimatedHomeScreenX,estimatedHomeScreenY = getScreenCoordinates(minX,minY,t_x,t_y,o_x,o_y,level) + estimatedHomeScreenX,estimatedHomeScreenY = getScreenCoordinates(conf,minX,minY,t_x,t_y,o_x,o_y,level) end end - collectgarbage() - collectgarbage() end -- position history sampling @@ -555,36 +586,53 @@ local function drawMap(myWidget,drawLib,conf,telemetry,status,battery,utils,leve lastPosSample = getTime() posUpdated = false -- points history - local path = tiles_to_path(tile_x, tile_y, level) + local path = tiles_to_path(conf,tile_x, tile_y, level) posHistory[sample] = { path, offset_x, offset_y } - collectgarbage() - collectgarbage() sampleCount = sampleCount+1 - sample = sampleCount%10 + sample = sampleCount%20 end -- draw map tiles - lcd.setColor(CUSTOM_COLOR,0xFE60) - drawTiles(conf,drawLib,3,minX,maxX,minY,maxY,CUSTOM_COLOR,level) + drawTiles(conf,drawLib,3,minX,maxX,minY,maxY,lcd.RGB(0xFF,0xCE,0x00),level) -- 0xFE60 = 0xFFCE00 = yellow tone -- draw home if telemetry.homeLat ~= nil and telemetry.homeLon ~= nil and homeScreenX ~= nil then local homeCode = drawLib.computeOutCode(homeScreenX, homeScreenY, minX+11, minY+10, maxX-11, maxY-10); if homeCode == 0 then - lcd.drawBitmap(utils.getBitmap("homeorange"),homeScreenX-11,homeScreenY-10) + if conf.enableTxGPS then + -- home position is the radio position + if getTxGPS() == nil then + -- internalgps option not included in the OpenTX build - blink the red rcradio symbol + utils.drawBlinkBitmap("radiored",homeScreenX-11,homeScreenY-10) + else + -- draw solid radio + lcd.drawBitmap(utils.getBitmap("rcradioorange"),homeScreenX-11,homeScreenY-10) + end + else + -- home position is the armed position, draw a symbol of a house + lcd.drawBitmap(utils.getBitmap("homeorange"),homeScreenX-11,homeScreenY-10) + end end end + + --[[ + -- draw estimated home (debug info) + if estimatedHomeGps.lat ~= nil and estimatedHomeGps.lon ~= nil and estimatedHomeScreenX ~= nil then + local homeCode = drawLib.computeOutCode(estimatedHomeScreenX, estimatedHomeScreenY, minX+11, minY+10, maxX-11, maxY-10); + if homeCode == 0 then + lcd.drawRectangle(estimatedHomeScreenX-11,estimatedHomeScreenY-11,20,20,RED) + end + end + --]] + -- draw vehicle if myScreenX ~= nil then - lcd.setColor(CUSTOM_COLOR,0xFFFF) - drawLib.drawRArrow(myScreenX,myScreenY,17-5,telemetry.yaw,CUSTOM_COLOR) - lcd.setColor(CUSTOM_COLOR,0x0000) - drawLib.drawRArrow(myScreenX,myScreenY,17,telemetry.yaw,CUSTOM_COLOR) + drawLib.drawRArrow(myScreenX,myScreenY,17-5,telemetry.yaw,WHITE) + drawLib.drawRArrow(myScreenX,myScreenY,17,telemetry.yaw,BLACK) end -- draw gps trace - lcd.setColor(CUSTOM_COLOR,0xFE60) - for p=0, math.min(sampleCount-1,10-1) + for p=0, math.min(sampleCount-1,20-1) do - if p ~= (sampleCount-1)%10 then + if p ~= (sampleCount-1)%20 then for x=1,3 do for y=1,2 @@ -592,100 +640,104 @@ local function drawMap(myWidget,drawLib,conf,telemetry,status,battery,utils,leve local idx = 3*(y-1)+x -- check if tile is on screen if tiles[idx] == posHistory[p][1] then - lcd.drawFilledRectangle(minX + (x-1)*100 + posHistory[p][2], minY + (y-1)*100 + posHistory[p][3],3,3,CUSTOM_COLOR) + lcd.drawFilledRectangle(minX + (x-1)*100 + posHistory[p][2], minY + (y-1)*100 + posHistory[p][3],3,3,lcd.RGB(0xFF,0xCE,0x00)) -- 0xFE60 = 0xFFCE00 = yellow tone end end end end end -- DEBUG - lcd.setColor(CUSTOM_COLOR,0xFFFF) - lcd.drawText((LCD_W-300)/2+5,18+5,string.format("zoom:%d",level),SMLSIZE+CUSTOM_COLOR) - lcd.setColor(CUSTOM_COLOR,0xFFFF) + lcd.drawText((LCD_W-300)/2+5,18+5,string.format("zoom:%d",level),SMLSIZE+WHITE) -- LEFT --- -- ALT - lcd.setColor(CUSTOM_COLOR,0x0000) - lcd.drawText(10, 50+25, "Alt("..unitLabel..")", SMLSIZE+0+CUSTOM_COLOR) - lcd.setColor(CUSTOM_COLOR,0xFFFF) - lcd.drawNumber(10,50+37,telemetry.homeAlt*unitScale,MIDSIZE+CUSTOM_COLOR+0) + lcd.drawText(10, 50+16, "Alt("..unitLabel..")", SMLSIZE+BLACK) + lcd.drawNumber(10,50+27,telemetry.homeAlt*unitScale,MIDSIZE+WHITE) -- SPEED - lcd.setColor(CUSTOM_COLOR,0x0000) - lcd.drawText(10, 50+60, "Spd("..conf.horSpeedLabel..")", SMLSIZE+0+CUSTOM_COLOR) - lcd.setColor(CUSTOM_COLOR,0xFFFF) - lcd.drawNumber(10,50+72,telemetry.hSpeed*0.1* conf.horSpeedMultiplier,MIDSIZE+CUSTOM_COLOR+0) + lcd.drawText(10, 50+54, "Spd("..conf.horSpeedLabel..")", SMLSIZE+BLACK) + lcd.drawNumber(10,50+65,telemetry.hSpeed*0.1* conf.horSpeedMultiplier,MIDSIZE+WHITE) -- VSPEED - lcd.setColor(CUSTOM_COLOR,0x0000) - lcd.drawText(10, 50+95, "VSI("..conf.vertSpeedLabel..")", SMLSIZE+0+CUSTOM_COLOR) - lcd.setColor(CUSTOM_COLOR,0xFFFF) - lcd.drawNumber(10,50+107, telemetry.vSpeed*0.1*conf.vertSpeedMultiplier, MIDSIZE+CUSTOM_COLOR+0) + lcd.drawText(10, 50+92, "VSI("..conf.vertSpeedLabel..")", SMLSIZE+BLACK) + lcd.drawNumber(10,50+103, telemetry.vSpeed*0.1*conf.vertSpeedMultiplier, MIDSIZE+WHITE) -- DIST - lcd.setColor(CUSTOM_COLOR,0x0000) - lcd.drawText(10, 50+130, "Dist("..unitLabel..")", SMLSIZE+0+CUSTOM_COLOR) - lcd.setColor(CUSTOM_COLOR,0xFFFF) - lcd.drawNumber(10, 50+142, telemetry.homeDist*unitScale, MIDSIZE+0+CUSTOM_COLOR) - + if getGeneralSettings().imperial == 0 then + -- metric, special handling for km + local dist = telemetry.homeDist*unitScale + if dist > 9999 then + -- add "k" for kilo + lcd.drawText(10, 50+130, "Dist(k"..unitLabel..")", SMLSIZE+BLACK) + lcd.drawNumber(10, 50+141, telemetry.homeDist*unitScale/1000, MIDSIZE+WHITE) + else + lcd.drawText(10, 50+130, "Dist("..unitLabel..")", SMLSIZE+BLACK) + lcd.drawNumber(10, 50+141, telemetry.homeDist*unitScale, MIDSIZE+WHITE) + end + else + -- imperial + lcd.drawText(10, 50+130, "Dist("..unitLabel..")", SMLSIZE+BLACK) + lcd.drawNumber(10, 50+141, telemetry.homeDist*unitScale, MIDSIZE+WHITE) + end -- RIGHT -- CELL if battery[1] * 0.01 < 10 then - lcd.drawNumber(410, 15+5, battery[1] + 0.5, PREC2+0+MIDSIZE+CUSTOM_COLOR) + lcd.drawNumber(410, 15+5, battery[1] + 0.5, PREC2+MIDSIZE+WHITE) else - lcd.drawNumber(410, 15+5, (battery[1] + 0.5)*0.1, PREC1+0+MIDSIZE+CUSTOM_COLOR) + lcd.drawNumber(410, 15+5, (battery[1] + 0.5)*0.1, PREC1+MIDSIZE+WHITE) end - lcd.drawText(410+50, 15+6, status.battsource, SMLSIZE+CUSTOM_COLOR) - lcd.drawText(410+50, 15+16, "V", SMLSIZE+CUSTOM_COLOR) + lcd.drawText(410+50, 15+6, status.battsource, SMLSIZE+WHITE) + lcd.drawText(410+50, 15+16, "V", SMLSIZE+WHITE) -- aggregate batt % - local perc = battery[16] - local strperc = string.format("%2d%%",perc) - lcd.drawText(410+65, 15+30, strperc, MIDSIZE+CUSTOM_COLOR+RIGHT) + local strperc = string.format("%2d%%",battery[16]) + lcd.drawText(410+65, 15+30, strperc, MIDSIZE+WHITE+RIGHT) -- Tracker - lcd.setColor(CUSTOM_COLOR,0x0000) - lcd.drawText(410, 15+70, "Tracker", SMLSIZE+0+CUSTOM_COLOR) - lcd.setColor(CUSTOM_COLOR,0xFFFF) - lcd.drawText(410, 15+82, string.format("%d@",(telemetry.homeAngle - 180) < 0 and telemetry.homeAngle + 180 or telemetry.homeAngle - 180), MIDSIZE+0+CUSTOM_COLOR) + lcd.drawText(410, 15+70, "Tracker", SMLSIZE+BLACK) + lcd.drawText(410, 15+82, string.format("%d@",(telemetry.homeAngle - 180) < 0 and telemetry.homeAngle + 180 or telemetry.homeAngle - 180), MIDSIZE+WHITE) -- HDG - lcd.setColor(CUSTOM_COLOR,0x0000) - lcd.drawText(410, 15+110, "Heading", SMLSIZE+0+CUSTOM_COLOR) - lcd.setColor(CUSTOM_COLOR,0xFFFF) - lcd.drawText(410, 15+122, string.format("%d@",telemetry.yaw), MIDSIZE+0+CUSTOM_COLOR) + lcd.drawText(410, 15+110, "Heading", SMLSIZE+BLACK) + lcd.drawText(410, 15+122, string.format("%d@",telemetry.yaw), MIDSIZE+WHITE) -- home - lcd.setColor(CUSTOM_COLOR,0xFE60) - drawLib.drawRArrow(410+28,15+175,22,math.floor(telemetry.homeAngle - telemetry.yaw),CUSTOM_COLOR) + drawLib.drawRArrow(410+28,15+175,22,math.floor(telemetry.homeAngle - telemetry.yaw),lcd.RGB(0xFF,0xCE,0x00)) -- 0xFE60 = 0xFFCE00 = yellow tone end - lcd.setColor(CUSTOM_COLOR,0xFFFF) end local initDone = false -local function init(utils,level) +local function init(conf,utils,level) if level ~= lastZoomLevel then utils.clearTable(tiles) - utils.clearTable(mapBitmapByPath) - utils.clearTable(posHistory) + sample = 0 sampleCount = 0 - world_tiles = tiles_on_level(level) + world_tiles = tiles_on_level(conf,level) tiles_per_radian = world_tiles / (2 * math.pi) - tile_dim = (40075017/world_tiles) * unitScale -- m or ft - - scaleLen = ((unitScale==1 and 1 or 3)*50*(level+3)/tile_dim)*100 - scaleLabel = tostring((unitScale==1 and 1 or 3)*50*(level+3))..unitLabel + if conf.mapProvider == 1 then + coord_to_tiles = gmapcacther_coord_to_tiles + tiles_to_path = gmapcatcher_tiles_to_path + tile_dim = (40075017/world_tiles) * unitScale -- m or ft + scaleLabel = tostring((unitScale==1 and 1 or 3)*50*2^(level+2))..unitLabel + scaleLen = ((unitScale==1 and 1 or 3)*50*2^(level+2)/tile_dim)*100 + elseif conf.mapProvider == 2 then + coord_to_tiles = google_coord_to_tiles + tiles_to_path = google_tiles_to_path + tile_dim = (40075017/world_tiles) * unitScale -- m or ft + scaleLabel = tostring((unitScale==1 and 1 or 3)*50*2^(20-level))..unitLabel + scaleLen = ((unitScale==1 and 1 or 3)*50*2^(20-level)/tile_dim)*100 + end + lastZoomLevel = level end end local function changeZoomLevel(level) - end local function draw(myWidget,drawLib,conf,telemetry,status,battery,alarms,frame,utils,customSensors,gpsStatuses,leftPanel,centerPanel,rightPanel) -- initialize maps - init(utils,status.mapZoomLevel) + init(conf,utils,status.mapZoomLevel) drawMap(myWidget,drawLib,conf,telemetry,status,battery,utils,status.mapZoomLevel) drawHud(myWidget,drawLib,conf,telemetry,status,battery,utils) utils.drawTopBar() diff --git a/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/left_1.lua b/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/left_1.lua index 8747648f..9d652536 100644 --- a/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/left_1.lua +++ b/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/left_1.lua @@ -36,6 +36,7 @@ --------------------- -- enable splash screen for no telemetry data --#define SPLASH +-- enable battery percentage based on voltage -- enable code to draw a compass rose vs a compass ribbon --#define COMPASS_ROSE @@ -54,14 +55,15 @@ --#define TESTMODE -- enable debug of generated hash or short hash string --#define HASHDEBUG - +-- enable MESSAGES DEBUG +--#define DEBUG_MESSAGES --------------------- -- DEBUG REFRESH RATES --------------------- -- calc and show hud refresh rate --#define HUDRATE -- calc and show telemetry process rate ---#define BGTELERATE +-- #define BGTELERATE --------------------- -- SENSOR IDS @@ -95,24 +97,7 @@ -- CONF REFRESH GV --------------------------------- ---------------------------------- --- ALARMS ---------------------------------- ---[[ - ALARM_TYPE_MIN needs arming (min has to be reached first), value below level for grace, once armed is periodic, reset on landing - ALARM_TYPE_MAX no arming, value above level for grace, once armed is periodic, reset on landing - ALARM_TYPE_TIMER no arming, fired periodically, spoken time, reset on landing - ALARM_TYPE_BATT needs arming (min has to be reached first), value below level for grace, no reset on landing -{ - 1 = notified, - 2 = alarm start, - 3 = armed, - 4 = type(0=min,1=max,2=timer,3=batt), - 5 = grace duration - 6 = ready - 7 = last alarm -} ---]]-- +-- -- -- @@ -125,7 +110,9 @@ --#define HUD_ALGO1 -- enable optimized hor bars HUD drawing --#define HUD_ALGO2 --- enable hor bars HUD drawing +-- enable hor bars HUD drawing, 2 px resolution +-- enable hor bars HUD drawing, 1 px resolution +--#define HUD_ALGO4 @@ -151,9 +138,6 @@ local unitLongLabel = getGeneralSettings().imperial == 0 and "km" or "mi" -- offsets are: 1 celm, 4 batt, 7 curr, 10 mah, 13 cap, indexing starts at 1 -- ------------------------ --- LIBRARY LOADING ------------------------ ---------------------- --- COLORS @@ -175,13 +159,6 @@ local unitLongLabel = getGeneralSettings().imperial == 0 and "km" or "mi" -- CLIPPING ALGO DEFINES -------------------------- - - - - - - - --------------------------------- -- LAYOUT --------------------------------- @@ -201,19 +178,15 @@ local unitLongLabel = getGeneralSettings().imperial == 0 and "km" or "mi" local function drawPane(x,drawLib,conf,telemetry,status,alarms,battery,battId,gpsStatuses,utils) - lcd.setColor(CUSTOM_COLOR,0xFFFF) if conf.rangeFinderMax > 0 then flags = 0 local rng = telemetry.range rng = utils.getMaxValue(rng,16) - lcd.setColor(CUSTOM_COLOR,0x0000) - lcd.drawText(90, 25, "Range("..unitLabel..")", SMLSIZE+CUSTOM_COLOR+RIGHT) - lcd.setColor(CUSTOM_COLOR,0xF800) + lcd.drawText(90, 25, "Range("..unitLabel..")", SMLSIZE+BLACK+RIGHT) if rng > conf.rangeFinderMax and status.showMinMaxValues == false then - lcd.drawFilledRectangle(90-65, 37+4,65,21,CUSTOM_COLOR) + lcd.drawFilledRectangle(90-65, 37+4,65,21,RED) end - lcd.setColor(CUSTOM_COLOR,0xFFFF) - lcd.drawText(90, 37, string.format("%.1f",rng*0.01*unitScale), MIDSIZE+RIGHT+CUSTOM_COLOR) + lcd.drawText(90, 37, string.format("%.1f",rng*0.01*unitScale), MIDSIZE+RIGHT+WHITE) else flags = BLINK -- always display gps altitude even without 3d lock @@ -226,19 +199,13 @@ local function drawPane(x,drawLib,conf,telemetry,status,alarms,battery,battId,gp if status.showMinMaxValues == true then flags = 0 end - lcd.setColor(CUSTOM_COLOR,0x0000) - lcd.drawText(90, 25, "AltAsl("..unitLabel..")", SMLSIZE+CUSTOM_COLOR+RIGHT) + lcd.drawText(90, 25, "GPSAlt("..unitLabel..")", SMLSIZE+BLACK+RIGHT) local stralt = string.format("%d",alt*unitScale) - lcd.setColor(CUSTOM_COLOR,0xFFFF) - lcd.drawText(90, 37, stralt, MIDSIZE+flags+RIGHT+CUSTOM_COLOR) + lcd.drawText(90, 37, stralt, MIDSIZE+flags+RIGHT+WHITE) end -- LABELS - lcd.setColor(CUSTOM_COLOR,0x0000) - drawLib.drawHomeIcon(90 - 70, 70,utils) - lcd.drawText(90, 70, "Dist("..unitLabel..")", SMLSIZE+RIGHT+CUSTOM_COLOR) - lcd.drawText(90, 117, "Travel("..unitLongLabel..")", SMLSIZE+RIGHT+CUSTOM_COLOR) + lcd.drawText(90, 117, "Travel("..unitLongLabel..")", SMLSIZE+RIGHT+BLACK) -- VALUES - lcd.setColor(CUSTOM_COLOR,0xFFFF) -- home distance flags = 0 if telemetry.homeAngle == -1 then @@ -248,13 +215,47 @@ local function drawPane(x,drawLib,conf,telemetry,status,alarms,battery,battId,gp if status.showMinMaxValues == true then flags = 0 end - local strdist = string.format("%d",dist*unitScale) - --lcd.setColor(CUSTOM_COLOR,0xFE60) --yellow - lcd.setColor(CUSTOM_COLOR,0xFFFF) - lcd.drawText(90, 82, strdist, MIDSIZE+flags+RIGHT+CUSTOM_COLOR) + if getGeneralSettings().imperial == 0 then + -- metric, special handling for km + if dist > 9999 then + -- add "k" for kilo, paint radio or home icon 8 pixels towards left + if conf.enableTxGPS then + -- radio home + drawLib.drawRadioIcon(82 - 70, 70,utils) + else + -- vehicle home + drawLib.drawHomeIcon(82 - 70, 70,utils) + end + lcd.drawText(82, 70, "Dist(k"..unitLabel..")", SMLSIZE+RIGHT+WHITE) + local strdist = string.format("%d",dist*unitScale/1000) + lcd.drawText(90, 82, strdist, MIDSIZE+flags+RIGHT+WHITE) + else + if conf.enableTxGPS then + -- radio home + drawLib.drawRadioIcon(90 - 70, 70,utils) + else + -- vehicle home + drawLib.drawHomeIcon(90 - 70, 70,utils) + end + lcd.drawText(90, 70, "Dist("..unitLabel..")", SMLSIZE+RIGHT+WHITE) + local strdist = string.format("%d",dist*unitScale) + lcd.drawText(90, 82, strdist, MIDSIZE+flags+RIGHT+WHITE) + end + else + -- imperial + if conf.enableTxGPS then + -- radio home + drawLib.drawRadioIcon(90 - 70, 70,utils) + else + -- vehicle home + drawLib.drawHomeIcon(90 - 70, 70,utils) + end + lcd.drawText(90, 70, "Dist("..unitLabel..")", SMLSIZE+RIGHT+WHITE) + local strdist = string.format("%d",dist*unitScale) + lcd.drawText(90, 82, strdist, MIDSIZE+flags+RIGHT+WHITE) + end -- total distance - lcd.setColor(CUSTOM_COLOR,0xFFFF) - lcd.drawNumber(90, 129, telemetry.totalDist*unitLongScale*100, PREC2+MIDSIZE+RIGHT+CUSTOM_COLOR) + lcd.drawNumber(90, 129, telemetry.totalDist*unitLongScale*100, PREC2+MIDSIZE+RIGHT+WHITE) if status.showMinMaxValues == true then drawLib.drawVArrow(4, 37 + 4,true,false,utils) diff --git a/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/left_2.lua b/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/left_2.lua index a186c754..170cf594 100644 --- a/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/left_2.lua +++ b/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/left_2.lua @@ -36,6 +36,7 @@ --------------------- -- enable splash screen for no telemetry data --#define SPLASH +-- enable battery percentage based on voltage -- enable code to draw a compass rose vs a compass ribbon --#define COMPASS_ROSE @@ -54,14 +55,15 @@ --#define TESTMODE -- enable debug of generated hash or short hash string --#define HASHDEBUG - +-- enable MESSAGES DEBUG +--#define DEBUG_MESSAGES --------------------- -- DEBUG REFRESH RATES --------------------- -- calc and show hud refresh rate --#define HUDRATE -- calc and show telemetry process rate ---#define BGTELERATE +-- #define BGTELERATE --------------------- -- SENSOR IDS @@ -95,24 +97,7 @@ -- CONF REFRESH GV --------------------------------- ---------------------------------- --- ALARMS ---------------------------------- ---[[ - ALARM_TYPE_MIN needs arming (min has to be reached first), value below level for grace, once armed is periodic, reset on landing - ALARM_TYPE_MAX no arming, value above level for grace, once armed is periodic, reset on landing - ALARM_TYPE_TIMER no arming, fired periodically, spoken time, reset on landing - ALARM_TYPE_BATT needs arming (min has to be reached first), value below level for grace, no reset on landing -{ - 1 = notified, - 2 = alarm start, - 3 = armed, - 4 = type(0=min,1=max,2=timer,3=batt), - 5 = grace duration - 6 = ready - 7 = last alarm -} ---]]-- +-- -- -- @@ -125,7 +110,9 @@ --#define HUD_ALGO1 -- enable optimized hor bars HUD drawing --#define HUD_ALGO2 --- enable hor bars HUD drawing +-- enable hor bars HUD drawing, 2 px resolution +-- enable hor bars HUD drawing, 1 px resolution +--#define HUD_ALGO4 @@ -151,9 +138,6 @@ local unitLongLabel = getGeneralSettings().imperial == 0 and "km" or "mi" -- offsets are: 1 celm, 4 batt, 7 curr, 10 mah, 13 cap, indexing starts at 1 -- ------------------------ --- LIBRARY LOADING ------------------------ ---------------------- --- COLORS @@ -175,13 +159,6 @@ local unitLongLabel = getGeneralSettings().imperial == 0 and "km" or "mi" -- CLIPPING ALGO DEFINES -------------------------- - - - - - - - --------------------------------- -- LAYOUT --------------------------------- @@ -201,18 +178,14 @@ local unitLongLabel = getGeneralSettings().imperial == 0 and "km" or "mi" local function drawPane(x,drawLib,conf,telemetry,status,alarms,battery,battId,gpsStatuses,utils) - lcd.setColor(CUSTOM_COLOR,0xFFFF) if conf.rangeFinderMax > 0 then local rng = telemetry.range rng = utils.getMaxValue(rng,16) - lcd.setColor(CUSTOM_COLOR,0x0000) - lcd.drawText(73, 21+8, "Rng("..unitLabel..")", SMLSIZE+CUSTOM_COLOR+RIGHT) + lcd.drawText(73, 21+8, "Rng("..unitLabel..")", SMLSIZE+BLACK+RIGHT) if rng > conf.rangeFinderMax and status.showMinMaxValues == false then - lcd.setColor(CUSTOM_COLOR,0xF800) - lcd.drawFilledRectangle(73-65, 33+8+4,65,21,CUSTOM_COLOR) + lcd.drawFilledRectangle(73-65, 33+8+4,65,21,RED) end - lcd.setColor(CUSTOM_COLOR,0xFFFF) - lcd.drawText(73, 33+8, string.format("%.1f",rng*0.01*unitScale), MIDSIZE+RIGHT+CUSTOM_COLOR) + lcd.drawText(73, 33+8, string.format("%.1f",rng*0.01*unitScale), MIDSIZE+RIGHT+WHITE) else flags = BLINK -- always display gps altitude even without 3d lock @@ -225,20 +198,21 @@ local function drawPane(x,drawLib,conf,telemetry,status,alarms,battery,battId,gp if status.showMinMaxValues == true then flags = 0 end - lcd.setColor(CUSTOM_COLOR,0x0000) - lcd.drawText(73, 21+8, "AltAsl("..unitLabel..")", SMLSIZE+CUSTOM_COLOR+RIGHT) + lcd.drawText(73, 21+8, "AltAsl("..unitLabel..")", SMLSIZE+BLACK+RIGHT) local stralt = string.format("%d",alt*unitScale) - lcd.setColor(CUSTOM_COLOR,0xFFFF) - lcd.drawText(73, 33+8, stralt, MIDSIZE+flags+RIGHT+CUSTOM_COLOR) + lcd.drawText(73, 33+8, stralt, MIDSIZE+flags+RIGHT+WHITE) end -- LABELS - lcd.setColor(CUSTOM_COLOR,0x0000) - drawLib.drawHomeIcon(155 - 68, 29,utils) - lcd.drawText(155, 29, "Dist("..unitLabel..")", SMLSIZE+RIGHT+CUSTOM_COLOR) - lcd.drawText(73, 95, "Spd("..conf.horSpeedLabel..")", SMLSIZE+RIGHT+CUSTOM_COLOR) - lcd.drawText(155, 95, "Travel("..unitLongLabel..")", SMLSIZE+RIGHT+CUSTOM_COLOR) + if conf.enableTxGPS then + -- radio home + drawLib.drawRadioIcon(155 - 68, 29,utils) + else + -- vehicle home + drawLib.drawHomeIcon(155 - 68, 29,utils) + end + lcd.drawText(73, 95, "Spd("..conf.horSpeedLabel..")", SMLSIZE+RIGHT+BLACK) + lcd.drawText(155, 95, "Travel("..unitLongLabel..")", SMLSIZE+RIGHT+BLACK) -- VALUES - lcd.setColor(CUSTOM_COLOR,0xFFFF) -- home distance flags = 0 if telemetry.homeAngle == -1 then @@ -248,17 +222,30 @@ local function drawPane(x,drawLib,conf,telemetry,status,alarms,battery,battId,gp if status.showMinMaxValues == true then flags = 0 end - local strdist = string.format("%d",dist*unitScale) - lcd.setColor(CUSTOM_COLOR,0xFFFF) - --lcd.setColor(CUSTOM_COLOR,0xFE60) --yellow - lcd.drawText(155, 41, strdist, MIDSIZE+flags+RIGHT+CUSTOM_COLOR) + if getGeneralSettings().imperial == 0 then + -- metric, special handling for km + if dist > 9999 then + -- add "k" for kilo + lcd.drawText(155, 29, "Dist(m"..unitLabel..")", SMLSIZE+RIGHT+BLACK) + local strdist = string.format("%d",dist*unitScale/1000) + lcd.drawText(155, 41, strdist, MIDSIZE+flags+RIGHT+WHITE) + else + lcd.drawText(155, 29, "Dist("..unitLabel..")", SMLSIZE+RIGHT+BLACK) + local strdist = string.format("%d",dist*unitScale) + lcd.drawText(155, 41, strdist, MIDSIZE+flags+RIGHT+WHITE) + end + else + -- imperial + lcd.drawText(155, 29, "Dist("..unitLabel..")", SMLSIZE+RIGHT+BLACK) + local strdist = string.format("%d",dist*unitScale) + lcd.drawText(155, 41, strdist, MIDSIZE+flags+RIGHT+WHITE) + end -- total distance - lcd.setColor(CUSTOM_COLOR,0xFFFF) - lcd.drawNumber(155, 107, telemetry.totalDist*unitLongScale*100, PREC2+MIDSIZE+RIGHT+CUSTOM_COLOR) + lcd.drawNumber(155, 107, telemetry.totalDist*unitLongScale*100, PREC2+MIDSIZE+RIGHT+WHITE) -- hspeed local speed = utils.getMaxValue(telemetry.hSpeed,14) - lcd.drawNumber(73,107,speed * conf.horSpeedMultiplier,MIDSIZE+RIGHT+PREC1+CUSTOM_COLOR) + lcd.drawNumber(73,107,speed * conf.horSpeedMultiplier,MIDSIZE+RIGHT+PREC1+WHITE) if status.showMinMaxValues == true then drawLib.drawVArrow(4, 33+8 + 4,true,false,utils) diff --git a/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/left_m2f_1.lua b/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/left_m2f_1.lua index 8c3d4bd5..3a18c5a7 100644 --- a/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/left_m2f_1.lua +++ b/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/left_m2f_1.lua @@ -36,6 +36,7 @@ --------------------- -- enable splash screen for no telemetry data --#define SPLASH +-- enable battery percentage based on voltage -- enable code to draw a compass rose vs a compass ribbon --#define COMPASS_ROSE @@ -54,14 +55,15 @@ --#define TESTMODE -- enable debug of generated hash or short hash string --#define HASHDEBUG - +-- enable MESSAGES DEBUG +--#define DEBUG_MESSAGES --------------------- -- DEBUG REFRESH RATES --------------------- -- calc and show hud refresh rate --#define HUDRATE -- calc and show telemetry process rate ---#define BGTELERATE +-- #define BGTELERATE --------------------- -- SENSOR IDS @@ -95,24 +97,7 @@ -- CONF REFRESH GV --------------------------------- ---------------------------------- --- ALARMS ---------------------------------- ---[[ - ALARM_TYPE_MIN needs arming (min has to be reached first), value below level for grace, once armed is periodic, reset on landing - ALARM_TYPE_MAX no arming, value above level for grace, once armed is periodic, reset on landing - ALARM_TYPE_TIMER no arming, fired periodically, spoken time, reset on landing - ALARM_TYPE_BATT needs arming (min has to be reached first), value below level for grace, no reset on landing -{ - 1 = notified, - 2 = alarm start, - 3 = armed, - 4 = type(0=min,1=max,2=timer,3=batt), - 5 = grace duration - 6 = ready - 7 = last alarm -} ---]]-- +-- -- -- @@ -125,7 +110,9 @@ --#define HUD_ALGO1 -- enable optimized hor bars HUD drawing --#define HUD_ALGO2 --- enable hor bars HUD drawing +-- enable hor bars HUD drawing, 2 px resolution +-- enable hor bars HUD drawing, 1 px resolution +--#define HUD_ALGO4 @@ -151,9 +138,6 @@ local unitLongLabel = getGeneralSettings().imperial == 0 and "km" or "mi" -- offsets are: 1 celm, 4 batt, 7 curr, 10 mah, 13 cap, indexing starts at 1 -- ------------------------ --- LIBRARY LOADING ------------------------ ---------------------- --- COLORS @@ -175,13 +159,6 @@ local unitLongLabel = getGeneralSettings().imperial == 0 and "km" or "mi" -- CLIPPING ALGO DEFINES -------------------------- - - - - - - - --------------------------------- -- LAYOUT --------------------------------- @@ -206,19 +183,14 @@ local unitLongLabel = getGeneralSettings().imperial == 0 and "km" or "mi" local function drawPane(x,drawLib,conf,telemetry,status,alarms,battery,battId,gpsStatuses,utils)--,getMaxValue,getBitmap,drawBlinkBitmap,lcdBacklightOn) - --lcd.setColor(CUSTOM_COLOR,lcd.RGB(0,33,56)) - --lcd.drawFilledRectangle(x + 3,21,93,203,CUSTOM_COLOR) if conf.rangeFinderMax > 0 then local rng = telemetry.range rng = utils.getMaxValue(rng,16) - lcd.setColor(CUSTOM_COLOR,0x0000) - lcd.drawText(25, 21, "Range("..unitLabel..")", SMLSIZE+CUSTOM_COLOR) + lcd.drawText(25, 21, "Range("..unitLabel..")", SMLSIZE+BLACK) if rng > conf.rangeFinderMax and status.showMinMaxValues == false then - lcd.setColor(CUSTOM_COLOR,0xF800) - lcd.drawFilledRectangle(88-65, 33+4,65,21,CUSTOM_COLOR) + lcd.drawFilledRectangle(88-65, 33+4,65,21,RED) end - lcd.setColor(CUSTOM_COLOR,0xFFFF) - lcd.drawText(88, 33, string.format("%.1f",rng*0.01*unitScale), MIDSIZE+flags+RIGHT+CUSTOM_COLOR) + lcd.drawText(88, 33, string.format("%.1f",rng*0.01*unitScale), MIDSIZE+flags+RIGHT+WHITE) else flags = BLINK -- always display gps altitude even without 3d lock @@ -231,25 +203,25 @@ local function drawPane(x,drawLib,conf,telemetry,status,alarms,battery,battId,gp if status.showMinMaxValues == true then flags = 0 end - lcd.setColor(CUSTOM_COLOR,0x0000) - lcd.drawText(25, 21, "AltAsl("..unitLabel..")", SMLSIZE+CUSTOM_COLOR) + lcd.drawText(25, 21, "AltAsl("..unitLabel..")", SMLSIZE+BLACK) local stralt = string.format("%d",alt*unitScale) - lcd.setColor(CUSTOM_COLOR,0xFFFF) - lcd.drawText(88, 33, stralt, MIDSIZE+flags+RIGHT+CUSTOM_COLOR) + lcd.drawText(88, 33, stralt, MIDSIZE+flags+RIGHT+WHITE) end -- LABELS - lcd.setColor(CUSTOM_COLOR,0x0000) - lcd.drawText(88, 102, "Dist("..unitLabel..")", SMLSIZE+RIGHT+CUSTOM_COLOR) - --lcd.drawText(88, 138, "Dist("..unitLongLabel..")", SMLSIZE+RIGHT+CUSTOM_COLOR) - lcd.drawText(88, 154, "WPN", SMLSIZE+RIGHT+CUSTOM_COLOR) - lcd.drawText(165, 154, "WPD("..unitLabel..")", SMLSIZE+RIGHT+CUSTOM_COLOR) + lcd.drawText(88, 154, "WPN", SMLSIZE+RIGHT+BLACK) + lcd.drawText(165, 154, "WPD("..unitLabel..")", SMLSIZE+RIGHT+BLACK) -- drawn on HUD bottom left - lcd.drawText(88, 63, "ASpd("..conf.horSpeedLabel..")", SMLSIZE+CUSTOM_COLOR+RIGHT) - lcd.drawText(315, 154, "Thr(%)", SMLSIZE+CUSTOM_COLOR+RIGHT) + lcd.drawText(88, 63, "ASpd("..conf.horSpeedLabel..")", SMLSIZE+BLACK+RIGHT) + lcd.drawText(315, 154, "Thr(%)", SMLSIZE+BLACK+RIGHT) -- VALUES - lcd.setColor(CUSTOM_COLOR,0xFFFF) -- home distance - drawLib.drawHomeIcon(2, 102 + 18,utils) + if conf.enableTxGPS then + -- radio home + drawLib.drawRadioIcon(2, 102 + 18,utils) + else + -- vehicle home + drawLib.drawHomeIcon(2, 102 + 18,utils) + end flags = 0 if telemetry.homeAngle == -1 then flags = BLINK @@ -258,26 +230,38 @@ local function drawPane(x,drawLib,conf,telemetry,status,alarms,battery,battId,gp if status.showMinMaxValues == true then flags = 0 end - lcd.setColor(CUSTOM_COLOR,lcd.RGB(255, 0xce, 0)) --yellow - local strdist = string.format("%d",dist*unitScale) - lcd.setColor(CUSTOM_COLOR,0xFE60) - lcd.drawText(88, 113, strdist, MIDSIZE+flags+RIGHT+CUSTOM_COLOR) + if getGeneralSettings().imperial == 0 then + -- metric, special handling for km + if dist > 9999 then + -- add "k" for kilo + lcd.drawText(80, 102, "Dist(k"..unitLabel..")", SMLSIZE+RIGHT+BLACK) + local strdist = string.format("%d",dist*unitScale/1000) + lcd.drawText(88, 113, strdist, MIDSIZE+flags+RIGHT+lcd.RGB(0xFF,0xCE,0x00)) -- 0xFE60 = 0xFFCE00 = yellow tone + else + lcd.drawText(88, 102, "Dist("..unitLabel..")", SMLSIZE+RIGHT+BLACK) + local strdist = string.format("%d",dist*unitScale) + lcd.drawText(88, 113, strdist, MIDSIZE+flags+RIGHT+lcd.RGB(0xFF,0xCE,0x00)) -- 0xFE60 = 0xFFCE00 = yellow tone + end + else + -- imperial + lcd.drawText(88, 102, "Dist("..unitLabel..")", SMLSIZE+RIGHT+BLACK) + local strdist = string.format("%d",dist*unitScale) + lcd.drawText(88, 113, strdist, MIDSIZE+flags+RIGHT+lcd.RGB(0xFF,0xCE,0x00)) -- 0xFE60 = 0xFFCE00 = yellow tone + end -- total distance - lcd.setColor(CUSTOM_COLOR,0xFFFF) - lcd.drawText(88, 138, unitLongLabel, SMLSIZE+RIGHT+CUSTOM_COLOR) - lcd.drawNumber(69, 134, telemetry.totalDist*unitLongScale*100, 0+RIGHT+CUSTOM_COLOR+PREC2) + lcd.drawText(88, 138, unitLongLabel, SMLSIZE+RIGHT+WHITE) + lcd.drawNumber(69, 134, telemetry.totalDist*unitLongScale*100, 0+RIGHT+WHITE+PREC2) -- wp number - lcd.drawNumber(68, 164, telemetry.wpNumber,MIDSIZE+RIGHT+CUSTOM_COLOR) + lcd.drawNumber(68, 164, telemetry.wpNumber,MIDSIZE+RIGHT+WHITE) -- wp distance - lcd.drawNumber(165, 164, telemetry.wpDistance * unitScale,MIDSIZE+RIGHT+CUSTOM_COLOR) + lcd.drawNumber(165, 164, telemetry.wpDistance * unitScale,MIDSIZE+RIGHT+WHITE) -- airspeed - lcd.drawNumber(88,74,telemetry.airspeed * conf.horSpeedMultiplier,MIDSIZE+RIGHT+PREC1+CUSTOM_COLOR) + lcd.drawNumber(88,74,telemetry.airspeed * conf.horSpeedMultiplier,MIDSIZE+RIGHT+PREC1+WHITE) -- throttle % - lcd.drawNumber(315,164,telemetry.throttle,MIDSIZE+RIGHT+CUSTOM_COLOR) + lcd.drawNumber(315,164,telemetry.throttle,MIDSIZE+RIGHT+WHITE) -- LINES - lcd.setColor(CUSTOM_COLOR,0xFFFF) --yellow -- wp bearing - drawLib.drawRArrow(80,180,9,telemetry.wpBearing*45,CUSTOM_COLOR) + drawLib.drawRArrow(80,180,9,telemetry.wpBearing*45,WHITE) -- if status.showMinMaxValues == true then drawLib.drawVArrow(3, 33+4,true,false,utils) @@ -293,7 +277,8 @@ local function background(myWidget,conf,telemetry,status,utils) setTelemetryValue(Thr_ID, Thr_SUBID, Thr_INSTANCE + i, telemetry.rcchannels[i], 13 , Thr_PRECISION , "RC"..i) end end - --]] + --]] + -- VFR setTelemetryValue(0x0AF, 0, 0, telemetry.airspeed*0.1, 4 , 0 , "ASpd") setTelemetryValue(0x010F, 0, 1, telemetry.baroAlt*10, 9 , 1 , "BAlt") @@ -307,6 +292,7 @@ local function background(myWidget,conf,telemetry,status,utils) --[[ setTelemetryValue(WPX_ID, WPX_SUBID, WPX_INSTANCE, telemetry.wpXTError, 9 , WPX_PRECISION , WPX_NAME) setTelemetryValue(WPB_ID, WPB_SUBID, WPB_INSTANCE, telemetry.wpBearing, 20 , WPB_PRECISION , WPB_NAME) - --]]end + --]] +end return {drawPane=drawPane,background=background} diff --git a/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/left_m2f_2.lua b/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/left_m2f_2.lua index 68e8b1fc..16bec0aa 100644 --- a/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/left_m2f_2.lua +++ b/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/left_m2f_2.lua @@ -36,6 +36,7 @@ --------------------- -- enable splash screen for no telemetry data --#define SPLASH +-- enable battery percentage based on voltage -- enable code to draw a compass rose vs a compass ribbon --#define COMPASS_ROSE @@ -54,14 +55,15 @@ --#define TESTMODE -- enable debug of generated hash or short hash string --#define HASHDEBUG - +-- enable MESSAGES DEBUG +--#define DEBUG_MESSAGES --------------------- -- DEBUG REFRESH RATES --------------------- -- calc and show hud refresh rate --#define HUDRATE -- calc and show telemetry process rate ---#define BGTELERATE +-- #define BGTELERATE --------------------- -- SENSOR IDS @@ -95,24 +97,7 @@ -- CONF REFRESH GV --------------------------------- ---------------------------------- --- ALARMS ---------------------------------- ---[[ - ALARM_TYPE_MIN needs arming (min has to be reached first), value below level for grace, once armed is periodic, reset on landing - ALARM_TYPE_MAX no arming, value above level for grace, once armed is periodic, reset on landing - ALARM_TYPE_TIMER no arming, fired periodically, spoken time, reset on landing - ALARM_TYPE_BATT needs arming (min has to be reached first), value below level for grace, no reset on landing -{ - 1 = notified, - 2 = alarm start, - 3 = armed, - 4 = type(0=min,1=max,2=timer,3=batt), - 5 = grace duration - 6 = ready - 7 = last alarm -} ---]]-- +-- -- -- @@ -125,7 +110,9 @@ --#define HUD_ALGO1 -- enable optimized hor bars HUD drawing --#define HUD_ALGO2 --- enable hor bars HUD drawing +-- enable hor bars HUD drawing, 2 px resolution +-- enable hor bars HUD drawing, 1 px resolution +--#define HUD_ALGO4 @@ -151,9 +138,6 @@ local unitLongLabel = getGeneralSettings().imperial == 0 and "km" or "mi" -- offsets are: 1 celm, 4 batt, 7 curr, 10 mah, 13 cap, indexing starts at 1 -- ------------------------ --- LIBRARY LOADING ------------------------ ---------------------- --- COLORS @@ -175,13 +159,6 @@ local unitLongLabel = getGeneralSettings().imperial == 0 and "km" or "mi" -- CLIPPING ALGO DEFINES -------------------------- - - - - - - - --------------------------------- -- LAYOUT --------------------------------- @@ -207,14 +184,11 @@ local function drawPane(x,drawLib,conf,telemetry,status,alarms,battery,battId,gp if conf.rangeFinderMax > 0 then local rng = telemetry.range rng = utils.getMaxValue(rng,16) - lcd.setColor(CUSTOM_COLOR,0x0000) - lcd.drawText(8, 20, "Range("..unitLabel..")", SMLSIZE+CUSTOM_COLOR) + lcd.drawText(8, 20, "Range("..unitLabel..")", SMLSIZE+BLACK) if rng > conf.rangeFinderMax and status.showMinMaxValues == false then - lcd.setColor(CUSTOM_COLOR,0xF800) - lcd.drawFilledRectangle(68-65, 31+4,65,21,CUSTOM_COLOR) + lcd.drawFilledRectangle(68-65, 31+4,65,21,RED) end - lcd.setColor(CUSTOM_COLOR,0xFFFF) - lcd.drawText(68, 31, string.format("%.1f",rng*0.01*unitScale), MIDSIZE+RIGHT+CUSTOM_COLOR) + lcd.drawText(68, 31, string.format("%.1f",rng*0.01*unitScale), MIDSIZE+RIGHT+WHITE) else flags = BLINK -- always display gps altitude even without 3d lock @@ -227,50 +201,78 @@ local function drawPane(x,drawLib,conf,telemetry,status,alarms,battery,battId,gp if status.showMinMaxValues == true then flags = 0 end - lcd.setColor(CUSTOM_COLOR,0x0000) - lcd.drawText(8, 20, "AltAsl("..unitLabel..")", SMLSIZE+CUSTOM_COLOR) + lcd.drawText(8, 20, "AltAsl("..unitLabel..")", SMLSIZE+BLACK) local stralt = string.format("%d",alt*unitScale) - lcd.setColor(CUSTOM_COLOR,0xFFFF) - lcd.drawText(68, 31, stralt, MIDSIZE+flags+RIGHT+CUSTOM_COLOR) + lcd.drawText(68, 31, stralt, MIDSIZE+flags+RIGHT+WHITE) end -- LABELS - lcd.setColor(CUSTOM_COLOR,0x0000) - lcd.drawText(153, 20, "Dist("..unitLabel..")", SMLSIZE+RIGHT+CUSTOM_COLOR) - lcd.drawText(69, 122, "AS("..conf.horSpeedLabel..")", SMLSIZE+RIGHT+CUSTOM_COLOR) - lcd.drawText(69, 76, "WPN", SMLSIZE+RIGHT+CUSTOM_COLOR) - lcd.drawText(153, 76, "WPD("..unitLabel..")", SMLSIZE+RIGHT+CUSTOM_COLOR) - lcd.drawText(153, 122, "THR(%)", SMLSIZE+RIGHT+CUSTOM_COLOR) + lcd.drawText(69, 122, "AS("..conf.horSpeedLabel..")", SMLSIZE+RIGHT+BLACK) + lcd.drawText(69, 76, "WPN", SMLSIZE+RIGHT+BLACK) + lcd.drawText(153, 76, "WPD("..unitLabel..")", SMLSIZE+RIGHT+BLACK) + lcd.drawText(153, 122, "THR(%)", SMLSIZE+RIGHT+BLACK) -- VALUES - lcd.setColor(CUSTOM_COLOR,0xFFFF) -- home distance - drawLib.drawHomeIcon(69 + 15, 20 + 2,utils) flags = 0 if telemetry.homeAngle == -1 then flags = BLINK end - local dist = utils.getMaxValue(telemetry.homeDist,15) if status.showMinMaxValues == true then flags = 0 end - local strdist = string.format("%d",dist*unitScale) - --lcd.setColor(CUSTOM_COLOR,0xFE60) - lcd.drawText(153, 31, strdist, MIDSIZE+flags+RIGHT+CUSTOM_COLOR) + local dist = utils.getMaxValue(telemetry.homeDist,15) + if getGeneralSettings().imperial == 0 then + -- metric, special handling for km + if dist > 9999 then + -- add "k" for kilo, draw icon 8 pixels to left + lcd.drawText(153, 20, "Dist(k"..unitLabel..")", SMLSIZE+RIGHT+BLACK) + if conf.enableTxGPS then + -- radio home + drawLib.drawRadioIcon(69 + 15 - 8, 20 + 2,utils) + else + -- vehicle home + drawLib.drawHomeIcon(69 + 15 - 8, 20 + 2,utils) + end + local strdist = string.format("%d",dist*unitScale/1000) + lcd.drawText(153, 31, strdist, MIDSIZE+flags+RIGHT+WHITE) + else + lcd.drawText(153, 20, "Dist("..unitLabel..")", SMLSIZE+RIGHT+BLACK) + if conf.enableTxGPS then + -- radio home + drawLib.drawRadioIcon(69 + 15, 20 + 2,utils) + else + -- vehicle home + drawLib.drawHomeIcon(69 + 15, 20 + 2,utils) + end + local strdist = string.format("%d",dist*unitScale) + lcd.drawText(153, 31, strdist, MIDSIZE+flags+RIGHT+WHITE) + end + else + -- imperial + lcd.drawText(153, 20, "Dist("..unitLabel..")", SMLSIZE+RIGHT+BLACK) + if conf.enableTxGPS then + -- radio home + drawLib.drawRadioIcon(69 + 15, 20 + 2,utils) + else + -- vehicle home + drawLib.drawHomeIcon(69 + 15, 20 + 2,utils) + end + local strdist = string.format("%d",dist*unitScale) + lcd.drawText(153, 31, strdist, MIDSIZE+flags+RIGHT+WHITE) + end -- total distance strdist = string.format("%.02f%s", telemetry.totalDist*unitLongScale,unitLongLabel) - lcd.setColor(CUSTOM_COLOR,0xFFFF) - lcd.drawText(152, 54, strdist, SMLSIZE+RIGHT+CUSTOM_COLOR) + lcd.drawText(152, 54, strdist, SMLSIZE+RIGHT+WHITE) -- airspeed - lcd.drawNumber(68,134,telemetry.airspeed * conf.horSpeedMultiplier,MIDSIZE+RIGHT+PREC1+CUSTOM_COLOR) + lcd.drawNumber(68,134,telemetry.airspeed * conf.horSpeedMultiplier,MIDSIZE+RIGHT+PREC1+WHITE) -- wp number - lcd.drawNumber(57, 87, telemetry.wpNumber,MIDSIZE+RIGHT+CUSTOM_COLOR) + lcd.drawNumber(57, 87, telemetry.wpNumber,MIDSIZE+RIGHT+WHITE) -- wp distance - lcd.drawNumber(153, 87, telemetry.wpDistance * unitScale,MIDSIZE+RIGHT+CUSTOM_COLOR) + lcd.drawNumber(153, 87, telemetry.wpDistance * unitScale,MIDSIZE+RIGHT+WHITE) -- throttle % - lcd.drawNumber(153,134,telemetry.throttle,MIDSIZE+RIGHT+CUSTOM_COLOR) + lcd.drawNumber(153,134,telemetry.throttle,MIDSIZE+RIGHT+WHITE) -- LINES - lcd.setColor(CUSTOM_COLOR,0xFFFF) --yellow -- wp bearing - drawLib.drawRArrow(67,100,10,telemetry.wpBearing*45,CUSTOM_COLOR) + drawLib.drawRArrow(67,100,10,telemetry.wpBearing*45,WHITE) -- if status.showMinMaxValues == true then drawLib.drawVArrow(68-70, 31+4,true,false,utils) @@ -286,7 +288,8 @@ local function background(myWidget,conf,telemetry,status,utils) setTelemetryValue(Thr_ID, Thr_SUBID, Thr_INSTANCE + i, telemetry.rcchannels[i], 13 , Thr_PRECISION , "RC"..i) end end - --]] + --]] + -- VFR setTelemetryValue(0x0AF, 0, 0, telemetry.airspeed*0.1, 4 , 0 , "ASpd") setTelemetryValue(0x010F, 0, 1, telemetry.baroAlt*10, 9 , 1 , "BAlt") @@ -300,6 +303,7 @@ local function background(myWidget,conf,telemetry,status,utils) --[[ setTelemetryValue(WPX_ID, WPX_SUBID, WPX_INSTANCE, telemetry.wpXTError, 9 , WPX_PRECISION , WPX_NAME) setTelemetryValue(WPB_ID, WPB_SUBID, WPB_INSTANCE, telemetry.wpBearing, 20 , WPB_PRECISION , WPB_NAME) - --]]end + --]] +end return {drawPane=drawPane,background=background} diff --git a/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/plane.lua b/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/plane.lua index 93c431ec..c0a1a7a3 100644 --- a/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/plane.lua +++ b/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/plane.lua @@ -22,9 +22,11 @@ enum FlightMode { QLAND = 20, QRTL = 21, QAUTOTUNE = 22, - QACRO = 23 + QACRO = 23, + THERMAL = 24, }; --]] + local flightModes = {} -- plane flight modes flightModes[0]="" @@ -52,6 +54,7 @@ flightModes[21]="Qland" flightModes[22]="QRTL" flightModes[23]="QAutotune" flightModes[24]="QAcro" +flightModes[25]="Thermal" -- return {flightModes=flightModes} diff --git a/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/plane_px4.lua b/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/plane_px4.lua index d143e236..d068aaf9 100644 --- a/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/plane_px4.lua +++ b/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/plane_px4.lua @@ -1,29 +1,86 @@ +--[[ + MavToPT 2.63 + + uint8_t PX4FlightModeNum(uint8_t main, uint8_t sub) { + switch(main) { + case 1: + return 0; // MANUAL + case 2: + return 1; // ALTITUDE + case 3: + return 2; // POSCTL + case 4: + switch(sub) { + case 1: + return 12; // AUTO READY + case 2: + return 13; // AUTO TAKEOFF + case 3: + return 14; // AUTO LOITER + case 4: + return 15; // AUTO MISSION + case 5: + return 16; // AUTO RTL + case 6: + return 17; // AUTO LAND + case 7: + return 18; // AUTO RTGS + case 8: + return 19; // AUTO FOLLOW ME + case 9: + return 20; // AUTO PRECLAND + default: + return 31; // AUTO UNKNOWN + } + case 5: + return 3; // ACRO + case 6: + return 4; // OFFBOARD + case 7: + return 5; // STABILIZED + case 8: + return 6; // RATTITUDE + case 9: + return 7; // SIMPLE + default: + return 11; // UNKNOWN + } + } +--]] local flightModes = {} -- plane flight modes -flightModes[0]="" -flightModes[1]="Manual" -flightModes[2]="AltCtl" --px4 specific -flightModes[3]="PosCtl" --px4 specific -flightModes[4]="Ready" --px4 specific -flightModes[5]="Takeoff" --px4 specific -flightModes[6]="Loiter" -flightModes[7]="Mission" --px4 specific -flightModes[8]="RTL" -flightModes[9]="Land" -flightModes[10]="RTGS" --px4 specific -flightModes[11]="Follow" -flightModes[12]="PrecLand" --px4 specific -flightModes[13]="" -flightModes[14]="Acro" -flightModes[15]="OffBoard" --px4 specific -flightModes[16]="Stabilize" -flightModes[17]="RAttitude" --px4 specific -flightModes[18]="Simple" --px4 specific -flightModes[19]="" -flightModes[20]="" -flightModes[21]="" -flightModes[22]="" -flightModes[23]="" --- +flightModes[0] = "Manual" +flightModes[1] = "AltCtl" --px4 specific +flightModes[2] = "PosCtl" --px4 specific +flightModes[3] = "Acro" +flightModes[4] = "OffBoard" --px4 specific +flightModes[5] = "Stabilize" +flightModes[6] = "RAttitude" --px4 specific +flightModes[7] = "Simple" --px4 specific +flightModes[8] = "" +flightModes[9] = "" +flightModes[10] = "" +flightModes[11] = "" +flightModes[12] = "Ready" --px4 specific +flightModes[13] = "Takeoff" --px4 specific +flightModes[14] = "Loiter" +flightModes[15] = "Mission" --px4 specific +flightModes[16] = "RTL" +flightModes[17] = "Land" +flightModes[18] = "" +flightModes[19] = "Follow" +flightModes[20] = "PrecLand" --px4 specific +flightModes[21] = "" +flightModes[22] = "" +flightModes[23] = "" +flightModes[24] = "" +flightModes[25] = "" +flightModes[26] = "" +flightModes[27] = "" +flightModes[28] = "" +flightModes[29] = "" +flightModes[30] = "" +flightModes[31] = "Unknown" + return {flightModes=flightModes} diff --git a/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/reset.lua b/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/reset.lua deleted file mode 100644 index 8bebd6bf..00000000 --- a/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/reset.lua +++ /dev/null @@ -1,332 +0,0 @@ --- --- An FRSKY S.Port based Telemetry script for the Horus X10 and X12 radios --- --- Copyright (C) 2018-2019. Alessandro Apostoli --- https://github.com/yaapu --- --- This program is free software; you can redistribute it and/or modify --- it under the terms of the GNU General Public License as published by --- the Free Software Foundation; either version 3 of the License, or --- (at your option) any later version. --- --- This program is distributed in the hope that it will be useful, --- but WITHOUT ANY WARRANTY, without even the implied warranty of --- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --- GNU General Public License for more details. --- --- You should have received a copy of the GNU General Public License --- along with this program; if not, see . --- - ---------------------- --- MAIN CONFIG --- 480x272 LCD_W x LCD_H ---------------------- - ---------------------- --- VERSION ---------------------- --- load and compile of lua files --- uncomment to force compile of all chunks, comment for release ---#define COMPILE --- fix for issue OpenTX 2.2.1 on X10/X10S - https://github.com/opentx/opentx/issues/5764 - ---------------------- --- FEATURE CONFIG ---------------------- --- enable splash screen for no telemetry data ---#define SPLASH --- enable code to draw a compass rose vs a compass ribbon ---#define COMPASS_ROSE - ---------------------- --- DEV FEATURE CONFIG ---------------------- --- enable memory debuging ---#define MEMDEBUG --- enable dev code ---#define DEV --- uncomment haversine calculation routine ---#define HAVERSINE --- enable telemetry logging to file (experimental) ---#define LOGTELEMETRY --- use radio channels imputs to generate fake telemetry data ---#define TESTMODE --- enable debug of generated hash or short hash string ---#define HASHDEBUG - ---------------------- --- DEBUG REFRESH RATES ---------------------- --- calc and show hud refresh rate ---#define HUDRATE --- calc and show telemetry process rate ---#define BGTELERATE - ---------------------- --- SENSOR IDS ---------------------- - - - - - - - - - - - - - - - - --- Throttle and RC use RPM sensor IDs - ---------------------- --- BATTERY DEFAULTS ---------------------- ---------------------------------- --- BACKLIGHT SUPPORT --- GV is zero based, GV 8 = GV 9 in OpenTX ---------------------------------- ---------------------------------- --- CONF REFRESH GV ---------------------------------- - ---------------------------------- --- ALARMS ---------------------------------- ---[[ - ALARM_TYPE_MIN needs arming (min has to be reached first), value below level for grace, once armed is periodic, reset on landing - ALARM_TYPE_MAX no arming, value above level for grace, once armed is periodic, reset on landing - ALARM_TYPE_TIMER no arming, fired periodically, spoken time, reset on landing - ALARM_TYPE_BATT needs arming (min has to be reached first), value below level for grace, no reset on landing -{ - 1 = notified, - 2 = alarm start, - 3 = armed, - 4 = type(0=min,1=max,2=timer,3=batt), - 5 = grace duration - 6 = ready - 7 = last alarm -} ---]]-- --- --- - --- - ----------------------- --- COMMON LAYOUT ----------------------- --- enable vertical bars HUD drawing (same as taranis) ---#define HUD_ALGO1 --- enable optimized hor bars HUD drawing ---#define HUD_ALGO2 --- enable hor bars HUD drawing - - - - - - --------------------------------------------------------------------------------- --- MENU VALUE,COMBO --------------------------------------------------------------------------------- - --------------------------- --- UNIT OF MEASURE --------------------------- -local unitScale = getGeneralSettings().imperial == 0 and 1 or 3.28084 -local unitLabel = getGeneralSettings().imperial == 0 and "m" or "ft" -local unitLongScale = getGeneralSettings().imperial == 0 and 1/1000 or 1/1609.34 -local unitLongLabel = getGeneralSettings().imperial == 0 and "km" or "mi" - - ------------------------ --- BATTERY ------------------------ --- offsets are: 1 celm, 4 batt, 7 curr, 10 mah, 13 cap, indexing starts at 1 --- - ------------------------ --- LIBRARY LOADING ------------------------ - ----------------------- ---- COLORS ----------------------- - ---#define COLOR_LABEL 0x7BCF ---#define COLOR_BG 0x0169 ---#define COLOR_BARSEX 0x10A3 - - ---#define COLOR_SENSORS 0x0169 - ------------------------------------ --- STATE TRANSITION ENGINE SUPPORT ------------------------------------ - - --------------------------- --- CLIPPING ALGO DEFINES --------------------------- - - - - - - - - - -local function resetTelemetry(status,telemetry,battery,alarms,utils) - -- sport queue max pops to prevent looping forever - local i = 0 - -- empty sport queue - local a,b,c,d = sportTelemetryPop() - while a ~= null and i < 50 do - a,b,c,d = sportTelemetryPop() - i = i + 1 - end - ----------------------------- - -- TELEMETRY - ----------------------------- - -- AP STATUS - telemetry.flightMode = 0 - telemetry.simpleMode = 0 - telemetry.landComplete = 0 - telemetry.statusArmed = 0 - telemetry.battFailsafe = 0 - telemetry.ekfFailsafe = 0 - telemetry.imuTemp = 0 - -- GPS - telemetry.numSats = 0 - telemetry.gpsStatus = 0 - telemetry.gpsHdopC = 100 - telemetry.gpsAlt = 0 - -- BATT 1 - telemetry.batt1volt = 0 - telemetry.batt1current = 0 - telemetry.batt1mah = 0 - -- BATT 2 - telemetry.batt2volt = 0 - telemetry.batt2current = 0 - telemetry.batt2mah = 0 - -- HOME - telemetry.homeDist = 0 - telemetry.homeAlt = 0 - telemetry.homeAngle = -1 - -- VELANDYAW - telemetry.vSpeed = 0 - telemetry.hSpeed = 0 - telemetry.yaw = 0 - -- ROLLPITCH - telemetry.roll = 0 - telemetry.pitch = 0 - telemetry.range = 0 - -- PARAMS - telemetry.frameType = -1 - telemetry.batt1Capacity = 0 - telemetry.batt2Capacity = 0 - -- GPS - telemetry.lat = nil - telemetry.lon = nil - telemetry.homeLat = nil - telemetry.homeLon = nil - -- WP - telemetry.wpNumber = 0 - telemetry.wpDistance = 0 - telemetry.wpXTError = 0 - telemetry.wpBearing = 0 - telemetry.wpCommands = 0 - -- RC channels - telemetry.rcchannels = {} - -- VFR - telemetry.airspeed = 0 - telemetry.throttle = 0 - telemetry.baroAlt = 0 - -- - telemetry.totalDist = 0 - ----------------------------- - -- SCRIPT STATUS - ----------------------------- - -- FLVSS 1 - status.cell1min = 0 - status.cell1sum = 0 - -- FLVSS 2 - status.cell2min = 0 - status.cell2sum = 0 - -- FC 1 - status.cell1sumFC = 0 - status.cell1maxFC = 0 - -- FC 2 - status.cell2sumFC = 0 - status.cell2maxFC = 0 - -- BATT - status.cell1count = 0 - status.cell2count = 0 - - status.battsource = "na" - -- BATT 1 - status.batt1sources = { - vs = false, - fc = false - } - -- BATT 2 - status.batt2sources = { - vs = false, - fc = false - } - -- TELEMETRY - status.noTelemetryData = 1 - -- MESSAGES - status.msgBuffer = "" - status.lastMsgValue = 0 - status.lastMsgTime = 0 - -- FLIGHT TIME - status.lastTimerStart = 0 - status.timerRunning = 0 - status.flightTime = 0 - -- EVENTS - status.lastStatusArmed = 0 - status.lastGpsStatus = 0 - status.lastFlightMode = 0 - status.lastSimpleMode = 0 - -- battery levels - status.batLevel = 99 - status.battLevel1 = false - status.battLevel2 = false - status.lastBattLevel = 14 - -- messages - status.lastMessage = nil - status.lastMessageSeverity = 0 - status.lastMessageCount = 1 - status.messageCount = 0 - ------------------------- - -- BATTERY ARRAY - ------------------------- - battery = {0,0,0,0,0,0,0,0,0,0,0,0} - -- clear message queue - utils.clearTable(status.messages) - --- - status.messages = {} - -- reset alarms - alarms[1] = { false, 0 , false, 0, 0, false, 0} --MIN_ALT - alarms[2] = { false, 0 , true, 1 , 0, false, 0 } --MAX_ALT - alarms[3] = { false, 0 , true, 1 , 0, false, 0 } --15 - alarms[4] = { false, 0 , true, 1 , 0, false, 0 } --FS_EKF - alarms[5] = { false, 0 , true, 1 , 0, false, 0 } --FS_BAT - alarms[6] = { false, 0 , true, 2, 0, false, 0 } --FLIGTH_TIME - alarms[7] = { false, 0 , false, 3, 4, false, 0 } --BATT L1 - alarms[8] = { false, 0 , false, 4, 4, false, 0 } --BATT L2 - alarms[9] = { false, 0 , false, 1 , 0, false, 0 } --MAX_HDOP - -- stop and reset timer - model.setTimer(2,{mode=0}) - model.setTimer(2,{value=0}) -end - -return {resetTelemetry=resetTelemetry} diff --git a/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/right_1.lua b/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/right_1.lua index ea77e8dc..f0e094f2 100644 --- a/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/right_1.lua +++ b/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/right_1.lua @@ -36,6 +36,7 @@ --------------------- -- enable splash screen for no telemetry data --#define SPLASH +-- enable battery percentage based on voltage -- enable code to draw a compass rose vs a compass ribbon --#define COMPASS_ROSE @@ -54,14 +55,15 @@ --#define TESTMODE -- enable debug of generated hash or short hash string --#define HASHDEBUG - +-- enable MESSAGES DEBUG +--#define DEBUG_MESSAGES --------------------- -- DEBUG REFRESH RATES --------------------- -- calc and show hud refresh rate --#define HUDRATE -- calc and show telemetry process rate ---#define BGTELERATE +-- #define BGTELERATE --------------------- -- SENSOR IDS @@ -95,24 +97,7 @@ -- CONF REFRESH GV --------------------------------- ---------------------------------- --- ALARMS ---------------------------------- ---[[ - ALARM_TYPE_MIN needs arming (min has to be reached first), value below level for grace, once armed is periodic, reset on landing - ALARM_TYPE_MAX no arming, value above level for grace, once armed is periodic, reset on landing - ALARM_TYPE_TIMER no arming, fired periodically, spoken time, reset on landing - ALARM_TYPE_BATT needs arming (min has to be reached first), value below level for grace, no reset on landing -{ - 1 = notified, - 2 = alarm start, - 3 = armed, - 4 = type(0=min,1=max,2=timer,3=batt), - 5 = grace duration - 6 = ready - 7 = last alarm -} ---]]-- +-- -- -- @@ -125,7 +110,9 @@ --#define HUD_ALGO1 -- enable optimized hor bars HUD drawing --#define HUD_ALGO2 --- enable hor bars HUD drawing +-- enable hor bars HUD drawing, 2 px resolution +-- enable hor bars HUD drawing, 1 px resolution +--#define HUD_ALGO4 @@ -151,9 +138,6 @@ local unitLongLabel = getGeneralSettings().imperial == 0 and "km" or "mi" -- offsets are: 1 celm, 4 batt, 7 curr, 10 mah, 13 cap, indexing starts at 1 -- ------------------------ --- LIBRARY LOADING ------------------------ ---------------------- --- COLORS @@ -185,13 +169,6 @@ local unitLongLabel = getGeneralSettings().imperial == 0 and "km" or "mi" - - - - - - - -- offsets are: 1 celm, 4 batt, 7 curr, 10 mah, 13 cap, indexing starts at 1 --[[ BATT_CELL 1 @@ -203,13 +180,12 @@ BATT_CAP 13 BATT_IDALL 0 BATT_ID1 1 BATT_ID2 2 ---]]local function drawPane(x,drawLib,conf,telemetry,status,alarms,battery,battId,gpsStatuses,utils) - lcd.setColor(CUSTOM_COLOR,0xFFFF) +--]] +local function drawPane(x,drawLib,conf,telemetry,status,alarms,battery,battId,gpsStatuses,utils) local perc = battery[16+battId] -- battery min cell - local flags = 0 + local colr = WHITE -- - lcd.setColor(CUSTOM_COLOR,0xFFFF) -- white if status.showMinMaxValues == false then if status.battLevel2 == false and alarms[8][2] > 0 then utils.drawBlinkBitmap("cell_red_blink_86x30",x+7,20) @@ -217,77 +193,79 @@ BATT_ID2 2 elseif status.battLevel2 == true then lcd.drawBitmap(utils.getBitmap("cell_red_86x30"),x+7,20) elseif status.battLevel1 == false and alarms[7][2] > 0 then - --lcd.setColor(CUSTOM_COLOR,0x0000) -- black utils.drawBlinkBitmap("cell_orange_blink_86x30",x+7,20) utils.lcdBacklightOn() elseif status.battLevel1 == true then lcd.drawBitmap(utils.getBitmap("cell_orange_86x30"),x+7,20) - lcd.setColor(CUSTOM_COLOR,0x0000) -- black + colr = BLACK end end - flags = CUSTOM_COLOR + --PREC2 forces a math.floor() whereas a math.round() is required, math.round(f) = math.floor(f+0.5) if battery[1+battId] * 0.01 < 10 then - lcd.drawNumber(x+75+2, 16, battery[1+battId] + 0.5, PREC2+DBLSIZE+RIGHT+flags) + lcd.drawNumber(x+75+2, 16, battery[1+battId] + 0.5, PREC2+DBLSIZE+RIGHT+colr) else - lcd.drawNumber(x+75+2, 16, (battery[1+battId] + 0.5)*0.1, PREC1+DBLSIZE+RIGHT+flags) + lcd.drawNumber(x+75+2, 16, (battery[1+battId] + 0.5)*0.1, PREC1+DBLSIZE+RIGHT+colr) end - local lx = x+76 - lcd.drawText(lx, 32, "V", flags) - lcd.drawText(lx, 18, status.battsource, flags) + local lx = x+77 + lcd.drawText(lx, 35, "V", colr+SMLSIZE) + lcd.drawText(lx, 18, status.battsource, colr) - lcd.setColor(CUSTOM_COLOR,0xFFFF) -- white -- battery voltage - drawLib.drawNumberWithDim(x+75,48,x+75, 58, battery[4+battId],"V",RIGHT+MIDSIZE+PREC1+CUSTOM_COLOR,SMLSIZE+CUSTOM_COLOR) + drawLib.drawNumberWithDim(x+77,47,x+77, 58, battery[4+battId],"V",RIGHT+MIDSIZE+PREC1+WHITE,SMLSIZE+WHITE) -- battery current local lowAmp = battery[7+battId]*0.1 < 10 - drawLib.drawNumberWithDim(x+75,68,x+76,83,battery[7+battId]*(lowAmp and 1 or 0.1),"A",DBLSIZE+RIGHT+CUSTOM_COLOR+(lowAmp and PREC1 or 0),0+CUSTOM_COLOR) + drawLib.drawNumberWithDim(x+77,70,x+77,81,battery[7+battId]*(lowAmp and 1 or 0.1),"A",MIDSIZE+RIGHT+WHITE+(lowAmp and PREC1 or 0),SMLSIZE+WHITE) -- display capacity bar % - lcd.setColor(CUSTOM_COLOR,lcd.RGB(255,255, 255)) - lcd.drawFilledRectangle(x+10, 105,80,21,CUSTOM_COLOR) + lcd.drawFilledRectangle(x+7, 99,86,21,WHITE) if perc > 50 then - lcd.setColor(CUSTOM_COLOR,lcd.RGB(0, 255, 0)) + colr = GREEN elseif perc <= 50 and perc > 25 then - lcd.setColor(CUSTOM_COLOR,lcd.RGB(255, 204, 0)) -- yellow + colr = lcd.RGB(255, 204, 0) -- yellow else - lcd.setColor(CUSTOM_COLOR,lcd.RGB(255,0, 0)) + colr = RED end - lcd.drawGauge(x+10, 105,80,21,perc,100,CUSTOM_COLOR) + lcd.drawGauge(x+7, 99,86,21,perc,100,colr) -- battery percentage - lcd.setColor(CUSTOM_COLOR,0x0000) -- black - local strperc = string.format("%02d%%",perc) - lcd.drawText(x+35, 101, strperc, MIDSIZE+CUSTOM_COLOR) + lcd.drawText(x+35, 95, strperc, MIDSIZE+BLACK) -- battery mah - lcd.setColor(CUSTOM_COLOR,0xFFFF) local strmah = string.format("%.02f/%.01f",battery[10+battId]/1000,battery[13+battId]/1000) - --lcd.drawText(x+90, 138+2, "Ah", SMLSIZE+RIGHT+CUSTOM_COLOR) - lcd.drawText(x+90, 138, strmah, 0+RIGHT+CUSTOM_COLOR) - - lcd.setColor(CUSTOM_COLOR,0x0000) - lcd.drawText(x+90,126,battId == 0 and "B1+B2(Ah)" or (battId == 1 and "B1(Ah)" or "B2(Ah)"),SMLSIZE+RIGHT+CUSTOM_COLOR) + lcd.drawText(x+95, 135, strmah, RIGHT+WHITE) + + local battLabel = "B1+B2(Ah)" + if battId == 0 then + if conf.battConf == 3 then + -- alarms are based on battery 1 + battLabel = "B1(Ah)" + elseif conf.battConf == 4 then + -- alarms are based on battery 2 + battLabel = "B2(Ah)" + end + else + battLabel = (battId == 1 and "B1(Ah)" or "B2(Ah)") + end + lcd.drawText(x+95, 122, battLabel, SMLSIZE+RIGHT+BLACK) if battId < 2 then -- labels - lcd.drawText(x+12, 154, "Eff(mAh)", SMLSIZE+CUSTOM_COLOR+RIGHT) - lcd.drawText(x+95, 154, "Power(W)", SMLSIZE+CUSTOM_COLOR+RIGHT) + lcd.drawText(x+12, 154, "Eff(mAh)", SMLSIZE+BLACK+RIGHT) + lcd.drawText(x+95, 154, "Power(W)", SMLSIZE+BLACK+RIGHT) -- data - lcd.setColor(CUSTOM_COLOR,0xFFFF) local speed = utils.getMaxValue(telemetry.hSpeed,14) -- efficiency for indipendent batteries makes sense only for battery 1 local eff = speed > 2 and (conf.battConf == 3 and battery[7+1] or battery[7])*1000/(speed*conf.horSpeedMultiplier) or 0 eff = ( conf.battConf == 3 and battId == 2) and 0 or eff - lcd.drawNumber(x+12,164,eff,(eff > 99999 and 0 or MIDSIZE)+RIGHT+CUSTOM_COLOR) + lcd.drawNumber(x+12,164,eff,(eff > 99999 and 0 or MIDSIZE)+RIGHT+WHITE) -- power local power = battery[4+battId]*battery[7+battId]*0.01 - lcd.drawNumber(x+95,164,power,MIDSIZE+RIGHT+CUSTOM_COLOR) - --lcd.drawText(x+95,164,string.format("%dW",power),MIDSIZE+CUSTOM_COLOR) + lcd.drawNumber(x+95,164,power,MIDSIZE+RIGHT+WHITE) end if status.showMinMaxValues == true then drawLib.drawVArrow(x+75+11, 16 + 8,false,true,utils) - drawLib.drawVArrow(x+75+11,48 + 3, false,true,utils) - drawLib.drawVArrow(x+75+11,68 + 10,true,false,utils) + drawLib.drawVArrow(x+77+11,47 + 3, false,true,utils) + drawLib.drawVArrow(x+77+11,70 + 10,true,false,utils) end end diff --git a/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/right_2.lua b/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/right_2.lua index 83e946b2..935f41fb 100644 --- a/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/right_2.lua +++ b/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/right_2.lua @@ -36,6 +36,7 @@ --------------------- -- enable splash screen for no telemetry data --#define SPLASH +-- enable battery percentage based on voltage -- enable code to draw a compass rose vs a compass ribbon --#define COMPASS_ROSE @@ -54,14 +55,15 @@ --#define TESTMODE -- enable debug of generated hash or short hash string --#define HASHDEBUG - +-- enable MESSAGES DEBUG +--#define DEBUG_MESSAGES --------------------- -- DEBUG REFRESH RATES --------------------- -- calc and show hud refresh rate --#define HUDRATE -- calc and show telemetry process rate ---#define BGTELERATE +-- #define BGTELERATE --------------------- -- SENSOR IDS @@ -95,24 +97,7 @@ -- CONF REFRESH GV --------------------------------- ---------------------------------- --- ALARMS ---------------------------------- ---[[ - ALARM_TYPE_MIN needs arming (min has to be reached first), value below level for grace, once armed is periodic, reset on landing - ALARM_TYPE_MAX no arming, value above level for grace, once armed is periodic, reset on landing - ALARM_TYPE_TIMER no arming, fired periodically, spoken time, reset on landing - ALARM_TYPE_BATT needs arming (min has to be reached first), value below level for grace, no reset on landing -{ - 1 = notified, - 2 = alarm start, - 3 = armed, - 4 = type(0=min,1=max,2=timer,3=batt), - 5 = grace duration - 6 = ready - 7 = last alarm -} ---]]-- +-- -- -- @@ -125,7 +110,9 @@ --#define HUD_ALGO1 -- enable optimized hor bars HUD drawing --#define HUD_ALGO2 --- enable hor bars HUD drawing +-- enable hor bars HUD drawing, 2 px resolution +-- enable hor bars HUD drawing, 1 px resolution +--#define HUD_ALGO4 @@ -151,9 +138,6 @@ local unitLongLabel = getGeneralSettings().imperial == 0 and "km" or "mi" -- offsets are: 1 celm, 4 batt, 7 curr, 10 mah, 13 cap, indexing starts at 1 -- ------------------------ --- LIBRARY LOADING ------------------------ ---------------------- --- COLORS @@ -184,13 +168,6 @@ local unitLongLabel = getGeneralSettings().imperial == 0 and "km" or "mi" - - - - - - - -- offsets are: 1 celm, 4 batt, 7 curr, 10 mah, 13 cap, indexing starts at 1 --[[ BATT_CELL 1 @@ -202,13 +179,12 @@ BATT_CAP 13 BATT_IDALL 0 BATT_ID1 1 BATT_ID2 2 ---]]local function drawPane(x,drawLib,conf,telemetry,status,alarms,battery,battId,gpsStatuses,utils) - lcd.setColor(CUSTOM_COLOR,0xFFFF) +--]] +local function drawPane(x,drawLib,conf,telemetry,status,alarms,battery,battId,gpsStatuses,utils) local perc = battery[16+battId] -- battery min cell - local flags = 0 - -- - lcd.setColor(CUSTOM_COLOR,0xFFFF) -- white + local colr = WHITE + if status.showMinMaxValues == false then if status.battLevel2 == false and alarms[8][2] > 0 then utils.drawBlinkBitmap("cell_red",x+41 - 2,13 + 7) @@ -216,72 +192,76 @@ BATT_ID2 2 elseif status.battLevel2 == true then lcd.drawBitmap(utils.getBitmap("cell_red"),x+41 - 2,13 + 7) elseif status.battLevel1 == false and alarms[7][2] > 0 then - --lcd.setColor(CUSTOM_COLOR,0x0000) -- black utils.drawBlinkBitmap("cell_orange_blink",x+41 - 2,13 + 7) utils.lcdBacklightOn() elseif status.battLevel1 == true then lcd.drawBitmap(utils.getBitmap("cell_orange"),x+41 - 2,13 + 7) - lcd.setColor(CUSTOM_COLOR,0x0000) -- black + colr = BLACK end end - flags = CUSTOM_COLOR --PREC2 forces a math.floor() whereas a math.round() is required, math.round(f) = math.floor(f+0.5) if battery[1+battId] * 0.01 < 10 then - lcd.drawNumber(x+41+2, 13, battery[1+battId] + 0.5, PREC2+XXLSIZE+flags) + lcd.drawNumber(x+41+2, 13, battery[1+battId] + 0.5, PREC2+XXLSIZE+colr) else - lcd.drawNumber(x+41+2, 13, (battery[1+battId] + 0.5)*0.1, PREC1+XXLSIZE+flags) + lcd.drawNumber(x+41+2, 13, (battery[1+battId] + 0.5)*0.1, PREC1+XXLSIZE+colr) end - --lcd.drawNumber(x+41+2, 13, battery[1+battId] + 0.5, XXLSIZE+flags) + --lcd.drawNumber(x+41+2, 13, battery[1+battId] + 0.5, XXLSIZE+colr) local lx = x+175 - lcd.drawText(lx, 23, "V", flags) - lcd.drawText(lx, 58, status.battsource, flags) + lcd.drawText(lx, 23, "V", colr) + lcd.drawText(lx, 58, status.battsource, colr) - lcd.setColor(CUSTOM_COLOR,0xFFFF) -- white -- battery voltage - drawLib.drawNumberWithDim(x+105,79,x+103, 79, battery[4+battId],"V",DBLSIZE+PREC1+RIGHT+CUSTOM_COLOR,SMLSIZE+CUSTOM_COLOR) + drawLib.drawNumberWithDim(x+105,79,x+103, 79, battery[4+battId],"V",DBLSIZE+PREC1+RIGHT+WHITE,SMLSIZE+WHITE) -- battery current - drawLib.drawNumberWithDim(x+178,79,x+176,79,battery[7+battId]*(battery[7+battId] >= 100 and 0.1 or 1),"A",DBLSIZE+RIGHT+CUSTOM_COLOR+(battery[7+battId] >= 100 and 0 or PREC1),SMLSIZE+CUSTOM_COLOR) + drawLib.drawNumberWithDim(x+178,79,x+176,79,battery[7+battId]*(battery[7+battId] >= 100 and 0.1 or 1),"A",DBLSIZE+RIGHT+WHITE+(battery[7+battId] >= 100 and 0 or PREC1),SMLSIZE+WHITE) -- display capacity bar % if perc > 50 then - lcd.setColor(CUSTOM_COLOR,lcd.RGB(0, 255, 0)) + colr = GREEN elseif perc <= 50 and perc > 25 then - lcd.setColor(CUSTOM_COLOR,lcd.RGB(255, 204, 0)) -- yellow + colr = lcd.RGB(255, 204, 0) -- yellow else - lcd.setColor(CUSTOM_COLOR,lcd.RGB(255,0, 0)) + colr = RED end lcd.drawBitmap(utils.getBitmap("gauge_bg"),x+43-2,117-2) - lcd.drawGauge(x+43, 117,147,23,perc,100,CUSTOM_COLOR) + lcd.drawGauge(x+43, 117,147,23,perc,100,colr) -- battery percentage - lcd.setColor(CUSTOM_COLOR,0x0000) -- black - local strperc = string.format("%02d%%",perc) - lcd.drawText(x+98, 114, strperc, MIDSIZE+CUSTOM_COLOR) + lcd.drawText(x+98, 114, strperc, MIDSIZE+BLACK) -- battery mah - lcd.setColor(CUSTOM_COLOR,0xFFFF) local strmah = string.format("%.02f/%.01f",battery[10+battId]/1000,battery[13+battId]/1000) - lcd.drawText(x+183, 140+6, "Ah", RIGHT+CUSTOM_COLOR) - lcd.drawText(x+183 - 22, 140, strmah, MIDSIZE+RIGHT+CUSTOM_COLOR) + lcd.drawText(x+183, 140+6, "Ah", RIGHT+WHITE) + lcd.drawText(x+183 - 22, 140, strmah, MIDSIZE+RIGHT+WHITE) - lcd.setColor(CUSTOM_COLOR,0x5AEB) - lcd.drawText(x+190,124,battId == 0 and "B1+B2" or (battId == 1 and "B1" or "B2"),SMLSIZE+CUSTOM_COLOR+RIGHT) + local battLabel = "B1+B2" + if battId == 0 then + if conf.battConf == 3 then + -- alarms are based on battery 1 + battLabel = "B1" + elseif conf.battConf == 4 then + -- alarms are based on battery 2 + battLabel = "B2" + end + else + battLabel = (battId == 1 and "B1(Ah)" or "B2(Ah)") + end + + lcd.drawText(x+190, 124, battLabel, SMLSIZE+lcd.RGB(0x5A,0x5D,0x5A)+RIGHT) -- 0x5AEB = 0x5A5D5A = grey tone if battId < 2 then -- RIGHT labels - lcd.setColor(CUSTOM_COLOR,0x0000) - lcd.drawText(478, 165, "Eff(mAh)", SMLSIZE+RIGHT+CUSTOM_COLOR) - lcd.drawText(395, 165, "Power(W)", SMLSIZE+CUSTOM_COLOR+RIGHT) + lcd.drawText(478, 165, "Eff(mAh)", SMLSIZE+RIGHT+BLACK) + lcd.drawText(395, 165, "Power(W)", SMLSIZE+BLACK+RIGHT) --data - lcd.setColor(CUSTOM_COLOR,0xFFFF) -- efficiency for indipendent batteries makes sense only for battery 1 local speed = utils.getMaxValue(telemetry.hSpeed,14) local eff = speed > 2 and (conf.battConf == 3 and battery[7+1] or battery[7])*1000/(speed*conf.horSpeedMultiplier) or 0 eff = ( conf.battConf == 3 and battId == 2) and 0 or eff - lcd.drawNumber(478,178,eff,MIDSIZE+RIGHT+CUSTOM_COLOR) + lcd.drawNumber(478,178,eff,MIDSIZE+RIGHT+WHITE) -- power local power = battery[4]*(conf.battConf == 3 and battery[7+1] or battery[7])*0.01 - lcd.drawNumber(395,178,power,MIDSIZE+RIGHT+CUSTOM_COLOR) + lcd.drawNumber(395,178,power,MIDSIZE+RIGHT+WHITE) end if status.showMinMaxValues == true then diff --git a/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/right_battperc_1.lua b/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/right_battperc_1.lua new file mode 100644 index 00000000..84418694 --- /dev/null +++ b/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/right_battperc_1.lua @@ -0,0 +1,240 @@ +-- +-- An FRSKY S.Port based Telemetry script for the Horus X10 and X12 radios +-- +-- Copyright (C) 2018-2019. Alessandro Apostoli +-- https://github.com/yaapu +-- +-- This program is free software; you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as published by +-- the Free Software Foundation; either version 3 of the License, or +-- (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY, without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program; if not, see . +-- + +--------------------- +-- MAIN CONFIG +-- 480x272 LCD_W x LCD_H +--------------------- + +--------------------- +-- VERSION +--------------------- +-- load and compile of lua files +-- uncomment to force compile of all chunks, comment for release +--#define COMPILE +-- fix for issue OpenTX 2.2.1 on X10/X10S - https://github.com/opentx/opentx/issues/5764 + +--------------------- +-- FEATURE CONFIG +--------------------- +-- enable splash screen for no telemetry data +--#define SPLASH +-- enable battery percentage based on voltage +-- enable code to draw a compass rose vs a compass ribbon +--#define COMPASS_ROSE + +--------------------- +-- DEV FEATURE CONFIG +--------------------- +-- enable memory debuging +--#define MEMDEBUG +-- enable dev code +--#define DEV +-- uncomment haversine calculation routine +--#define HAVERSINE +-- enable telemetry logging to file (experimental) +--#define LOGTELEMETRY +-- use radio channels imputs to generate fake telemetry data +--#define TESTMODE +-- enable debug of generated hash or short hash string +--#define HASHDEBUG +-- enable MESSAGES DEBUG +--#define DEBUG_MESSAGES +--------------------- +-- DEBUG REFRESH RATES +--------------------- +-- calc and show hud refresh rate +--#define HUDRATE +-- calc and show telemetry process rate +-- #define BGTELERATE + +--------------------- +-- SENSOR IDS +--------------------- + + + + + + + + + + + + + + + + +-- Throttle and RC use RPM sensor IDs + +--------------------- +-- BATTERY DEFAULTS +--------------------- +--------------------------------- +-- BACKLIGHT SUPPORT +-- GV is zero based, GV 8 = GV 9 in OpenTX +--------------------------------- +--------------------------------- +-- CONF REFRESH GV +--------------------------------- + +-- +-- +-- + +-- + +---------------------- +-- COMMON LAYOUT +---------------------- +-- enable vertical bars HUD drawing (same as taranis) +--#define HUD_ALGO1 +-- enable optimized hor bars HUD drawing +--#define HUD_ALGO2 +-- enable hor bars HUD drawing, 2 px resolution +-- enable hor bars HUD drawing, 1 px resolution +--#define HUD_ALGO4 + + + + + + +-------------------------------------------------------------------------------- +-- MENU VALUE,COMBO +-------------------------------------------------------------------------------- + +-------------------------- +-- UNIT OF MEASURE +-------------------------- +local unitScale = getGeneralSettings().imperial == 0 and 1 or 3.28084 +local unitLabel = getGeneralSettings().imperial == 0 and "m" or "ft" +local unitLongScale = getGeneralSettings().imperial == 0 and 1/1000 or 1/1609.34 +local unitLongLabel = getGeneralSettings().imperial == 0 and "km" or "mi" + + +----------------------- +-- BATTERY +----------------------- +-- offsets are: 1 celm, 4 batt, 7 curr, 10 mah, 13 cap, indexing starts at 1 +-- + + +---------------------- +--- COLORS +---------------------- + +--#define COLOR_LABEL 0x7BCF +--#define COLOR_BG 0x0169 +--#define COLOR_BARSEX 0x10A3 + + +--#define COLOR_SENSORS 0x0169 + +----------------------------------- +-- STATE TRANSITION ENGINE SUPPORT +----------------------------------- + + +-------------------------- +-- CLIPPING ALGO DEFINES +-------------------------- + + + + + + + +-- offsets are: 1 celm, 4 batt, 7 curr, 10 mah, 13 cap, indexing starts at 1 +--[[ +BATT_CELL 1 +BATT_VOLT 4 +BATT_CURR 7 +BATT_MAH 10 +BATT_CAP 13 + +BATT_IDALL 0 +BATT_ID1 1 +BATT_ID2 2 +--]] +local function drawPane(x,drawLib,conf,telemetry,status,alarms,battery,battId,gpsStatuses,utils) + local perc = battery[16+battId] + -- battery min cell + local colr = WHITE + + -- display capacity bar % + lcd.drawFilledRectangle(x+10, 22,80,32,WHITE) + if perc > 50 then + colr = GREEN + elseif perc <= 50 and perc > 25 then + colr = lcd.RGB(255, 204, 0) -- yellow + else + colr = RED + end + lcd.drawGauge(x+10, 22,80,32,perc,100,colr) + -- battery percentage + local strperc = string.format("%02d%%",perc) + lcd.drawText(x+25, 18, strperc, DBLSIZE+BLACK) + + colr = WHITE + if status.showMinMaxValues == false then + if status.battLevel2 == false and alarms[8][2] > 0 then + utils.drawBlinkBitmap("cell_red_blink_86x30",x+7,74) + utils.lcdBacklightOn() + elseif status.battLevel2 == true then + lcd.drawBitmap(utils.getBitmap("cell_red_86x30"),x+7,74) + elseif status.battLevel1 == false and alarms[7][2] > 0 then + utils.drawBlinkBitmap("cell_orange_blink_86x30",x+7,74) + utils.lcdBacklightOn() + elseif status.battLevel1 == true then + lcd.drawBitmap(utils.getBitmap("cell_orange_86x30"),x+7,74) + colr = BLACK + end + end + --PREC2 forces a math.floor() whereas a math.round() is required, math.round(f) = math.floor(f+0.5) + if battery[1+battId] * 0.01 < 10 then + lcd.drawNumber(x+75+2, 70, battery[1+battId] + 0.5, PREC2+DBLSIZE+RIGHT+colr) + else + lcd.drawNumber(x+75+2, 70, (battery[1+battId] + 0.5)*0.1, PREC1+DBLSIZE+RIGHT+colr) + end + + local lx = x+76 + lcd.drawText(lx, 86, "V", colr) + lcd.drawText(lx, 72, status.battsource, colr) + + -- labels + lcd.drawText(x+90,54,battId == 0 and "B1+B2" or (battId == 1 and "B1" or "B2"),SMLSIZE+RIGHT+BLACK) + lcd.drawText(x+90, 108, "IMUt", SMLSIZE+RIGHT+BLACK) + + -- IMU Temperature + lcd.drawText(x+90, 120, string.format("%d@",telemetry.imuTemp), DBLSIZE+RIGHT+WHITE) + + if status.showMinMaxValues == true then + drawLib.drawVArrow(x+75+11, 70 + 8,false,true,utils) + end +end + +local function background(myWidget,conf,telemetry,status,utils) +end + +return {drawPane=drawPane,background=background} diff --git a/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/right_custom_2.lua b/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/right_custom_2.lua index d0b7e68f..c2823f34 100644 --- a/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/right_custom_2.lua +++ b/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/right_custom_2.lua @@ -36,6 +36,7 @@ --------------------- -- enable splash screen for no telemetry data --#define SPLASH +-- enable battery percentage based on voltage -- enable code to draw a compass rose vs a compass ribbon --#define COMPASS_ROSE @@ -54,14 +55,15 @@ --#define TESTMODE -- enable debug of generated hash or short hash string --#define HASHDEBUG - +-- enable MESSAGES DEBUG +--#define DEBUG_MESSAGES --------------------- -- DEBUG REFRESH RATES --------------------- -- calc and show hud refresh rate --#define HUDRATE -- calc and show telemetry process rate ---#define BGTELERATE +-- #define BGTELERATE --------------------- -- SENSOR IDS @@ -95,24 +97,7 @@ -- CONF REFRESH GV --------------------------------- ---------------------------------- --- ALARMS ---------------------------------- ---[[ - ALARM_TYPE_MIN needs arming (min has to be reached first), value below level for grace, once armed is periodic, reset on landing - ALARM_TYPE_MAX no arming, value above level for grace, once armed is periodic, reset on landing - ALARM_TYPE_TIMER no arming, fired periodically, spoken time, reset on landing - ALARM_TYPE_BATT needs arming (min has to be reached first), value below level for grace, no reset on landing -{ - 1 = notified, - 2 = alarm start, - 3 = armed, - 4 = type(0=min,1=max,2=timer,3=batt), - 5 = grace duration - 6 = ready - 7 = last alarm -} ---]]-- +-- -- -- @@ -125,7 +110,9 @@ --#define HUD_ALGO1 -- enable optimized hor bars HUD drawing --#define HUD_ALGO2 --- enable hor bars HUD drawing +-- enable hor bars HUD drawing, 2 px resolution +-- enable hor bars HUD drawing, 1 px resolution +--#define HUD_ALGO4 @@ -151,9 +138,6 @@ local unitLongLabel = getGeneralSettings().imperial == 0 and "km" or "mi" -- offsets are: 1 celm, 4 batt, 7 curr, 10 mah, 13 cap, indexing starts at 1 -- ------------------------ --- LIBRARY LOADING ------------------------ ---------------------- --- COLORS @@ -187,13 +171,6 @@ local unitLongLabel = getGeneralSettings().imperial == 0 and "km" or "mi" - - - - - - - @@ -227,8 +204,7 @@ local function drawCustomSensors(x,customSensors,utils,status) label = string.format("%s(%s)",sensorConfig[1],sensorConfig[4]) end -- draw sensor label - lcd.setColor(CUSTOM_COLOR,0x0000) - lcd.drawText(x+customSensorXY[i][1], customSensorXY[i][2],label, SMLSIZE+RIGHT+CUSTOM_COLOR) + lcd.drawText(x+customSensorXY[i][1], customSensorXY[i][2],label, SMLSIZE+RIGHT+BLACK) mult = sensorConfig[3] == 0 and 1 or ( sensorConfig[3] == 1 and 10 or 100 ) prec = mult == 1 and 0 or (mult == 10 and 32 or 48) @@ -245,22 +221,20 @@ local function drawCustomSensors(x,customSensors,utils,status) flags = MIDSIZE end - local color = 0xFFFF + local colr = WHITE local sign = sensorConfig[6] == "+" and 1 or -1 -- max tracking, high values are critical if math.abs(value) ~= 0 and status.showMinMaxValues == false then - color = ( sensorValue*sign > sensorConfig[9]*sign and 0xF800 or (sensorValue*sign > sensorConfig[8]*sign and 0xFE60 or 0xFFFF)) + colr = ( sensorValue*sign > sensorConfig[9]*sign and RED or (sensorValue*sign > sensorConfig[8]*sign and lcd.RGB(0xFF,0xCE,0x00) or WHITE)) end - lcd.setColor(CUSTOM_COLOR,color) - local voffset = (i>2 and flags==MIDSIZE) and 5 or 0 -- if a lookup table exists use it! if customSensors.lookups[i] ~= nil and customSensors.lookups[i][value] ~= nil then - lcd.drawText(x+customSensorXY[i][3], customSensorXY[i][4]+voffset, customSensors.lookups[i][value] or value, flags+RIGHT+CUSTOM_COLOR) + lcd.drawText(x+customSensorXY[i][3], customSensorXY[i][4]+voffset, customSensors.lookups[i][value] or value, flags+RIGHT+colr) else - lcd.drawNumber(x+customSensorXY[i][3], customSensorXY[i][4]+voffset, value, flags+RIGHT+prec+CUSTOM_COLOR) + lcd.drawNumber(x+customSensorXY[i][3], customSensorXY[i][4]+voffset, value, flags+RIGHT+prec+colr) end end end @@ -277,13 +251,11 @@ BATT_CAP 13 BATT_IDALL 0 BATT_ID1 1 BATT_ID2 2 ---]]local function drawPane(x,drawLib,conf,telemetry,status,alarms,battery,battId,gpsStatuses,utils,customSensors) - lcd.setColor(CUSTOM_COLOR,0xFFFF) - local perc = battery[16+battId] +--]] +local function drawPane(x,drawLib,conf,telemetry,status,alarms,battery,battId,gpsStatuses,utils,customSensors) + local perc = battery[16+battId] -- battery min cell - local flags = 0 - -- - lcd.setColor(CUSTOM_COLOR,0xFFFF) -- white + local colr = WHITE if status.showMinMaxValues == false then if status.battLevel2 == false and alarms[8][2] > 0 then utils.drawBlinkBitmap("cell_red_small",x+110+1,16 + 7) @@ -291,54 +263,47 @@ BATT_ID2 2 elseif status.battLevel2 == true then lcd.drawBitmap(utils.getBitmap("cell_red_small"),x+110+1,16 + 7) elseif status.battLevel1 == false and alarms[7][2] > 0 then - --lcd.setColor(CUSTOM_COLOR,0x0000) -- black utils.drawBlinkBitmap("cell_orange_small_blink",x+110+1,16 + 7) utils.lcdBacklightOn() elseif status.battLevel1 == true then lcd.drawBitmap(utils.getBitmap("cell_orange_small"),x+110+1,16 + 7) - lcd.setColor(CUSTOM_COLOR,0x0000) -- black + colr = BLACK end end - flags = CUSTOM_COLOR --PREC2 forces a math.floor() whereas a math.round() is required, math.round(f) = math.floor(f+0.5) if battery[1+battId] * 0.01 < 10 then - lcd.drawNumber(x+110+2, 16, battery[1+battId] + 0.5, PREC2+DBLSIZE+flags) + lcd.drawNumber(x+110+2, 16, battery[1+battId] + 0.5, PREC2+DBLSIZE+colr) else - lcd.drawNumber(x+110+2, 16, (battery[1+battId] + 0.5)*0.1, PREC1+DBLSIZE+flags) + lcd.drawNumber(x+110+2, 16, (battery[1+battId] + 0.5)*0.1, PREC1+DBLSIZE+colr) end local lx = x+180 - lcd.drawText(lx, 19, "V", SMLSIZE+flags) - lcd.drawText(lx-2, 35, status.battsource, SMLSIZE+flags) + lcd.drawText(lx, 19, "V", SMLSIZE+colr) + lcd.drawText(lx-2, 35, status.battsource, SMLSIZE+colr) - lcd.setColor(CUSTOM_COLOR,0xFFFF) -- white -- battery voltage - drawLib.drawNumberWithDim(x+110,48,x+110, 46, battery[4+battId],"V",MIDSIZE+PREC1+RIGHT+CUSTOM_COLOR,SMLSIZE+CUSTOM_COLOR) + drawLib.drawNumberWithDim(x+110,48,x+110, 46, battery[4+battId],"V",MIDSIZE+PREC1+RIGHT+WHITE,SMLSIZE+WHITE) -- battery current - drawLib.drawNumberWithDim(x+178,48,x+178,48,battery[7+battId],"A",MIDSIZE+RIGHT+PREC1+CUSTOM_COLOR,SMLSIZE+CUSTOM_COLOR) + drawLib.drawNumberWithDim(x+178,48,x+178,48,battery[7+battId],"A",MIDSIZE+RIGHT+PREC1+WHITE,SMLSIZE+WHITE) -- display capacity bar % if perc > 50 then - lcd.setColor(CUSTOM_COLOR,lcd.RGB(0, 255, 0)) + colr = GREEN elseif perc <= 50 and perc > 25 then - lcd.setColor(CUSTOM_COLOR,lcd.RGB(255, 204, 0)) -- yellow + colr = lcd.RGB(255, 204, 0) -- yellow else - lcd.setColor(CUSTOM_COLOR,lcd.RGB(255,0, 0)) + colr = RED end lcd.drawBitmap(utils.getBitmap("gauge_bg_small"),x+47,29) - lcd.drawGauge(x+47, 29,58,16,perc,100,CUSTOM_COLOR) + lcd.drawGauge(x+47, 29,58,16,perc,100,colr) -- battery percentage - lcd.setColor(CUSTOM_COLOR,0x0000) -- black - local strperc = string.format("%02d%%",perc) - lcd.drawText(x+63, 27, strperc, 0+CUSTOM_COLOR) + lcd.drawText(x+63, 27, strperc, 0+BLACK) -- battery mah - lcd.setColor(CUSTOM_COLOR,0xFFFF) local strmah = string.format("%.02f/%.01f",battery[10+battId]/1000,battery[13+battId]/1000) - lcd.drawText(x+180, 71+4, "Ah", SMLSIZE+RIGHT+CUSTOM_COLOR) - lcd.drawText(x+180 - 22, 71, strmah, 0+RIGHT+CUSTOM_COLOR) + lcd.drawText(x+180, 71+4, "Ah", SMLSIZE+RIGHT+WHITE) + lcd.drawText(x+180 - 22, 71, strmah, 0+RIGHT+WHITE) - lcd.setColor(CUSTOM_COLOR,0x5AEB) - --lcd.drawText(475,124,battId == 0 and "B1+B2" or (battId == 1 and "B1" or "B2"),SMLSIZE+CUSTOM_COLOR+RIGHT) + -- lcd.setColor(CUSTOM_COLOR,0x5AEB) -- 0x5AEB = 0x5A5D5A = grey tone lcd.drawBitmap(utils.getBitmap("battbox_small"),x+42,21) -- do no show custom sensors when displaying 2nd battery info diff --git a/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/right_hybrid_1.lua b/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/right_hybrid_1.lua new file mode 100644 index 00000000..5fbc8cae --- /dev/null +++ b/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/right_hybrid_1.lua @@ -0,0 +1,235 @@ +-- +-- An FRSKY S.Port based Telemetry script for the Horus X10 and X12 radios +-- +-- Copyright (C) 2018-2019. Alessandro Apostoli +-- https://github.com/yaapu +-- +-- This program is free software; you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as published by +-- the Free Software Foundation; either version 3 of the License, or +-- (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY, without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program; if not, see . +-- + +--------------------- +-- MAIN CONFIG +-- 480x272 LCD_W x LCD_H +--------------------- + +--------------------- +-- VERSION +--------------------- +-- load and compile of lua files +-- uncomment to force compile of all chunks, comment for release +--#define COMPILE +-- fix for issue OpenTX 2.2.1 on X10/X10S - https://github.com/opentx/opentx/issues/5764 + +--------------------- +-- FEATURE CONFIG +--------------------- +-- enable splash screen for no telemetry data +--#define SPLASH +-- enable battery percentage based on voltage +-- enable code to draw a compass rose vs a compass ribbon +--#define COMPASS_ROSE + +--------------------- +-- DEV FEATURE CONFIG +--------------------- +-- enable memory debuging +--#define MEMDEBUG +-- enable dev code +--#define DEV +-- uncomment haversine calculation routine +--#define HAVERSINE +-- enable telemetry logging to file (experimental) +--#define LOGTELEMETRY +-- use radio channels imputs to generate fake telemetry data +--#define TESTMODE +-- enable debug of generated hash or short hash string +--#define HASHDEBUG +-- enable MESSAGES DEBUG +--#define DEBUG_MESSAGES +--------------------- +-- DEBUG REFRESH RATES +--------------------- +-- calc and show hud refresh rate +--#define HUDRATE +-- calc and show telemetry process rate +-- #define BGTELERATE + +--------------------- +-- SENSOR IDS +--------------------- + + + + + + + + + + + + + + + + +-- Throttle and RC use RPM sensor IDs + +--------------------- +-- BATTERY DEFAULTS +--------------------- +--------------------------------- +-- BACKLIGHT SUPPORT +-- GV is zero based, GV 8 = GV 9 in OpenTX +--------------------------------- +--------------------------------- +-- CONF REFRESH GV +--------------------------------- + +-- +-- +-- + +-- + +---------------------- +-- COMMON LAYOUT +---------------------- +-- enable vertical bars HUD drawing (same as taranis) +--#define HUD_ALGO1 +-- enable optimized hor bars HUD drawing +--#define HUD_ALGO2 +-- enable hor bars HUD drawing, 2 px resolution +-- enable hor bars HUD drawing, 1 px resolution +--#define HUD_ALGO4 + + + + + + +-------------------------------------------------------------------------------- +-- MENU VALUE,COMBO +-------------------------------------------------------------------------------- + +-------------------------- +-- UNIT OF MEASURE +-------------------------- +local unitScale = getGeneralSettings().imperial == 0 and 1 or 3.28084 +local unitLabel = getGeneralSettings().imperial == 0 and "m" or "ft" +local unitLongScale = getGeneralSettings().imperial == 0 and 1/1000 or 1/1609.34 +local unitLongLabel = getGeneralSettings().imperial == 0 and "km" or "mi" + + +----------------------- +-- BATTERY +----------------------- +-- offsets are: 1 celm, 4 batt, 7 curr, 10 mah, 13 cap, indexing starts at 1 +-- + + +---------------------- +--- COLORS +---------------------- + +--#define COLOR_LABEL 0x7BCF +--#define COLOR_BG 0x0169 +--#define COLOR_BARSEX 0x10A3 + + +--#define COLOR_SENSORS 0x0169 + +----------------------------------- +-- STATE TRANSITION ENGINE SUPPORT +----------------------------------- + + +-------------------------- +-- CLIPPING ALGO DEFINES +-------------------------- + + + + + + + + + + + +-- offsets are: 1 celm, 4 batt, 7 curr, 10 mah, 13 cap, indexing starts at 1 +--[[ +BATT_CELL 1 +BATT_VOLT 4 +BATT_CURR 7 +BATT_MAH 10 +BATT_CAP 13 + +BATT_IDALL 0 +BATT_ID1 1 +BATT_ID2 2 +--]] + +--[[ + On hybrid vehicle we have voltage and current from battery 1, mah from battery 2 +--]] +local function drawPane(x,drawLib,conf,telemetry,status,alarms,battery,battId,gpsStatuses,utils) + -- battery min cell + local colr = WHITE + -- + if status.showMinMaxValues == false then + if status.battLevel2 == false and alarms[8][2] > 0 then + utils.drawBlinkBitmap("cell_red_blink_86x30",x+7,20) + utils.lcdBacklightOn() + elseif status.battLevel2 == true then + lcd.drawBitmap(utils.getBitmap("cell_red_86x30"),x+7,20) + elseif status.battLevel1 == false and alarms[7][2] > 0 then + utils.drawBlinkBitmap("cell_orange_blink_86x30",x+7,20) + utils.lcdBacklightOn() + elseif status.battLevel1 == true then + lcd.drawBitmap(utils.getBitmap("cell_orange_86x30"),x+7,20) + colr = BLACK + end + end + -- PREC2 forces a math.floor() whereas a math.round() is required, math.round(f) = math.floor(f+0.5) + if battery[1+1] * 0.01 < 10 then + lcd.drawNumber(x+75+2, 16, battery[1+1] + 0.5, PREC2+DBLSIZE+RIGHT+colr) + else + lcd.drawNumber(x+75+2, 16, (battery[1+1] + 0.5)*0.1, PREC1+DBLSIZE+RIGHT+colr) + end + + local lx = x+76 + lcd.drawText(lx, 32, "V", colr) + lcd.drawText(lx, 18, status.battsource, colr) + + -- battery current + local lowAmp = battery[7+1]*0.1 < 10 + drawLib.drawNumberWithDim(x+75,68+86,x+76,83+86,battery[7+1]*(lowAmp and 1 or 0.1),"A",DBLSIZE+RIGHT+WHITE+(lowAmp and PREC1 or 0),0+WHITE) + + -- battery mah is from battery 2 + -- we display remaining liters vs used liters as usual + local strmah = string.format("%.01fL/%.01fL",(battery[13+2]-battery[10+2])/1000,battery[13+2]/1000) + lcd.drawText(x+90, 133, strmah, 0+RIGHT+WHITE) + -- fuel gauge from battery 2 + -- battery % only from battery 2 + local perc = battery[16+2] + + drawLib.drawGauge(393,54,"fuelgauge_75x75", 430, 94, 25, 8, perc, 125, RED, utils) +end + +local function background(myWidget,conf,telemetry,status,utils) +end + +return {drawPane=drawPane,background=background} diff --git a/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/right_tether_1.lua b/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/right_tether_1.lua new file mode 100644 index 00000000..ad6ae478 --- /dev/null +++ b/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/right_tether_1.lua @@ -0,0 +1,328 @@ +-- +-- An FRSKY S.Port based Telemetry script for the Horus X10 and X12 radios +-- +-- Copyright (C) 2018-2019. Alessandro Apostoli +-- https://github.com/yaapu +-- +-- This program is free software; you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as published by +-- the Free Software Foundation; either version 3 of the License, or +-- (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY, without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program; if not, see . +-- + +--------------------- +-- MAIN CONFIG +-- 480x272 LCD_W x LCD_H +--------------------- + +--------------------- +-- VERSION +--------------------- +-- load and compile of lua files +-- uncomment to force compile of all chunks, comment for release +--#define COMPILE +-- fix for issue OpenTX 2.2.1 on X10/X10S - https://github.com/opentx/opentx/issues/5764 + +--------------------- +-- FEATURE CONFIG +--------------------- +-- enable splash screen for no telemetry data +--#define SPLASH +-- enable battery percentage based on voltage +-- enable code to draw a compass rose vs a compass ribbon +--#define COMPASS_ROSE + +--------------------- +-- DEV FEATURE CONFIG +--------------------- +-- enable memory debuging +--#define MEMDEBUG +-- enable dev code +--#define DEV +-- uncomment haversine calculation routine +--#define HAVERSINE +-- enable telemetry logging to file (experimental) +--#define LOGTELEMETRY +-- use radio channels imputs to generate fake telemetry data +--#define TESTMODE +-- enable debug of generated hash or short hash string +--#define HASHDEBUG +-- enable MESSAGES DEBUG +--#define DEBUG_MESSAGES +--------------------- +-- DEBUG REFRESH RATES +--------------------- +-- calc and show hud refresh rate +--#define HUDRATE +-- calc and show telemetry process rate +-- #define BGTELERATE + +--------------------- +-- SENSOR IDS +--------------------- + + + + + + + + + + + + + + + + +-- Throttle and RC use RPM sensor IDs + +--------------------- +-- BATTERY DEFAULTS +--------------------- +--------------------------------- +-- BACKLIGHT SUPPORT +-- GV is zero based, GV 8 = GV 9 in OpenTX +--------------------------------- +--------------------------------- +-- CONF REFRESH GV +--------------------------------- + +-- +-- +-- + +-- + +---------------------- +-- COMMON LAYOUT +---------------------- +-- enable vertical bars HUD drawing (same as taranis) +--#define HUD_ALGO1 +-- enable optimized hor bars HUD drawing +--#define HUD_ALGO2 +-- enable hor bars HUD drawing, 2 px resolution +-- enable hor bars HUD drawing, 1 px resolution +--#define HUD_ALGO4 + + + + + + +-------------------------------------------------------------------------------- +-- MENU VALUE,COMBO +-------------------------------------------------------------------------------- + +-------------------------- +-- UNIT OF MEASURE +-------------------------- +local unitScale = getGeneralSettings().imperial == 0 and 1 or 3.28084 +local unitLabel = getGeneralSettings().imperial == 0 and "m" or "ft" +local unitLongScale = getGeneralSettings().imperial == 0 and 1/1000 or 1/1609.34 +local unitLongLabel = getGeneralSettings().imperial == 0 and "km" or "mi" + + +----------------------- +-- BATTERY +----------------------- +-- offsets are: 1 celm, 4 batt, 7 curr, 10 mah, 13 cap, indexing starts at 1 +-- + + +---------------------- +--- COLORS +---------------------- + +--#define COLOR_LABEL 0x7BCF +--#define COLOR_BG 0x0169 +--#define COLOR_BARSEX 0x10A3 + + +--#define COLOR_SENSORS 0x0169 + +----------------------------------- +-- STATE TRANSITION ENGINE SUPPORT +----------------------------------- + + +-------------------------- +-- CLIPPING ALGO DEFINES +-------------------------- + + + + + + + + + + +--[[ + Example data based on a 18 minutes flight for quad, battery:5200mAh LiPO 10C, hover @15A + Notes: + - when motors are armed VOLTAGE_DROP offset is applied! + - number of samples is fixed at 11 but percentage values can be anything and are not restricted to multiples of 10 + - voltage between samples is assumed to be linear +--]] +local battPercByVoltage = { + {3.40, 0}, + {3.46, 10}, + {3.51, 20}, + {3.53, 30}, + {3.56, 40}, + {3.60, 50}, + {3.63, 60}, + {3.70, 70}, + {3.73, 80}, + {3.86, 90}, + {4.00, 99} + } + +function getBattPercByCell(cellVoltage) + if cellVoltage == 0 then + return 99 + end + if cellVoltage >= battPercByVoltage[11][1] then + return 99 + end + if cellVoltage <= battPercByVoltage[1][1] then + return 0 + end + for i=2,11 do + if cellVoltage <= battPercByVoltage[i][1] then + -- + local v0 = battPercByVoltage[i-1][1] + local fv0 = battPercByVoltage[i-1][2] + -- + local v1 = battPercByVoltage[i][1] + local fv1 = battPercByVoltage[i][2] + -- interpolation polinomial + return fv0 + ((fv1 - fv0)/(v1-v0))*(cellVoltage - v0) + end + end --for +end + +-- offsets are: 1 celm, 4 batt, 7 curr, 10 mah, 13 cap, indexing starts at 1 +--[[ +BATT_CELL 1 +BATT_VOLT 4 +BATT_CURR 7 +BATT_MAH 10 +BATT_CAP 13 + +BATT_IDALL 0 +BATT_ID1 1 +BATT_ID2 2 +--]] +local function drawPane(x,drawLib,conf,telemetry,status,alarms,battery,battId,gpsStatuses,utils) + local perc = 99 + if conf.enableBattPercByVoltage == true then + --[[ + discharge curve is based on battery under load, when motors are disarmed + cellvoltage needs to be corrected by subtracting the "under load" voltage drop + --]] + if telemetry.statusArmed then + perc = getBattPercByCell(0.01*battery[1+1]) + else + perc = getBattPercByCell((0.01*battery[1+1])-0.15) + end + else + perc = battery[16+1] + end --conf.enableBattPercByVoltage + + local perc2 = 99 + if conf.enableBattPercByVoltage == true then + --[[ + discharge curve is based on battery under load, when motors are disarmed + cellvoltage needs to be corrected by subtracting the "under load" voltage drop + --]] + if telemetry.statusArmed then + perc = getBattPercByCell(0.01*battery[1+2]) + else + perc = getBattPercByCell((0.01*battery[1+2])-0.15) + end + else + perc2 = battery[16+2] + end --conf.enableBattPercByVoltage + + -- battery 1 cell voltage (no alerts on battery 1) + lcd.drawFilledRectangle(x+7,16+5,86,52,lcd.RGB(200,200,200)) + --PREC2 forces a math.floor() whereas a math.round() is required, math.round(f) = math.floor(f+0.5) + if battery[1+1] * 0.01 < 10 then + lcd.drawNumber(x+75+2, 16, battery[1+1] + 0.5, PREC2+DBLSIZE+RIGHT+BLACK) + else + lcd.drawNumber(x+75+2, 16, (battery[1+1] + 0.5)*0.1, PREC1+DBLSIZE+RIGHT+BLACK) + end + + local lx = x+76 + lcd.drawText(lx, 36, "V", BLACK) + lcd.drawText(lx, 18, status.battsource, BLACK) + + -- BATT2 Cell voltage + local colr = WHITE + if status.showMinMaxValues == false then + if status.battLevel2 == false and alarms[8][2] > 0 then + utils.drawBlinkBitmap("cell_red_blink_86x30",x+7,76) + utils.lcdBacklightOn() + elseif status.battLevel2 == true then + lcd.drawBitmap(utils.getBitmap("cell_red_86x30"),x+7,76) + elseif status.battLevel1 == false and alarms[7][2] > 0 then + utils.drawBlinkBitmap("cell_orange_blink_86x30",x+7,76) + utils.lcdBacklightOn() + elseif status.battLevel1 == true then + lcd.drawBitmap(utils.getBitmap("cell_orange_86x30"),x+7,76) + colr = BLACK + end + end + --PREC2 forces a math.floor() whereas a math.round() is required, math.round(f) = math.floor(f+0.5) + if battery[1+2] * 0.01 < 10 then + lcd.drawNumber(x+75+2, 72, battery[1+2] + 0.5, PREC2+DBLSIZE+RIGHT+colr) + else + lcd.drawNumber(x+75+2, 72, (battery[1+2] + 0.5)*0.1, PREC1+DBLSIZE+RIGHT+colr) + end + + lx = x+78 + lcd.drawText(lx, 88, "V", colr) + lcd.drawText(lx, 72, status.battsource, colr) + + -- BATTERY BAR % -- + -- batt2 capacity bar % + lcd.drawFilledRectangle(x+10, 130,80,21,WHITE) + if perc2 > 50 then + colr = GREEN + elseif perc2 <= 50 and perc2 > 25 then + colr = lcd.RGB(255, 204, 0) -- yellow + else + colr = RED + end + lcd.drawGauge(x+10, 130,80,21,perc2,100,colr) + -- battery 1 percentage + local strperc2 = string.format("%02d%%",perc2) + lcd.drawText(x+35, 126, strperc2, MIDSIZE+BLACK) + + -- POWER -- + -- power 1 + local power1 = battery[4+1]*battery[7+1]*0.01 + lcd.drawNumber(x+75,46,power1,MIDSIZE+RIGHT+BLACK) + lcd.drawText(x+77,53,"W",BLACK) + -- power 2 + local power2 = battery[4+2]*battery[7+2]*0.01 + lcd.drawNumber(x+75,103,power2,MIDSIZE+RIGHT+WHITE) + lcd.drawText(x+77,110,"W",WHITE) +end + +local function background(myWidget,conf,telemetry,status,utils) +end + +return {drawPane=drawPane,background=background} diff --git a/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/rover.lua b/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/rover.lua index 29e08ab0..aee6cd0f 100644 --- a/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/rover.lua +++ b/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/LIB/rover.lua @@ -16,6 +16,7 @@ INITIALISING = 16 }; --]] + local flightModes = {} -- rover modes diff --git a/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/menu.lua b/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/menu.lua index b527b7d8..7febe298 100644 --- a/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/menu.lua +++ b/HORUS/SOURCES/SRC/SCRIPTS/YAAPU/menu.lua @@ -3,6 +3,8 @@ -- -- Copyright (C) 2018-2019. Alessandro Apostoli -- https://github.com/yaapu +-- OlliW MavSDK additions by Risto Kõiva +-- https://github.com/rotorman -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -36,6 +38,7 @@ --------------------- -- enable splash screen for no telemetry data --#define SPLASH +-- enable battery percentage based on voltage -- enable code to draw a compass rose vs a compass ribbon --#define COMPASS_ROSE @@ -54,14 +57,15 @@ --#define TESTMODE -- enable debug of generated hash or short hash string --#define HASHDEBUG - +-- enable MESSAGES DEBUG +--#define DEBUG_MESSAGES --------------------- -- DEBUG REFRESH RATES --------------------- -- calc and show hud refresh rate --#define HUDRATE -- calc and show telemetry process rate ---#define BGTELERATE +-- #define BGTELERATE --------------------- -- SENSOR IDS @@ -95,24 +99,7 @@ -- CONF REFRESH GV --------------------------------- ---------------------------------- --- ALARMS ---------------------------------- ---[[ - ALARM_TYPE_MIN needs arming (min has to be reached first), value below level for grace, once armed is periodic, reset on landing - ALARM_TYPE_MAX no arming, value above level for grace, once armed is periodic, reset on landing - ALARM_TYPE_TIMER no arming, fired periodically, spoken time, reset on landing - ALARM_TYPE_BATT needs arming (min has to be reached first), value below level for grace, no reset on landing -{ - 1 = notified, - 2 = alarm start, - 3 = armed, - 4 = type(0=min,1=max,2=timer,3=batt), - 5 = grace duration - 6 = ready - 7 = last alarm -} ---]]-- +-- -- -- @@ -125,7 +112,9 @@ --#define HUD_ALGO1 -- enable optimized hor bars HUD drawing --#define HUD_ALGO2 --- enable hor bars HUD drawing +-- enable hor bars HUD drawing, 2 px resolution +-- enable hor bars HUD drawing, 1 px resolution +--#define HUD_ALGO4 @@ -151,9 +140,6 @@ local unitLongLabel = getGeneralSettings().imperial == 0 and "km" or "mi" -- offsets are: 1 celm, 4 batt, 7 curr, 10 mah, 13 cap, indexing starts at 1 -- ------------------------ --- LIBRARY LOADING ------------------------ ---------------------- --- COLORS @@ -176,13 +162,6 @@ local unitLongLabel = getGeneralSettings().imperial == 0 and "km" or "mi" -------------------------- - - - - - - - ------------------------------------- -- UNITS Scales from Ardupilot OSD code /ardupilot/libraries/AP_OSD/AP_OSD_Screen.cpp ------------------------------------- @@ -219,48 +198,53 @@ local unitLongLabel = getGeneralSettings().imperial == 0 and "km" or "mi" 0.000539957, //DISTANCE_LONG Nm 1.0, //TEMPERATURE C }; ---]]--[[ - -TYPEVALUE - menu option to select a numeric value -{description, type,name,default value,min,max,uit of measure,precision,increment step, , } -example {"batt alert level 1:", TYPEVALUE, "V1", 375, 0,5000,"V",PREC2,5,"L2",350 }, +--]] +-- +local menuItems = { + {"voice language:", "L1", 1, { "english", "italian", "french", "german" } , {"en","it","fr","de"} }, + {"batt alert level 1:", "V1", 375, 0,5000,"V",PREC2,5 }, + {"batt alert level 2:", "V2", 350, 0,5000,"V",PREC2,5 }, + {"batt[1] capacity override:", "B1", 0, 0,5000,"Ah",PREC2,10 }, + {"batt[2] capacity override:", "B2", 0, 0,5000,"Ah",PREC2,10 }, + {"batt[1] cell count override:", "CC", 0, 0,12," cells",0,1 }, + {"batt[2] cell count override:", "CC2", 0, 0,12," cells",0,1 }, + {"dual battery config:", "BC", 1, { "parallel", "series", "dual with alert on B1", "dual with alert on B2", "volts on B1, curr on B2", "volts on B2, curr on B1" }, { 1, 2, 3, 4, 5, 6 } }, + {"enable battery % by voltage:", "BPBV", 1, { "no", "yes" }, { false, true } }, + {"default voltage source:", "VS", 1, { "auto", "FLVSS", "fc" }, { nil, "vs", "fc" } }, + {"disable all sounds:", "S1", 1, { "no", "yes" }, { false, true } }, + {"disable incoming msg beep:", "S2", 1, { "no", "only for INF severity", "always" }, { 1, 2, 3 } }, + {"enable haptic:", "VIBR", 1, { "no", "yes" }, { false, true } }, + {"timer alert every:", "T1", 0, 0,600,"min",PREC1,5 }, + {"min altitude alert:", "A1", 0, 0,500,"m",PREC1,5 }, + {"max altitude alert:", "A2", 0, 0,10000,"m",0,1 }, + {"max distance alert:", "D1", 0, 0,100000,"m",0,10 }, + {"repeat alerts every:", "T2", 10, 5,600,"sec",0,5 }, + {"rangefinder max:", "RM", 0, 0,10000," cm",0,10 }, + {"air/groundspeed unit:", "HSPD", 1, { "m/s", "km/h", "mph", "kn" }, { 1, 3.6, 2.23694, 1.94384} }, + {"vertical speed unit:", "VSPD", 1, { "m/s", "ft/s", "ft/min" }, { 1, 3.28084, 196.85} }, + {"widget layout:", "WL", 1, { "default","legacy"}, { 1, 2 } }, + {"center panel:", "CPANE", 1, { "option 1","option 2","option 3","option 4" }, { 1, 2, 3, 4 } }, + {"right panel:", "RPANE", 1, { "option 1","option 2","option 3","option 4","option 5","option 6" }, { 1, 2, 3, 4, 5, 6 } }, + {"left panel:", "LPANE", 1, { "option 1","option 2","option 3","option 4" }, { 1 , 2, 3, 4 } }, + {"enable PX4 flightmodes:", "PX4", 1, { "no", "yes" }, { false, true } }, + {"enable CRSF support:", "CRSF", 1, { "no", "yes" }, { false, true } }, + {"enable OlliW MavSDK support:", "MAVSDK", 1, { "no", "yes" }, { false, true } }, + {"emulated page channel:", "STC", 0, 0, 32,nil,0,1 }, + {"emulated wheel channel:", "SWC", 0, 0, 32,nil,0,1 }, + {"GPS coordinates format:", "GPS", 1, { "DMS", "decimal" }, { 1, 2 } }, + {"map provider:", "MAPP", 1, { "GMapCatcher", "Google" }, { 1, 2 } }, + {"map type:", "MAPT", 1, { "satellite", "map", "terrain" }, { "sat_tiles", "tiles", "ter_tiles" } }, + {"map min zoom level:", "MAPmZ", -2, -2, 17,nil,0,1 }, + {"map max zoom level:", "MAPMZ", 17, -2, 17,nil,0,1 }, + {"map grid lines:", "MAPG", 1, { "yes", "no" }, { true, false } }, + {"use radio GPS for home:", "TXGPS", 1, { "no", "yes" }, { false, true } }, +} -TYPECOMBO - menu option to select a value from a list -{description, type, name, default, label list, value list, , } -example {"center pane layout:", TYPECOMBO, "CPANE", 1, { "hud","radar" }, { 1, 2 },"CPANE",1 }, +local menuItemsByName = {} ---]]-- -local menuItems = { - {"voice language:", 1, "L1", 1, { "english", "italian", "french", "german" } , {"en","it","fr","de"} }, - {"batt alert level 1:", 0, "V1", 375, 0,5000,"V",PREC2,5 }, - {"batt alert level 2:", 0, "V2", 350, 0,5000,"V",PREC2,5 }, - {"batt[1] capacity override:", 0, "B1", 0, 0,5000,"Ah",PREC2,10 }, - {"batt[2] capacity override:", 0, "B2", 0, 0,5000,"Ah",PREC2,10 }, - {"disable all sounds:", 1, "S1", 1, { "no", "yes" }, { false, true } }, - {"disable msg beep:", 1, "S2", 1, { "no", "info", "all" }, { 1, 2, 3 } }, - {"enable haptic:", 1, "VIBR", 1, { "no", "yes" }, { false, true } }, - {"default voltage source:", 1, "VS", 1, { "auto", "FLVSS", "fc" }, { nil, "vs", "fc" } }, - {"timer alert every:", 0, "T1", 0, 0,600,"min",PREC1,5 }, - {"min altitude alert:", 0, "A1", 0, 0,500,"m",PREC1,5 }, - {"max altitude alert:", 0, "A2", 0, 0,10000,"m",0,1 }, - {"max distance alert:", 0, "D1", 0, 0,100000,"m",0,10 }, - {"repeat alerts every:", 0, "T2", 10, 5,600,"sec",0,5 }, - {"dual battery config:", 1, "BC", 1, { "par", "ser", "other" }, { 1, 2, 3 } }, - {"batt[1] cell count override:", 0, "CC", 0, 0,12," cells",0,1 }, - {"batt[2] cell count override:", 0, "CC2", 0, 0,12," cells",0,1 }, - {"rangefinder max:", 0, "RM", 0, 0,10000," cm",0,10 }, - {"air/groundspeed unit:", 1, "HSPD", 1, { "m/s", "km/h", "mph", "kn" }, { 1, 3.6, 2.23694, 1.94384} }, - {"vertical speed unit:", 1, "VSPD", 1, { "m/s", "ft/s", "ft/min" }, { 1, 3.28084, 196.85} }, - {"widget layout:", 1, "WL", 1, { "default","legacy"}, { 1, 2 } }, - {"center panel:", 1, "CPANE", 1, { "option 1","option 2","option 3","option 4" }, { 1, 2, 3, 4 } }, - {"right panel:", 1, "RPANE", 1, { "option 1","option 2","option 3","option 4" }, { 1, 2, 3, 4 } }, - {"left panel:", 1, "LPANE", 1, { "option 1","option 2","option 3","option 4" }, { 1 , 2, 3, 4 } }, - {"enable px4 flightmodes:", 1, "PX4", 1, { "no", "yes" }, { false, true } }, - {"screen toggle channel:", 0, "STC", 0, 0, 32,nil,0,1 }, - {"map zoom level:", 0, "MAPZ", -2, -2, 17,nil,0,1 }, - {"map type:", 1, "MAPT", 1, { "satellite", "map", "terrain" }, { "sat_tiles", "tiles", "ter_tiles" } }, - {"map grid lines:", 1, "MAPG", 1, { "yes", "no" }, { true, false } }, - {"map zoom channel:", 0, "ZTC", 0, 0, 32,nil,0,1 }, +-- map from NEW to OLD settings +local mapNewToOldItemCfg = { + ["SWC"] = "ZTC" -- ZTC was replaced by SWC } local menu = { @@ -284,20 +268,18 @@ local leftPanelFiles = {} -- returns item's VALUE,LABEL,IDX ------------------------------------------ local function getMenuItemByName(items,name) - for idx=1,#items - do - -- items[idx][3] is the menu item's name as it appears in the config file - if items[idx][3] == name then - if items[idx][2] == 1 then - -- return item's value, label, index - return items[idx][6][items[idx][4]], items[idx][5][items[idx][4]], idx - else - -- return item's value, label, index - return items[idx][4], name, idx - end - end + local itemIdx = menuItemsByName[name] + local item = items[itemIdx] + if item == nil then + return nil + end + if type(item[4]) == "table" then + -- return item's value, label, index + return item[5][item[3]], item[4][item[3]], itemIdx + else + -- return item's value, label, index + return item[3], name, itemIdx end - return nil end local function updateMenuItems() @@ -307,60 +289,62 @@ local function updateMenuItems() --------------------- -- large hud layout --------------------- + value, name, idx = getMenuItemByName(menuItems,"CPANE") - menuItems[idx][5] = { "default"}; - menuItems[idx][6] = { 1 }; + menuItems[idx][4] = { "default" }; + menuItems[idx][5] = { 1 }; - if menuItems[idx][4] > #menuItems[idx][5] then - menuItems[idx][4] = 1 + if menuItems[idx][3] > #menuItems[idx][4] then + menuItems[idx][3] = 1 end value, name, idx = getMenuItemByName(menuItems,"RPANE") - menuItems[idx][5] = { "default" }; - menuItems[idx][6] = { 1 }; + menuItems[idx][4] = { "default", "batt% by voltage", "tether", "hybrid"}; + menuItems[idx][5] = { 1, 2, 3, 4 }; - if menuItems[idx][4] > #menuItems[idx][5] then - menuItems[idx][4] = 1 + if menuItems[idx][3] > #menuItems[idx][4] then + menuItems[idx][3] = 1 end value, name, idx = getMenuItemByName(menuItems,"LPANE") - menuItems[idx][5] = { "default","mav2passthru" }; - menuItems[idx][6] = { 1, 2 }; + menuItems[idx][4] = { "default", "MavSDK/Mav2PT" }; + menuItems[idx][5] = { 1, 2 }; - if menuItems[idx][4] > #menuItems[idx][5] then - menuItems[idx][4] = 1 + if menuItems[idx][3] > #menuItems[idx][4] then + menuItems[idx][3] = 1 end - centerPanelFiles = {"hud_1", "hud_nav_1" } - rightPanelFiles = {"right_1" } - leftPanelFiles = {"left_1", "left_m2f_1" } + centerPanelFiles = { "hud_1" } + rightPanelFiles = { "right_1", "right_battperc_1", "right_tether_1", "right_hybrid_1" } + leftPanelFiles = { "left_1", "left_m2f_1" } elseif value == 2 then --------------------- -- legacy layout --------------------- + value, name, idx = getMenuItemByName(menuItems,"CPANE") - menuItems[idx][5] = { "default", "russian hud", "compact hud" }; - menuItems[idx][6] = { 1, 2, 3 }; + menuItems[idx][4] = { "default", "russian hud", "compact hud " }; + menuItems[idx][5] = { 1, 2, 3 }; - if menuItems[idx][4] > #menuItems[idx][5] then - menuItems[idx][4] = 1 + if menuItems[idx][3] > #menuItems[idx][4] then + menuItems[idx][3] = 1 end value, name, idx = getMenuItemByName(menuItems,"RPANE") - menuItems[idx][5] = { "default", "custom sensors" }; - menuItems[idx][6] = { 1, 2 }; + menuItems[idx][4] = { "default", "custom sensors" }; + menuItems[idx][5] = { 1, 2 }; - if menuItems[idx][4] > #menuItems[idx][5] then - menuItems[idx][4] = 1 + if menuItems[idx][3] > #menuItems[idx][4] then + menuItems[idx][3] = 1 end value, name, idx = getMenuItemByName(menuItems,"LPANE") - menuItems[idx][5] = { "default","mav2passthru" }; - menuItems[idx][6] = { 1, 2 }; + menuItems[idx][4] = { "default", "MavSDK/Mav2PT" }; + menuItems[idx][5] = { 1, 2 }; - if menuItems[idx][4] > #menuItems[idx][5] then - menuItems[idx][4] = 1 + if menuItems[idx][3] > #menuItems[idx][4] then + menuItems[idx][3] = 1 end centerPanelFiles = {"hud_2", "hud_russian_2", "hud_small_2" } @@ -368,14 +352,67 @@ local function updateMenuItems() leftPanelFiles = {"left_2", "left_m2f_2" } end + value, name, idx = getMenuItemByName(menuItems,"MAPP") + + if value == nil then + return + end + + local value2, name2, idx2 = getMenuItemByName(menuItems,"MAPT") + + if value2 ~= nil then + if value == 1 then --GMapCatcher + menuItems[idx2][4] = { "satellite", "map", "terrain" } + menuItems[idx2][5] = { "sat_tiles", "tiles", "ter_tiles" } + elseif value == 2 then -- Google + menuItems[idx2][4] = { "GoogleSatelliteMap", "GoogleHybridMap", "GoogleMap", "GoogleTerrainMap" } + menuItems[idx2][5] = { "GoogleSatelliteMap", "GoogleHybridMap", "GoogleMap", "GoogleTerrainMap" } + end + end + + value2, name2, idx2 = getMenuItemByName(menuItems,"MAPmZ") + + if value2 ~= nil then + if value == 1 then -- GMapCatcher + menuItems[idx2][4] = -2 + menuItems[idx2][5] = 17 + else -- Google + menuItems[idx2][4] = 1 + menuItems[idx2][5] = 20 + end + -- check that the selected value is in range of the appropriate map product + if menuItems[idx2][3] < menuItems[idx2][4] then + menuItems[idx2][3] = menuItems[idx2][4] + end + if menuItems[idx2][3] > menuItems[idx2][5] then + menuItems[idx2][3] = menuItems[idx2][5] + end + end + + value2, name2, idx2 = getMenuItemByName(menuItems,"MAPMZ") + + if value2 ~= nil then + if value == 1 then -- GMapCatcher + menuItems[idx2][4] = -2 + menuItems[idx2][5] = 17 + else -- Google + menuItems[idx2][4] = 1 + menuItems[idx2][5] = 20 + end + -- check that the selected value is in range of the appropriate map product + if menuItems[idx2][3] < menuItems[idx2][4] then + menuItems[idx2][3] = menuItems[idx2][4] + end + if menuItems[idx2][3] > menuItems[idx2][5] then + menuItems[idx2][3] = menuItems[idx2][5] + end + end + menu.updated = false - collectgarbage() - collectgarbage() end end -local -function getConfigFilename() +local function getConfigFilename() local info = model.getInfo() return "/SCRIPTS/YAAPU/CFG/" .. string.lower(string.gsub(info.name, "[%c%p%s%z]", "")..".cfg") end @@ -416,56 +453,76 @@ local function applyConfigValues(conf) conf.leftPanel = getMenuItemByName(menuItems,"LPANE") conf.leftPanelFilename = leftPanelFiles[conf.leftPanel] - conf.enablePX4Modes = getMenuItemByName(menuItems,"PX4") + conf.enableCRSF = getMenuItemByName(menuItems,"CRSF") + conf.enableMavSDK = getMenuItemByName(menuItems,"MAVSDK") + + conf.mapZoomMin = getMenuItemByName(menuItems,"MAPmZ") + conf.mapZoomMax = getMenuItemByName(menuItems,"MAPMZ") - conf.mapZoomLevel = getMenuItemByName(menuItems,"MAPZ") conf.mapType = getMenuItemByName(menuItems,"MAPT") local chInfo = getFieldInfo("ch"..getMenuItemByName(menuItems,"STC")) conf.screenToggleChannelId = (chInfo == nil and -1 or chInfo['id']) - chInfo = getFieldInfo("ch"..getMenuItemByName(menuItems,"ZTC")) - conf.mapToggleChannelId = (chInfo == nil and -1 or chInfo['id']) + chInfo = getFieldInfo("ch"..getMenuItemByName(menuItems,"SWC")) + conf.screenWheelChannelId = (chInfo == nil and -1 or chInfo['id']) conf.enableMapGrid = getMenuItemByName(menuItems,"MAPG") + conf.mapProvider = getMenuItemByName(menuItems,"MAPP") -- set default voltage source if getMenuItemByName(menuItems,"VS") ~= nil then conf.defaultBattSource = getMenuItemByName(menuItems,"VS") end + conf.gpsFormat = getMenuItemByName(menuItems,"GPS") + conf.enableBattPercByVoltage = getMenuItemByName(menuItems,"BPBV") + conf.enableTxGPS = getMenuItemByName(menuItems,"TXGPS") menu.editSelected = false - collectgarbage() - collectgarbage() end local function loadConfig(conf) + local cfg_found = false + local cfg_string local cfg = io.open(getConfigFilename(),"r") + if cfg ~= nil then - local str = io.read(cfg,500) + cfg_string = io.read(cfg,500) io.close(cfg) - if string.len(str) > 0 then - for i=1,#menuItems - do - local value = string.match(str, menuItems[i][3]..":([-%d]+)") - collectgarbage() - if value ~= nil then - menuItems[i][4] = tonumber(value) - -- check if the value read from file is compatible with available options - if menuItems[i][2] == 1 and tonumber(value) > #menuItems[i][5] then - --if not force default - menuItems[i][4] = 1 - end + if string.len(cfg_string) > 0 then + cfg_found = true + end + end + + for i=1,#menuItems + do + menuItemsByName[tostring(menuItems[i][2])] = i + if cfg_found then + local value = string.match(cfg_string, menuItems[i][2]..":([-%d]+)") + if value == nil then + -- check if it was replaced by an older settings + local oldCfg = mapNewToOldItemCfg[menuItems[i][2]] + if oldCfg ~= nil then + value = string.match(cfg_string, oldCfg..":([-%d]+)") + end + end + if value ~= nil then + menuItems[i][3] = tonumber(value) + -- check if the value read from file is compatible with available options + if type(menuItems[i][4]) == "table" and tonumber(value) > #menuItems[i][4] then + --if not force default + menuItems[i][3] = 1 end end end end - -- menu was loaded apply required changes - menu.updated = true + -- when run standalone there's nothing to update :-) if conf ~= nil then applyConfigValues(conf) + -- menu was loaded apply required changes + menu.updated = true end end @@ -473,7 +530,7 @@ local function saveConfig(conf) local myConfig = "" for i=1,#menuItems do - myConfig = myConfig..menuItems[i][3]..":"..menuItems[i][4] + myConfig = myConfig..menuItems[i][2]..":"..menuItems[i][3] if i < #menuItems then myConfig = myConfig.."," end @@ -484,8 +541,6 @@ local function saveConfig(conf) io.close(cfg) end myConfig = nil - collectgarbage() - collectgarbage() -- when run standalone there's nothing to update :-) if conf ~= nil then applyConfigValues(conf) @@ -494,59 +549,68 @@ local function saveConfig(conf) end local function drawConfigMenuBars() - lcd.setColor(CUSTOM_COLOR,0x0000) local itemIdx = string.format("%d/%d",menu.selectedItem,#menuItems) - lcd.drawFilledRectangle(0,0, LCD_W, 20, CUSTOM_COLOR) - lcd.drawRectangle(0, 0, LCD_W, 20, CUSTOM_COLOR) - lcd.drawFilledRectangle(0,LCD_H-20, LCD_W, 20, CUSTOM_COLOR) - lcd.drawRectangle(0, LCD_H-20, LCD_W, 20, CUSTOM_COLOR) - lcd.setColor(CUSTOM_COLOR,0xFFFF) - lcd.drawText(2,0,"Yaapu Telemetry Widget 1.8.1",CUSTOM_COLOR) - lcd.drawText(2,LCD_H-20+1,getConfigFilename(),CUSTOM_COLOR) - lcd.drawText(LCD_W,LCD_H-20+1,itemIdx,CUSTOM_COLOR+RIGHT) + lcd.drawFilledRectangle(0,0, LCD_W, 20, COLOR_THEME_SECONDARY1) + lcd.drawRectangle(0, 0, LCD_W, 20, COLOR_THEME_SECONDARY1) + lcd.drawFilledRectangle(0,LCD_H-20, LCD_W, 20, COLOR_THEME_SECONDARY1) + lcd.drawRectangle(0, LCD_H-20, LCD_W, 20, COLOR_THEME_SECONDARY1) + lcd.drawText(2,0,"Yaapu v1.9.3b4 (OlliW MavSDK support by Risto)",COLOR_THEME_PRIMARY2) + lcd.drawText(2,LCD_H-20+1,getConfigFilename(),COLOR_THEME_PRIMARY2) + lcd.drawText(LCD_W,LCD_H-20+1,itemIdx,COLOR_THEME_PRIMARY2+RIGHT) end local function incMenuItem(idx) - if menuItems[idx][2] == 0 then - menuItems[idx][4] = menuItems[idx][4] + menuItems[idx][9] - if menuItems[idx][4] > menuItems[idx][6] then - menuItems[idx][4] = menuItems[idx][6] + if type(menuItems[idx][4]) == "table" then + menuItems[idx][3] = menuItems[idx][3] + 1 + if menuItems[idx][3] > #menuItems[idx][4] then + menuItems[idx][3] = 1 end else - menuItems[idx][4] = menuItems[idx][4] + 1 - if menuItems[idx][4] > #menuItems[idx][5] then - menuItems[idx][4] = 1 + menuItems[idx][3] = menuItems[idx][3] + menuItems[idx][8] + if menuItems[idx][3] > menuItems[idx][5] then + menuItems[idx][3] = menuItems[idx][5] end end end local function decMenuItem(idx) - if menuItems[idx][2] == 0 then - menuItems[idx][4] = menuItems[idx][4] - menuItems[idx][9] - if menuItems[idx][4] < menuItems[idx][5] then - menuItems[idx][4] = menuItems[idx][5] + if type(menuItems[idx][4]) == "table" then + menuItems[idx][3] = menuItems[idx][3] - 1 + if menuItems[idx][3] < 1 then + menuItems[idx][3] = #menuItems[idx][4] end else - menuItems[idx][4] = menuItems[idx][4] - 1 - if menuItems[idx][4] < 1 then - menuItems[idx][4] = #menuItems[idx][5] + menuItems[idx][3] = menuItems[idx][3] - menuItems[idx][8] + if menuItems[idx][3] < menuItems[idx][4] then + menuItems[idx][3] = menuItems[idx][4] end end end local function drawItem(idx,flags) - lcd.setColor(CUSTOM_COLOR,0xFFFF) - if menuItems[idx][2] == 0 then - if menuItems[idx][4] == 0 and menuItems[idx][5] >= 0 then - lcd.drawText(300,25 + (idx-menu.offset-1)*20, "---",flags+CUSTOM_COLOR) + if type(menuItems[idx][4]) == "table" then + lcd.drawText(280, 25 + (idx-menu.offset-1)*20, menuItems[idx][4][menuItems[idx][3]], flags+COLOR_THEME_PRIMARY1) + else + if menuItems[idx][3] == 0 and menuItems[idx][4] >= 0 then + lcd.drawText(280,25 + (idx-menu.offset-1)*20, "---",flags+COLOR_THEME_PRIMARY1) else - lcd.drawNumber(300,25 + (idx-menu.offset-1)*20, menuItems[idx][4],flags+menuItems[idx][8]+CUSTOM_COLOR) - if menuItems[idx][7] ~= nil then - lcd.drawText(300 + 50,25 + (idx-menu.offset-1)*20, menuItems[idx][7],flags+CUSTOM_COLOR) + if menuItems[idx][6] ~= nil then + if (menuItems[idx][7] == PREC1) then + -- str = tostring(menuItems[idx][3]/10) + str = string.format("%.2f",menuItems[idx][3]/10) + else + if (menuItems[idx][7] == PREC2) then + -- str = tostring(menuItems[idx][3]/100) + str = string.format("%.2f",menuItems[idx][3]/100) + else + str = tostring(menuItems[idx][3]) + end + end + lcd.drawText(280, 25 + (idx-menu.offset-1)*20, str .. " " .. tostring(menuItems[idx][6]), flags+COLOR_THEME_PRIMARY1) + else + lcd.drawNumber(280, 25 + (idx-menu.offset-1)*20, menuItems[idx][3], flags+menuItems[idx][7]+COLOR_THEME_PRIMARY1) end end - else - lcd.drawText(300,25 + (idx-menu.offset-1)*20, menuItems[idx][5][menuItems[idx][4]],flags+CUSTOM_COLOR) end end @@ -585,8 +649,7 @@ local function drawConfigMenu(event) end -- for m=1+menu.offset,math.min(#menuItems,11+menu.offset) do - lcd.setColor(CUSTOM_COLOR,0xFFFF) - lcd.drawText(2,25 + (m-menu.offset-1)*20, menuItems[m][1],CUSTOM_COLOR) + lcd.drawText(2,25 + (m-menu.offset-1)*20, menuItems[m][1],COLOR_THEME_PRIMARY1) if m == menu.selectedItem then if menu.editSelected then drawItem(m,INVERS+BLINK) @@ -604,8 +667,7 @@ end -- RUN -------------------------- local function run(event) - lcd.setColor(CUSTOM_COLOR, 0x0AB1) -- hex 0x084c7b -- 073f66 - lcd.clear(CUSTOM_COLOR) + lcd.clear(COLOR_THEME_SECONDARY2) --------------------- -- CONFIG MENU --------------------- diff --git a/HORUS/SOURCES/SRC/WIDGETS/Yaapu/main.lua b/HORUS/SOURCES/SRC/WIDGETS/Yaapu/main.lua index 35cff54f..c99036d7 100644 --- a/HORUS/SOURCES/SRC/WIDGETS/Yaapu/main.lua +++ b/HORUS/SOURCES/SRC/WIDGETS/Yaapu/main.lua @@ -3,6 +3,8 @@ -- -- Copyright (C) 2018-2019. Alessandro Apostoli -- https://github.com/yaapu +-- OlliW MavSDK additions by Risto Kõiva +-- https://github.com/rotorman -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -36,6 +38,7 @@ --------------------- -- enable splash screen for no telemetry data --#define SPLASH +-- enable battery percentage based on voltage -- enable code to draw a compass rose vs a compass ribbon --#define COMPASS_ROSE @@ -54,14 +57,15 @@ --#define TESTMODE -- enable debug of generated hash or short hash string --#define HASHDEBUG - +-- enable MESSAGES DEBUG +--#define DEBUG_MESSAGES --------------------- -- DEBUG REFRESH RATES --------------------- -- calc and show hud refresh rate --#define HUDRATE -- calc and show telemetry process rate ---#define BGTELERATE +-- #define BGTELERATE --------------------- -- SENSOR IDS @@ -95,24 +99,7 @@ -- CONF REFRESH GV --------------------------------- ---------------------------------- --- ALARMS ---------------------------------- ---[[ - ALARM_TYPE_MIN needs arming (min has to be reached first), value below level for grace, once armed is periodic, reset on landing - ALARM_TYPE_MAX no arming, value above level for grace, once armed is periodic, reset on landing - ALARM_TYPE_TIMER no arming, fired periodically, spoken time, reset on landing - ALARM_TYPE_BATT needs arming (min has to be reached first), value below level for grace, no reset on landing -{ - 1 = notified, - 2 = alarm start, - 3 = armed, - 4 = type(0=min,1=max,2=timer,3=batt), - 5 = grace duration - 6 = ready - 7 = last alarm -} ---]]-- +-- -- -- @@ -125,7 +112,9 @@ --#define HUD_ALGO1 -- enable optimized hor bars HUD drawing --#define HUD_ALGO2 --- enable hor bars HUD drawing +-- enable hor bars HUD drawing, 2 px resolution +-- enable hor bars HUD drawing, 1 px resolution +--#define HUD_ALGO4 @@ -151,9 +140,6 @@ local unitLongLabel = getGeneralSettings().imperial == 0 and "km" or "mi" -- offsets are: 1 celm, 4 batt, 7 curr, 10 mah, 13 cap, indexing starts at 1 -- ------------------------ --- LIBRARY LOADING ------------------------ ---------------------- --- COLORS @@ -176,13 +162,6 @@ local unitLongLabel = getGeneralSettings().imperial == 0 and "km" or "mi" -------------------------- - - - - - - - local frameNames = {} -- copter frameNames[0] = "GEN" @@ -212,7 +191,6 @@ frameNames[11] = "BOAT" local currentModel = nil local frameTypes = {} -local frameType = nil --[[ MAV_TYPE_GENERIC=0, /* Generic micro air vehicle. | */ @@ -246,6 +224,7 @@ local frameType = nil MAV_TYPE_PARAFOIL=28, /* Steerable, nonrigid airfoil | */ MAV_TYPE_DODECAROTOR=29, /* Dodecarotor | */ ]] + -- copter frameTypes[0] = "c" frameTypes[2] = "c" @@ -293,6 +272,7 @@ gpsStatuses[6]="RTK" 6 MAV_SEVERITY_INFO Normal operational messages. Useful for logging. No action is required for these messages. 7 MAV_SEVERITY_DEBUG Useful non-operational messages that can assist in debugging. These should not occur during normal operation. --]] + local mavSeverity = {} mavSeverity[0]="EMR" mavSeverity[1]="ALR" @@ -349,6 +329,8 @@ telemetry.lat = nil telemetry.lon = nil telemetry.homeLat = nil telemetry.homeLon = nil +telemetry.strLat = "N/A" +telemetry.strLon = "N/A" -- WP telemetry.wpNumber = 0 telemetry.wpDistance = 0 @@ -363,6 +345,10 @@ telemetry.throttle = 0 telemetry.baroAlt = 0 -- Total distance telemetry.totalDist = 0 +-- CRSF +telemetry.rssiCRSF = 0 +-- MavSDK +telemetry.rssiMavSDK = 0 -------------------------------- -- STATUS DATA -------------------------------- @@ -393,6 +379,10 @@ status.batt2sources = { vs = false, fc = false } +-- SYNTH VSPEED SUPPORT +status.vspd = 0 +status.synthVSpeedTime = 0 +status.prevHomeAlt = 0 -- FLIGHT TIME status.lastTimerStart = 0 status.timerRunning = 0 @@ -416,6 +406,8 @@ status.lastMessage = nil status.lastMessageSeverity = 0 status.lastMessageCount = 1 status.messageCount = 0 +status.messageOffset = 0 +status.messageAutoScroll = true -- LINK STATUS status.noTelemetryData = 1 status.hideNoTelemetry = false @@ -427,6 +419,13 @@ status.mapZoomLevel = 1 -- FLIGHTMODE status.strFlightMode = nil status.modelString = nil +-- HOME POS +status.homeGood = false +status.homelat = nil -- gets directly set from MavSDK, thus if ~= nil, can use directly +status.homelon = nil -- gets directly set from MavSDK, thus if ~= nil, can use directly +status.homealt = nil +status.homehdg = nil + --------------------------- -- BATTERY TABLE --------------------------- @@ -456,12 +455,39 @@ local leftPanel = nil -- MP SCREEN LAYOUT ------------------------------- local mapLayout = nil - +------------------------------- +-- SENSORS +------------------------------- local customSensors = nil local backlightLastTime = 0 + +local resetPhase = 0 local resetPending = false +local loadConfigPending = false +local modelChangePending = false +local resetLayoutPhase = 0 +local resetLayoutPending = false + +--------------------------------- +-- ALARMS +--------------------------------- +--[[ + ALARM_TYPE_MIN needs arming (min has to be reached first), value below level for grace, once armed is periodic, reset on landing + ALARM_TYPE_MAX no arming, value above level for grace, once armed is periodic, reset on landing + ALARM_TYPE_TIMER no arming, fired periodically, spoken time, reset on landing + ALARM_TYPE_BATT needs arming (min has to be reached first), value below level for grace, no reset on landing +{ + 1 = notified, + 2 = alarm start, + 3 = armed, + 4 = type(0=min,1=max,2=timer,3=batt), + 5 = grace duration + 6 = ready + 7 = last alarm +} +--]] local alarms = { --{ notified, alarm_start, armed, type(0=min,1=max,2=timer,3=batt), grace, ready, last_alarm} { false, 0 , false, 0, 0, false, 0}, --MIN_ALT @@ -481,9 +507,7 @@ local transitions = { } -- SYNTH GPS DIST SUPPORT -local prevDist = 0 local lastSpeed = 0 -local lastYaw = 0 local lastUpdateTotDist = 0 local paramId,paramValue @@ -524,53 +548,147 @@ local conf = { battConf = 1, -- 1=parallel,2=other cell1Count = 0, cell2Count = 0, - rangeMax=0, + enableBattPercByVoltage = false, + rangeFinderMax=0, + enableSynthVSpeed=false, horSpeedMultiplier=1, vertSpeedMultiplier=1, horSpeedLabel = "m/s", vertSpeedLabel = "m/s", maxHdopAlert = 2, enablePX4Modes = false, + enableCRSF = false, + enableMavSDK = true, centerPanel = 1, rightPanel = 1, - leftPanel = 1, + leftPanel = 2, -- MavSDK/Mav2PT left pane by default widgetLayout = 1, - widgetLayoutFilename = nil, - centerPanelFilename = nil, - rightPanelFilename = nil, - leftPanelFilename = nil, - mapType = "sat_tiles", - mapZoomLevel = -2, + widgetLayoutFilename = "layout_1", + centerPanelFilename = "hud_1", + rightPanelFilename = "right_1", + leftPanelFilename = "left_1", + mapType = "sat_tiles", -- applies to gmapcacther only + mapZoomMax = 17, + mapZoomMin = -2, enableMapGrid = true, - screenToggleChannelId = nil, - mapToggleChannelId = nil, + screenToggleChannelId = 0, + screenWheelChannelId = 0, + gpsFormat = 1, -- DMS + mapProvider = 1, -- 1 GMapCatcher, 2 Google, 3 Yandex + enableTxGPS = false, } ------------------------- -- message hash support ------------------------- -local shortHashes = { - -- 16 bytes hashes - {554623408}, -- "554623408.wav", "Takeoff complete" - {3025044912}, -- "3025044912.wav", "SmartRTL deactiv" - {3956583920}, -- "3956583920.wav", "EKF2 IMU0 is usi" - {1309405592}, -- "1309405592.wav", "EKF3 IMU0 is usi" - {4091124880,true}, -- "4091124880.wav", "Reached command " - {3311875476,true}, -- "3311875476.wav", "Reached waypoint" - {1997782032,true}, -- "1997782032.wav", "Passed waypoint " -} +local shortHashes = {} +-- 16 bytes hashes +shortHashes[2730864352] = false -- Soaring: Too high +shortHashes[1698465616] = false -- Soaring: Too low +shortHashes[981284144] = false -- Soaring: Thermal ended +shortHashes[2913564252] = false -- Soaring: Drifted too far +shortHashes[1746499976] = false -- Soaring: Exit via RC switch +shortHashes[883458048] = false -- Soaring: Enabled. +shortHashes[2139150204] = false -- Soaring: thermal weak +shortHashes[1352994600] = false -- Soaring: reached upper altitude +shortHashes[4026147344] = false -- Soaring: reached lower altitude + +shortHashes[4091124880] = true -- reached command: +shortHashes[3311875476] = true -- reached waypoint: +shortHashes[1997782032] = true -- Passed waypoint: +shortHashes[554623408] = false -- Takeoff complete +shortHashes[3025044912] = false -- Smart RTL deactivated +shortHashes[3956583920] = false -- GPS home acquired +shortHashes[1309405592] = false -- GPS home acquired local shortHash = nil local parseShortHash = false local hashByteIndex = 0 local hash = 2166136261 +------------------------------- +-- SCREEN DRAWING +------------------------------- +local drawMainLayout = nil +local drawMapLayout = nil + + +local function triggerReset() + resetPending = true + modelChangePending = true +end + +local function calcCellCount() + -- cellcount override from menu + local c1 = 0 + local c2 = 0 + + if conf.cell1Count ~= nil and conf.cell1Count > 0 then + c1 = conf.cell1Count + elseif status.batt1sources.vs == true and status.cell1count > 1 then + c1 = status.cell1count + else + c1 = math.floor( ((status.cell1maxFC*0.1) / 4.35) + 1) + end + + if conf.cell2Count ~= nil and conf.cell2Count > 0 then + c2 = conf.cell2Count + elseif status.batt2sources.vs == true and status.cell2count > 1 then + c2 = status.cell2count + else + c2 = math.floor(((status.cell2maxFC*0.1)/4.35) + 1) + end + + return c1,c2 +end + +--[[ + Example data based on a 18 minutes flight for quad, battery:5200mAh LiPO 10C, hover @15A + Notes: + - when motors are armed VOLTAGE_DROP offset is applied! + - number of samples is fixed at 11 but percentage values can be anything and are not restricted to multiples of 10 + - voltage between samples is assumed to be linear +--]] +local battPercByVoltage = {} + +utils.getBattPercByCell = function(voltage) + if battPercByVoltage.dischargeCurve == nil then + return 99 + end + -- when disarmed apply voltage drop to use an "under load" curve + if telemetry.statusArmed == 0 then + voltage = voltage - battPercByVoltage.voltageDrop + end + + if battPercByVoltage.useCellVoltage == false then + voltage = voltage*calcCellCount() + end + if voltage == 0 then + return 99 + end + if voltage >= battPercByVoltage.dischargeCurve[#battPercByVoltage.dischargeCurve][1] then + return 99 + end + if voltage <= battPercByVoltage.dischargeCurve[1][1] then + return 0 + end + for i=2,#battPercByVoltage.dischargeCurve do + if voltage <= battPercByVoltage.dischargeCurve[i][1] then + -- + local v0 = battPercByVoltage.dischargeCurve[i-1][1] + local fv0 = battPercByVoltage.dischargeCurve[i-1][2] + -- + local v1 = battPercByVoltage.dischargeCurve[i][1] + local fv1 = battPercByVoltage.dischargeCurve[i][2] + -- interpolation polinomial + return fv0 + ((fv1 - fv0)/(v1-v0))*(voltage - v0) + end + end --for +end local loadCycle = 0 utils.doLibrary = function(filename) local f = assert(loadScript(libBasePath..filename..".lua")) - collectgarbage() - collectgarbage() return f() end ----------------------------- @@ -589,29 +707,37 @@ utils.clearTable = function(t) t = nil collectgarbage() collectgarbage() - maxmem = 0 end - -local function loadConfig() - -- load menu library - menuLib = dofile(basePath..menuLibFile..".lua") - menuLib.loadConfig(conf) - -- ok configuration loaded - status.battsource = conf.defaultBattSource - -- unload libraries - utils.clearTable(menuLib) - utils.clearTable(layout) - layout = nil - utils.clearTable(centerPanel) - centerPanel = nil - utils.clearTable(rightPanel) - rightPanel = nil - utils.clearTable(leftPanel) - leftPanel = nil - utils.clearTable(mapLayout) - mapLayout = nil - collectgarbage() - collectgarbage() + +local function resetLayouts() + if resetLayoutPending == true then + if resetLayoutPhase == -1 then + -- empty step + resetLayoutPhase = 0 + elseif resetLayoutPhase == 0 then + utils.clearTable(layout) + layout = nil + resetLayoutPhase = 1 + elseif resetLayoutPhase == 1 then + utils.clearTable(centerPanel) + centerPanel = nil + resetLayoutPhase = 2 + elseif resetLayoutPhase == 2 then + utils.clearTable(rightPanel) + rightPanel = nil + resetLayoutPhase = 3 + elseif resetLayoutPhase == 3 then + utils.clearTable(leftPanel) + leftPanel = nil + resetLayoutPhase = 4 + elseif resetLayoutPhase == 4 then + utils.clearTable(mapLayout) + mapLayout = nil + drawMainLayout = layoutLoad + resetLayoutPhase = 0 + resetLayoutPending = false + end + end end utils.getBitmap = function(name) @@ -666,21 +792,18 @@ utils.playSoundByFlightMode = function(flightMode) end - local function formatMessage(severity,msg) local clippedMsg = msg if #msg > 50 then clippedMsg = string.sub(msg,1,50) msg = nil - collectgarbage() - collectgarbage() end if status.lastMessageCount > 1 then - return string.format("%02d:%s (x%d) %s", status.messageCount, mavSeverity[severity], status.lastMessageCount, clippedMsg) + return string.format("%02d:%02d %s (x%d) %s", status.flightTime/60, status.flightTime%60, mavSeverity[severity], status.lastMessageCount, clippedMsg) else - return string.format("%02d:%s %s", status.messageCount, mavSeverity[severity], clippedMsg) + return string.format("%02d:%02d %s %s", status.flightTime/60, status.flightTime%60, mavSeverity[severity], clippedMsg) end end @@ -704,17 +827,19 @@ utils.pushMessage = function(severity, msg) status.lastMessageCount = 1 status.messageCount = status.messageCount + 1 end - if status.messages[(status.messageCount-1) % 20] == nil then - status.messages[(status.messageCount-1) % 20] = {} + local msgIndex = (status.messageCount-1) % 200 + if status.messages[msgIndex] == nil then + status.messages[msgIndex] = {} end - status.messages[(status.messageCount-1) % 20][1] = formatMessage(severity,msg) - status.messages[(status.messageCount-1) % 20][2] = severity + status.messages[msgIndex][1] = formatMessage(severity,msg) + status.messages[msgIndex][2] = severity status.lastMessage = msg status.lastMessageSeverity = severity - -- Collect Garbage - collectgarbage() - collectgarbage() + -- each new message scrolls all messages to the end (offset is absolute) + if status.messageAutoScroll == true then + status.messageOffset = math.max(0, status.messageCount - 20) + end end @@ -724,11 +849,12 @@ utils.getHomeFromAngleAndDistance = function(telemetry) d be distance (m), R as radius of Earth (m), Ad be the angular distance i.e d/R and - θ be the bearing in deg + Theta be the bearing in deg - la2 = asin(sin la1 * cos Ad + cos la1 * sin Ad * cos θ), and - lo2 = lo1 + atan2(sin θ * sin Ad * cos la1 , cos Ad – sin la1 * sin la2) ---]] if telemetry.lat == nil or telemetry.lon == nil then + la2 = asin(sin la1 * cos Ad + cos la1 * sin Ad * cos Theta), and + lo2 = lo1 + atan2(sin Theta * sin Ad * cos la1 , cos Ad – sin la1 * sin la2) +--]] + if telemetry.lat == nil or telemetry.lon == nil then return nil,nil end @@ -777,7 +903,21 @@ end local function getSensorsConfigFilename() local info = model.getInfo() - return "/SCRIPTS/YAAPU/CFG/" .. string.lower(string.gsub(info.name, "[%c%p%s%z]", "").."_sensors.lua") + local cfg = "/SCRIPTS/YAAPU/CFG/" .. string.lower(string.gsub(info.name, "[%c%p%s%z]", "").."_sensors.lua") + local file = io.open(cfg,"r") + + if file == nil then + cfg = "/SCRIPTS/YAAPU/CFG/default_sensors.lua" + else + io.close(file) + end + + return cfg +end + +local function getBattConfigFilename() + local info = model.getInfo() + return "/SCRIPTS/YAAPU/CFG/" .. string.lower(string.gsub(info.name, "[%c%p%s%z]", "").."_batt.lua") end -------------------------- @@ -791,7 +931,6 @@ utils.loadCustomSensors = function() customSensors = nil return end - collectgarbage() customSensors = sensorScript() -- handle nil values for warning and critical levels for i=1,6 @@ -806,13 +945,28 @@ utils.loadCustomSensors = function() end end end - collectgarbage() - collectgarbage() else customSensors = nil end end +------------------------------------------- +-- Battery Percentage By Voltage +------------------------------------------- +utils.loadBatteryConfigFile = function() + local success, battConfig = pcall(loadScript,getBattConfigFilename()) + if success then + if battConfig == nil then + battPercByVoltage = {} + return + end + battPercByVoltage = battConfig() + --utils.pushMessage(6,"battery curve loaded") + else + battPercByVoltage = {} + end +end + local function startTimer() status.lastTimerStart = getTime()/100 model.setTimer(2,{mode=1}) @@ -827,8 +981,247 @@ end ----------------------------------------------------------------- -- TELEMETRY ----------------------------------------------------------------- +local function updateHash(c) + hash = bit32.bxor(hash, c) + hash = (hash * 16777619) % 2^32 + hashByteIndex = hashByteIndex+1 + -- check if this hash matches any 16bytes prefix hash + if hashByteIndex == 16 then + parseShortHash = shortHashes[hash] + shortHash = hash + end +end + +local function playHash() + -- try to play the hash sound file without checking for existence + -- OpenTX will gracefully ignore it :-) + utils.playSound(tostring(shortHash == nil and hash or shortHash),true) + -- if required parse parameter and play it! + if parseShortHash == true then + local param = string.match(status.msgBuffer, ".*#(%d+).*") + if param ~= nil then + playNumber(tonumber(param),0) + end + end +end + +local function resetHash() + -- reset hash for next string + parseShortHash = false + shortHash = nil + hash = 2166136261 + hashByteIndex = 0 +end + +local function MarkHome() -- inspired by Mav2PT + if telemetry.gpsStatus >= 3 and telemetry.statusArmed == 1 then + status.homeGood = true + -- save current position + status.homelat = telemetry.lat + status.homelon = telemetry.lon + status.homealt = telemetry.gpsAlt + status.homehdg = telemetry.yaw + end +end + +local function TxGPShome() -- uses GPS connected to radio for home position + local txGPS = getTxGPS() + if txGPS ~= nil then + -- txGPS.numsat -- number of sats locked + -- txGPS.hdop * 0.01 -- GPS dilution, converted to std. unit where approx. 1 is good + if txGPS.fix then + status.homelat = txGPS.lat -- internal gpsData.latitude * 0.000001, positive is North + status.homelon = txGPS.lon -- internal gpsData.longitude * 0.000001, positive is East + status.homealt = txGPS.alt -- unit m + -- txGPS.speed * 0.01 -- converted to m/s + status.homehdg = txGPS.heading * 0.1 -- converted to degrees + status.homeGood = true + end + end +end + +-- processes OlliW MavSDK (MAVLink enhanced OpenTX) data +local function processMavSDKfastUpdate() + -- only status text needs to be quickly updated in order not to miss any messages + if mavsdk ~= nil then -- in order not for the script to get disabled when running on non OlliW OpenTX firmware + -- messages + if mavsdk.isStatusTextAvailable() then + local severity, txt = mavsdk.getStatusText() + if severity ~= nil and txt ~= nil then + utils.pushMessage(severity, txt) + playHash() + resetHash() + end + end + end +end + +local function processMavSDKslowUpdate() + -- for all the data in this function it is irrelevant if we miss some info, we only need the latest value, thus slow rate is just fine + if mavsdk ~= nil then -- in order not for the script to get disabled when running on non OlliW OpenTX firmware + -- telemetry.roll + local roll = mavsdk.getAttRollDeg() + if roll ~= nil then telemetry.roll = roll end + -- telemetry.pitch + local pitch = mavsdk.getAttPitchDeg() + if pitch ~= nil then telemetry.pitch = pitch end + -- telemetry.range + local range = mavsdk.apGetRangefinder() + if range ~= nil then telemetry.range = range * 100 end -- from m to cm + -- telemetry.vSpeed + local vSpeed = mavsdk.getVfrClimbRate() + if vSpeed ~= nil then telemetry.vSpeed = vSpeed * 10 end -- from m/s to dm/s + -- telemetry.hSpeed + local hSpeed = mavsdk.getVfrGroundSpeed() + if hSpeed ~= nil then telemetry.hSpeed = hSpeed * 10 end -- from m/s to dm/s + -- telemetry.yaw + local yaw = mavsdk.getVfrHeadingDeg() + if yaw ~= nil then telemetry.yaw = yaw end + -- telemetry.frameType + local frameType = mavsdk.getVehicleType() + if frameType ~= nil then telemetry.frameType = frameType end + -- telemetry.flightMode + local fm = mavsdk.getFlightMode() + if fm ~= nil then telemetry.flightMode = fm + 1 end -- needs to be incremented by one from MAVLink standard output + -- telemetry.simpleMode + telemetry.simpleMode = 0 + -- telemetry.statusArmed and telemetry.landComplete + local armed = mavsdk.isArmed() + if armed ~= nil then + if armed then + telemetry.statusArmed = 1 + telemetry.landComplete = 1 + else + telemetry.statusArmed = 0 + telemetry.landComplete = 0 + end + if conf.enableTxGPS then + -- use radio GPS for home position + TxGPShome() -- update even if status.homeGood == true to keep moving radio as home + else + -- use vehicle GPS for home position + if not status.homeGood then + MarkHome() + end + end + end + -- telemetry.battFailsafe + if ((mavsdk.getBatFaultBitMask() ~= nil) or (mavsdk.getBat2FaultBitMask() ~= nil)) then telemetry.battFailsafe = 1 end + -- telemetry.ekfFailsafe + telemetry.ekfFailsafe = 0 + -- telemetry.imuTemp -- [°C] value not yet parsed by OlliW + -- telemetry.numSats + local gpssat = mavsdk.getGpsSat() + if gpssat ~= nil then + if gpssat > 99 then gpssat = 0 end + telemetry.numSats = gpssat + end + -- telemetry.gpsStatus + local gpsStatus = mavsdk.getGpsFix() + if gpsStatus ~= nil then + telemetry.gpsStatus = gpsStatus + if ((not status.homeGood) and (not conf.enableTxGPS)) then + MarkHome() + end + end + -- telemetry.gpsHdopC + local Hdop = mavsdk.getGpsHDop() -- here NOT divided with 10 to keep the original dilution scale + if Hdop ~= nil then telemetry.gpsHdopC = Hdop end + -- telemetry.batt1volt + local batt1Volt = mavsdk.getBatVoltage() + if batt1Volt ~= nil then telemetry.batt1volt = batt1Volt * 10 end -- from V to dV + -- telemetry.batt1current + local BatCurrent = mavsdk.getBatCurrent() + if BatCurrent ~= nil then telemetry.batt1current = BatCurrent * 10 end -- from A to cA + -- telemetry.batt1Capacity + local batt1Capacity = mavsdk.getBatCapacity() + if batt1Capacity ~= nil then telemetry.batt1Capacity = batt1Capacity end + -- telemetry.batt1mah + local BatCharge = mavsdk.getBatChargeConsumed() + if BatCharge ~= nil then telemetry.batt1mah = BatCharge end + -- telemetry.batt2volt + local batt2Volt = mavsdk.getBat2Voltage() + if batt2Volt ~= nil then telemetry.batt2volt = batt2Volt * 10 end -- from V to dV + -- telemetry.batt2current + local Bat2current = mavsdk.getBat2Current() + if Bat2current ~= nil then telemetry.batt2current = Bat2current * 10 end -- from A to cA + -- telemetry.batt2Capacity + local batt2Capacity = mavsdk.getBat2Capacity() + if batt2Capacity ~= nil then telemetry.batt2Capacity = batt2Capacity end + -- telemetry.batt2mah + local Bat2Charge = mavsdk.getBat2ChargeConsumed() + if Bat2Charge ~= nil then telemetry.batt2mah = Bat2Charge end + -- telemetry.lat and telemetry.lon + if telemetry.gpsStatus >= 2 then -- minimally 2D-Fix required to pass GPS data + local latlon = mavsdk.getGpsLatLonInt() + if type(latlon) == "table" and latlon.lat ~= nil then + telemetry.lat = latlon.lat * 0.0000001 -- converted to degrees.fraction + end + if type(latlon) == "table" and latlon.lon ~= nil then + telemetry.lon = latlon.lon * 0.0000001 -- converted to degrees.fraction + end + -- telemetry.gpsAlt + local gpsAlt = mavsdk.getGpsAltitudeMsl() + if gpsAlt ~= nil then telemetry.gpsAlt = gpsAlt * 10 end -- from m to dm + end + -- telemetry.homeAlt (altitude above ground) + local homeAlt = mavsdk.getPositionAltitudeRelative() + if homeAlt ~= nil then telemetry.homeAlt = homeAlt end -- m + -- telemetry.homeAngle and telemetry.homeDist + if status.homeGood and status.homelon ~= nil and status.homelat ~= nil and telemetry.lon ~= nil and telemetry.lat ~= nil then + -- Equations from Mav2PT FrSky_Ports.h + local lon1 = status.homelon/180.0*math.pi; -- home position, converted from degrees to radians + local lat1 = status.homelat/180.0*math.pi; + local lon2 = telemetry.lon/180.0*math.pi; -- current position + local lat2 = telemetry.lat/180.0*math.pi; + local dLat = (lat2-lat1); -- latitude difference + local dLon = (lon2-lon1); -- longitude difference + -- telemetry.homeAngle + -- Calculate azimuth bearing of craft from home + local ab = math.atan2(math.sin(lon2-lon1)*math.cos(lat2), math.cos(lat1)*math.sin(lat2)-math.sin(lat1)*math.cos(lat2)*math.cos(lon2-lon1)) * 180.0/math.pi - 180.0 + if ab < 0 then ab = ab + 360.0 end + if ab > 359.0 then ab = ab - 360.0 end + telemetry.homeAngle = ab + -- telemetry.homeDist + local a = math.sin(dLat*0.5) * math.sin(dLat*0.5) + math.sin(dLon*0.5) * math.sin(dLon*0.5) * math.cos(lat1) * math.cos(lat2); + if a == 0 then + telemetry.homeDist = 0 + else + telemetry.homeDist = 6371000.0 * 2.0 * math.asin(math.sqrt(a)) -- radius of the Earth is 6371km times + end + end + -- telemetry.wpNumber and telemetry.wpCommands + local mission = mavsdk.getMission() + if mission.current_seq ~= nil and mission.current_seq ~= 65535 then telemetry.wpNumber = mission.current_seq end -- OlliW initializes to UINT16_MAX, need to discard this value + if mission.count ~= nil then telemetry.wpCommands = mission.count end + -- telemetry.wpXTError not yet used in telemetry script further and also not yet parsed by OlliW + -- telemetry.wpDistance + local navcontroller = mavsdk.getNavController() + if type(navcontroller) == "table" and navcontroller.wp_dist ~= nil then telemetry.wpDistance = navcontroller.wp_dist end -- unit m + -- telemetry.wpBearing + local cog = mavsdk.getGpsCourseOverGroundDeg() + if type(navcontroller) == "table" and navcontroller.target_bearing ~= nil and cog ~= nil then + -- Equation from Mav2PT FrSky_Ports.h + local angle = math.fmod (navcontroller.target_bearing - cog, 360.0); + if angle < 0 then angle = angle + 360.0 end -- shift, if necessary, to be in range between 0 and 360 + telemetry.wpBearing = ((angle + 22.5) / 45.0) % 8 -- convert into nearest 45° bearing offset from COG (to match FrSky PT) + end + -- telemetry.airspeed + local airspeed = mavsdk.getVfrAirSpeed() + if airspeed ~= nil then telemetry.airspeed = airspeed * 10 end -- from m/s to dm/s + -- telemetry.throttle + local throttle = mavsdk.getVfrThrottle() + if throttle ~= nil then telemetry.throttle = throttle end -- unit [%] + -- telemetry.baroAlt + local baroAlt = mavsdk.getVfrAltitudeMsl() + if baroAlt ~= nil then telemetry.baroAlt = baroAlt end + -- RSSI + local rssi = mavsdk.getRadioRssiScaled() + if rssi ~= nil then telemetry.rssiMavSDK = rssi end -- scaling 0 to 100 (FrSky 0 to 99) + end +end -local function processTelemetry(DATA_ID,VALUE) +local function processFrSkyPTtelemetry(DATA_ID,VALUE) if DATA_ID == 0x5006 then -- ROLLPITCH -- roll [0,1800] ==> [-180,180] telemetry.roll = (math.min(bit32.extract(VALUE,0,11),1800) - 900) * 0.2 @@ -848,7 +1241,7 @@ local function processTelemetry(DATA_ID,VALUE) telemetry.battFailsafe = bit32.extract(VALUE,9,1) telemetry.ekfFailsafe = bit32.extract(VALUE,10,2) -- IMU temperature: 0 means temp =< 19°, 63 means temp => 82° - telemetry.imuTemp = bit32.extract(VALUE,26,6) + 19 -- C° + telemetry.imuTemp = bit32.extract(VALUE,26,6) + 19 -- °C elseif DATA_ID == 0x5002 then -- GPS STATUS telemetry.numSats = bit32.extract(VALUE,0,4) -- offset 4: NO_GPS = 0, NO_FIX = 1, GPS_OK_FIX_2D = 2, GPS_OK_FIX_3D or GPS_OK_FIX_3D_DGPS or GPS_OK_FIX_3D_RTK_FLOAT or GPS_OK_FIX_3D_RTK_FIXED = 3 @@ -864,7 +1257,7 @@ local function processTelemetry(DATA_ID,VALUE) -- assume a 2Vx12 as minimum acceptable "real" voltage telemetry.batt1volt = 512 + telemetry.batt1volt end - telemetry.batt1current = bit32.extract(VALUE,10,7) * (10^bit32.extract(VALUE,9,1)) + telemetry.batt1current = bit32.extract(VALUE,10,7) * (10^bit32.extract(VALUE,9,1)) -- unit cA telemetry.batt1mah = bit32.extract(VALUE,17,15) elseif DATA_ID == 0x5008 then -- BATT2 telemetry.batt2volt = bit32.extract(VALUE,0,9) @@ -874,11 +1267,11 @@ local function processTelemetry(DATA_ID,VALUE) -- assume a 2Vx12 as minimum acceptable "real" voltage telemetry.batt2volt = 512 + telemetry.batt2volt end - telemetry.batt2current = bit32.extract(VALUE,10,7) * (10^bit32.extract(VALUE,9,1)) + telemetry.batt2current = bit32.extract(VALUE,10,7) * (10^bit32.extract(VALUE,9,1)) -- unit cA telemetry.batt2mah = bit32.extract(VALUE,17,15) elseif DATA_ID == 0x5004 then -- HOME telemetry.homeDist = bit32.extract(VALUE,2,10) * (10^bit32.extract(VALUE,0,2)) - telemetry.homeAlt = bit32.extract(VALUE,14,10) * (10^bit32.extract(VALUE,12,2)) * 0.1 * (bit32.extract(VALUE,24,1) == 1 and -1 or 1) + telemetry.homeAlt = bit32.extract(VALUE,14,10) * (10^bit32.extract(VALUE,12,2)) * 0.1 * (bit32.extract(VALUE,24,1) == 1 and -1 or 1) -- m (altitude above ground) telemetry.homeAngle = bit32.extract(VALUE, 25, 7) * 3 elseif DATA_ID == 0x5000 then -- MESSAGES if VALUE ~= status.lastMsgValue then @@ -890,23 +1283,7 @@ local function processTelemetry(DATA_ID,VALUE) c = bit32.extract(VALUE,i*8,7) if c ~= 0 then status.msgBuffer = status.msgBuffer .. string.char(c) - collectgarbage() - collectgarbage() - hash = bit32.bxor(hash, c) - hash = (hash * 16777619) % 2^32 - hashByteIndex = hashByteIndex+1 - -- check if this hash matches any 16bytes prefix hash - if hashByteIndex == 16 then - for i=1,#shortHashes - do - if hash == shortHashes[i][1] then - shortHash = hash - -- check if needs parsing - parseShortHash = shortHashes[i][2] == nil and false or true - break; - end - end - end + updateHash(c) else msgEnd = true; break; @@ -915,27 +1292,9 @@ local function processTelemetry(DATA_ID,VALUE) if msgEnd then local severity = (bit32.extract(VALUE,7,1) * 1) + (bit32.extract(VALUE,15,1) * 2) + (bit32.extract(VALUE,23,1) * 4) utils.pushMessage( severity, status.msgBuffer) - -- try to play the hash sound file without checking - -- for existence, OpenTX will gracefully ignore it :-) - utils.playSound(tostring(shortHash == nil and hash or shortHash),true) - -- if required parse parameter and play it! - if parseShortHash then - local param = string.match(status.msgBuffer, ".*#(%d+).*") - collectgarbage() - if param ~= nil then - playNumber(tonumber(param),0) - collectgarbage() - end - end - -- reset hash for next string - parseShortHash = false - shortHash = nil - hash = 2166136261 - hashByteIndex = 0 + playHash() + resetHash() status.msgBuffer = nil - -- recover memory - collectgarbage() - collectgarbage() status.msgBuffer = "" end end @@ -964,7 +1323,8 @@ local function processTelemetry(DATA_ID,VALUE) rcchannels[2 + offset] = 100 * (bit32.extract(VALUE,11,6)/63) * (bit32.extract(VALUE,17,1) == 1 and -1 or 1) rcchannels[3 + offset] = 100 * (bit32.extract(VALUE,18,6)/63) * (bit32.extract(VALUE,24,1) == 1 and -1 or 1) rcchannels[4 + offset] = 100 * (bit32.extract(VALUE,25,6)/63) * (bit32.extract(VALUE,31,1) == 1 and -1 or 1) - --]] elseif DATA_ID == 0x50F2 then -- VFR + --]] + elseif DATA_ID == 0x50F2 then -- VFR telemetry.airspeed = bit32.extract(VALUE,1,7) * (10^bit32.extract(VALUE,0,1)) -- dm/s telemetry.throttle = bit32.extract(VALUE,8,7) telemetry.baroAlt = bit32.extract(VALUE,17,10) * (10^bit32.extract(VALUE,15,2)) * 0.1 * (bit32.extract(VALUE,27,1) == 1 and -1 or 1) @@ -972,8 +1332,21 @@ local function processTelemetry(DATA_ID,VALUE) end local function telemetryEnabled() - if getRSSI() == 0 then - status.noTelemetryData = 1 + if conf.enableMavSDK then + if mavsdk ~= nil then -- in order not for the script to get disabled when running on non OlliW OpenTX firmware + if mavsdk.isReceiving() then + status.noTelemetryData = 0 + else + status.noTelemetryData = 1 + end + end + else + -- not MavSDK + if getRSSI() == 0 then + status.noTelemetryData = 1 + else + status.noTelemetryData = 0 + end end return status.noTelemetryData == 0 end @@ -992,30 +1365,6 @@ local function getNonZeroMin(v1,v2) return v1 == 0 and v2 or ( v2 == 0 and v1 or math.min(v1,v2)) end -local function calcCellCount() - -- cellcount override from menu - local c1 = 0 - local c2 = 0 - - if conf.cell1Count ~= nil and conf.cell1Count > 0 then - c1 = conf.cell1Count - elseif status.batt1sources.vs == true and status.cell1count > 1 then - c1 = status.cell1count - else - c1 = math.floor( ((status.cell1maxFC*0.1) / 4.35) + 1) - end - - if conf.cell2Count ~= nil and conf.cell2Count > 0 then - c2 = conf.cell2Count - elseif status.batt2sources.vs == true and status.cell2count > 1 then - c2 = status.cell2count - else - c2 = math.floor(((status.cell2maxFC*0.1)/4.35) + 1) - end - - return c1,c2 -end - local function getBatt1Capacity() return conf.battCapOverride1 > 0 and conf.battCapOverride1*10 or telemetry.batt1Capacity end @@ -1133,6 +1482,16 @@ local function calcBattery() -- value = offset + [0 aggregate|1 for batt 1| 2 for batt2] -- batt2 = 4 + 2 = 6 ------------------------------------------ + + -- 1 1 + -- 4 4 + -- 7 7 + -- 10 10 + -- 13 13 + -- 16 16 + -- possible battery configs + -- 1, 2, 3, 4, 5, 6 + -- Note: these can be calculated. not necessary to track them as min/max -- cell1minFC = cell1sumFC/calcCellCount() -- cell2minFC = cell2sumFC/calcCellCount() @@ -1142,24 +1501,75 @@ local function calcBattery() battery[1+1] = getMinVoltageBySource(status.battsource, status.cell1min, status.cell1sumFC/count1, 1)*100 --cel1m battery[1+2] = getMinVoltageBySource(status.battsource, status.cell2min, status.cell2sumFC/count2, 2)*100 --cel2m - battery[1] = (conf.battConf == 3 and battery[2] or getNonZeroMin(battery[2], battery[3]) ) battery[4+1] = getMinVoltageBySource(status.battsource, status.cell1sum, status.cell1sumFC, 1)*10 --batt1 battery[4+2] = getMinVoltageBySource(status.battsource, status.cell2sum, status.cell2sumFC, 2)*10 --batt2 - battery[4] = (conf.battConf == 3 and battery[5] or (conf.battConf == 2 and battery[5]+battery[6] or getNonZeroMin(battery[5],battery[6]))) - battery[7] = utils.getMaxValue((conf.battConf == 3 and telemetry.batt1current or telemetry.batt1current + telemetry.batt2current),7) battery[7+1] = utils.getMaxValue(telemetry.batt1current,8) --curr1 battery[7+2] = utils.getMaxValue(telemetry.batt2current,9) --curr2 - battery[10] = (conf.battConf == 3 and telemetry.batt1mah or telemetry.batt1mah + telemetry.batt2mah) battery[10+1] = telemetry.batt1mah --mah1 battery[10+2] = telemetry.batt2mah --mah2 - battery[13] = (conf.battConf == 1 and getBatt1Capacity() + getBatt2Capacity() or getBatt1Capacity()) battery[13+1] = getBatt1Capacity() --cap1 battery[13+2] = getBatt2Capacity() --cap2 + if (conf.battConf == 1) then + battery[1] = getNonZeroMin(battery[2], battery[3]) + battery[4] = getNonZeroMin(battery[5],battery[6]) + battery[7] = utils.getMaxValue(telemetry.batt1current + telemetry.batt2current, 7) + battery[10] = telemetry.batt1mah + telemetry.batt2mah + battery[13] = getBatt2Capacity() + getBatt1Capacity() + elseif (conf.battConf == 2) then + battery[1] = getNonZeroMin(battery[2], battery[3]) + battery[4] = battery[5] + battery[6] + battery[7] = utils.getMaxValue(telemetry.batt1current,7) + battery[10] = telemetry.batt1mah + battery[13] = getBatt1Capacity() + elseif (conf.battConf == 3) then + -- independent batteries, alerts and capacity % on battery 1 + battery[1] = battery[2] + battery[4] = battery[5] + battery[7] = utils.getMaxValue(telemetry.batt1current,7) + battery[10] = telemetry.batt1mah + battery[13] = getBatt1Capacity() + elseif (conf.battConf == 4) then + -- independent batteries, alerts and capacity % on battery 2 + battery[1] = battery[3] + battery[4] = battery[6] + battery[7] = utils.getMaxValue(telemetry.batt2current,7) + battery[10] = telemetry.batt2mah + battery[13] = getBatt2Capacity() + elseif (conf.battConf == 5) then + -- independent batteries, voltage alerts on battery 1, capacity % on battery 2 + battery[1] = battery[2] + battery[4] = battery[5] + battery[7] = utils.getMaxValue(telemetry.batt2current,7) + battery[10] = telemetry.batt2mah + battery[13] = getBatt2Capacity() + elseif (conf.battConf == 6) then + -- independent batteries, voltage alerts on battery 2, capacity % on battery 1 + battery[1] = battery[3] + battery[4] = battery[6] + battery[7] = utils.getMaxValue(telemetry.batt1current,7) + battery[10] = telemetry.batt1mah + battery[13] = getBatt1Capacity() + end + + --[[ + discharge curve is based on battery under load, when motors are disarmed + cellvoltage needs to be corrected by subtracting the "under load" voltage drop + --]] + if conf.enableBattPercByVoltage == true then + for battId=0,2 + do + if telemetry.statusArmed == 1 then + battery[16+battId] = utils.getBattPercByCell(0.01*battery[1+battId]) + else + battery[16+battId] = utils.getBattPercByCell((0.01*battery[1+battId])-0.15) + end + end + else for battId=0,2 do if (battery[13+battId] > 0) then @@ -1173,7 +1583,8 @@ local function calcBattery() battery[16+battId] = 99 end end - + end + if status.showDualBattery == true and conf.battConf == 1 then -- dual parallel battery: do I have also dual current monitor? if battery[7+1] > 0 and battery[7+2] == 0 then @@ -1199,7 +1610,7 @@ local function checkLandingStatus() end if (status.timerRunning == 1 and telemetry.landComplete == 0 and status.lastTimerStart ~= 0) then stopTimer() - -- play landing complete anly if motorts are armed + -- play landing complete only if motors are armed if telemetry.statusArmed == 1 then utils.playSound("landing") end @@ -1207,58 +1618,258 @@ local function checkLandingStatus() status.timerRunning = telemetry.landComplete end -local resetLib = {} +local function drainTelemetryQueues() + if conf.enableCRSF == false then + -- SPORT + local i = 0 + -- empty sport queue + local a,b,c,d = sportTelemetryPop() + while a ~= null and i < 50 do + a,b,c,d = sportTelemetryPop() + i = i + 1 + end + else + -- CRSF + local i = 0 + -- empty sport queue + local a,b = crossfireTelemetryPop() + while a ~= null and i < 50 do + a,b = crossfireTelemetryPop() + i = i + 1 + end + end +end -local function reset() - -- ERRORE reset da kill CPU limit!!!!!!!! - -- 2 stage reset - if resetPending == false then - -- initialize status - if resetLib.resetWidget == nil then - resetLib = utils.doLibrary("reset") - collectgarbage() - collectgarbage() - end - -- reset frame - utils.clearTable(frame.frameTypes) - -- reset widget pages - currentPage = 0 - - minmaxValues = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0} - - status.showMinMaxValues = false - status.showDualBattery = false - status.strFlightMode = nil - status.modelString = nil - - frame = {} - -- reset all - resetLib.resetTelemetry(status,telemetry,battery,alarms,utils) - -- release resources - utils.clearTable(resetLib) - -- force load model config - model.setGlobalVariable(8,8,1) - collectgarbage() - collectgarbage() - utils.pushMessage(6,"telemetry reset done!") - resetPending = true +local function drawRssi() + -- RSSI + if conf.enableMavSDK then + -- MavSDK RSSI can have up to 3 digits. Need to be more left in comparison to FrSky 2 digit RSSI output + lcd.drawBitmap(utils.getBitmap("rssi"), 326, 3) + lcd.drawText(326 + 10, 0, ":", WHITE) + lcd.drawText(326 + 10 + 5, 0, telemetry.rssiMavSDK, WHITE) else - -- custom sensors - utils.clearTable(customSensors) - customSensors = nil - utils.loadCustomSensors() - -- done - utils.playSound("yaapu") - collectgarbage() - collectgarbage() - resetPending = false + -- only 2 RSSI digits max with FrSky + lcd.drawBitmap(utils.getBitmap("rssi"), 336, 3) + lcd.drawText(336 + 10, 0, ":", WHITE) + lcd.drawText(336 + 10 + 5, 0, getRSSI(), WHITE) + end +end + +local function drawRssiCRSF() + -- RSSI + lcd.drawText(323 - 128, 0, "RTP:", 0 +WHITE+SMLSIZE) + lcd.drawText(323, 0, "RS:", 0 +WHITE+SMLSIZE) + lcd.drawText(323 - 128 + 30, 0, string.format("%d/%d/%d",getValue("RQly"),getValue("TQly"),getValue("TPWR")), 0 +WHITE+SMLSIZE) + lcd.drawText(323 + 22, 0, string.format("%d/%d", status.rssiCRSF, getValue("RFMD")), 0 +WHITE+SMLSIZE) +end + +local function resetTelemetry() + ----------------------------- + -- TELEMETRY + ----------------------------- + -- AP STATUS + telemetry.flightMode = 0 + telemetry.simpleMode = 0 + telemetry.landComplete = 0 + telemetry.statusArmed = 0 + telemetry.battFailsafe = 0 + telemetry.ekfFailsafe = 0 + telemetry.imuTemp = 0 + -- GPS + telemetry.numSats = 0 + telemetry.gpsStatus = 0 + telemetry.gpsHdopC = 100 + telemetry.gpsAlt = 0 + -- BATT 1 + telemetry.batt1volt = 0 + telemetry.batt1current = 0 + telemetry.batt1mah = 0 + -- BATT 2 + telemetry.batt2volt = 0 + telemetry.batt2current = 0 + telemetry.batt2mah = 0 + -- HOME + telemetry.homeDist = 0 + telemetry.homeAlt = 0 + telemetry.homeAngle = -1 + -- VELANDYAW + telemetry.vSpeed = 0 + telemetry.hSpeed = 0 + telemetry.yaw = 0 + -- ROLLPITCH + telemetry.roll = 0 + telemetry.pitch = 0 + telemetry.range = 0 + -- PARAMS + telemetry.frameType = -1 + telemetry.batt1Capacity = 0 + telemetry.batt2Capacity = 0 + -- GPS + telemetry.lat = nil + telemetry.lon = nil + telemetry.homeLat = nil + telemetry.homeLon = nil + -- WP + telemetry.wpNumber = 0 + telemetry.wpDistance = 0 + telemetry.wpXTError = 0 + telemetry.wpBearing = 0 + telemetry.wpCommands = 0 + -- RC channels + telemetry.rcchannels = {} + -- VFR + telemetry.airspeed = 0 + telemetry.throttle = 0 + telemetry.baroAlt = 0 + -- + telemetry.totalDist = 0 +end + +local function resetStatus() + ----------------------------- + -- SCRIPT STATUS + ----------------------------- + -- FLVSS 1 + status.cell1min = 0 + status.cell1sum = 0 + -- FLVSS 2 + status.cell2min = 0 + status.cell2sum = 0 + -- FC 1 + status.cell1sumFC = 0 + status.cell1maxFC = 0 + -- FC 2 + status.cell2sumFC = 0 + status.cell2maxFC = 0 + -- BATT + status.cell1count = 0 + status.cell2count = 0 + + status.battsource = "na" + -- BATT 1 + status.batt1sources = { + vs = false, + fc = false + } + -- BATT 2 + status.batt2sources = { + vs = false, + fc = false + } + -- TELEMETRY + status.noTelemetryData = 1 + -- MESSAGES + status.msgBuffer = "" + status.lastMsgValue = 0 + status.lastMsgTime = 0 + -- FLIGHT TIME + status.lastTimerStart = 0 + status.timerRunning = 0 + status.flightTime = 0 + -- EVENTS + status.lastStatusArmed = 0 + status.lastGpsStatus = 0 + status.lastFlightMode = 0 + status.lastSimpleMode = 0 + -- battery levels + status.batLevel = 99 + status.battLevel1 = false + status.battLevel2 = false + status.lastBattLevel = 14 + ------------------------- + -- BATTERY ARRAY + ------------------------- + battery = {0,0,0,0,0,0,0,0,0,0,0,0} +end + +local function resetMessages() + -- MESSAGES + utils.clearTable(status.messages) + + status.msgBuffer = "" + status.lastMsgValue = 0 + status.lastMsgTime = 0 + status.lastMessage = nil + status.lastMessageSeverity = 0 + status.lastMessageCount = 1 + status.messageCount = 0 + status.messages = {} +end + +local function resetAlarms() + -- reset alarms + alarms[1] = { false, 0 , false, 0, 0, false, 0} --MIN_ALT + alarms[2] = { false, 0 , true, 1 , 0, false, 0 } --MAX_ALT + alarms[3] = { false, 0 , true, 1 , 0, false, 0 } --15 + alarms[4] = { false, 0 , true, 1 , 0, false, 0 } --FS_EKF + alarms[5] = { false, 0 , true, 1 , 0, false, 0 } --FS_BAT + alarms[6] = { false, 0 , true, 2, 0, false, 0 } --FLIGTH_TIME + alarms[7] = { false, 0 , false, 3, 4, false, 0 } --BATT L1 + alarms[8] = { false, 0 , false, 4, 4, false, 0 } --BATT L2 + alarms[9] = { false, 0 , false, 1 , 0, false, 0 } --MAX_HDOP +end + +local function resetTimers() + -- stop and reset timer + model.setTimer(2,{mode=0}) + model.setTimer(2,{value=0}) +end + +local function reset() + if resetPending then + if resetPhase == 0 then + -- reset frame + utils.clearTable(frame.frameTypes) + drainTelemetryQueues() + resetPhase = 1 + elseif resetPhase == 1 then + resetTelemetry() + resetPhase = 2 + elseif resetPhase == 2 then + resetStatus() + resetPhase = 3 + elseif resetPhase == 3 then + resetAlarms() + resetPhase = 4 + elseif resetPhase == 4 then + resetTimers() + resetMessages() + resetPhase = 5 + elseif resetPhase == 5 then + currentPage = 0 + minmaxValues = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0} + status.showMinMaxValues = false + status.showDualBattery = false + status.strFlightMode = nil + status.modelString = nil + frame = {} + resetPhase = 6 + elseif resetPhase == 6 then + -- custom sensors + utils.clearTable(customSensors) + customSensors = nil + utils.loadCustomSensors() + -- done + resetPhase = 7 + elseif resetPhase == 7 then + utils.pushMessage(7,"Yaapu v1.9.3b4 (OlliW MavSDK support by Risto)") + utils.playSound("yaapu") + -- on model change reload config! + if modelChangePending == true then + -- force load model config + loadConfigPending = true + model.setGlobalVariable(8, 8, 1) + end + resetPhase = 0 + resetPending = false + end end end local function calcFlightTime() -- update local variable with timer 3 value if ( model.getTimer(2).value < status.flightTime and telemetry.statusArmed == 0) then - reset() + triggerReset() end if (model.getTimer(2).value < status.flightTime and telemetry.statusArmed == 1) then model.setTimer(2,{value=status.flightTime}) @@ -1268,115 +1879,140 @@ local function calcFlightTime() end local function setSensorValues() - if (not telemetryEnabled()) then - return - end - local battmah = telemetry.batt1mah - local battcapacity = getBatt1Capacity() - if telemetry.batt2mah > 0 then - battcapacity = getBatt1Capacity() + getBatt2Capacity() - battmah = telemetry.batt1mah + telemetry.batt2mah - end + if not conf.enableMavSDK then + -- only if MavSDK is not enabled + if (not telemetryEnabled()) then + return + end + local battmah = telemetry.batt1mah + local battcapacity = getBatt1Capacity() + if telemetry.batt2mah > 0 then + battcapacity = getBatt1Capacity() + getBatt2Capacity() + battmah = telemetry.batt1mah + telemetry.batt2mah + end - local perc = 0 + local perc = 0 - if (battcapacity > 0) then - perc = math.min(math.max((1 - (battmah/battcapacity))*100,0),99) - end + if (battcapacity > 0) then + perc = math.min(math.max((1 - (battmah/battcapacity))*100,0),99) + end - setTelemetryValue(0x060F, 0, 0, perc, 13 , 0 , "Fuel") - setTelemetryValue(0x021F, 0, 0, getNonZeroMin(telemetry.batt1volt,telemetry.batt2volt)*10, 1 , 2 , "VFAS") - setTelemetryValue(0x020F, 0, 0, telemetry.batt1current+telemetry.batt2current, 2 , 1 , "CURR") - setTelemetryValue(0x011F, 0, 0, telemetry.vSpeed, 5 , 1 , "VSpd") - setTelemetryValue(0x083F, 0, 0, telemetry.hSpeed*0.1, 5 , 0 , "GSpd") - setTelemetryValue(0x010F, 0, 0, telemetry.homeAlt*10, 9 , 1 , "Alt") - setTelemetryValue(0x082F, 0, 0, math.floor(telemetry.gpsAlt*0.1), 9 , 0 , "GAlt") - setTelemetryValue(0x084F, 0, 0, math.floor(telemetry.yaw), 20 , 0 , "Hdg") - setTelemetryValue(0x041F, 0, 0, telemetry.imuTemp, 11 , 0 , "IMUt") - setTelemetryValue(0x060F, 0, 1, telemetry.statusArmed*100, 0 , 0 , "ARM") + -- CRSF + if not conf.enableCRSF then + setTelemetryValue(0x060F, 0, 0, perc, 13 , 0 , "Fuel") + setTelemetryValue(0x020F, 0, 0, telemetry.batt1current+telemetry.batt2current, 2 , 1 , "CURR") + setTelemetryValue(0x084F, 0, 0, math.floor(telemetry.yaw), 20 , 0 , "Hdg") + setTelemetryValue(0x010F, 0, 0, telemetry.homeAlt*10, 9 , 1 , "Alt") + setTelemetryValue(0x083F, 0, 0, telemetry.hSpeed*0.1, 5 , 0 , "GSpd") + end + + setTelemetryValue(0x021F, 0, 0, getNonZeroMin(telemetry.batt1volt,telemetry.batt2volt)*10, 1 , 2 , "VFAS") + setTelemetryValue(0x011F, 0, 0, telemetry.vSpeed, 5 , 1 , "VSpd") + setTelemetryValue(0x082F, 0, 0, math.floor(telemetry.gpsAlt*0.1), 9 , 0 , "GAlt") + setTelemetryValue(0x041F, 0, 0, telemetry.imuTemp, 11 , 0 , "IMUt") + setTelemetryValue(0x060F, 0, 1, telemetry.statusArmed*100, 0 , 0 , "ARM") + end end utils.drawTopBar = function() - lcd.setColor(CUSTOM_COLOR,0x0000) -- black bar - lcd.drawFilledRectangle(0,0, LCD_W, 18, CUSTOM_COLOR) + lcd.drawFilledRectangle(0,0, LCD_W, 18, BLACK) -- frametype and model name - lcd.setColor(CUSTOM_COLOR,0xFFFF) if status.modelString ~= nil then - lcd.drawText(2, 0, status.modelString, CUSTOM_COLOR) + lcd.drawText(2, 0, status.modelString, WHITE) end -- flight time local time = getDateTime() local strtime = string.format("%02d:%02d:%02d",time.hour,time.min,time.sec) - lcd.drawText(LCD_W, 0+4, strtime, SMLSIZE+RIGHT+CUSTOM_COLOR) + lcd.drawText(LCD_W, 0, strtime, SMLSIZE+RIGHT+WHITE) -- RSSI if telemetryEnabled() == false then - lcd.setColor(CUSTOM_COLOR,0xF800) - lcd.drawText(285-23, 0, "NO TELEM", 0 +CUSTOM_COLOR) + lcd.drawText(323-36, 0, "NO TELEM", RED) else - lcd.drawText(285, 0, "RS:", 0 +CUSTOM_COLOR) - lcd.drawText(285 + 30,0, getRSSI(), 0 +CUSTOM_COLOR) + utils.drawRssi() end - lcd.setColor(CUSTOM_COLOR,0xFFFF) -- tx voltage - local vtx = string.format("Tx:%.1fv",getValue(getFieldInfo("tx-voltage").id)) - lcd.drawText(350,0, vtx, 0+CUSTOM_COLOR) + local vtx = string.format("%.1fv",getValue(getFieldInfo("tx-voltage").id)) + lcd.drawText(391,0, vtx, WHITE+SMLSIZE) end local function drawMessageScreen() - for i=0,#status.messages do - if status.messages[(status.messageCount + i) % (#status.messages+1)][2] == 4 then - lcd.setColor(CUSTOM_COLOR,lcd.RGB(255,255,0)) - elseif status.messages[(status.messageCount + i) % (#status.messages+1)][2] < 4 then - --lcd.setColor(CUSTOM_COLOR,0xF800) - lcd.setColor(CUSTOM_COLOR,lcd.RGB(255,70,0)) + local row = 0 + local offsetStart = status.messageOffset + local offsetEnd = math.min(status.messageCount-1, status.messageOffset + 20 - 1) + + for i=offsetStart,offsetEnd do + local colr + if status.messages[i % 200][2] == 4 then + colr = lcd.RGB(255,255,0) + elseif status.messages[i % 200][2] < 4 then + colr = lcd.RGB(255,70,0) else - lcd.setColor(CUSTOM_COLOR,0xFFFF) + colr = WHITE end - lcd.drawText(0,2+13*i, status.messages[(status.messageCount + i) % (#status.messages+1)][1],SMLSIZE+CUSTOM_COLOR) + lcd.drawText(0,4+12*row, status.messages[i % 200][1],SMLSIZE+colr) + row = row+1 end + lcd.drawFilledRectangle(405,0,75,272,lcd.RGB(8,85,140)) -- 0x0AB1 = 0x08558C = blue tone - lcd.setColor(CUSTOM_COLOR,0x0AB1) - lcd.drawFilledRectangle(405,0,75,272,CUSTOM_COLOR) - - lcd.setColor(CUSTOM_COLOR,0xFFFF) -- print info on the right -- CELL if battery[1] * 0.01 < 10 then - lcd.drawNumber(410, 0, battery[1] + 0.5, PREC2+0+MIDSIZE+CUSTOM_COLOR) + lcd.drawNumber(410, 0, battery[1] + 0.5, PREC2+MIDSIZE+WHITE) else - lcd.drawNumber(410, 0, (battery[1] + 0.5)*0.1, PREC1+0+MIDSIZE+CUSTOM_COLOR) + lcd.drawNumber(410, 0, (battery[1] + 0.5)*0.1, PREC1+MIDSIZE+WHITE) end - lcd.drawText(410+50, 1, status.battsource, SMLSIZE+CUSTOM_COLOR) - lcd.drawText(410+50, 11, "V", SMLSIZE+CUSTOM_COLOR) + lcd.drawText(410+50, 1, status.battsource, SMLSIZE+WHITE) + lcd.drawText(410+50, 11, "V", SMLSIZE+WHITE) -- ALT - lcd.setColor(CUSTOM_COLOR,0x0000) - lcd.drawText(410, 25, "Alt("..unitLabel..")", SMLSIZE+0+CUSTOM_COLOR) - lcd.setColor(CUSTOM_COLOR,0xFFFF) - lcd.drawNumber(410,37,telemetry.homeAlt*unitScale,MIDSIZE+CUSTOM_COLOR+0) + lcd.drawText(410, 25, "Alt("..unitLabel..")", SMLSIZE+BLACK) + lcd.drawNumber(410,37,telemetry.homeAlt*unitScale,MIDSIZE+WHITE) -- SPEED - lcd.setColor(CUSTOM_COLOR,0x0000) - lcd.drawText(410, 60, "Spd("..conf.horSpeedLabel..")", SMLSIZE+0+CUSTOM_COLOR) - lcd.setColor(CUSTOM_COLOR,0xFFFF) - lcd.drawNumber(410,72,telemetry.hSpeed*0.1* conf.horSpeedMultiplier,MIDSIZE+CUSTOM_COLOR+0) + lcd.drawText(410, 60, "Spd("..conf.horSpeedLabel..")", SMLSIZE+BLACK) + lcd.drawNumber(410,72,telemetry.hSpeed*0.1* conf.horSpeedMultiplier,MIDSIZE+WHITE) -- VSPEED - lcd.setColor(CUSTOM_COLOR,0x0000) - lcd.drawText(410, 95, "VSI("..conf.vertSpeedLabel..")", SMLSIZE+0+CUSTOM_COLOR) - lcd.setColor(CUSTOM_COLOR,0xFFFF) - lcd.drawNumber(410,107, telemetry.vSpeed*0.1*conf.vertSpeedMultiplier, MIDSIZE+CUSTOM_COLOR+0) + lcd.drawText(410, 95, "VSI("..conf.vertSpeedLabel..")", SMLSIZE+BLACK) + lcd.drawNumber(410,107, telemetry.vSpeed*0.1*conf.vertSpeedMultiplier, MIDSIZE+WHITE) -- DIST - lcd.setColor(CUSTOM_COLOR,0x0000) - lcd.drawText(410, 130, "Dist("..unitLabel..")", SMLSIZE+0+CUSTOM_COLOR) - lcd.setColor(CUSTOM_COLOR,0xFFFF) - lcd.drawNumber(410, 142, telemetry.homeDist*unitScale, MIDSIZE+0+CUSTOM_COLOR) + if getGeneralSettings().imperial == 0 then + -- metric, special handling for km + local dist = telemetry.homeDist*unitScale + if dist > 9999 then + -- add "k" for kilo + lcd.drawText(410, 130, "Dist(k"..unitLabel..")", SMLSIZE+BLACK) + lcd.drawNumber(410, 142, telemetry.homeDist*unitScale/1000, MIDSIZE+WHITE) + else + lcd.drawText(410, 130, "Dist("..unitLabel..")", SMLSIZE+BLACK) + lcd.drawNumber(410, 142, telemetry.homeDist*unitScale, MIDSIZE+WHITE) + end + else + -- imperial + lcd.drawText(410, 130, "Dist("..unitLabel..")", SMLSIZE+BLACK) + lcd.drawNumber(410, 142, telemetry.homeDist*unitScale, MIDSIZE+WHITE) + end -- HDG - lcd.setColor(CUSTOM_COLOR,0x0000) - lcd.drawText(410, 165, "Heading", SMLSIZE+0+CUSTOM_COLOR) - lcd.setColor(CUSTOM_COLOR,0xFFFF) - lcd.drawNumber(410, 177, telemetry.yaw, MIDSIZE+0+CUSTOM_COLOR) + lcd.drawText(410, 165, "Heading", SMLSIZE+BLACK) + lcd.drawNumber(410, 177, telemetry.yaw, MIDSIZE+WHITE) -- HOMEDIR - lcd.setColor(CUSTOM_COLOR,0xFE60) - drawLib.drawRArrow(442,235,22,math.floor(telemetry.homeAngle - telemetry.yaw),CUSTOM_COLOR)--HomeDirection(telemetry) + drawLib.drawRArrow(442,235,22,math.floor(telemetry.homeAngle - telemetry.yaw),lcd.RGB(255,206,0)) -- HomeDirection(telemetry) 0xFE60 = 0xFFCE00 = yellow + -- AUTOSCROLL + local colr + if status.messageAutoScroll == true then + colr = WHITE + else + colr = lcd.RGB(255,206,0) -- 0xFE60 = FFCE00 = yellow tone + end + local maxPages = tonumber(math.ceil((#status.messages+1)/20)) + local currentPage = 1+tonumber(maxPages - (status.messageCount - status.messageOffset)/20) + + lcd.drawText(LCD_W-2, LCD_H-16, string.format("%d/%d",currentPage,maxPages), SMLSIZE+colr+RIGHT) + lcd.drawLine(0,LCD_H-20,405,LCD_H-20,SOLID,lcd.RGB(123,121,123)) -- 0x7BCF = 0x7B797B = grey + + if status.strFlightMode ~= nil then + lcd.drawText(0,LCD_H-20,status.strFlightMode,WHITE) + lcd.drawText(0,LCD_H-20,status.strFlightMode,WHITE) + end + lcd.drawTimer(402, LCD_H-20, model.getTimer(2).value, WHITE+RIGHT) end --------------------------------- @@ -1466,9 +2102,6 @@ local function loadFlightModes() elseif frameTypes[telemetry.frameType] == "r" or frameTypes[telemetry.frameType] == "b" then frame = utils.doLibrary("rover") end - collectgarbage() - collectgarbage() - maxmem = 0 end end @@ -1506,20 +2139,31 @@ local function checkEvents(celm) utils.checkAlarm(conf.timerAlert,status.flightTime,6,1,"timealert",conf.timerAlert) end + --[[ -- default is use battery 1 local capacity = getBatt1Capacity() local mah = telemetry.batt1mah -- only if dual battery has been detected use battery 2 - if (status.batt2sources.fc or status.batt2sources.vs) and conf.battConf == 1 then + if (status.batt2sources.fc or status.batt2sources.vs) and conf.battConf == BATTCONF_PARALLEL then capacity = capacity + getBatt2Capacity() mah = mah + telemetry.batt2mah end - - if (capacity > 0) then - status.batLevel = (1 - (mah/capacity))*100 + --]] + if conf.enableBattPercByVoltage == true then + -- discharge curve is based on battery under load, when motors are disarmed + -- cellvoltage needs to be corrected by subtracting the "under load" voltage drop + if telemetry.statusArmed == 1 then + status.batLevel = utils.getBattPercByCell(celm*0.01) + else + status.batLevel = utils.getBattPercByCell((celm*0.01)-0.15) + end + else + if (battery[13] > 0) then + status.batLevel = (1 - (battery[10]/battery[13]))*100 else status.batLevel = 99 end + end for l=1,13 do -- trigger alarm as as soon as it falls below level + 1 (i.e 91%,81%,71%,...) @@ -1536,6 +2180,7 @@ local function checkEvents(celm) -- reset home on arming telemetry.homeLat = nil telemetry.homeLon = nil + status.homeGood = false elseif telemetry.statusArmed == 0 and status.lastStatusArmed == 1 then status.lastStatusArmed = telemetry.statusArmed utils.playSound("disarmed") @@ -1551,9 +2196,16 @@ local function checkEvents(celm) -- home detecting code if telemetry.homeLat == nil then - if telemetry.gpsStatus > 2 and telemetry.homeAngle ~= -1 then - telemetry.homeLat, telemetry.homeLon = utils.getHomeFromAngleAndDistance(telemetry) - end + if ((status.homelat ~= nil) and (status.homelon ~= nil)) then + -- with MavSDK we directly get the lat and lon values, can directly assign them + telemetry.homeLat = status.homelat + telemetry.homeLon = status.homelon + else + -- with FrSky PT we only get home angle and home distance, need to calculate lat and lon + if telemetry.gpsStatus > 2 and telemetry.homeAngle ~= -1 then + telemetry.homeLat, telemetry.homeLon = utils.getHomeFromAngleAndDistance(telemetry) + end + end end -- flightmode transitions have a grace period to prevent unwanted flightmode call out @@ -1581,55 +2233,145 @@ local function checkCellVoltage(celm) if status.battLevel2 == false then status.battLevel2 = alarms[8][1] end end -local function cycleBatteryInfo() - if status.showDualBattery == false and (status.batt2sources.fc or status.batt2sources.vs) and conf.battConf ~= 2 then - status.showDualBattery = true - return - end - status.battsource = status.battsource == "vs" and "fc" or "vs" -end -------------------------------------------------------------------------------- -- MAIN LOOP -------------------------------------------------------------------------------- --- + local bgclock = 0 +-- telemetry pop function, either SPort or CRSF +local telemetryPop = nil + +local function crossfirePop() + local command, data = crossfireTelemetryPop() + if (command == 0x80 or command == 0x7F) and data ~= nil then + -- actual payload starts at data[2] + if #data >= 7 and data[1] == 0xF0 then + local app_id = bit32.lshift(data[3],8) + data[2] + local value = bit32.lshift(data[7],24) + bit32.lshift(data[6],16) + bit32.lshift(data[5],8) + data[4] + return 0x00, 0x10, app_id, value + elseif #data > 4 and data[1] == 0xF1 then + local severity = data[2] + -- copy the terminator as well + for i=3,#data + do + status.msgBuffer = status.msgBuffer .. string.char(data[i]) + -- hash support + updateHash(data[i]) + end + utils.pushMessage(severity, status.msgBuffer) + playHash() -- hash audio support + resetHash() -- hash reset + status.msgBuffer = nil + status.msgBuffer = "" + elseif #data > 48 and data[1] == 0xF2 then + -- passthrough array + local app_id, value + for i=0,data[2]-1 + do + app_id = bit32.lshift(data[4+(6*i)],8) + data[3+(6*i)] + value = bit32.lshift(data[8+(6*i)],24) + bit32.lshift(data[7+(6*i)],16) + bit32.lshift(data[6+(6*i)],8) + data[5+(6*i)] + --utils.pushMessage(7,string.format("CRSF:%d - %04X:%08X",i, app_id, value), true) + processFrSkyPTtelemetry(app_id, value) + end + status.noTelemetryData = 0 + status.hideNoTelemetry = true + end + end + return nil, nil ,nil ,nil +end + +local function loadConfig(init) + -- load menu library + local menuLib = utils.doLibrary("../"..menuLibFile) + menuLib.loadConfig(conf) + -- ok configuration loaded + status.battsource = conf.defaultBattSource + -- CRSF or SPORT? + telemetryPop = sportTelemetryPop + utils.drawRssi = drawRssi + if conf.enableCRSF then + telemetryPop = crossfirePop + utils.drawRssi = drawRssiCRSF + end + -- do not reset layout on boot + if init == nil then + resetLayoutPending = true + resetLayoutPhase = -1 + end + status.mapZoomLevel=conf.mapProvider == 1 and conf.mapZoomMin or conf.mapZoomMax + loadConfigPending = false +end + ------------------------------- -- running at 20Hz (every 50ms) ------------------------------- -local timer2Hz = getTime() +local timerPage = getTime() +local timerWheel = getTime() + local function backgroundTasks(myWidget,telemetryLoops) - -- FAST: this runs at 60Hz (every 16ms) - for i=1,telemetryLoops - do - local sensor_id,frame_id,data_id,value = sportTelemetryPop() - - if frame_id == 0x10 then - status.noTelemetryData = 0 - -- no telemetry dialog only shown once - status.hideNoTelemetry = true - processTelemetry(data_id,value) + -- don't process telemetry while resetting to prevent CPU kill + if resetPending == false and resetLayoutPending == false and loadConfigPending == false then + if conf.enableMavSDK then + if mavsdk ~= nil then -- in order not for the script to get disabled when running on non OlliW OpenTX firmware + if mavsdk.isReceiving() then + status.noTelemetryData = 0 + -- no telemetry dialog only shown once + status.hideNoTelemetry = true + processMavSDKfastUpdate() + end + end + else + for i=1,telemetryLoops + do + local sensor_id,frame_id,data_id,value = telemetryPop() + + if frame_id == 0x10 then + status.noTelemetryData = 0 + -- no telemetry dialog only shown once + status.hideNoTelemetry = true + processFrSkyPTtelemetry(data_id,value) + end + end end end -- SLOW: this runs around 2.5Hz if bgclock % 2 == 1 then calcFlightTime() - -- update gps telemetry data - local gpsData = getValue("GPS") + + if conf.enableMavSDK then + if mavsdk ~= nil then -- in order not for the script to get disabled when running on non OlliW OpenTX firmware + if mavsdk.isReceiving() then + processMavSDKslowUpdate() -- most MAVLink messages can be processed with low update rate, as we are only interested on latest values + end + end + else + -- FrSky PT + -- update gps telemetry data + local gpsData = getValue("GPS") - if type(gpsData) == "table" and gpsData.lat ~= nil and gpsData.lon ~= nil then - telemetry.lat = gpsData.lat - telemetry.lon = gpsData.lon + if type(gpsData) == "table" and gpsData.lat ~= nil and gpsData.lon ~= nil then + telemetry.lat = gpsData.lat + telemetry.lon = gpsData.lon + end end - --export OpenTX sensor values + + -- export OpenTX sensor values setSensorValues() -- update total distance as often as po utils.updateTotalDist() - if getTime() - timer2Hz > 50 then + -- handle page emulation + if getTime() - timerPage > 50 then status.screenTogglePage = utils.getScreenTogglePage(myWidget,conf,status) - status.mapZoomLevel = utils.getMapZoomLevel(myWidget,conf,status) - timer2Hz = getTime() + timerPage = getTime() + end + -- handle wheel emulation + if getTime() - timerWheel > 200 then + local chValue = getValue(conf.screenWheelChannelId) + status.mapZoomLevel = utils.getMapZoomLevel(myWidget,conf,status,chValue) + status.messageOffset = utils.getMessageOffset(myWidget,conf,status,chValue) + timerWheel = getTime() end -- flight mode @@ -1651,10 +2393,15 @@ local function backgroundTasks(myWidget,telemetryLoops) status.modelString = fn..": "..info.name end end - end + + if conf.enableCRSF then + -- take the best signal and apply same algo used by ardupilot to estimate a 0-100 rssi value + -- rssi = roundf((1.0f - (rssi_dbm - 50.0f) / 70.0f) * 255.0f); + status.rssiCRSF = math.min(100, math.floor(0.5 + ((1-(math.min(getValue("1RSS"), getValue("2RSS")) - 50)/70)*100))) + end + end -- SLOWER: this runs around 1.25Hz but not when the previous block runs - -- because bgclock%4 == 0 is always different than bgclock%2==1 if bgclock % 4 == 0 then -- update battery calcBattery() @@ -1662,9 +2409,12 @@ local function backgroundTasks(myWidget,telemetryLoops) local count1,count2 = calcCellCount() local cellVoltage = 0 - if conf.battConf == 3 then - -- alarms are based on battery 1 + if conf.battConf == 3 or conf.battConf == 5 then + -- voltage alarms are based on battery 1 cellVoltage = 100*(status.battsource == "vs" and status.cell1min or status.cell1sumFC/count1) + elseif conf.battConf == 4 or conf.battConf == 6 then + -- voltage alarms are based on battery 2 + cellVoltage = 100*(status.battsource == "vs" and status.cell2min or status.cell2sumFC/count2) else -- alarms are based on battery 1 and battery 2 cellVoltage = 100*(status.battsource == "vs" and getNonZeroMin(status.cell1min,status.cell2min) or getNonZeroMin(status.cell1sumFC/count1,status.cell2sumFC/count2)) @@ -1676,13 +2426,26 @@ local function backgroundTasks(myWidget,telemetryLoops) if cellVoltage > 0 then checkCellVoltage(cellVoltage) end + + local batcurrent = 0 + + if conf.battConf == 1 then + batcurrent = telemetry.batt1current + telemetry.batt2current + elseif conf.battConf == 2 or conf.battConf == 3 or conf.battConf == 5 then + batcurrent = telemetry.batt1current + elseif conf.battConf == 4 or conf.battConf == 6 then + batcurrent = telemetry.batt2current + end -- aggregate value - minmaxValues[7] = math.max((conf.battConf == 3 and telemetry.batt1current or telemetry.batt1current+telemetry.batt2current), minmaxValues[7]) + minmaxValues[7] = math.max(batcurrent, minmaxValues[7]) -- indipendent values minmaxValues[8] = math.max(telemetry.batt1current,minmaxValues[8]) minmaxValues[9] = math.max(telemetry.batt2current,minmaxValues[9]) - + end + + -- SLOWER: this runs around 1.25Hz but not when the previous block runs + if bgclock % 4 == 2 then -- reset backlight panel if (model.getGlobalVariable(8,0) > 0 and getTime()/100 - backlightLastTime > 5) then model.setGlobalVariable(8,0,0) @@ -1691,7 +2454,7 @@ local function backgroundTasks(myWidget,telemetryLoops) if (model.getGlobalVariable(8,8) > 0) then loadConfig() model.setGlobalVariable(8,8,0) - end + end -- call custom panel background functions if leftPanel ~= nil then leftPanel.background(myWidget,conf,telemetry,status,utils) @@ -1702,37 +2465,47 @@ local function backgroundTasks(myWidget,telemetryLoops) if rightPanel ~= nil then rightPanel.background(myWidget,conf,telemetry,status,utils) end - - bgclock = 0 + + if telemetry.lat ~= nil then + if conf.gpsFormat == 1 then + -- DMS + telemetry.strLat = utils.decToDMSFull(telemetry.lat) + telemetry.strLon = utils.decToDMSFull(telemetry.lon, telemetry.lat) + else + -- decimal + telemetry.strLat = string.format("%.06f", telemetry.lat) + telemetry.strLon = string.format("%.06f", telemetry.lon) + end + end end - bgclock = bgclock+1 + + bgclock = (bgclock%4)+1 + -- blinking support if (getTime() - blinktime) > 65 then blinkon = not blinkon blinktime = getTime() end - collectgarbage() - collectgarbage() return 0 end -local showSensorPage = false -local showMessages = false - local function init() -- initialize flight timer model.setTimer(2,{mode=0}) model.setTimer(2,{value=0}) --- load configuration at boot and only refresh if GV(8,8) = 1 - loadConfig() + -- load configuration at boot and only refresh if GV(8,8) = 1 + loadConfig(true) + -- ok configuration loaded + status.battsource = conf.defaultBattSource -- load draw library drawLib = utils.doLibrary(drawLibFile) - currentModel = model.getInfo().name -- load custom sensors utils.loadCustomSensors() + -- load battery config + utils.loadBatteryConfigFile() -- ok done - utils.pushMessage(7,"Yaapu Telemetry Widget 1.8.1") + utils.pushMessage(7,"Yaapu v1.9.3b4 (OlliW MavSDK support by Risto)") utils.playSound("yaapu") -- fix for generalsettings lazy loading... unitScale = getGeneralSettings().imperial == 0 and 1 or 3.28084 @@ -1761,7 +2534,7 @@ local function create(zone, options) -- all local vars are shared between widget instances -- init() needs to be called only once! if initDone == 0 then - init() + init(zone) initDone = 1 end -- @@ -1774,13 +2547,6 @@ local function update(myWidget, options) loadConfig() end -local function fullScreenRequired(myWidget) - lcd.setColor(CUSTOM_COLOR,lcd.RGB(255, 0, 0)) - lcd.drawText(myWidget.zone.x,myWidget.zone.y,"Yaapu requires",SMLSIZE+CUSTOM_COLOR) - lcd.drawText(myWidget.zone.x,myWidget.zone.y+16,"full screen",SMLSIZE+CUSTOM_COLOR) -end - - utils.getScreenTogglePage = function(myWidget,conf,status) local screenChValue = status.hideNoTelemetry == false and 0 or getValue(conf.screenToggleChannelId) @@ -1798,27 +2564,67 @@ utils.getScreenTogglePage = function(myWidget,conf,status) return myWidget.options.page end -utils.getMapZoomLevel = function(myWidget,conf,status) - local chValue = getValue(conf.mapToggleChannelId) - - if conf.mapToggleChannelId > -1 then - if chValue >= 600 then - return conf.mapZoomLevel + 2 + +utils.getMessageOffset = function(myWidget,conf,status,chValue) + if currentPage ~= 2 and status.screenTogglePage ~= 2 then + return status.messageOffset + end + if conf.screenWheelChannelId > -1 then + -- SW up + if chValue < -600 then + local offset = math.min(status.messageOffset + 20, math.max(0,status.messageCount - 20)) + if offset >= (status.messageCount - 20) then + status.messageAutoScroll = true + else + status.messageAutoScroll = false + end + return offset end - - if chValue > - 600 and chValue < 600 then - return conf.mapZoomLevel + 1 + -- SW down + if chValue > 600 then + status.messageAutoScroll = false + return math.max(0,math.max(status.messageCount - 200,status.messageOffset - 20)) end end - return conf.mapZoomLevel + return status.messageOffset +end + +utils.getMapZoomLevel = function(myWidget,conf,status,chValue) + if currentPage ~= 5 and status.screenTogglePage ~= 5 then + return status.mapZoomLevel + end + + if conf.screenWheelChannelId > -1 then + -- SW up (increase zoom level) + if chValue < -600 then + if conf.mapProvider == 1 then + return status.mapZoomLevel > conf.mapZoomMin and status.mapZoomLevel - 1 or status.mapZoomLevel + end + return status.mapZoomLevel < conf.mapZoomMax and status.mapZoomLevel + 1 or status.mapZoomLevel + end + -- SW down (decrease zoom level) + if chValue > 600 then + if conf.mapProvider == 1 then + return status.mapZoomLevel < conf.mapZoomMax and status.mapZoomLevel + 1 or status.mapZoomLevel + end + return status.mapZoomLevel > conf.mapZoomMin and status.mapZoomLevel - 1 or status.mapZoomLevel + end + end + -- SW mid + return status.mapZoomLevel end -- called when widget instance page changes local function onChangePage(myWidget) + if myWidget.options.page == 3 then + -- when page 3 goes to foreground show minmax values + status.showMinMaxValues = true + elseif myWidget.options.page == 4 then + -- when page 4 goes to foreground show dual battery view + status.showDualBattery = true + end -- reset HUD counters myWidget.vars.hudcounter = 0 - collectgarbage() - collectgarbage() end -- Called when script is hidden @20Hz @@ -1826,7 +2632,7 @@ local function background(myWidget) -- when page 1 goes to background run bg tasks if myWidget.options.page == 1 then -- run bg tasks - backgroundTasks(myWidget,12) + backgroundTasks(myWidget,15) return end -- when page 3 goes to background hide minmax values @@ -1842,106 +2648,127 @@ local function background(myWidget) end local slowTimer = getTime() +local fastTimer = getTime() + +local function fullScreenRequired(myWidget) + lcd.drawText(myWidget.zone.x,myWidget.zone.y,"Yaapu requires",SMLSIZE+RED) + lcd.drawText(myWidget.zone.x,myWidget.zone.y+16,"full screen",SMLSIZE+RED) +end + + +local function loadLayout() + -- Layout start + if leftPanel == nil and loadCycle == 1 then + leftPanel = utils.doLibrary(conf.leftPanelFilename) + end + + if centerPanel == nil and loadCycle == 2 then + centerPanel = utils.doLibrary(conf.centerPanelFilename) + end + + if rightPanel == nil and loadCycle == 4 then + rightPanel = utils.doLibrary(conf.rightPanelFilename) + end + + if layout == nil and loadCycle == 6 and leftPanel ~= nil and centerPanel ~= nil and rightPanel ~= nil then + layout = utils.doLibrary(conf.widgetLayoutFilename) + end + + lcd.drawFilledRectangle(88,74, 304, 84, WHITE) + lcd.drawFilledRectangle(90,76, 300, 80, lcd.RGB(16,20,25)) -- 0x10A3 = 0x101419 = almost black + lcd.drawText(120, 95, "loading layout...", DBLSIZE+WHITE) +end + +local function loadMapLayout() + -- Layout start + if loadCycle == 3 then + mapLayout = utils.doLibrary("layout_map") + end +end + +local function drawInitialingMsg() + lcd.drawFilledRectangle(88,74, 304, 84, WHITE) + lcd.drawFilledRectangle(90,76, 300, 80, lcd.RGB(16,20,25)) -- 0x10A3 = 0x101419 = almost black + lcd.drawText(155, 95, "initializing...", DBLSIZE+WHITE) +end + +local fgclock = 0 -- Called when script is visible local function drawFullScreen(myWidget) - if getTime() - slowTimer > 50 then - -- reset phase 2 if reset pending - if resetPending == true then - reset() + -- when page 1 goes to foreground run bg tasks + if myWidget.options.page == 1 then + -- run bg tasks only if we are not resetting, this prevent cpu limit kill + if not (resetPending or resetLayoutPending) then + backgroundTasks(myWidget,15) + end + end + -- TODO! lcd.setColor(CUSTOM_COLOR, 0x0AB1) -- 0x0AB1 = 0x08558C = lcd.RGB(8, 85, 140) + + if not (resetPending or resetLayoutPending or loadConfigPending) then + if myWidget.options.page == 2 or status.screenTogglePage == 2 then + ------------------------------------ + -- Widget Page 2: MESSAGES + ------------------------------------ + -- message history has black background + lcd.clear(BLACK) + + drawMessageScreen() + elseif myWidget.options.page == 5 or status.screenTogglePage == 5 then + ------------------------------------ + -- Widget Page 5: MAP + ------------------------------------ + lcd.clear(lcd.RGB(8, 85, 140)) + + if mapLayout ~= nil then + mapLayout.draw(myWidget,drawLib,conf,telemetry,status,battery,alarms,frame,utils,customSensors,gpsStatuses,leftPanel,centerPanel,rightPanel) + else + loadMapLayout() + end else - -- frametype and model name - local info = model.getInfo() - -- model change event - if currentModel ~= info.name then - currentModel = info.name - -- trigger reset phase 1 - reset() + ------------------------------------ + -- Widget Page 1: HUD + ------------------------------------ + lcd.clear(lcd.RGB(8, 85, 140)) + if layout ~= nil then + layout.draw(myWidget,drawLib,conf,telemetry,status,battery,alarms,frame,utils,customSensors,gpsStatuses,leftPanel,centerPanel,rightPanel) + else + loadLayout(); end + end + else + -- not ready to draw yet + drawInitialingMsg() + end + + if fgclock % 2 == 1 then + -- reset phase 2 if reset pending + if resetLayoutPending == true then + resetLayouts() + elseif resetPending == true then + reset() end - - if myWidget.options.page == 3 then - -- when page 3 goes to foreground show minmax values - status.showMinMaxValues = true - elseif myWidget.options.page == 4 then - -- when page 4 goes to foreground show dual battery view - status.showDualBattery = true - end - - -- check if current widget page changed + end + + if fgclock % 4 == 0 then if currentPage ~= myWidget.options.page then currentPage = myWidget.options.page onChangePage(myWidget) end - - slowTimer = getTime() end - -- when page 1 goes to foreground run bg tasks - if myWidget.options.page == 1 then - -- run bg tasks only if we are not resetting, this prevent cpu limit kill - if resetPending == false then - backgroundTasks(myWidget,12) + if fgclock % 8 == 2 then + -- frametype and model name + local info = model.getInfo() + -- model change event + if currentModel ~= info.name then + currentModel = info.name + -- trigger reset + triggerReset() end end - -- + fgclock = (fgclock % 8) + 1 - lcd.setColor(CUSTOM_COLOR, 0x0AB1) - if myWidget.options.page == 2 or status.screenTogglePage == 2 then - ------------------------------------ - -- Widget Page 2 is message history - ------------------------------------ - -- message history has black background - lcd.setColor(CUSTOM_COLOR, 0x0000) - lcd.clear(CUSTOM_COLOR) - - drawMessageScreen() - elseif myWidget.options.page == 5 or status.screenTogglePage == 5 then - ------------------------------------ - -- Widget Page 5 is map - ------------------------------------ - lcd.clear(CUSTOM_COLOR) - - if mapLayout ~= nil then - mapLayout.draw(myWidget,drawLib,conf,telemetry,status,battery,alarms,frame,utils,customSensors,gpsStatuses,leftPanel,centerPanel,rightPanel) - else - -- Layout start - if loadCycle == 3 then - mapLayout = utils.doLibrary("layout_map") - end - end - else - lcd.clear(CUSTOM_COLOR) - - if layout ~= nil then - layout.draw(myWidget,drawLib,conf,telemetry,status,battery,alarms,frame,utils,customSensors,gpsStatuses,leftPanel,centerPanel,rightPanel) - else - -- Layout start - if leftPanel == nil and loadCycle == 1 then - leftPanel = utils.doLibrary(conf.leftPanelFilename) - end - - if centerPanel == nil and loadCycle == 2 then - centerPanel = utils.doLibrary(conf.centerPanelFilename) - end - - if rightPanel == nil and loadCycle == 4 then - rightPanel = utils.doLibrary(conf.rightPanelFilename) - end - - if layout == nil and loadCycle == 6 and leftPanel ~= nil and centerPanel ~= nil and rightPanel ~= nil then - layout = utils.doLibrary(conf.widgetLayoutFilename) - end - - lcd.setColor(CUSTOM_COLOR,0xFFFF) - lcd.drawFilledRectangle(88,74, 304, 84, CUSTOM_COLOR) - lcd.setColor(CUSTOM_COLOR,0x10A3) - lcd.drawFilledRectangle(90,76, 300, 80, CUSTOM_COLOR) - lcd.setColor(CUSTOM_COLOR,0xFFFF) - lcd.drawText(155, 95, "loading...", DBLSIZE+CUSTOM_COLOR) - end - -- Layout END - end -- no telemetry/minmax outer box if telemetryEnabled() == false then -- no telemetry inner box @@ -1954,19 +2781,28 @@ local function drawFullScreen(myWidget) utils.drawBlinkBitmap("minmax",0,0) end end - drawLib.drawFailsafe(telemetry,utils) + + if conf.enableMavSDK and mavsdk == nil then + -- MavSDK enabled in configuration, but OpenTX firmware without MavSDK support + drawLib.drawNoMavSDK() + end + + drawLib.drawFailsafe(telemetry,utils); loadCycle=(loadCycle+1)%8 - collectgarbage() - collectgarbage() +end + +-- are we full screen? if +local function drawScreen(myWidget) + if myWidget.zone.h < 250 then + fullScreenRequired(myWidget) + return + end + drawFullScreen(myWidget) end function refresh(myWidget) - if myWidget.zone.h < 250 then - fullScreenRequired(myWidget) - return - end - drawFullScreen(myWidget) + drawScreen(myWidget) end return { name="Yaapu", options=options, create=create, update=update, background=background, refresh=refresh } diff --git a/HORUS/TOOLS/gmapresizetool.zip b/HORUS/TOOLS/gmapresizetool.zip new file mode 100644 index 00000000..a8a4d255 Binary files /dev/null and b/HORUS/TOOLS/gmapresizetool.zip differ diff --git a/README.md b/README.md index cd2d648c..e8491411 100644 --- a/README.md +++ b/README.md @@ -343,12 +343,13 @@ Open an issue on github.com - [Jumper](https://www.jumper.xyz) (Jumper T16 version sponsor) - [Frsky](https://www.frsky-rc.com/) (Taranis X9D 2019 sponsor) - [Radiomaster](https://www.radiomasterrc.com/) (TX16S sponsor) + - [TBS](https://www.team-blacksheep.com) (Crossfire version sponsor) - Craft&Theory for the passthrough protocol ## Donation This project is free and will always be. -If you like it you can support it by making a donation! +If you like it you can support it by making a donation to the original author Yaapu: [![donate](https://user-images.githubusercontent.com/30294218/61724877-16fa7a80-ad6f-11e9-80de-9771e0b820ae.png)](https://paypal.me/yaapu) diff --git a/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu/alt7_view.luac b/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu/alt7_view.luac index 9ac5249a..0dcba203 100644 Binary files a/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu/alt7_view.luac and b/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu/alt7_view.luac differ diff --git a/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu/alt9_view.luac b/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu/alt9_view.luac index 936d042f..6a8aab11 100644 Binary files a/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu/alt9_view.luac and b/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu/alt9_view.luac differ diff --git a/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu/copter.luac b/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu/copter.luac index f517670b..44ef7dad 100644 Binary files a/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu/copter.luac and b/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu/copter.luac differ diff --git a/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu/copter_px4.luac b/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu/copter_px4.luac index 13dccdaa..be235e96 100644 Binary files a/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu/copter_px4.luac and b/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu/copter_px4.luac differ diff --git a/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu/draw7.luac b/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu/draw7.luac index 368c0b73..16685883 100644 Binary files a/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu/draw7.luac and b/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu/draw7.luac differ diff --git a/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu/draw9.luac b/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu/draw9.luac index baee2259..c6f64e0d 100644 Binary files a/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu/draw9.luac and b/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu/draw9.luac differ diff --git a/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu/hud7.luac b/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu/hud7.luac index 874c5907..ac89d50d 100644 Binary files a/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu/hud7.luac and b/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu/hud7.luac differ diff --git a/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu/hud9.luac b/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu/hud9.luac index 2972e284..26629fea 100644 Binary files a/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu/hud9.luac and b/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu/hud9.luac differ diff --git a/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu/left7.luac b/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu/left7.luac index a5a3b24b..16a286f0 100644 Binary files a/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu/left7.luac and b/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu/left7.luac differ diff --git a/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu/left7_m2f.luac b/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu/left7_m2f.luac index a92acdca..e0d28db8 100644 Binary files a/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu/left7_m2f.luac and b/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu/left7_m2f.luac differ diff --git a/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu/left9.luac b/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu/left9.luac index f8d66c38..891d4222 100644 Binary files a/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu/left9.luac and b/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu/left9.luac differ diff --git a/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu/left9_m2f.luac b/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu/left9_m2f.luac index 9efe3449..d684099d 100644 Binary files a/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu/left9_m2f.luac and b/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu/left9_m2f.luac differ diff --git a/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu/menu7.luac b/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu/menu7.luac index 5f16316a..89697027 100644 Binary files a/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu/menu7.luac and b/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu/menu7.luac differ diff --git a/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu/menu9.luac b/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu/menu9.luac index d63165e9..080a93af 100644 Binary files a/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu/menu9.luac and b/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu/menu9.luac differ diff --git a/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu/plane.luac b/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu/plane.luac index bd67a7c3..ccd5dffa 100644 Binary files a/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu/plane.luac and b/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu/plane.luac differ diff --git a/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu/plane_px4.luac b/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu/plane_px4.luac index 13dccdaa..be235e96 100644 Binary files a/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu/plane_px4.luac and b/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu/plane_px4.luac differ diff --git a/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu/reset.luac b/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu/reset.luac index 7e221192..3fe572a1 100644 Binary files a/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu/reset.luac and b/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu/reset.luac differ diff --git a/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu/right7.luac b/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu/right7.luac index 6f505610..fdc2a7dc 100644 Binary files a/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu/right7.luac and b/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu/right7.luac differ diff --git a/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu/right9.luac b/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu/right9.luac index f1b665a4..1c4685fd 100644 Binary files a/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu/right9.luac and b/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu/right9.luac differ diff --git a/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu7.lua b/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu7.lua index 58ee4991..ab621f93 100644 Binary files a/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu7.lua and b/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu7.lua differ diff --git a/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu7.luac b/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu7.luac index 58ee4991..ab621f93 100644 Binary files a/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu7.luac and b/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu7.luac differ diff --git a/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu9.lua b/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu9.lua index 9f32544d..590cf18a 100644 Binary files a/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu9.lua and b/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu9.lua differ diff --git a/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu9.luac b/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu9.luac index 9f32544d..590cf18a 100644 Binary files a/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu9.luac and b/TARANIS/SD/SCRIPTS/TELEMETRY/yaapu9.luac differ diff --git a/TARANIS/SD/SOUNDS/yaapu0/de/qautotune.missing b/TARANIS/SD/SOUNDS/yaapu0/de/qautotune.missing new file mode 100644 index 00000000..e69de29b diff --git a/TARANIS/SD/SOUNDS/yaapu0/de/qstabilize.missing b/TARANIS/SD/SOUNDS/yaapu0/de/qstabilize.missing new file mode 100644 index 00000000..e69de29b diff --git a/TARANIS/SD/SOUNDS/yaapu0/de/qstabilize.wav b/TARANIS/SD/SOUNDS/yaapu0/de/qstabilize.wav deleted file mode 100644 index 1a00a662..00000000 Binary files a/TARANIS/SD/SOUNDS/yaapu0/de/qstabilize.wav and /dev/null differ diff --git a/TARANIS/SD/SOUNDS/yaapu0/de/zigzag.missing b/TARANIS/SD/SOUNDS/yaapu0/de/zigzag.missing new file mode 100644 index 00000000..e69de29b diff --git a/TARANIS/SD/SOUNDS/yaapu0/en/1008001424.wav b/TARANIS/SD/SOUNDS/yaapu0/en/1008001424.wav index 4dbeb9b2..e67f0f19 100644 Binary files a/TARANIS/SD/SOUNDS/yaapu0/en/1008001424.wav and b/TARANIS/SD/SOUNDS/yaapu0/en/1008001424.wav differ diff --git a/TARANIS/SD/SOUNDS/yaapu0/en/116655276.wav b/TARANIS/SD/SOUNDS/yaapu0/en/116655276.wav index 859868cd..48cb155f 100644 Binary files a/TARANIS/SD/SOUNDS/yaapu0/en/116655276.wav and b/TARANIS/SD/SOUNDS/yaapu0/en/116655276.wav differ diff --git a/TARANIS/SD/SOUNDS/yaapu0/en/1204090832.wav b/TARANIS/SD/SOUNDS/yaapu0/en/1204090832.wav index b06f6ead..84126d80 100644 Binary files a/TARANIS/SD/SOUNDS/yaapu0/en/1204090832.wav and b/TARANIS/SD/SOUNDS/yaapu0/en/1204090832.wav differ diff --git a/TARANIS/SD/SOUNDS/yaapu0/en/1249672288.wav b/TARANIS/SD/SOUNDS/yaapu0/en/1249672288.wav index 4fd515c4..81ccac87 100644 Binary files a/TARANIS/SD/SOUNDS/yaapu0/en/1249672288.wav and b/TARANIS/SD/SOUNDS/yaapu0/en/1249672288.wav differ diff --git a/TARANIS/SD/SOUNDS/yaapu0/en/1309405592.wav b/TARANIS/SD/SOUNDS/yaapu0/en/1309405592.wav index c94bc715..a0c908a3 100644 Binary files a/TARANIS/SD/SOUNDS/yaapu0/en/1309405592.wav and b/TARANIS/SD/SOUNDS/yaapu0/en/1309405592.wav differ diff --git a/TARANIS/SD/SOUNDS/yaapu0/en/1396289024.wav b/TARANIS/SD/SOUNDS/yaapu0/en/1396289024.wav index cf13b872..01a8f4bc 100644 Binary files a/TARANIS/SD/SOUNDS/yaapu0/en/1396289024.wav and b/TARANIS/SD/SOUNDS/yaapu0/en/1396289024.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/en/1412704816.wav b/TARANIS/SD/SOUNDS/yaapu0/en/1412704816.wav similarity index 100% rename from HORUS/SD/SOUNDS/yaapu0/en/1412704816.wav rename to TARANIS/SD/SOUNDS/yaapu0/en/1412704816.wav diff --git a/HORUS/SD/SOUNDS/yaapu0/en/1457255568.wav b/TARANIS/SD/SOUNDS/yaapu0/en/1457255568.wav similarity index 100% rename from HORUS/SD/SOUNDS/yaapu0/en/1457255568.wav rename to TARANIS/SD/SOUNDS/yaapu0/en/1457255568.wav diff --git a/HORUS/SD/SOUNDS/yaapu0/en/1481434156.wav b/TARANIS/SD/SOUNDS/yaapu0/en/1481434156.wav similarity index 100% rename from HORUS/SD/SOUNDS/yaapu0/en/1481434156.wav rename to TARANIS/SD/SOUNDS/yaapu0/en/1481434156.wav diff --git a/TARANIS/SD/SOUNDS/yaapu0/en/1535290648.wav b/TARANIS/SD/SOUNDS/yaapu0/en/1535290648.wav index e57387ef..b2018bb9 100644 Binary files a/TARANIS/SD/SOUNDS/yaapu0/en/1535290648.wav and b/TARANIS/SD/SOUNDS/yaapu0/en/1535290648.wav differ diff --git a/TARANIS/SD/SOUNDS/yaapu0/en/1809087708.wav b/TARANIS/SD/SOUNDS/yaapu0/en/1809087708.wav index 8a469803..52e4896d 100644 Binary files a/TARANIS/SD/SOUNDS/yaapu0/en/1809087708.wav and b/TARANIS/SD/SOUNDS/yaapu0/en/1809087708.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/en/1811095020.wav b/TARANIS/SD/SOUNDS/yaapu0/en/1811095020.wav similarity index 100% rename from HORUS/SD/SOUNDS/yaapu0/en/1811095020.wav rename to TARANIS/SD/SOUNDS/yaapu0/en/1811095020.wav diff --git a/TARANIS/SD/SOUNDS/yaapu0/en/1834616480.wav b/TARANIS/SD/SOUNDS/yaapu0/en/1834616480.wav index c081bdd6..1a4df589 100644 Binary files a/TARANIS/SD/SOUNDS/yaapu0/en/1834616480.wav and b/TARANIS/SD/SOUNDS/yaapu0/en/1834616480.wav differ diff --git a/TARANIS/SD/SOUNDS/yaapu0/en/1883944664.wav b/TARANIS/SD/SOUNDS/yaapu0/en/1883944664.wav new file mode 100644 index 00000000..a3a78004 Binary files /dev/null and b/TARANIS/SD/SOUNDS/yaapu0/en/1883944664.wav differ diff --git a/TARANIS/SD/SOUNDS/yaapu0/en/1997782032.wav b/TARANIS/SD/SOUNDS/yaapu0/en/1997782032.wav index 65f0f228..d4617970 100644 Binary files a/TARANIS/SD/SOUNDS/yaapu0/en/1997782032.wav and b/TARANIS/SD/SOUNDS/yaapu0/en/1997782032.wav differ diff --git a/TARANIS/SD/SOUNDS/yaapu0/en/2310179660.wav b/TARANIS/SD/SOUNDS/yaapu0/en/2310179660.wav index f1bdd88a..db82b477 100644 Binary files a/TARANIS/SD/SOUNDS/yaapu0/en/2310179660.wav and b/TARANIS/SD/SOUNDS/yaapu0/en/2310179660.wav differ diff --git a/TARANIS/SD/SOUNDS/yaapu0/en/2386213680.wav b/TARANIS/SD/SOUNDS/yaapu0/en/2386213680.wav index a8740c0c..b564e548 100644 Binary files a/TARANIS/SD/SOUNDS/yaapu0/en/2386213680.wav and b/TARANIS/SD/SOUNDS/yaapu0/en/2386213680.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/en/24877608.wav b/TARANIS/SD/SOUNDS/yaapu0/en/24877608.wav similarity index 100% rename from HORUS/SD/SOUNDS/yaapu0/en/24877608.wav rename to TARANIS/SD/SOUNDS/yaapu0/en/24877608.wav diff --git a/TARANIS/SD/SOUNDS/yaapu0/en/264977348.wav b/TARANIS/SD/SOUNDS/yaapu0/en/264977348.wav index 919dcb82..aa1f6af5 100644 Binary files a/TARANIS/SD/SOUNDS/yaapu0/en/264977348.wav and b/TARANIS/SD/SOUNDS/yaapu0/en/264977348.wav differ diff --git a/TARANIS/SD/SOUNDS/yaapu0/en/2664106240.wav b/TARANIS/SD/SOUNDS/yaapu0/en/2664106240.wav index fd74c55b..25f9a91a 100644 Binary files a/TARANIS/SD/SOUNDS/yaapu0/en/2664106240.wav and b/TARANIS/SD/SOUNDS/yaapu0/en/2664106240.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/en/2773270064.wav b/TARANIS/SD/SOUNDS/yaapu0/en/2773270064.wav similarity index 100% rename from HORUS/SD/SOUNDS/yaapu0/en/2773270064.wav rename to TARANIS/SD/SOUNDS/yaapu0/en/2773270064.wav diff --git a/TARANIS/SD/SOUNDS/yaapu0/en/2890289840.wav b/TARANIS/SD/SOUNDS/yaapu0/en/2890289840.wav index 2eab10f3..c4c0b756 100644 Binary files a/TARANIS/SD/SOUNDS/yaapu0/en/2890289840.wav and b/TARANIS/SD/SOUNDS/yaapu0/en/2890289840.wav differ diff --git a/TARANIS/SD/SOUNDS/yaapu0/en/3025044912.wav b/TARANIS/SD/SOUNDS/yaapu0/en/3025044912.wav index 38889305..735d20f9 100644 Binary files a/TARANIS/SD/SOUNDS/yaapu0/en/3025044912.wav and b/TARANIS/SD/SOUNDS/yaapu0/en/3025044912.wav differ diff --git a/TARANIS/SD/SOUNDS/yaapu0/en/3311875476.wav b/TARANIS/SD/SOUNDS/yaapu0/en/3311875476.wav index 61a8d73b..4c99e007 100644 Binary files a/TARANIS/SD/SOUNDS/yaapu0/en/3311875476.wav and b/TARANIS/SD/SOUNDS/yaapu0/en/3311875476.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/en/3330664438.wav b/TARANIS/SD/SOUNDS/yaapu0/en/3330664438.wav similarity index 100% rename from HORUS/SD/SOUNDS/yaapu0/en/3330664438.wav rename to TARANIS/SD/SOUNDS/yaapu0/en/3330664438.wav diff --git a/TARANIS/SD/SOUNDS/yaapu0/en/3417557720.wav b/TARANIS/SD/SOUNDS/yaapu0/en/3417557720.wav index d06f19ab..3cb098d0 100644 Binary files a/TARANIS/SD/SOUNDS/yaapu0/en/3417557720.wav and b/TARANIS/SD/SOUNDS/yaapu0/en/3417557720.wav differ diff --git a/TARANIS/SD/SOUNDS/yaapu0/en/3602501704.wav b/TARANIS/SD/SOUNDS/yaapu0/en/3602501704.wav index 5f88ec8c..cba6a22c 100644 Binary files a/TARANIS/SD/SOUNDS/yaapu0/en/3602501704.wav and b/TARANIS/SD/SOUNDS/yaapu0/en/3602501704.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/en/3651151340.wav b/TARANIS/SD/SOUNDS/yaapu0/en/3651151340.wav similarity index 100% rename from HORUS/SD/SOUNDS/yaapu0/en/3651151340.wav rename to TARANIS/SD/SOUNDS/yaapu0/en/3651151340.wav diff --git a/TARANIS/SD/SOUNDS/yaapu0/en/3708582640.wav b/TARANIS/SD/SOUNDS/yaapu0/en/3708582640.wav index 6ee0d5ed..cdbec948 100644 Binary files a/TARANIS/SD/SOUNDS/yaapu0/en/3708582640.wav and b/TARANIS/SD/SOUNDS/yaapu0/en/3708582640.wav differ diff --git a/TARANIS/SD/SOUNDS/yaapu0/en/3721120084.wav b/TARANIS/SD/SOUNDS/yaapu0/en/3721120084.wav index ac9622ad..8f6e375e 100644 Binary files a/TARANIS/SD/SOUNDS/yaapu0/en/3721120084.wav and b/TARANIS/SD/SOUNDS/yaapu0/en/3721120084.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/en/3806931323.wav b/TARANIS/SD/SOUNDS/yaapu0/en/3806931323.wav similarity index 100% rename from HORUS/SD/SOUNDS/yaapu0/en/3806931323.wav rename to TARANIS/SD/SOUNDS/yaapu0/en/3806931323.wav diff --git a/TARANIS/SD/SOUNDS/yaapu0/en/3879875148.wav b/TARANIS/SD/SOUNDS/yaapu0/en/3879875148.wav index ac9622ad..8f6e375e 100644 Binary files a/TARANIS/SD/SOUNDS/yaapu0/en/3879875148.wav and b/TARANIS/SD/SOUNDS/yaapu0/en/3879875148.wav differ diff --git a/TARANIS/SD/SOUNDS/yaapu0/en/3956583920.wav b/TARANIS/SD/SOUNDS/yaapu0/en/3956583920.wav index c94bc715..a0c908a3 100644 Binary files a/TARANIS/SD/SOUNDS/yaapu0/en/3956583920.wav and b/TARANIS/SD/SOUNDS/yaapu0/en/3956583920.wav differ diff --git a/TARANIS/SD/SOUNDS/yaapu0/en/4019153925.wav b/TARANIS/SD/SOUNDS/yaapu0/en/4019153925.wav index 434cf073..e140e6ea 100644 Binary files a/TARANIS/SD/SOUNDS/yaapu0/en/4019153925.wav and b/TARANIS/SD/SOUNDS/yaapu0/en/4019153925.wav differ diff --git a/TARANIS/SD/SOUNDS/yaapu0/en/4091124880.wav b/TARANIS/SD/SOUNDS/yaapu0/en/4091124880.wav index 69a12b3c..054968c0 100644 Binary files a/TARANIS/SD/SOUNDS/yaapu0/en/4091124880.wav and b/TARANIS/SD/SOUNDS/yaapu0/en/4091124880.wav differ diff --git a/TARANIS/SD/SOUNDS/yaapu0/en/4137200300.wav b/TARANIS/SD/SOUNDS/yaapu0/en/4137200300.wav index 64b83240..0913903c 100644 Binary files a/TARANIS/SD/SOUNDS/yaapu0/en/4137200300.wav and b/TARANIS/SD/SOUNDS/yaapu0/en/4137200300.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/en/483575668.wav b/TARANIS/SD/SOUNDS/yaapu0/en/483575668.wav similarity index 100% rename from HORUS/SD/SOUNDS/yaapu0/en/483575668.wav rename to TARANIS/SD/SOUNDS/yaapu0/en/483575668.wav diff --git a/TARANIS/SD/SOUNDS/yaapu0/en/554623408.wav b/TARANIS/SD/SOUNDS/yaapu0/en/554623408.wav index 757cbbe8..047b66ac 100644 Binary files a/TARANIS/SD/SOUNDS/yaapu0/en/554623408.wav and b/TARANIS/SD/SOUNDS/yaapu0/en/554623408.wav differ diff --git a/TARANIS/SD/SOUNDS/yaapu0/en/656739232.wav b/TARANIS/SD/SOUNDS/yaapu0/en/656739232.wav index fd526aee..940438cc 100644 Binary files a/TARANIS/SD/SOUNDS/yaapu0/en/656739232.wav and b/TARANIS/SD/SOUNDS/yaapu0/en/656739232.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/en/722073480.wav b/TARANIS/SD/SOUNDS/yaapu0/en/722073480.wav similarity index 100% rename from HORUS/SD/SOUNDS/yaapu0/en/722073480.wav rename to TARANIS/SD/SOUNDS/yaapu0/en/722073480.wav diff --git a/HORUS/SD/SOUNDS/yaapu0/en/886442312.wav b/TARANIS/SD/SOUNDS/yaapu0/en/886442312.wav similarity index 100% rename from HORUS/SD/SOUNDS/yaapu0/en/886442312.wav rename to TARANIS/SD/SOUNDS/yaapu0/en/886442312.wav diff --git a/TARANIS/SD/SOUNDS/yaapu0/en/956150328.wav b/TARANIS/SD/SOUNDS/yaapu0/en/956150328.wav index ac9622ad..8f6e375e 100644 Binary files a/TARANIS/SD/SOUNDS/yaapu0/en/956150328.wav and b/TARANIS/SD/SOUNDS/yaapu0/en/956150328.wav differ diff --git a/TARANIS/SD/SOUNDS/yaapu0/en/986165592.wav b/TARANIS/SD/SOUNDS/yaapu0/en/986165592.wav index 434cf073..e140e6ea 100644 Binary files a/TARANIS/SD/SOUNDS/yaapu0/en/986165592.wav and b/TARANIS/SD/SOUNDS/yaapu0/en/986165592.wav differ diff --git a/TARANIS/SD/SOUNDS/yaapu0/en/autorotate.wav b/TARANIS/SD/SOUNDS/yaapu0/en/autorotate.wav new file mode 100644 index 00000000..55a296d1 Binary files /dev/null and b/TARANIS/SD/SOUNDS/yaapu0/en/autorotate.wav differ diff --git a/TARANIS/SD/SOUNDS/yaapu0/en/systemid.wav b/TARANIS/SD/SOUNDS/yaapu0/en/systemid.wav new file mode 100644 index 00000000..cc0e1b5c Binary files /dev/null and b/TARANIS/SD/SOUNDS/yaapu0/en/systemid.wav differ diff --git a/TARANIS/SD/SOUNDS/yaapu0/en/thermal.wav b/TARANIS/SD/SOUNDS/yaapu0/en/thermal.wav new file mode 100644 index 00000000..8922f2f7 Binary files /dev/null and b/TARANIS/SD/SOUNDS/yaapu0/en/thermal.wav differ diff --git a/TARANIS/SD/SOUNDS/yaapu0/english.psv b/TARANIS/SD/SOUNDS/yaapu0/english.psv index bdf34e2a..69f3f0cc 100644 --- a/TARANIS/SD/SOUNDS/yaapu0/english.psv +++ b/TARANIS/SD/SOUNDS/yaapu0/english.psv @@ -71,9 +71,12 @@ SOUNDS/yaapu0/en|ssimpleoff|super simple mode disabled SOUNDS/yaapu0/en|ssimpleon|super simple mode enabled SOUNDS/yaapu0/en|stabilize|Stabilize flight mode SOUNDS/yaapu0/en|steering_r|Steering mode +SOUNDS/yaapu0/en|thermal|Thermal flight mode SOUNDS/yaapu0/en|throw|Throw flight mode SOUNDS/yaapu0/en|timealert|Timer alert SOUNDS/yaapu0/en|training|Training flight mode SOUNDS/yaapu0/en|zigzag|Zigzag flight mode -SOUNDS/yaapu0/en|yaapu|Yaa-pu telemetry ready - +SOUNDS/yaapu0/en|takeoff|takeoff flight mode +SOUNDS/yaapu0/en|systemid|System I D flight mode +SOUNDS/yaapu0/en|autorotate|autorotate flight mode +SOUNDS/yaapu0/en|yaapu|Yaa-pu telemetry ready diff --git a/TARANIS/SD/SOUNDS/yaapu0/english_msg_hash.psv b/TARANIS/SD/SOUNDS/yaapu0/english_msg_hash.psv index 16b52e11..b0f74a05 100644 --- a/TARANIS/SD/SOUNDS/yaapu0/english_msg_hash.psv +++ b/TARANIS/SD/SOUNDS/yaapu0/english_msg_hash.psv @@ -18,13 +18,26 @@ /SOUNDS/yaapu0/en|2890289840|Land final started /SOUNDS/yaapu0/en|1535290648|Soaring: forcing RTL /SOUNDS/yaapu0/en|3602501704|Soaring: Thermal detected +/SOUNDS/yaapu0/en|3330664438|Soaring: Thermal detected /SOUNDS/yaapu0/en|3721120084|Soaring: Thermal ended /SOUNDS/yaapu0/en|956150328|Soaring: Thermal ended +/SOUNDS/yaapu0/en|722073480|Soaring: Thermal ended /SOUNDS/yaapu0/en|3879875148|Soaring: Thermal ended -/SOUNDS/yaapu0/en|4091124880|reached command: +/SOUNDS/yaapu0/en|3806931323|Soaring: Too low +/SOUNDS/yaapu0/en|886442312|Soaring: Too low +/SOUNDS/yaapu0/en|483575668|Soaring: Too low +/SOUNDS/yaapu0/en|1412704816|Soaring: Too high +/SOUNDS/yaapu0/en|1457255568|Soaring: Too high +/SOUNDS/yaapu0/en|3651151340|Soaring: Too high +/SOUNDS/yaapu0/en|24877608|Soaring: Drifted too far +/SOUNDS/yaapu0/en|1481434156|Soaring: Drifted too far +/SOUNDS/yaapu0/en|1811095020|Soaring: Drifted too far +/SOUNDS/yaapu0/en|1883944664|Soaring: Outside max radius +/SOUNDS/yaapu0/en|4091124880|reached command: /SOUNDS/yaapu0/en|3311875476|reached waypoint: -/SOUNDS/yaapu0/en|1997782032|Passed waypoint +/SOUNDS/yaapu0/en|1997782032|Passed waypoint: /SOUNDS/yaapu0/en|554623408|Takeoff complete /SOUNDS/yaapu0/en|3025044912|Smart RTL deactivated /SOUNDS/yaapu0/en|3956583920|GPS home acquired -/SOUNDS/yaapu0/en|1309405592|GPS home acquired +/SOUNDS/yaapu0/en|1309405592|GPS home acquired +/SOUNDS/yaapu0/en|2773270064|GPS home acquired diff --git a/TARANIS/SD/SOUNDS/yaapu0/err.wav b/TARANIS/SD/SOUNDS/yaapu0/err.wav index c09e1b57..18113452 100644 Binary files a/TARANIS/SD/SOUNDS/yaapu0/err.wav and b/TARANIS/SD/SOUNDS/yaapu0/err.wav differ diff --git a/TARANIS/SD/SOUNDS/yaapu0/fr/maxalt.missing b/TARANIS/SD/SOUNDS/yaapu0/fr/maxalt.missing new file mode 100644 index 00000000..e69de29b diff --git a/TARANIS/SD/SOUNDS/yaapu0/fr/maxalt.wav b/TARANIS/SD/SOUNDS/yaapu0/fr/maxalt.wav deleted file mode 100644 index e7ffe698..00000000 Binary files a/TARANIS/SD/SOUNDS/yaapu0/fr/maxalt.wav and /dev/null differ diff --git a/TARANIS/SD/SOUNDS/yaapu0/fr/qautotune.missing b/TARANIS/SD/SOUNDS/yaapu0/fr/qautotune.missing new file mode 100644 index 00000000..e69de29b diff --git a/TARANIS/SD/SOUNDS/yaapu0/fr/simpleoff.wav b/TARANIS/SD/SOUNDS/yaapu0/fr/simpleoff.wav new file mode 100644 index 00000000..c510f8b2 Binary files /dev/null and b/TARANIS/SD/SOUNDS/yaapu0/fr/simpleoff.wav differ diff --git a/TARANIS/SD/SOUNDS/yaapu0/fr/simpleon.wav b/TARANIS/SD/SOUNDS/yaapu0/fr/simpleon.wav new file mode 100644 index 00000000..9313193a Binary files /dev/null and b/TARANIS/SD/SOUNDS/yaapu0/fr/simpleon.wav differ diff --git a/TARANIS/SD/SOUNDS/yaapu0/fr/zigzag.missing b/TARANIS/SD/SOUNDS/yaapu0/fr/zigzag.missing new file mode 100644 index 00000000..e69de29b diff --git a/TARANIS/SD/SOUNDS/yaapu0/it/1309405592.wav b/TARANIS/SD/SOUNDS/yaapu0/it/1309405592.wav index a9c85ff4..a7cee0be 100644 Binary files a/TARANIS/SD/SOUNDS/yaapu0/it/1309405592.wav and b/TARANIS/SD/SOUNDS/yaapu0/it/1309405592.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/it/1412704816.wav b/TARANIS/SD/SOUNDS/yaapu0/it/1412704816.wav similarity index 100% rename from HORUS/SD/SOUNDS/yaapu0/it/1412704816.wav rename to TARANIS/SD/SOUNDS/yaapu0/it/1412704816.wav diff --git a/HORUS/SD/SOUNDS/yaapu0/it/1457255568.wav b/TARANIS/SD/SOUNDS/yaapu0/it/1457255568.wav similarity index 100% rename from HORUS/SD/SOUNDS/yaapu0/it/1457255568.wav rename to TARANIS/SD/SOUNDS/yaapu0/it/1457255568.wav diff --git a/HORUS/SD/SOUNDS/yaapu0/it/1481434156.wav b/TARANIS/SD/SOUNDS/yaapu0/it/1481434156.wav similarity index 100% rename from HORUS/SD/SOUNDS/yaapu0/it/1481434156.wav rename to TARANIS/SD/SOUNDS/yaapu0/it/1481434156.wav diff --git a/TARANIS/SD/SOUNDS/yaapu0/it/1535290648.wav b/TARANIS/SD/SOUNDS/yaapu0/it/1535290648.wav index 3bac47f4..f3d87100 100644 Binary files a/TARANIS/SD/SOUNDS/yaapu0/it/1535290648.wav and b/TARANIS/SD/SOUNDS/yaapu0/it/1535290648.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/it/1811095020.wav b/TARANIS/SD/SOUNDS/yaapu0/it/1811095020.wav similarity index 100% rename from HORUS/SD/SOUNDS/yaapu0/it/1811095020.wav rename to TARANIS/SD/SOUNDS/yaapu0/it/1811095020.wav diff --git a/TARANIS/SD/SOUNDS/yaapu0/it/1883944664.wav b/TARANIS/SD/SOUNDS/yaapu0/it/1883944664.wav new file mode 100644 index 00000000..e795bcde Binary files /dev/null and b/TARANIS/SD/SOUNDS/yaapu0/it/1883944664.wav differ diff --git a/TARANIS/SD/SOUNDS/yaapu0/it/1997782032.wav b/TARANIS/SD/SOUNDS/yaapu0/it/1997782032.wav index a0ebfdb6..457afa5a 100644 Binary files a/TARANIS/SD/SOUNDS/yaapu0/it/1997782032.wav and b/TARANIS/SD/SOUNDS/yaapu0/it/1997782032.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/it/24877608.wav b/TARANIS/SD/SOUNDS/yaapu0/it/24877608.wav similarity index 100% rename from HORUS/SD/SOUNDS/yaapu0/it/24877608.wav rename to TARANIS/SD/SOUNDS/yaapu0/it/24877608.wav diff --git a/HORUS/SD/SOUNDS/yaapu0/it/2773270064.wav b/TARANIS/SD/SOUNDS/yaapu0/it/2773270064.wav similarity index 100% rename from HORUS/SD/SOUNDS/yaapu0/it/2773270064.wav rename to TARANIS/SD/SOUNDS/yaapu0/it/2773270064.wav diff --git a/TARANIS/SD/SOUNDS/yaapu0/it/3025044912.wav b/TARANIS/SD/SOUNDS/yaapu0/it/3025044912.wav index 7a4c3b1b..d5dd5da3 100644 Binary files a/TARANIS/SD/SOUNDS/yaapu0/it/3025044912.wav and b/TARANIS/SD/SOUNDS/yaapu0/it/3025044912.wav differ diff --git a/TARANIS/SD/SOUNDS/yaapu0/it/3311875476.wav b/TARANIS/SD/SOUNDS/yaapu0/it/3311875476.wav index 2f5eb2fd..0043a623 100644 Binary files a/TARANIS/SD/SOUNDS/yaapu0/it/3311875476.wav and b/TARANIS/SD/SOUNDS/yaapu0/it/3311875476.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/it/3330664438.wav b/TARANIS/SD/SOUNDS/yaapu0/it/3330664438.wav similarity index 100% rename from HORUS/SD/SOUNDS/yaapu0/it/3330664438.wav rename to TARANIS/SD/SOUNDS/yaapu0/it/3330664438.wav diff --git a/TARANIS/SD/SOUNDS/yaapu0/it/3417557720.wav b/TARANIS/SD/SOUNDS/yaapu0/it/3417557720.wav index e65ea26b..9f08cd7c 100644 Binary files a/TARANIS/SD/SOUNDS/yaapu0/it/3417557720.wav and b/TARANIS/SD/SOUNDS/yaapu0/it/3417557720.wav differ diff --git a/TARANIS/SD/SOUNDS/yaapu0/it/3602501704.wav b/TARANIS/SD/SOUNDS/yaapu0/it/3602501704.wav index c54f8cd0..13932c67 100644 Binary files a/TARANIS/SD/SOUNDS/yaapu0/it/3602501704.wav and b/TARANIS/SD/SOUNDS/yaapu0/it/3602501704.wav differ diff --git a/TARANIS/SD/SOUNDS/yaapu0/it/3651151340.wav b/TARANIS/SD/SOUNDS/yaapu0/it/3651151340.wav new file mode 100644 index 00000000..0cefcd64 Binary files /dev/null and b/TARANIS/SD/SOUNDS/yaapu0/it/3651151340.wav differ diff --git a/TARANIS/SD/SOUNDS/yaapu0/it/3708582640.wav b/TARANIS/SD/SOUNDS/yaapu0/it/3708582640.wav index c99347b1..55eb8cfe 100644 Binary files a/TARANIS/SD/SOUNDS/yaapu0/it/3708582640.wav and b/TARANIS/SD/SOUNDS/yaapu0/it/3708582640.wav differ diff --git a/TARANIS/SD/SOUNDS/yaapu0/it/3721120084.wav b/TARANIS/SD/SOUNDS/yaapu0/it/3721120084.wav index 943303ea..a8460411 100644 Binary files a/TARANIS/SD/SOUNDS/yaapu0/it/3721120084.wav and b/TARANIS/SD/SOUNDS/yaapu0/it/3721120084.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/it/3806931323.wav b/TARANIS/SD/SOUNDS/yaapu0/it/3806931323.wav similarity index 100% rename from HORUS/SD/SOUNDS/yaapu0/it/3806931323.wav rename to TARANIS/SD/SOUNDS/yaapu0/it/3806931323.wav diff --git a/TARANIS/SD/SOUNDS/yaapu0/it/3879875148.wav b/TARANIS/SD/SOUNDS/yaapu0/it/3879875148.wav index 943303ea..a8460411 100644 Binary files a/TARANIS/SD/SOUNDS/yaapu0/it/3879875148.wav and b/TARANIS/SD/SOUNDS/yaapu0/it/3879875148.wav differ diff --git a/TARANIS/SD/SOUNDS/yaapu0/it/3956583920.wav b/TARANIS/SD/SOUNDS/yaapu0/it/3956583920.wav index a9c85ff4..a7cee0be 100644 Binary files a/TARANIS/SD/SOUNDS/yaapu0/it/3956583920.wav and b/TARANIS/SD/SOUNDS/yaapu0/it/3956583920.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/it/483575668.wav b/TARANIS/SD/SOUNDS/yaapu0/it/483575668.wav similarity index 100% rename from HORUS/SD/SOUNDS/yaapu0/it/483575668.wav rename to TARANIS/SD/SOUNDS/yaapu0/it/483575668.wav diff --git a/TARANIS/SD/SOUNDS/yaapu0/it/554623408.wav b/TARANIS/SD/SOUNDS/yaapu0/it/554623408.wav index a62c6d72..427ec166 100644 Binary files a/TARANIS/SD/SOUNDS/yaapu0/it/554623408.wav and b/TARANIS/SD/SOUNDS/yaapu0/it/554623408.wav differ diff --git a/HORUS/SD/SOUNDS/yaapu0/it/722073480.wav b/TARANIS/SD/SOUNDS/yaapu0/it/722073480.wav similarity index 100% rename from HORUS/SD/SOUNDS/yaapu0/it/722073480.wav rename to TARANIS/SD/SOUNDS/yaapu0/it/722073480.wav diff --git a/HORUS/SD/SOUNDS/yaapu0/it/886442312.wav b/TARANIS/SD/SOUNDS/yaapu0/it/886442312.wav similarity index 100% rename from HORUS/SD/SOUNDS/yaapu0/it/886442312.wav rename to TARANIS/SD/SOUNDS/yaapu0/it/886442312.wav diff --git a/TARANIS/SD/SOUNDS/yaapu0/it/986165592.wav b/TARANIS/SD/SOUNDS/yaapu0/it/986165592.wav index e65ea26b..9f08cd7c 100644 Binary files a/TARANIS/SD/SOUNDS/yaapu0/it/986165592.wav and b/TARANIS/SD/SOUNDS/yaapu0/it/986165592.wav differ diff --git a/TARANIS/SD/SOUNDS/yaapu0/it/autorotate.wav b/TARANIS/SD/SOUNDS/yaapu0/it/autorotate.wav new file mode 100644 index 00000000..4128e95b Binary files /dev/null and b/TARANIS/SD/SOUNDS/yaapu0/it/autorotate.wav differ diff --git a/TARANIS/SD/SOUNDS/yaapu0/it/simple_r.wav b/TARANIS/SD/SOUNDS/yaapu0/it/simple_r.wav index 78bca5b4..3cea5a56 100644 Binary files a/TARANIS/SD/SOUNDS/yaapu0/it/simple_r.wav and b/TARANIS/SD/SOUNDS/yaapu0/it/simple_r.wav differ diff --git a/TARANIS/SD/SOUNDS/yaapu0/it/systemid.wav b/TARANIS/SD/SOUNDS/yaapu0/it/systemid.wav new file mode 100644 index 00000000..72e71624 Binary files /dev/null and b/TARANIS/SD/SOUNDS/yaapu0/it/systemid.wav differ diff --git a/TARANIS/SD/SOUNDS/yaapu0/it/thermal.wav b/TARANIS/SD/SOUNDS/yaapu0/it/thermal.wav new file mode 100644 index 00000000..e7a05f37 Binary files /dev/null and b/TARANIS/SD/SOUNDS/yaapu0/it/thermal.wav differ diff --git a/TARANIS/SOURCES/PP/includes/yaapu_inc.lua b/TARANIS/SOURCES/PP/includes/yaapu_inc.lua deleted file mode 100644 index 3789eaeb..00000000 --- a/TARANIS/SOURCES/PP/includes/yaapu_inc.lua +++ /dev/null @@ -1,516 +0,0 @@ --- --- An FRSKY S.Port based Telemetry script for the Taranis X9D+ and QX7+ radios --- --- Copyright (C) 2018. Alessandro Apostoli --- https://github.com/yaapu --- --- This program is free software; you can redistribute it and/or modify --- it under the terms of the GNU General Public License as published by --- the Free Software Foundation; either version 3 of the License, or --- (at your option) any later version. --- --- This program is distributed in the hope that it will be useful, --- but WITHOUT ANY WARRANTY, without even the implied warranty of --- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --- GNU General Public License for more details. --- --- You should have received a copy of the GNU General Public License --- along with this program; if not, see . --- --- Passthrough protocol reference: --- https://cdn.rawgit.com/ArduPilot/ardupilot_wiki/33cd0c2c/images/FrSky_Passthrough_protocol.xlsx --- ---------------------- --- GLOBAL DEFINES ---------------------- -#define X9 ---#define X7 --- always use loadscript() instead of loadfile() -#define LOADSCRIPT --- force a loadscript() on init() to compile all .lua in .luac ---#define COMPILE -#ifdef COMPILE -#define LOAD_LUA -#endif ---------------------- --- VERSION ---------------------- -#ifdef X9 - #define VERSION "Yaapu X9 telemetry script 1.8.0" -#else - #define VERSION "Yaapu X7 1.8.0" -#endif ---------------------- --- FEATURES ---------------------- ---#define BATTMAH3DEC --- enable altitude/distance monitor and vocal alert (experimental) ---#define MONITOR --- show incoming DIY packet rates ---#define TELEMETRY_STATS --- enable synthetic vspeed when ekf is disabled ---#define SYNTHVSPEED --- enable telemetry reset on timer 3 reset -#define RESET --- always calculate FNV hash and play sound msg_.wav -#define FNV_HASH --- enable telemetry logging menu option ---#define LOGTELEMETRY --- enable max HDOP alert ---#define HDOP_ALARM --- enable support for custom background functions ---#define CUSTOM_BG_CALL --- enable alert window for no telemetry ---#define NOTELEM_ALERT --- enable popups for no telemetry data ---#define NOTELEM_POPUP --- enable blinking rectangle on no telemetry -#define NOTELEM_BLINK ---------------------- --- DEBUG ---------------------- ---#define DEBUG ---#define DEBUGEVT ---#define DEV ---#define MEMDEBUG --- calc and show background function rate ---#define BGRATE --- calc and show run function rate ---#define FGRATE --- calc and show hud refresh rate ---#define HUDRATE --- calc and show telemetry process rate ---#define BGTELERATE ---------------------- --- TESTMODE ---------------------- --- enable script testing via radio sticks ---#define TESTMODE - -#ifdef TESTMODE --- force cellcount -#define CELLCOUNT 12 --- copy 1st battery data over 2nd battery data ---#define BATT2TEST --- copy 1st FLVSS data over 2nd FLVSS data -#define FLVSS2TEST --- generate sample messages to parse ---#define MESSAGES --- put the script in demo mode for screenshots ---#define DEMO -#endif - ---------------------- --- SENSORS ---------------------- -#define VFAS_ID 0x021F -#define VFAS_SUBID 0 -#define VFAS_INSTANCE 0 -#define VFAS_PRECISION 2 -#define VFAS_NAME "VFAS" - -#define CURR_ID 0x020F -#define CURR_SUBID 0 -#define CURR_INSTANCE 0 -#define CURR_PRECISION 1 -#define CURR_NAME "CURR" - -#define VSpd_ID 0x011F -#define VSpd_SUBID 0 -#define VSpd_INSTANCE 0 -#define VSpd_PRECISION 1 -#define VSpd_NAME "VSpd" - -#define GSpd_ID 0x083F -#define GSpd_SUBID 0 -#define GSpd_INSTANCE 0 -#define GSpd_PRECISION 0 -#define GSpd_NAME "GSpd" - -#define Alt_ID 0x010F -#define Alt_SUBID 0 -#define Alt_INSTANCE 0 -#define Alt_PRECISION 1 -#define Alt_NAME "Alt" - -#define GAlt_ID 0x082F -#define GAlt_SUBID 0 -#define GAlt_INSTANCE 0 -#define GAlt_PRECISION 0 -#define GAlt_NAME "GAlt" - -#define Hdg_ID 0x084F -#define Hdg_SUBID 0 -#define Hdg_INSTANCE 0 -#define Hdg_PRECISION 0 -#define Hdg_NAME "Hdg" - -#define Fuel_ID 0x060F -#define Fuel_SUBID 0 -#define Fuel_INSTANCE 0 -#define Fuel_PRECISION 0 -#define Fuel_NAME "Fuel" - -#define IMUTmp_ID 0x041F -#define IMUTmp_SUBID 0 -#define IMUTmp_INSTANCE 0 -#define IMUTmp_PRECISION 0 -#define IMUTmp_NAME "IMUt" - -#define ARM_ID 0x060F -#define ARM_SUBID 0 -#define ARM_INSTANCE 1 -#define ARM_PRECISION 0 -#define ARM_NAME "ARM" - -#define ASpd_ID 0x0AF -#define ASpd_SUBID 0 -#define ASpd_INSTANCE 0 -#define ASpd_PRECISION 0 -#define ASpd_NAME "ASpd" - -#define BAlt_ID 0x010F -#define BAlt_SUBID 0 -#define BAlt_INSTANCE 1 -#define BAlt_PRECISION 1 -#define BAlt_NAME "BAlt" - --- Throttle and RC use RPM sensor IDs -#define Thr_ID 0x050F -#define Thr_SUBID 0 -#define Thr_INSTANCE 0 -#define Thr_PRECISION 0 -#define Thr_NAME "Thr" - -#define WPD_ID 0x082F -#define WPD_SUBID 0 -#define WPD_INSTANCE 10 -#define WPD_PRECISION 0 -#define WPD_NAME "WPD" - -#define WPX_ID 0x082F -#define WPX_SUBID 0 -#define WPX_INSTANCE 11 -#define WPX_PRECISION 0 -#define WPX_NAME "WPX" - -#define WPN_ID 0x050F -#define WPN_SUBID 0 -#define WPN_INSTANCE 10 -#define WPN_PRECISION 0 -#define WPN_NAME "WPN" - -#define WPB_ID 0x084F -#define WPB_SUBID 0 -#define WPB_INSTANCE 10 -#define WPB_PRECISION 0 -#define WPB_NAME "WPB" - -#define CELLFULL 4.36 ------------------------- --- MIN MAX ------------------------- --- min -#define MIN_BATT1_FC 1 -#define MIN_BATT2_FC 2 -#define MIN_CELL1_VS 3 -#define MIN_CELL2_VS 4 -#define MIN_BATT1_VS 5 -#define MIN_BATT2_VS 6 - -#define MAX_CURR 7 -#define MAX_CURR1 8 -#define MAX_CURR2 9 -#define MAX_POWER 10 -#define MINMAX_ALT 11 -#define MAX_GPSALT 12 -#define MAX_VSPEED 13 -#define MAX_HSPEED 14 -#define MAX_DIST 15 -#define MAX_RANGE 16 ------------------------- --- LAYOUT ------------------------- -#ifdef X9 - -#define LCD_W 212 - -#define HUD_X 62 -#define HUD_WIDTH 88 -#define HUD_X_MID 33 - -#define LEFTPANE_X 1 -#define RIGHTPANE_X 152 - -#define TOPBAR_Y 0 -#define TOPBAR_HEIGHT 7 -#define TOPBAR_WIDTH 212 - -#define BOTTOMBAR_Y 56 -#define BOTTOMBAR_HEIGHT 9 -#define BOTTOMBAR_WIDTH 212 - -#define BOX1_X 0 -#define BOX1_Y 38 -#define BOX1_WIDTH 66 -#define BOX1_HEIGHT 8 - -#define BOX2_X 61 -#define BOX2_Y 46 -#define BOX2_WIDTH 17 -#define BOX2_HEIGHT 12 - -#define FLIGHTMODE_X 1 -#define FLIGHTMODE_Y 0 -#define FLIGHTMODE_FLAGS SMLSIZE+INVERS - -#define HOMEANGLE_X 60 -#define HOMEANGLE_Y 27 -#define HOMEANGLE_XLABEL 3 -#define HOMEANGLE_YLABEL 27 -#define HOMEANGLE_FLAGS SMLSIZE - -#define HSPEED_X 60 -#define HSPEED_Y 49 -#define HSPEED_XLABEL 12 -#define HSPEED_YLABEL 48 -#define HSPEED_XDIM 61 -#define HSPEED_YDIM 49 -#define HSPEED_FLAGS SMLSIZE -#define HSPEED_ARROW_WIDTH 10 - -#define HOMEDIR_X 133 -#define HOMEDIR_Y 47 -#define HOMEDIR_R 7 - -#define FLIGHTTIME_X 176 -#define FLIGHTTIME_Y 0 -#define FLIGHTTIME_FLAGS SMLSIZE+INVERS+TIMEHOUR - -#define RSSI_X 69 -#define RSSI_Y 0 -#define RSSI_FLAGS SMLSIZE+INVERS - -#define TXVOLTAGE_X 115 -#define TXVOLTAGE_Y 0 -#define TXVOLTAGE_FLAGS SMLSIZE+INVERS - -#else - -#define LCD_W 128 - -#define HUD_X 32 -#define HUD_WIDTH 64 -#define HUD_X_MID 33 - -#define LEFTPANE_X 0 -#define RIGHTPANE_X 97 - -#define TOPBAR_Y 0 -#define TOPBAR_HEIGHT 7 -#define TOPBAR_WIDTH 128 - -#define BOTTOMBAR_Y 57 -#define BOTTOMBAR_HEIGHT 8 -#define BOTTOMBAR_WIDTH 128 - -#define BOX1_X 65 -#define BOX1_Y 28 -#define BOX1_WIDTH 23 -#define BOX1_HEIGHT 15 - -#define BOX2_X 65 -#define BOX2_Y 7 -#define BOX2_WIDTH 38 -#define BOX2_HEIGHT 7 - -#define FLIGHTMODE_X 1 -#define FLIGHTMODE_Y 0 -#define FLIGHTMODE_FLAGS SMLSIZE+INVERS - -#define HOMEANGLE_X 0 -#define HOMEANGLE_Y 0 -#define HOMEANGLE_XLABEL 0 -#define HOMEANGLE_YLABEL 0 -#define HOMEANGLE_FLAGS SMLSIZE - -#define HSPEED_X 107 -#define HSPEED_Y 8 -#define HSPEED_XLABEL 66 -#define HSPEED_YLABEL 10 -#define HSPEED_XDIM 102 -#define HSPEED_YDIM 9 -#define HSPEED_FLAGS SMLSIZE -#define HSPEED_ARROW_WIDTH 6 - ---#define HOMEDIR_X 42 -#define HOMEDIR_X 82 -#define HOMEDIR_Y 48 -#define HOMEDIR_R 7 - -#define FLIGHTTIME_X 98 -#define FLIGHTTIME_Y 0 -#define FLIGHTTIME_FLAGS SMLSIZE+INVERS - -#define RSSI_X 70 -#define RSSI_Y 0 -#define RSSI_FLAGS SMLSIZE+INVERS - -#define TXVOLTAGE_X 104 -#define TXVOLTAGE_Y 21 -#define TXVOLTAGE_FLAGS SMLSIZE - -#endif --X7 --------------------------------------------------------------------------------- --- MENU VALUE,COMBO --------------------------------------------------------------------------------- -#define TYPEVALUE 0 -#define TYPECOMBO 1 -#define MENU_Y 7 -#define MENU_PAGESIZE 7 - -#ifdef X9 -#define MENU_ITEM_X 150 -#else -#define MENU_ITEM_X 102 -#endif - --------------------------------------------------------------------------------- --- ALARMS --------------------------------------------------------------------------------- ---[[ - ALARM_TYPE_MIN needs arming (min has to be reached first), value below level for grace, once armed is periodic, reset on landing - ALARM_TYPE_MAX no arming, value above level for grace, once armed is periodic, reset on landing - ALARM_TYPE_TIMER no arming, fired periodically, spoken time, reset on landing - ALARM_TYPE_BATT needs arming (min has to be reached first), value below level for grace, no reset on landing -{ - 1 = notified, - 2 = alarm start, - 3 = armed, - 4 = type(0=min,1=max,2=timer,3=batt), - 5 = grace duration - 6 = ready - 7 = last alarm -} ---]] -#define ALARM_NOTIFIED 1 -#define ALARM_START 2 -#define ALARM_ARMED 3 -#define ALARM_TYPE 4 -#define ALARM_GRACE 5 -#define ALARM_READY 6 -#define ALARM_LAST_ALARM 7 - -#define ALARMS_MIN_ALT 1 -#define ALARMS_MAX_ALT 2 -#define ALARMS_MAX_DIST 3 -#define ALARMS_FS_EKF 4 -#define ALARMS_FS_BATT 5 -#define ALARMS_TIMER 6 -#define ALARMS_BATT_L1 7 -#define ALARMS_BATT_L2 8 -#define ALARMS_MAX_HDOP 9 - -#define ALARM_TYPE_MIN 0 -#define ALARM_TYPE_MAX 1 -#define ALARM_TYPE_TIMER 2 -#define ALARM_TYPE_BATT 3 -#define ALARM_TYPE_BATT_CRT 4 - -#define ALARM_TYPE_BATT_GRACE 4 ------------------------ --- UNIT SCALING ------------------------ -local unitScale = getGeneralSettings().imperial == 0 and 1 or 3.28084 -local unitLabel = getGeneralSettings().imperial == 0 and "m" or "ft" -local unitLongScale = getGeneralSettings().imperial == 0 and 1/1000 or 1/1609.34 -local unitLongLabel = getGeneralSettings().imperial == 0 and "km" or "mi" - -#define UNIT_ALT_SCALE unitScale -#define UNIT_ALT_LABEL unitLabel -#define UNIT_DIST_SCALE unitScale -#define UNIT_DIST_LABEL unitLabel -#define UNIT_DIST_LONG_LABEL unitLongLabel -#define UNIT_DIST_LONG_SCALE unitLongScale -#define UNIT_HSPEED_SCALE conf.horSpeedMultiplier -#define UNIT_VSPEED_SCALE conf.vertSpeedMultiplier -#define UNIT_HSPEED_LABEL conf.horSpeedLabel -#define UNIT_VSPEED_LABEL conf.vertSpeedLabel - -#define OPENTX_UNIT_METERS 9 -#define OPENTX_UNIT_FEET 10 - ------------------------ --- HUD AND YAW ------------------------ -#define YAW_Y TOPBAR_Y+TOPBAR_HEIGHT -#ifdef X9 -#define YAW_STEPWIDTH 8 -#define YAW_X_MIN (LCD_W-HUD_WIDTH)/2 + 6 -#define YAW_X_MAX (LCD_W+HUD_WIDTH)/2 - 8 -#define YAW_WIDTH HUD_WIDTH-7 -#else -#define YAW_STEPWIDTH 6.2 -#define YAW_X_MIN 34 -#define YAW_X_MAX 26+HUD_WIDTH -#define YAW_WIDTH HUD_WIDTH-5 -#endif --X9 --- vertical distance between roll horiz segments -#define HUD_R2 6 - -#define LEFTWIDTH 17 -#define RIGHTWIDTH 17 --- vertical distance between roll horiz segments -#define R2 6 ------------------------ --- BATTERY ------------------------ --- offsets are: 1 celm, 4 batt, 7 curr, 10 mah, 13 cap, indexing starts at 1 -#define BATT_CELL 1 -#define BATT_VOLT 4 -#define BATT_CURR 7 -#define BATT_MAH 10 -#define BATT_CAP 13 - -#define BATT_IDALL 0 -#define BATT_ID1 1 -#define BATT_ID2 2 - -#define BATTCONF_PARALLEL 1 -#define BATTCONF_SERIAL 2 -#define BATTCONF_OTHER 3 - --- X-Lite Support -#define XLITE_UP 36 -#define XLITE_UP_RPT 68 -#define XLITE_DOWN 35 -#define XLITE_DOWN_RPT 67 -#define XLITE_RTN 33 -#define XLITE_ENTER 34 -#define XLITE_MENU_LONG 128 -#define XLITE_MENU 32 - ------------------------------------ --- STATE TRANSITION ENGINE SUPPORT ------------------------------------ -#define TRANSITION_LASTVALUE 1 -#define TRANSITION_LASTCHANGED 2 -#define TRANSITION_DONE 3 -#define TRANSITION_DELAY 4 - -#define TRANSITIONS_FLIGHTMODE 1 - -#define MONITOR_ALTITUDE 1 -#define MONITOR_DISTANCE 2 - -#define LIB_BASE_PATH "/SCRIPTS/TELEMETRY/yaapu/" - -#define HAPTIC_DURATION 12 - -#define DRAWLIB_LOAD_CYCLE 0 -#define MENU_LOAD_CYCLE 4 -#define ALTVIEW_LOAD_CYCLE 2 -#define LEFT_LOAD_CYCLE 2 -#define CENTER_LOAD_CYCLE 4 -#define RIGHT_LOAD_CYCLE 6 -#define LOAD_CYCLE_MAX 8 diff --git a/TARANIS/SOURCES/PP/lib/alt_view.lua b/TARANIS/SOURCES/PP/lib/alt_view.lua deleted file mode 100644 index 8a2489c4..00000000 --- a/TARANIS/SOURCES/PP/lib/alt_view.lua +++ /dev/null @@ -1,954 +0,0 @@ -#include "includes/yaapu_inc.lua" - -#ifdef X9 --------------------------------- --- Layout 212x64 taranis X9D+ --------------------------------- -#define LCD_W 212 - -#define ALT_HUD_X_CENTER 147 -#define ALT_HUD_X 116 -#define ALT_HUD_WIDTH 62 -#define ALT_HUD_X_MID 33 - -#define ALT_LEFTPANE_X 116 -#define ALT_RIGHTPANE_X 178 - -#define ALT_YAW_STEPWIDTH 6.2 -#define ALT_YAW_X_MIN 120 -#define ALT_YAW_X_MAX 174 -#define ALT_YAW_WIDTH ALT_HUD_WIDTH-5 - -#define BATTCELL_X 0 -#define BATTCELL_Y 7 -#define BATTCELL_YV 6 -#define BATTCELL_YS 12 -#define BATTCELL_FLAGS MIDSIZE - -#define BATTVOLT_X 33 -#define BATTVOLT_Y 19 -#define BATTVOLT_YV 19 -#define BATTVOLT_FLAGS SMLSIZE -#define BATTVOLT_FLAGSV SMLSIZE - -#define BATTCURR_X 33 -#define BATTCURR_Y 26 -#define BATTCURR_YA 26 -#define BATTCURR_FLAGS SMLSIZE -#define BATTCURR_FLAGSA SMLSIZE - -#define BATTPERC_X 0 -#define BATTPERC_Y 31 -#define BATTPERC_YPERC 35 -#define BATTPERC_FLAGS MIDSIZE -#define BATTPERC_FLAGSPERC SMLSIZE - -#define BATTMAH_X 0 -#define BATTMAH_Y 43 -#define BATTMAH_FLAGS SMLSIZE+PREC1 - -#define ALT_HOMEDIR_X 165 -#define ALT_HOMEDIR_Y 48 -#define ALT_HOMEDIR_R 7 - -#define GPS_X 70 -#define GPS_Y 8 - -#define ALTASL_X 31 -#define ALTASL_Y 43 -#define ALTASL_XLABEL 1 -#define ALTASL_YLABEL 43 -#define ALTASL_FLAGS SMLSIZE - -#define HOMEDIST_X 115 -#define HOMEDIST_Y 8 -#define HOMEDIST_XLABEL 73 -#define HOMEDIST_YLABEL 10 -#define HOMEDIST_FLAGS RIGHT -#define HOMEDIST_ARROW_WIDTH 7 - -#define TOTDIST_X 115 -#define TOTDIST_Y 17 -#define TOTDIST_XLABEL 0 -#define TOTDIST_YLABEL 17 -#define TOTDIST_FLAGS RIGHT+SMLSIZE -#define TOTDIST_ARROW_WIDTH 4 - --------------------------- --- CUSTOM SENSORS SUPPORT --------------------------- -#define SENSOR_LABEL 1 -#define SENSOR_NAME 2 -#define SENSOR_PREC 3 -#define SENSOR_UNIT 4 -#define SENSOR_MULT 5 -#define SENSOR_MAX 6 -#define SENSOR_FONT 7 -#define SENSOR_WARN 8 -#define SENSOR_CRIT 9 - -#define SENSOR1_X 0 -#define SENSOR1_Y 26 - -#define SENSOR2_X 58 -#define SENSOR2_Y 26 - -#define SENSOR3_X 0 -#define SENSOR3_Y 33 - -#define SENSOR4_X 58 -#define SENSOR4_Y 33 - -#define SENSOR5_X 0 -#define SENSOR5_Y 44 - -#define SENSOR6_X 58 -#define SENSOR6_Y 44 - -#else --X9 --------------------------------- --- Layout 128x64 QX7/X-Lite --------------------------------- -#define LCD_W 128 - -#define ALT_HUD_X_CENTER 65 -#define ALT_HUD_X 31 -#define ALT_HUD_WIDTH 64 -#define ALT_HUD_X_MID 19 - -#define ALT_LEFTPANE_X 116 -#define ALT_RIGHTPANE_X 178 - -#define ALT_YAW_STEPWIDTH 6.2 -#define ALT_YAW_X_MIN 120 -#define ALT_YAW_X_MAX 174 -#define ALT_YAW_WIDTH ALT_HUD_WIDTH-5 - -#define BATTCELL_X 0 -#define BATTCELL_Y 7 -#define BATTCELL_YV 6 -#define BATTCELL_YS 12 -#define BATTCELL_FLAGS MIDSIZE - -#define BATTVOLT_X 32 -#define BATTVOLT_Y 19 -#define BATTVOLT_YV 19 -#define BATTVOLT_FLAGS SMLSIZE -#define BATTVOLT_FLAGSV SMLSIZE - -#define BATTCURR_X 32 -#define BATTCURR_Y 26 -#define BATTCURR_YA 26 -#define BATTCURR_FLAGS SMLSIZE -#define BATTCURR_FLAGSA SMLSIZE - -#define BATTPERC_X 0 -#define BATTPERC_Y 32 -#define BATTPERC_YPERC 35 -#define BATTPERC_FLAGS MIDSIZE -#define BATTPERC_FLAGSPERC SMLSIZE - -#define BATTMAH_X 0 -#define BATTMAH_Y 44 -#define BATTMAH_FLAGS SMLSIZE+PREC1 - -#define ALT_HOMEDIR_X 25 -#define ALT_HOMEDIR_Y 14 -#define ALT_HOMEDIR_R 6 - -#define GPS_X 74 -#define GPS_Y 8 - -#define ALTASL_X 31 -#define ALTASL_Y 43 -#define ALTASL_XLABEL 1 -#define ALTASL_YLABEL 43 -#define ALTASL_FLAGS SMLSIZE - -#define HOMEDIST_X 32 -#define HOMEDIST_Y 22 -#define HOMEDIST_XLABEL 1 -#define HOMEDIST_YLABEL 25 -#define HOMEDIST_FLAGS RIGHT -#define HOMEDIST_ARROW_WIDTH 7 - -#define TOTDIST_X 32 -#define TOTDIST_Y 24 -#define TOTDIST_XLABEL 0 -#define TOTDIST_YLABEL 24 -#define TOTDIST_FLAGS RIGHT+SMLSIZE -#define TOTDIST_ARROW_WIDTH 4 - -#define ALT_ALT_X 94 -#define ALT_ALT_Y 7 - -#define ALT_HSPEED_X 94 -#define ALT_HSPEED_Y 19 - --------------------------- --- CUSTOM SENSORS SUPPORT --------------------------- -#define SENSOR_LABEL 1 -#define SENSOR_NAME 2 -#define SENSOR_PREC 3 -#define SENSOR_UNIT 4 -#define SENSOR_MULT 5 -#define SENSOR_MAX 6 -#define SENSOR_FONT 7 -#define SENSOR_WARN 8 -#define SENSOR_CRIT 9 - -#define SENSOR1_X 0 -#define SENSOR1_Y 33 - -#define SENSOR2_X 47 -#define SENSOR2_Y 33 - -#define SENSOR3_X 0 -#define SENSOR3_Y 41 - -#define SENSOR4_X 47 -#define SENSOR4_Y 41 - -#define SENSOR5_X 0 -#define SENSOR5_Y 49 - -#define SENSOR6_X 47 -#define SENSOR6_Y 49 - -#endif --X9 - -local initSensors = true - - -#ifdef X9 - -local gpsLat = nil -local gpsLon = nil - ---------------------- --- Single long function much more memory efficient than many little functions ---------------------- -local function drawLeftPane(x,drawLib,conf,telemetry,status,battery,battId,getMaxValue,gpsStatuses) - -- GPS status - local strStatus = gpsStatuses[telemetry.gpsStatus] - flags = BLINK+PREC1 - local mult = 1 - - if telemetry.gpsStatus > 2 then - if telemetry.homeAngle ~= -1 then - flags = PREC1 - end - if telemetry.gpsHdopC > 99 then - flags = 0 - mult=0.1 - end - lcd.drawNumber(20,9, telemetry.gpsHdopC*mult ,MIDSIZE+flags+RIGHT) - else - lcd.drawText(5, 8, "No", SMLSIZE+INVERS+BLINK) - lcd.drawText(2, 16, "GPS", SMLSIZE+INVERS+BLINK) - end - - if telemetry.gpsLat ~= nil then - lcd.drawText(GPS_X,GPS_Y,telemetry.gpsLat,RIGHT+SMLSIZE) - lcd.drawText(GPS_X,GPS_Y+8,telemetry.gpsLon,RIGHT+SMLSIZE) - end - -- alt asl/rng - if status.showMinMaxValues == true then - flags = 0 - end - -- varrow is shared - flags = 0 - -- home dist - local flags = 0 - if telemetry.homeAngle == -1 then - flags = BLINK - end - local dist = getMaxValue(telemetry.homeDist,MAX_DIST) - if status.showMinMaxValues == true then - flags = 0 - end - lcd.drawText(x+HOMEDIST_X, HOMEDIST_Y+1, UNIT_DIST_LABEL,SMLSIZE+RIGHT) - lcd.drawNumber(lcd.getLastLeftPos(), HOMEDIST_Y, dist*UNIT_DIST_SCALE,HOMEDIST_FLAGS+flags) - if status.showMinMaxValues == true then - drawLib.drawVArrow(x+HOMEDIST_XLABEL+1, HOMEDIST_YLABEL-2,5,true,false) - else - drawLib.drawHomeIcon(x+HOMEDIST_XLABEL, HOMEDIST_YLABEL) - end - -- total distance - lcd.drawText(TOTDIST_X, TOTDIST_Y, UNIT_DIST_LONG_LABEL, RIGHT+SMLSIZE) - lcd.drawNumber(lcd.getLastLeftPos(), TOTDIST_Y, telemetry.totalDist*UNIT_DIST_LONG_SCALE*10, RIGHT+SMLSIZE+PREC1) - -- needs to be called often for strings created by decToDMSFull() fragment memory - collectgarbage() -end -#else --X9 -local function drawLeftPane(x,drawLib,conf,telemetry,status,battery,battId,getMaxValue,gpsStatuses) - -- GPS status - local strStatus = gpsStatuses[telemetry.gpsStatus] - flags = BLINK+PREC1 - local mult = 1 - - if telemetry.gpsStatus > 2 then - if telemetry.homeAngle ~= -1 then - flags = PREC1 - end - if telemetry.gpsHdopC > 99 then - flags = 0 - mult=0.1 - end - lcd.drawNumber(x+1, 7,telemetry.gpsHdopC*mult ,flags+MIDSIZE) - else - lcd.drawText(x+3, 7, "No", SMLSIZE+INVERS+BLINK) - lcd.drawText(x, 15, "Gps", SMLSIZE+INVERS+BLINK) - end - -- alt asl/rng - if status.showMinMaxValues == true then - flags = 0 - end - -- varrow is shared - flags = 0 - -- home dist - local flags = 0 - if telemetry.homeAngle == -1 then - flags = BLINK - end - local dist = getMaxValue(telemetry.homeDist,MAX_DIST) - if status.showMinMaxValues == true then - flags = 0 - end - lcd.drawText(x+HOMEDIST_X, HOMEDIST_Y+1, UNIT_DIST_LABEL,SMLSIZE+RIGHT) - lcd.drawNumber(lcd.getLastLeftPos(), HOMEDIST_Y, dist*UNIT_DIST_SCALE,HOMEDIST_FLAGS+flags) - if status.showMinMaxValues == true then - drawLib.drawVArrow(x+HOMEDIST_XLABEL+1, HOMEDIST_YLABEL-2,5,true,false) - else - drawLib.drawHomeIcon(x+HOMEDIST_XLABEL, HOMEDIST_YLABEL) - end - --[[ - -- altitude on right side - local alt = getMaxValue(telemetry.homeAlt,MINMAX_ALT) * UNIT_ALT_SCALE -- homeAlt is meters*3.28 = feet - - if math.abs(alt) < 10 then - lcd.drawNumber(ALT_ALT_X+1,ALT_ALT_Y,alt * 10,PREC1+RIGHT+MIDSIZE) - else - lcd.drawNumber(ALT_ALT_X+1,ALT_ALT_Y,alt,RIGHT+MIDSIZE) - end - -- hspeed - local speed = getMaxValue(telemetry.hSpeed,MAX_HSPEED) * UNIT_HSPEED_SCALE - - if math.abs(speed) > 99 then - lcd.drawNumber(ALT_HSPEED_X+1,ALT_HSPEED_Y,speed*0.1,RIGHT+MIDSIZE) - else - lcd.drawNumber(ALT_HSPEED_X+1,ALT_HSPEED_Y,speed,PREC1+RIGHT+MIDSIZE) - end - --]] - -- needs to be called ofter for strings created by decToDMSFull() fragment memory - collectgarbage() -end -#endif --X9 - --- max 6 extra sensors -local customSensors = nil --- {label,name,prec:0,1,2,unit,multiplier,mninmax,font} - -local function getSensorsConfigFilename() - local info = model.getInfo() - return "/MODELS/yaapu/" .. string.lower(string.gsub(info.name, "[%c%p%s%z]", "").."_sensors.lua") -end - -local function loadSensors() - local tmp = io.open(getSensorsConfigFilename(),"r") - if tmp == nil then - return - else - io.close(tmp) - end - local sensorScript = loadScript(getSensorsConfigFilename()) - collectgarbage() - customSensors = sensorScript() - sensorScript = nil - collectgarbage() - collectgarbage() -end - - -local customSensorXY = { - { SENSOR1_X, SENSOR1_Y }, - { SENSOR2_X, SENSOR2_Y }, - { SENSOR3_X, SENSOR3_Y }, - { SENSOR4_X, SENSOR4_Y }, - { SENSOR5_X, SENSOR5_Y }, - { SENSOR6_X, SENSOR6_Y }, -} - -local function drawCustomSensors(x,status) - if customSensors == nil then - --drawNoCustomSensors(x) - lcd.drawText(x+10,33, "NO CUSTOM SENSORS",0) - lcd.drawText(x+30,45, "DEFINED",0) - return - end - local label,data,prec,mult,flags,color,labelColor - for i=1,6 - do - -- default font attribute - color = 0 - labelColor = 0 - - if customSensors.sensors[i] ~= nil then - sensorConfig = customSensors.sensors[i] - - mult = sensorConfig[SENSOR_PREC] == 0 and 1 or ( sensorConfig[SENSOR_PREC] == 1 and 10 or 100 ) - prec = mult == 1 and 0 or (mult == 10 and 32 or 48) - - local sensorName = sensorConfig[SENSOR_NAME]..(status.showMinMaxValues == true and sensorConfig[SENSOR_MAX] or "") - local sensorValue = getValue(sensorName) - - local value = (sensorValue+(mult == 100 and 0.005 or 0))*mult*sensorConfig[SENSOR_MULT] - -#ifdef X9 - -- default font size - flags = i<=2 and 0 or (sensorConfig[SENSOR_FONT] == 1 and 0 or MIDSIZE) - - -- reduce font if necessary - if math.abs(value)/mult > 9999 then - flags = 0 - end - - local voffset = (i>2 and flags==0) and 3 or 0 -#else --X9 - flags = 0 - local voffset = 0 -#endif --X9 - local sign = sensorConfig[SENSOR_MAX] == "+" and 1 or -1 - - -- max tracking, high values are critical - if math.abs(value) ~= 0 and status.showMinMaxValues == false then - if sensorValue*sign > sensorConfig[SENSOR_CRIT]*sign then - color = BLINK - labelColor = 0 - elseif sensorValue*sign > sensorConfig[SENSOR_WARN]*sign then - color = 0 - labelColor = BLINK - end - end - - if customSensors.lookups[i] ~= nil and customSensors.lookups[i][sensorValue] ~= nil then - lcd.drawText(x+customSensorXY[i][1], voffset+customSensorXY[i][2], customSensors.lookups[i][sensorValue] or value, flags+color) - else - lcd.drawNumber(x+customSensorXY[i][1], voffset+customSensorXY[i][2], value, flags+prec+color) - end -#ifdef X9 - lcd.drawText(lcd.getLastRightPos()-(sensorConfig[SENSOR_FONT]==MIDSIZE and 1 or 0), customSensorXY[i][2]+(i>2 and 5 or 1),sensorConfig[SENSOR_UNIT],labelColor+SMLSIZE) -#else --X9 - lcd.drawText(lcd.getLastRightPos(), customSensorXY[i][2],sensorConfig[SENSOR_UNIT],labelColor+SMLSIZE) -#endif -- X9 - collectgarbage() - collectgarbage() - end - end -end - -#ifdef X9 --- SYNTH VSPEED SUPPORT -local vspd = 0 -local synthVSpeedTime = 0 -local prevHomeAlt = 0 - -local function drawHud(drawLib,conf,telemetry,status,battery,getMaxValue) - -- HUD - local r = -telemetry.roll - local cx,cy,dx,dy,ccx,ccy - local yPos = TOPBAR_Y + TOPBAR_HEIGHT + 8 - ----------------------- - -- artificial horizon - ----------------------- - -- no roll ==> segments are vertical, offsets are multiples of R2 - if ( roll == 0) then - dx=0 - dy=telemetry.pitch - cx=0 - cy=HUD_R2 - ccx=0 - ccy=2*HUD_R2 - else - -- center line offsets - dx = math.cos(math.rad(90 - r)) * -telemetry.pitch - dy = math.sin(math.rad(90 - r)) * telemetry.pitch - -- 1st line offsets - cx = math.cos(math.rad(90 - r)) * HUD_R2 - cy = math.sin(math.rad(90 - r)) * HUD_R2 - -- 2nd line offsets - ccx = math.cos(math.rad(90 - r)) * 2 * HUD_R2 - ccy = math.sin(math.rad(90 - r)) * 2 * HUD_R2 - end - ----------------------- - -- dark color for "ground" - ----------------------- - local minY = 7 - local minX = ALT_HUD_X + 1 - local maxX = ALT_HUD_X + ALT_HUD_WIDTH - 6 - local maxY = 54 - local ox = ALT_HUD_X_CENTER + dx - local oy = ALT_HUD_X_MID + dy - local yy = 0 - local rollX = ALT_HUD_X_CENTER-1 - -- parallel lines above and below horizon line - drawLib.drawLineWithClipping(rollX + dx - ccx,dy + ALT_HUD_X_MID + ccy,r,20,DOTTED,ALT_HUD_X,ALT_HUD_X + ALT_HUD_WIDTH,8,maxY) - drawLib.drawLineWithClipping(rollX + dx - cx,dy + ALT_HUD_X_MID + cy,r,8,DOTTED,ALT_HUD_X,ALT_HUD_X + ALT_HUD_WIDTH,8,maxY) - drawLib.drawLineWithClipping(rollX + dx + cx,dy + ALT_HUD_X_MID - cy,r,8,DOTTED,ALT_HUD_X,ALT_HUD_X + ALT_HUD_WIDTH,8,maxY) - drawLib.drawLineWithClipping(rollX + dx + ccx,dy + ALT_HUD_X_MID - ccy,r,20,DOTTED,ALT_HUD_X,ALT_HUD_X + ALT_HUD_WIDTH,8,maxY) - -- angle of the line passing on point(ox,oy) - local angle = math.tan(math.rad(-telemetry.roll)) - -- for each pixel of the hud base/top draw vertical black - -- lines from hud border to horizon line - -- horizon line moves with pitch/roll - for xx= minX,maxX - do - yy = (oy - ox*angle) + math.floor(xx*angle) - if telemetry.roll > 90 or telemetry.roll < -90 then - if yy > minY then - lcd.drawLine(xx, minY, xx, math.min(yy,maxY),SOLID,0) - end - else - if yy < maxY then - lcd.drawLine(xx, maxY, xx, math.max(yy,minY),SOLID,0) - end - end - end - -#ifdef SYNTHVSPEED - ------------------------------------ - -- synthetic vSpeed based on - -- home altitude when EKF is disabled - -- updated at 1Hz (i.e every 1000ms) - ------------------------------------- - if conf.enableSynthVSpeed == true then - if (synthVSpeedTime == 0) then - -- first time do nothing - synthVSpeedTime = getTime() - prevHomeAlt = telemetry.homeAlt -- dm - elseif (getTime() - synthVSpeedTime > 100) then - -- calc vspeed - vspd = 1000*(telemetry.homeAlt-prevHomeAlt)/(getTime()-synthVSpeedTime) -- m/s - -- update counters - synthVSpeedTime = getTime() - prevHomeAlt = telemetry.homeAlt -- m - end - else - vspd = telemetry.vSpeed - end -#else --SYNTHVSPEED - vspd = telemetry.vSpeed -#endif --SYNTHVSPEED - ------------------------------------- - -- vario indicator on right - ------------------------------------- - lcd.drawLine(ALT_HUD_X + ALT_HUD_WIDTH - 4, 7, ALT_HUD_X + ALT_HUD_WIDTH - 4, yPos + 40, SOLID, 0) - local varioMax = 10 - local varioSpeed = math.min(math.abs(0.1*vspd),10) - local varioY = 0 - local arrowY = -1 - if vspd > 0 then - varioY = ALT_HUD_X_MID - 4 - varioSpeed/varioMax*22 - else - varioY = ALT_HUD_X_MID + 7 - arrowY = 1 - end - lcd.drawFilledRectangle(ALT_HUD_X + ALT_HUD_WIDTH - 4, varioY, 4, varioSpeed/varioMax*22, FORCE, 0) - for i=0,16 - do - lcd.drawLine(ALT_HUD_X + ALT_HUD_WIDTH - 3, 9+i*3, ALT_HUD_X + ALT_HUD_WIDTH, 9+i*3, SOLID, ERASE) - lcd.drawLine(ALT_HUD_X + ALT_HUD_WIDTH - 2, arrowY+9+i*3, ALT_HUD_X + ALT_HUD_WIDTH-2, arrowY+9+i*3, SOLID, ERASE) - end - ------------------------------------- - -- left and right indicators on HUD - ------------------------------------- - -- lets erase to hide the artificial horizon lines - -- black borders - lcd.drawRectangle(ALT_HUD_X, ALT_HUD_X_MID - 5, LEFTWIDTH, 11, FORCE, 0) - lcd.drawRectangle(ALT_HUD_X + ALT_HUD_WIDTH - RIGHTWIDTH - 1, ALT_HUD_X_MID - 5, RIGHTWIDTH+1, 11, FORCE, 0) - -- erase area - lcd.drawFilledRectangle(ALT_HUD_X, ALT_HUD_X_MID - 4, LEFTWIDTH, 9, ERASE, 0) - lcd.drawFilledRectangle(ALT_HUD_X + ALT_HUD_WIDTH - RIGHTWIDTH - 1, ALT_HUD_X_MID - 4, RIGHTWIDTH+2, 9, ERASE, 0) - -- erase tips - lcd.drawLine(ALT_HUD_X + LEFTWIDTH,ALT_HUD_X_MID - 3,ALT_HUD_X + LEFTWIDTH,ALT_HUD_X_MID + 3, SOLID, ERASE) - lcd.drawLine(ALT_HUD_X + LEFTWIDTH+1,ALT_HUD_X_MID - 2,ALT_HUD_X + LEFTWIDTH+1,ALT_HUD_X_MID + 2, SOLID, ERASE) - lcd.drawLine(ALT_HUD_X + ALT_HUD_WIDTH - RIGHTWIDTH - 2,ALT_HUD_X_MID - 3,ALT_HUD_X + ALT_HUD_WIDTH - RIGHTWIDTH - 2,ALT_HUD_X_MID + 3, SOLID, ERASE) - lcd.drawLine(ALT_HUD_X + ALT_HUD_WIDTH - RIGHTWIDTH - 3,ALT_HUD_X_MID - 2,ALT_HUD_X + ALT_HUD_WIDTH - RIGHTWIDTH - 3,ALT_HUD_X_MID + 2, SOLID, ERASE) - -- left tip - lcd.drawLine(ALT_HUD_X + LEFTWIDTH+2,ALT_HUD_X_MID - 2,ALT_HUD_X + LEFTWIDTH+2,ALT_HUD_X_MID + 2, SOLID, FORCE) - lcd.drawLine(ALT_HUD_X + LEFTWIDTH-1,ALT_HUD_X_MID - 5,ALT_HUD_X + LEFTWIDTH+1,ALT_HUD_X_MID - 3, SOLID, FORCE) - lcd.drawLine(ALT_HUD_X + LEFTWIDTH-1,ALT_HUD_X_MID + 5,ALT_HUD_X + LEFTWIDTH+1,ALT_HUD_X_MID + 3, SOLID, FORCE) - -- right tip - lcd.drawLine(ALT_HUD_X + ALT_HUD_WIDTH - RIGHTWIDTH - 4,ALT_HUD_X_MID - 2,ALT_HUD_X + ALT_HUD_WIDTH - RIGHTWIDTH - 4,ALT_HUD_X_MID + 2, SOLID, FORCE) - lcd.drawLine(ALT_HUD_X + ALT_HUD_WIDTH - RIGHTWIDTH - 3,ALT_HUD_X_MID - 3,ALT_HUD_X + ALT_HUD_WIDTH - RIGHTWIDTH - 1,ALT_HUD_X_MID - 5, SOLID, FORCE) - lcd.drawLine(ALT_HUD_X + ALT_HUD_WIDTH - RIGHTWIDTH - 3,ALT_HUD_X_MID + 3,ALT_HUD_X + ALT_HUD_WIDTH - RIGHTWIDTH - 1,ALT_HUD_X_MID + 5, SOLID, FORCE) - -- altitude - local alt = getMaxValue(telemetry.homeAlt,MINMAX_ALT) * UNIT_ALT_SCALE -- homeAlt is meters*3.28 = feet - - if math.abs(alt) < 10 then - lcd.drawNumber(ALT_HUD_X + ALT_HUD_WIDTH,ALT_HUD_X_MID - 3,alt * 10,SMLSIZE+PREC1+RIGHT) - else - lcd.drawNumber(ALT_HUD_X + ALT_HUD_WIDTH,ALT_HUD_X_MID - 3,alt,SMLSIZE+RIGHT) - end - -- hspeed - local speed = getMaxValue(telemetry.hSpeed,MAX_HSPEED) * UNIT_HSPEED_SCALE - if math.abs(speed) > 99 then - lcd.drawNumber(ALT_HUD_X+1,ALT_HUD_X_MID - 3,speed*0.1,SMLSIZE) - else - lcd.drawNumber(ALT_HUD_X+1,ALT_HUD_X_MID - 3,speed,SMLSIZE+PREC1) - end - -- reference lines - lcd.drawLine(ALT_HUD_X_CENTER-9-1,ALT_HUD_X_MID,ALT_HUD_X_CENTER-4-1,ALT_HUD_X_MID ,SOLID,0) -- -1 to compensate for H offset - lcd.drawLine(ALT_HUD_X_CENTER-3-1,ALT_HUD_X_MID,ALT_HUD_X_CENTER-3-1,ALT_HUD_X_MID+3 ,SOLID,0) - lcd.drawLine(ALT_HUD_X_CENTER+4-1,ALT_HUD_X_MID,ALT_HUD_X_CENTER+9-1,ALT_HUD_X_MID ,SOLID,0) - lcd.drawLine(ALT_HUD_X_CENTER+3-1,ALT_HUD_X_MID,ALT_HUD_X_CENTER+3-1,ALT_HUD_X_MID+3 ,SOLID,0) - -- vspeed box (dm/s) - local xx = math.abs(vspd*UNIT_VSPEED_SCALE) > 9999 and 4 or 3 - xx = xx + (vspd*UNIT_VSPEED_SCALE < 0 and 1 or 0) - lcd.drawFilledRectangle(ALT_HUD_X_CENTER - (xx/2)*5 - 2, LCD_H - 17, xx*5+3, 10, ERASE) - if math.abs(vspd*UNIT_VSPEED_SCALE) > 99 then -- - lcd.drawNumber(ALT_HUD_X_CENTER + (xx/2)*5, LCD_H - 15, vspd*0.1*UNIT_VSPEED_SCALE, HSPEED_FLAGS+RIGHT) - else - lcd.drawNumber(ALT_HUD_X_CENTER + (xx/2)*5, LCD_H - 15, vspd*UNIT_VSPEED_SCALE, HSPEED_FLAGS+RIGHT+PREC1) - end - lcd.drawRectangle(ALT_HUD_X_CENTER - (xx/2)*5 - 2, LCD_H - 17, xx*5+3, 10, FORCE) - -- min/max arrows - if status.showMinMaxValues == true then - drawLib.drawVArrow(ALT_HUD_X + ALT_HUD_WIDTH - 24, ALT_HUD_X_MID - 4,6,true,false) - drawLib.drawVArrow(ALT_HUD_X + LEFTWIDTH + 4, ALT_HUD_X_MID - 4,6,true,false) - end - -- arming status, show only if timer is not running, hide otherwise - if telemetry.ekfFailsafe == 0 and telemetry.battFailsafe == 0 and status.timerRunning == 0 then - if (telemetry.statusArmed == 1) then - lcd.drawText(ALT_HUD_X + ALT_HUD_WIDTH/2 - 15, 20, " ARMED ", SMLSIZE+INVERS) - else - lcd.drawText(ALT_HUD_X + ALT_HUD_WIDTH/2 - 21, 20, " DISARMED ", SMLSIZE+INVERS+BLINK) - end - end - -- yaw angle box - xx = telemetry.yaw < 10 and 1 or ( telemetry.yaw < 100 and -2 or -5 ) - lcd.drawNumber(ALT_HUD_X_CENTER + xx - 6, YAW_Y-1, telemetry.yaw, MIDSIZE+INVERS) -end - -#else --X9 - -#define MINIHUD_R2 6 -#define MINIHUD_R3 8 -#define ALT_LEFTWIDTH 16 -#define ALT_RIGHTWIDTH 18 - -local vspd = 0 -local synthVSpeedTime = 0 -local prevHomeAlt = 0 - -local function drawMiniHud(drawLib,conf,telemetry,status,battery,getMaxValue) - ---------------------- - -- MINI HUD TOP LEFT - ---------------------- - local r = -telemetry.roll - local dx,dy - local yPos = TOPBAR_Y + TOPBAR_HEIGHT + 8 - - if ( roll == 0) then - dx=0 - dy=telemetry.pitch - -- 1st line offsets - cx=0 - cy=MINIHUD_R2 - -- 2nd line offsets - ccx=0 - ccy=2*MINIHUD_R2 - else - -- for a smaller hud vertical movement has to be scaled down - dx = 0.4 * math.cos(math.rad(90 - r)) * -telemetry.pitch - dy = 0.4 * math.sin(math.rad(90 - r)) * telemetry.pitch - -- 1st line offsets - cx = math.cos(math.rad(90 - r)) * MINIHUD_R2 - cy = math.sin(math.rad(90 - r)) * MINIHUD_R2 - -- 2nd line offsets - ccx = math.cos(math.rad(90 - r)) * 2 * MINIHUD_R3 - ccy = math.sin(math.rad(90 - r)) * 2 * MINIHUD_R3 - -- 3rd line offsets - cccx = math.cos(math.rad(90 - r)) * 3 * MINIHUD_R3 - cccy = math.sin(math.rad(90 - r)) * 3 * MINIHUD_R3 - end - - local minY = 7 - local maxY = 7 + 24 - local minX = ALT_HUD_X + 1 - local maxX = ALT_HUD_X + 64 - local ox = ALT_HUD_X + 31 + dx - - local oy = 7 + 12 + dy - local yy = 0 - -- angle of the line passing on point(ox,oy) - local angle = math.tan(math.rad(-telemetry.roll)) - -- for each pixel of the hud base/top - -- draw vertical black lines from hud border to horizon line - -- horizon line moves with pitch/roll - for xx= minX,maxX - do - yy = (oy - ox*angle) + math.floor(xx*angle) - if telemetry.roll > 90 or telemetry.roll < -90 then - if yy > minY then - lcd.drawLine(xx, minY, xx, math.min(yy,maxY),SOLID,0) - end - else - if yy < maxY then - lcd.drawLine(xx, maxY, xx, math.max(yy,minY),SOLID,0) - end - end - end - -- parallel lines above and below horizon of increasing length 5,7,16,16,7,5 - drawLib.drawLineWithClipping(ALT_HUD_X + 31 + dx - cccx,dy + 7 + 12 + cccy,r,16,DOTTED,ALT_HUD_X,ALT_HUD_X + 64,7,7+24) - drawLib.drawLineWithClipping(ALT_HUD_X + 31 + dx - ccx,dy + 7 + 12 + ccy,r,10,DOTTED,ALT_HUD_X,ALT_HUD_X + 64,7,7+24) - drawLib.drawLineWithClipping(ALT_HUD_X + 31 + dx - cx,dy + 7 + 12 + cy,r,16,DOTTED,ALT_HUD_X,ALT_HUD_X + 64,7,7+24) - drawLib.drawLineWithClipping(ALT_HUD_X + 31 + dx + cx,dy + 7 + 12 - cy,r,16,DOTTED,ALT_HUD_X,ALT_HUD_X + 64,7,7+24) - drawLib.drawLineWithClipping(ALT_HUD_X + 31 + dx + ccx,dy + 7 + 12 - ccy,r,10,DOTTED,ALT_HUD_X,ALT_HUD_X + 64,7,7+24) - drawLib.drawLineWithClipping(ALT_HUD_X + 31 + dx + cccx,dy + 7 + 12 - cccy,r,16,DOTTED,ALT_HUD_X,ALT_HUD_X + 64,7,7+24) - ------------------------------------- - -- vario indicator on right - ------------------------------------- - lcd.drawFilledRectangle(ALT_HUD_X + ALT_HUD_WIDTH - 5, 7, 5, 24, ERASE, 0) -#ifdef SYNTHVSPEED - ------------------------------------ - -- synthetic vSpeed based on - -- home altitude when EKF is disabled - -- updated at 1Hz (i.e every 1000ms) - ------------------------------------- - if conf.enableSynthVSpeed == true then - if (synthVSpeedTime == 0) then - -- first time do nothing - synthVSpeedTime = getTime() - prevHomeAlt = telemetry.homeAlt -- dm - elseif (getTime() - synthVSpeedTime > 100) then - -- calc vspeed - vspd = 1000*(telemetry.homeAlt-prevHomeAlt)/(getTime()-synthVSpeedTime) -- m/s - -- update counters - synthVSpeedTime = getTime() - prevHomeAlt = telemetry.homeAlt -- m - end - else - vspd = telemetry.vSpeed - end -#else --SYNTHVSPEED - vspd = telemetry.vSpeed -#endif --SYNTHVSPEED - lcd.drawLine(ALT_HUD_X + ALT_HUD_WIDTH - 6, 7, ALT_HUD_X + ALT_HUD_WIDTH - 6, 30, SOLID, FORCE) - local varioMax = 5 - local varioSpeed = math.min(math.abs(0.1*vspd),5) - local varioY = 0 - local arrowY = -1 - if vspd > 0 then - varioY = ALT_HUD_X_MID - varioSpeed/varioMax*9 - 3 - else - varioY = ALT_HUD_X_MID + 4 - arrowY = 1 - end - lcd.drawFilledRectangle(ALT_HUD_X + ALT_HUD_WIDTH - 4, varioY, 4, varioSpeed/varioMax*9, FORCE, 0) - --[[ - for i=0,8 - do - lcd.drawLine(ALT_HUD_X + ALT_HUD_WIDTH - 3, 8+i*3, ALT_HUD_X + ALT_HUD_WIDTH -1, 8+i*3, SOLID, ERASE) - lcd.drawLine(ALT_HUD_X + ALT_HUD_WIDTH - 2, arrowY+8+i*3, ALT_HUD_X + ALT_HUD_WIDTH-2, arrowY+8+i*3, SOLID, ERASE) - end - --]] - lcd.drawLine(ALT_HUD_X + ALT_HUD_WIDTH - 5, 19, ALT_HUD_X + ALT_HUD_WIDTH, 19, SOLID, FORCE) - ------------------------------------- - -- left and right indicators on HUD - ------------------------------------- - -- lets erase to hide the artificial horizon lines - -- black borders - lcd.drawRectangle(ALT_HUD_X+1, ALT_HUD_X_MID - 5, ALT_LEFTWIDTH, 10, FORCE, 0) - lcd.drawFilledRectangle(ALT_HUD_X+2, ALT_HUD_X_MID - 4, ALT_LEFTWIDTH, 8, ERASE, 0) - lcd.drawLine(ALT_HUD_X+ALT_LEFTWIDTH+2,ALT_HUD_X_MID - 3,ALT_HUD_X+ALT_LEFTWIDTH+2,ALT_HUD_X_MID +2,SOLID,FORCE) - lcd.drawPoint(ALT_HUD_X+ALT_LEFTWIDTH+1,ALT_HUD_X_MID - 4,SOLID+FORCE) - lcd.drawPoint(ALT_HUD_X+ALT_LEFTWIDTH+1,ALT_HUD_X_MID + 3,SOLID+FORCE) - - lcd.drawRectangle(ALT_HUD_X + ALT_HUD_WIDTH - ALT_RIGHTWIDTH + 1, ALT_HUD_X_MID - 5, ALT_RIGHTWIDTH, 10, FORCE, 0) - lcd.drawFilledRectangle(ALT_HUD_X + ALT_HUD_WIDTH - ALT_RIGHTWIDTH, ALT_HUD_X_MID - 4, ALT_RIGHTWIDTH, 8, ERASE, 0) - lcd.drawLine(ALT_HUD_X + ALT_HUD_WIDTH - ALT_RIGHTWIDTH - 1, ALT_HUD_X_MID - 3,ALT_HUD_X + ALT_HUD_WIDTH - ALT_RIGHTWIDTH - 1, ALT_HUD_X_MID +2,SOLID,FORCE) - lcd.drawPoint(ALT_HUD_X + ALT_HUD_WIDTH - ALT_RIGHTWIDTH, ALT_HUD_X_MID - 4,SOLID+FORCE) - lcd.drawPoint(ALT_HUD_X + ALT_HUD_WIDTH - ALT_RIGHTWIDTH, ALT_HUD_X_MID + 3,SOLID+FORCE) - - -- altitude - local alt = getMaxValue(telemetry.homeAlt,MINMAX_ALT) * UNIT_ALT_SCALE -- homeAlt is meters*3.28 = feet - if math.abs(alt) < 10 then - lcd.drawNumber(ALT_HUD_X + ALT_HUD_WIDTH,ALT_HUD_X_MID - 3,alt * 10,SMLSIZE+PREC1+RIGHT) - else - lcd.drawNumber(ALT_HUD_X + ALT_HUD_WIDTH,ALT_HUD_X_MID - 3,alt,SMLSIZE+RIGHT) - end - -- hspeed - local speed = getMaxValue(telemetry.hSpeed,MAX_HSPEED) * UNIT_HSPEED_SCALE - if math.abs(speed) > 99 then - lcd.drawNumber(ALT_HUD_X+2,ALT_HUD_X_MID - 3,speed*0.1,SMLSIZE) - else - lcd.drawNumber(ALT_HUD_X+2,ALT_HUD_X_MID - 3,speed,SMLSIZE+PREC1) - end - -- reference lines - lcd.drawLine(ALT_HUD_X_CENTER-11-1,ALT_HUD_X_MID,ALT_HUD_X_CENTER-6-1,ALT_HUD_X_MID ,SOLID,0) -- -1 to compensate for H offset - lcd.drawLine(ALT_HUD_X_CENTER-5-1,ALT_HUD_X_MID,ALT_HUD_X_CENTER-5-1,ALT_HUD_X_MID+3 ,SOLID,0) - lcd.drawLine(ALT_HUD_X_CENTER+2-1,ALT_HUD_X_MID,ALT_HUD_X_CENTER+7-1,ALT_HUD_X_MID ,SOLID,0) - lcd.drawLine(ALT_HUD_X_CENTER+1-1,ALT_HUD_X_MID,ALT_HUD_X_CENTER+1-1,ALT_HUD_X_MID+3 ,SOLID,0) - -- min/max arrows - if status.showMinMaxValues == true then - drawLib.drawVArrow(ALT_HUD_X + ALT_HUD_WIDTH - 24, ALT_HUD_X_MID - 4,6,true,false) - drawLib.drawVArrow(ALT_HUD_X + LEFTWIDTH + 4, ALT_HUD_X_MID - 4,6,true,false) - end - -- yaw angle box - local xx = telemetry.yaw < 10 and 0 or ( telemetry.yaw < 100 and -2 or -5 ) - lcd.drawNumber(ALT_HUD_X_CENTER + xx - 4, YAW_Y, telemetry.yaw, INVERS+SMLSIZE) -end -#endif --X7 - -local function drawRightPane(x,drawLib,conf,telemetry,status,battery,battId,getMaxValue,gpsStatuses) - local perc = 0 - if (battery[BATT_CAP+battId] > 0) then - perc = math.min(math.max((1 - (battery[BATT_MAH+battId]/battery[BATT_CAP+battId]))*100,0),99) - end - -- battery min cell - local flags = 0 - local dimFlags = 0 - if status.showMinMaxValues == false then - if status.battAlertLevel2 == true then - flags = BLINK - dimFlags = BLINK - elseif status.battAlertLevel1 == true then - dimFlags = BLINK+INVERS - end - end - -- +0.5 because PREC2 does a math.floor() and not a math.round() - lcd.drawNumber(x+BATTCELL_X, BATTCELL_Y, (battery[BATT_CELL+battId] + 0.5)*(battery[BATT_CELL+battId] < 1000 and 1 or 0.1), BATTCELL_FLAGS+flags+(battery[BATT_CELL+battId] < 1000 and PREC2 or PREC1)) - if status.showMinMaxValues == true then - drawLib.drawVArrow(x+BATTCELL_X+26, BATTCELL_Y+2,6,false,true) - else - lcd.drawText(LCD_W, BATTCELL_YV, "V", dimFlags+SMLSIZE+RIGHT) - --local xx = telemetry.yaw < 10 and 1 or ( telemetry.yaw < 100 and -2 or -5 ) - local s = status.battsource == "a2" and "a" or (status.battsource == "vs" and "s" or "f") - lcd.drawText(LCD_W, BATTCELL_YS, s, SMLSIZE+RIGHT) - end - - -- battery voltage - lcd.drawText(x+BATTVOLT_X, BATTVOLT_YV, "V", SMLSIZE+RIGHT) - lcd.drawNumber(lcd.getLastLeftPos()-1, BATTVOLT_Y, battery[BATT_VOLT+battId],SMLSIZE+PREC1+RIGHT) - -- battery current - lcd.drawText(x+BATTCURR_X, BATTCURR_YA, "A", SMLSIZE+RIGHT) - local mult = (battery[BATT_CURR+battId]*0.1 < 10) and 1 or 0.1 - lcd.drawNumber(lcd.getLastLeftPos()-1, BATTCURR_Y, battery[BATT_CURR+battId]*mult,SMLSIZE+RIGHT+(mult == 1 and PREC1 or 0)) - -- battery percentage - lcd.drawNumber(x+BATTPERC_X, BATTPERC_Y, perc, BATTPERC_FLAGS) - lcd.drawText(lcd.getLastRightPos()+1, BATTPERC_YPERC, "%", BATTPERC_FLAGSPERC) - -- battery mah - lcd.drawNumber(x+BATTMAH_X, BATTMAH_Y, battery[BATT_MAH+battId]/10, SMLSIZE+PREC2) - lcd.drawText(lcd.getLastRightPos(), BATTMAH_Y, "Ah", SMLSIZE) - -- battery cap - lcd.drawNumber(x+BATTMAH_X, BATTMAH_Y+7, battery[BATT_CAP+battId]/10, SMLSIZE+PREC2) - lcd.drawText(lcd.getLastRightPos(), BATTMAH_Y+7, "Ah", SMLSIZE) -end - --------------------- --- Single long function much more memory efficient than many little functions ---------------------- -#ifdef X9 -local sensorDelayStart = getTime() - -local function drawView(drawLib,conf,telemetry,status,battery,battId,getMaxValue,gpsStatuses) - - -- delay loading and compile of sensor conf file - if getTime() - sensorDelayStart > 20 then - if initSensors == true then - loadSensors() - initSensors = false - -- deallocate unused code - loadSensors = nil - getSensorsConfigFilename = nil - collectgarbage() - collectgarbage() - end - end - - drawCustomSensors(0,status) - - drawLib.drawRArrow(ALT_HOMEDIR_X,ALT_HOMEDIR_Y,ALT_HOMEDIR_R,telemetry.homeAngle - telemetry.yaw,1) - drawHud(drawLib,conf,telemetry,status,battery,getMaxValue) - - drawRightPane(LCD_W-32,drawLib,conf,telemetry,status,battery,battId,getMaxValue,gpsStatuses) - drawLeftPane(0,drawLib,conf,telemetry,status,battery,battId,getMaxValue,gpsStatuses) - - lcd.drawLine(0,24 ,ALT_HUD_X-1, 24, SOLID, FORCE) - lcd.drawLine(20, 7 , 20, 23, SOLID, FORCE) - lcd.drawLine(70, 7 ,70, 23, SOLID, FORCE) - lcd.drawLine(ALT_HUD_X - 1, 7 ,ALT_HUD_X - 1, 57, SOLID, FORCE) - lcd.drawLine(ALT_HUD_X + ALT_HUD_WIDTH, 7, ALT_HUD_X + ALT_HUD_WIDTH, 57, SOLID, FORCE) - - if telemetry.ekfFailsafe > 0 then - lcd.drawText(ALT_HUD_X + ALT_HUD_WIDTH/2 - 31, 20, " EKF FAILSAFE ", SMLSIZE+INVERS+BLINK) - end - if telemetry.battFailsafe > 0 then - lcd.drawText(ALT_HUD_X + ALT_HUD_WIDTH/2 - 33, 20, " BATT FAILSAFE ", SMLSIZE+INVERS+BLINK) - end -end - -#else -local sensorDelayStart = getTime() - -local function drawView(drawLib,conf,telemetry,status,battery,battId,getMaxValue,gpsStatuses) - - -- delay loading and compile of sensor conf file - if getTime() - sensorDelayStart > 20 then - if initSensors == true then - loadSensors() - initSensors = false - -- deallocate unused code - loadSensors = nil - getSensorsConfigFilename = nil - collectgarbage() - collectgarbage() - end - end - - drawCustomSensors(0,status) - - drawRightPane(LCD_W-31,drawLib,conf,telemetry,status,battery,battId,getMaxValue,gpsStatuses) - drawMiniHud(drawLib,conf,telemetry,status,battery,getMaxValue) - drawLeftPane(0,drawLib,conf,telemetry,status,battery,battId,getMaxValue,gpsStatuses) - drawLib.drawRArrow(ALT_HOMEDIR_X,ALT_HOMEDIR_Y,ALT_HOMEDIR_R,telemetry.homeAngle - telemetry.yaw,FORCE) - - lcd.drawLine(95, 7 ,95, 56, SOLID, FORCE) - lcd.drawLine(0, 31 ,95, 31, SOLID, FORCE) - lcd.drawLine(32, 7 ,32, 31, SOLID, FORCE) - --lcd.drawLine(64, 7 ,64, 31, SOLID, FORCE) - - -- arming status, show only if timer is not running, hide otherwise - if telemetry.ekfFailsafe == 0 and telemetry.battFailsafe == 0 and status.timerRunning == 0 then - if (telemetry.statusArmed == 1) then - lcd.drawText(ALT_HUD_X + 20, 22, "ARMED", SMLSIZE+INVERS) - else - lcd.drawText(ALT_HUD_X+12, 22, "DISARMED", SMLSIZE+INVERS+BLINK) - end - end - if telemetry.ekfFailsafe > 0 then - lcd.drawText(ALT_HUD_X+14, 22, "EKF FAIL", SMLSIZE+INVERS+BLINK) - end - - if telemetry.battFailsafe > 0 then - lcd.drawText(ALT_HUD_X+14, 22, "BAT FAIL", SMLSIZE+INVERS+BLINK) - end -end -#endif - -#ifdef CUSTOM_BG_CALL --- called at around 2Hz -local function background(conf,telemetry,status,getMaxValue,checkAlarm) -end -#endif --CUSTOM_BG_CALL - -return { - drawView=drawView, -#ifdef CUSTOM_BG_CALL - background=background, -#endif --CUSTOM_BG_CALL - customSensors=customSensors, - customSensorXY=customSensorXY -} \ No newline at end of file diff --git a/TARANIS/SOURCES/PP/lib/copter.lua b/TARANIS/SOURCES/PP/lib/copter.lua deleted file mode 100644 index 224854f8..00000000 --- a/TARANIS/SOURCES/PP/lib/copter.lua +++ /dev/null @@ -1,59 +0,0 @@ - --[[ - // Auto Pilot Modes enumeration - enum control_mode_t { - STABILIZE = 0, // manual airframe angle with manual throttle - ACRO = 1, // manual body-frame angular rate with manual throttle - ALT_HOLD = 2, // manual airframe angle with automatic throttle - AUTO = 3, // fully automatic waypoint control using mission commands - GUIDED = 4, // fully automatic fly to coordinate or fly at velocity/direction using GCS immediate commands - LOITER = 5, // automatic horizontal acceleration with automatic throttle - RTL = 6, // automatic return to launching point - CIRCLE = 7, // automatic circular flight with automatic throttle - LAND = 9, // automatic landing with horizontal position control - DRIFT = 11, // semi-automous position, yaw and throttle control - SPORT = 13, // manual earth-frame angular rate control with manual throttle - FLIP = 14, // automatically flip the vehicle on the roll axis - AUTOTUNE = 15, // automatically tune the vehicle's roll and pitch gains - POSHOLD = 16, // automatic position hold with manual override, with automatic throttle - BRAKE = 17, // full-brake using inertial/GPS system, no pilot input - THROW = 18, // throw to launch mode using inertial/GPS system, no pilot input - AVOID_ADSB = 19, // automatic avoidance of obstacles in the macro scale - e.g. full-sized aircraft - GUIDED_NOGPS = 20, // guided mode but only accepts attitude and altitude - SMART_RTL = 21, // SMART_RTL returns to home by retracing its steps - FLOWHOLD = 22, // FLOWHOLD holds position with optical flow without rangefinder - FOLLOW = 23, // follow attempts to follow another vehicle or ground station - ZIGZAG = 24, // ZIGZAG mode is able to fly in a zigzag manner with predefined point A and point B - }; - --]] - local flightModes = {} - - -- copter flight modes - flightModes[0]="" - flightModes[1]="Stabilize" - flightModes[2]="Acro" - flightModes[3]="AltHold" - flightModes[4]="Auto" - flightModes[5]="Guided" - flightModes[6]="Loiter" - flightModes[7]="RTL" - flightModes[8]="Circle" - flightModes[9]="" - flightModes[10]="Land" - flightModes[11]="" - flightModes[12]="Drift" - flightModes[13]="" - flightModes[14]="Sport" - flightModes[15]="Flip" - flightModes[16]="AutoTune" - flightModes[17]="PosHold" - flightModes[18]="Brake" - flightModes[19]="Throw" - flightModes[20]="AvoidADSB" - flightModes[21]="GuidedNOGPS" - flightModes[22]="SmartRTL" - flightModes[23]="FlowHold" - flightModes[24]="Follow" - flightModes[25]="ZigZag" - flightModes[26]="Initializing" - -return {flightModes=flightModes} \ No newline at end of file diff --git a/TARANIS/SOURCES/PP/lib/copter_px4.lua b/TARANIS/SOURCES/PP/lib/copter_px4.lua deleted file mode 100644 index f1bb2c01..00000000 --- a/TARANIS/SOURCES/PP/lib/copter_px4.lua +++ /dev/null @@ -1,28 +0,0 @@ -local flightModes = {} --- plane flight modes -flightModes[0]="" -flightModes[1]="Manual" -flightModes[2]="AltCtl" --px4 specific -flightModes[3]="PosCtl" --px4 specific -flightModes[4]="Ready" --px4 specific -flightModes[5]="Takeoff" --px4 specific -flightModes[6]="Loiter" -flightModes[7]="Mission" --px4 specific -flightModes[8]="RTL" -flightModes[9]="Land" -flightModes[10]="RTGS" --px4 specific -flightModes[11]="Follow" -flightModes[12]="PrecLand" --px4 specific -flightModes[13]="" -flightModes[14]="Acro" -flightModes[15]="OffBoard" --px4 specific -flightModes[16]="Stabilize" -flightModes[17]="RAttitude" --px4 specific -flightModes[18]="Simple" --px4 specific -flightModes[19]="" -flightModes[20]="" -flightModes[21]="" -flightModes[22]="" -flightModes[23]="" --- -return {flightModes=flightModes} diff --git a/TARANIS/SOURCES/PP/lib/draw.lua b/TARANIS/SOURCES/PP/lib/draw.lua deleted file mode 100644 index 0199a2b4..00000000 --- a/TARANIS/SOURCES/PP/lib/draw.lua +++ /dev/null @@ -1,281 +0,0 @@ -#include "includes/yaapu_inc.lua" - -local function drawHArrow(x,y,width,left,right) - lcd.drawLine(x, y, x + width,y, SOLID, 0) - if left == true then - lcd.drawLine(x + 1,y - 1,x + 2,y - 2, SOLID, 0) - lcd.drawLine(x + 1,y + 1,x + 2,y + 2, SOLID, 0) - end - if right == true then - lcd.drawLine(x + width - 1,y - 1,x + width - 2,y - 2, SOLID, 0) - lcd.drawLine(x + width - 1,y + 1,x + width - 2,y + 2, SOLID, 0) - end -end - -local function drawVArrow(x,y,h,top,bottom) - lcd.drawLine(x,y,x,y + h, SOLID, 0) -#ifdef X9 - if top == true then - lcd.drawLine(x - 1,y + 1,x - 2,y + 2, SOLID, 0) - lcd.drawLine(x + 1,y + 1,x + 2,y + 2, SOLID, 0) - end - if bottom == true then - lcd.drawLine(x - 1,y + h - 1,x - 2,y + h - 2, SOLID, 0) - lcd.drawLine(x + 1,y + h - 1,x + 2,y + h - 2, SOLID, 0) - end -#else - if top == true then - lcd.drawPoint(x - 1,y + 1) - lcd.drawPoint(x + 1,y + 1) - end - if bottom == true then - lcd.drawPoint(x - 1,y + h - 1) - lcd.drawPoint(x + 1,y + h - 1) - end -#endif -end - - -#ifdef X9 -local function drawHomeIcon(x,y) - lcd.drawRectangle(x,y,5,5,SOLID) - lcd.drawLine(x+2,y+3,x+2,y+4,SOLID,FORCE) - lcd.drawPoint(x+2,y-1,FORCE) - lcd.drawLine(x,y+1,x+5,y+1,SOLID,FORCE) - lcd.drawLine(x-1,y+1,x+2,y-2,SOLID, FORCE) - lcd.drawLine(x+5,y+1,x+3,y-1,SOLID, FORCE) -end -#else --X9 -local function drawHomeIcon(x,y) - lcd.drawRectangle(x,y,3,4,SOLID) - lcd.drawFilledRectangle(x,y,3,4,SOLID) - lcd.drawPoint(x-1,y+1,FORCE) - lcd.drawPoint(x+3,y+1,FORCE) - lcd.drawPoint(x+1,y-1,FORCE) -end -#endif - -#define CS_INSIDE 0 -#define CS_LEFT 1 -#define CS_RIGHT 2 -#define CS_BOTTOM 4 -#define CS_TOP 8 - -local function computeOutCode(x,y,xmin,ymin,xmax,ymax) - local code = CS_INSIDE; --initialised as being inside of hud - -- - if x < xmin then --to the left of hud - code = bit32.bor(code,CS_LEFT); - elseif x > xmax then --to the right of hud - code = bit32.bor(code,CS_RIGHT); - end - if y < ymin then --below the hud - code = bit32.bor(code,CS_BOTTOM); - elseif y > ymax then --above the hud - code = bit32.bor(code,CS_TOP); - end - -- - return code; -end --- Cohen–Sutherland clipping algorithm --- https://en.wikipedia.org/wiki/Cohen%E2%80%93Sutherland_algorithm -local function drawLineWithClipping(ox,oy,angle,len,style,xmin,xmax,ymin,ymax) - -- - local xx = math.cos(math.rad(angle)) * len * 0.5 - local yy = math.sin(math.rad(angle)) * len * 0.5 - -- - local x0 = ox - xx - local x1 = ox + xx - local y0 = oy - yy - local y1 = oy + yy - -- compute outcodes for P0, P1, and whatever point lies outside the clip rectangle - local outcode0 = computeOutCode(x0, y0, xmin, ymin, xmax, ymax); - local outcode1 = computeOutCode(x1, y1, xmin, ymin, xmax, ymax); - local accept = false; - while (true) do - if ( bit32.bor(outcode0,outcode1) == CS_INSIDE) then - -- bitwise OR is 0: both points inside window; trivially accept and exit loop - accept = true; - break; - elseif (bit32.band(outcode0,outcode1) ~= CS_INSIDE) then - -- bitwise AND is not 0: both points share an outside zone (LEFT, RIGHT, TOP, BOTTOM) - -- both must be outside window; exit loop (accept is false) - break; - else - -- failed both tests, so calculate the line segment to clip - -- from an outside point to an intersection with clip edge - local x = 0 - local y = 0 - -- At least one endpoint is outside the clip rectangle; pick it. - local outcodeOut = outcode0 ~= CS_INSIDE and outcode0 or outcode1 - -- No need to worry about divide-by-zero because, in each case, the - -- outcode bit being tested guarantees the denominator is non-zero - if bit32.band(outcodeOut,CS_TOP) ~= CS_INSIDE then --point is above the clip window - x = x0 + (x1 - x0) * (ymax - y0) / (y1 - y0) - y = ymax - elseif bit32.band(outcodeOut,CS_BOTTOM) ~= CS_INSIDE then --point is below the clip window - x = x0 + (x1 - x0) * (ymin - y0) / (y1 - y0) - y = ymin - elseif bit32.band(outcodeOut,CS_RIGHT) ~= CS_INSIDE then --point is to the right of clip window - y = y0 + (y1 - y0) * (xmax - x0) / (x1 - x0) - x = xmax - elseif bit32.band(outcodeOut,CS_LEFT) ~= CS_INSIDE then --point is to the left of clip window - y = y0 + (y1 - y0) * (xmin - x0) / (x1 - x0) - x = xmin - end - -- Now we move outside point to intersection point to clip - -- and get ready for next pass. - if outcodeOut == outcode0 then - x0 = x - y0 = y - outcode0 = computeOutCode(x0, y0, xmin, ymin, xmax, ymax) - else - x1 = x - y1 = y - outcode1 = computeOutCode(x1, y1, xmin, ymin, xmax, ymax) - end - end - end - if accept then - lcd.drawLine(x0,y0,x1,y1, style,0) - end -end - -local function drawBottomBar(msg,lastMsgTime) - lcd.drawText(0,BOTTOMBAR_Y+1,msg,SMLSIZE+INVERS) -end - -#ifdef DEV -local function drawCircle(x0,y0,radius,delta) - local x = radius-1 - local y = 0 - local dx = delta - local dy = delta - local err = dx - bit32.lshift(radius,1) - while (x >= y) do - lcd.drawPoint(x0 + x, y0 + y); - lcd.drawPoint(x0 + y, y0 + x); - lcd.drawPoint(x0 - y, y0 + x); - lcd.drawPoint(x0 - x, y0 + y); - lcd.drawPoint(x0 - x, y0 - y); - lcd.drawPoint(x0 - y, y0 - x); - lcd.drawPoint(x0 + y, y0 - x); - lcd.drawPoint(x0 + x, y0 - y); - if err <= 0 then - y=y+1 - err = err + dy - dy = dy + 2 - end - if err > 0 then - - x=x-1 - dx = dx + 2 - err = err + dx - bit32.lshift(radius,1) - end - end -end -#endif --DEV - -local function drawGrid() - lcd.drawLine(HUD_X - 1, 7 ,HUD_X - 1, 57, SOLID, FORCE) - lcd.drawLine(HUD_X + HUD_WIDTH, 7, HUD_X + HUD_WIDTH, 55, SOLID, FORCE) -end - -local function drawTopBar(strMode,simpleMode,flightTime,telemetryEnabled) - -- flight mode - -- simplemode - if strMode ~= nil then - lcd.drawText(FLIGHTMODE_X, FLIGHTMODE_Y, strMode, FLIGHTMODE_FLAGS) - if ( simpleMode > 0) then - local strSimpleMode = simpleMode == 1 and "(S)" or "(SS)" - lcd.drawText(lcd.getLastRightPos(), FLIGHTMODE_Y, strSimpleMode, FLIGHTMODE_FLAGS) - end - end -#ifdef X9 - lcd.drawTimer(LCD_W-1, FLIGHTTIME_Y, flightTime, FLIGHTTIME_FLAGS+RIGHT) -#else - lcd.drawTimer(FLIGHTTIME_X, FLIGHTTIME_Y, flightTime, FLIGHTTIME_FLAGS) -#endif - -- RSSI - if (not telemetryEnabled()) then -#ifdef X9 - lcd.drawText(RSSI_X, RSSI_Y, "no telem!", SMLSIZE+BLINK+INVERS) -#else - lcd.drawText(RSSI_X-24, RSSI_Y, "no telem!", SMLSIZE+BLINK+INVERS) -#endif - else - lcd.drawText(RSSI_X, RSSI_Y, "RS:", RSSI_FLAGS) -#ifdef DEMO - lcd.drawText(lcd.getLastRightPos(), RSSI_Y, 87, RSSI_FLAGS) -#else --DEMO - lcd.drawText(lcd.getLastRightPos(), RSSI_Y, getRSSI(), RSSI_FLAGS) -#endif --DEMO - end -#ifdef X9 - -- tx voltage - local vTx = string.format("Tx%.1fv",getValue(getFieldInfo("tx-voltage").id)) - lcd.drawText(TXVOLTAGE_X, TXVOLTAGE_Y, vTx, TXVOLTAGE_FLAGS) -#endif --X9 -end - -local function drawFailSafe(showDualBattery,ekfFailsafe,battFailsafe) - local xoffset = 0 - local yoffset = 0 - if ekfFailsafe > 0 then - lcd.drawText(xoffset + HUD_X + HUD_WIDTH/2 - 31, 20 + yoffset, " EKF FAILSAFE ", SMLSIZE+INVERS+BLINK) - end - if battFailsafe > 0 then - lcd.drawText(xoffset + HUD_X + HUD_WIDTH/2 - 31, 20 + yoffset, " BATT FAILSAFE ", SMLSIZE+INVERS+BLINK) - end -end - -#ifndef NOTELEM_POPUP -local function drawNoTelemetry(telemetryEnabled,hideNoTelemetry) - -- no telemetry data -#ifdef X9 - if (not telemetryEnabled() and not hideNoTelemetry) then - lcd.drawFilledRectangle((212-130)/2,18, 130, 30, SOLID) - lcd.drawRectangle((212-130)/2,18, 130, 30, ERASE) - lcd.drawText(60, 29, "no telemetry data", INVERS) - return - end -#else - if (not telemetryEnabled() and not hideNoTelemetry) then - lcd.drawFilledRectangle(12,18, 105, 30, SOLID) - lcd.drawRectangle(12,18, 105, 30, ERASE) - lcd.drawText(30, 29, "no telemetry", INVERS) - return - end -#endif --X9 -end -#endif - -local function drawRArrow(x,y,rad,angle,flags) - local x1 = x + rad * math.cos(math.rad(angle - 90)) - local y1 = y + rad * math.sin(math.rad(angle - 90)) - local x2 = x + (rad-1) * math.cos(math.rad(angle - 90 + 140)) - local y2 = y + (rad-1) * math.sin(math.rad(angle - 90 + 140)) - local x3 = x + (rad-1) * math.cos(math.rad(angle - 90 - 140)) - local y3 = y + (rad-1) * math.sin(math.rad(angle - 90 - 140)) - local x4 = x + (rad-1) * 0.5 * math.cos(math.rad(angle - 270)) - local y4 = y + (rad-1) * 0.5 *math.sin(math.rad(angle - 270)) - -- - lcd.drawLine(x1,y1,x2,y2,SOLID,flags) - lcd.drawLine(x1,y1,x3,y3,SOLID,flags) - lcd.drawLine(x2,y2,x4,y4,SOLID,flags) - lcd.drawLine(x3,y3,x4,y4,SOLID,flags) - lcd.drawPoint(x1,y1,SOLID+flags) -end - -return { - drawFailSafe=drawFailSafe, - drawTopBar=drawTopBar, - drawHArrow=drawHArrow, - drawVArrow=drawVArrow, - drawRArrow=drawRArrow, - drawGrid=drawGrid, - drawBottomBar=drawBottomBar, - drawHomeIcon=drawHomeIcon, - drawLineWithClipping=drawLineWithClipping, - drawNoTelemetry=drawNoTelemetry - } \ No newline at end of file diff --git a/TARANIS/SOURCES/PP/lib/hud.lua b/TARANIS/SOURCES/PP/lib/hud.lua deleted file mode 100644 index 9c78adbd..00000000 --- a/TARANIS/SOURCES/PP/lib/hud.lua +++ /dev/null @@ -1,283 +0,0 @@ -#include "includes/yaapu_inc.lua" - --- SYNTH VSPEED SUPPORT -local vspd = 0 -local synthVSpeedTime = 0 -local prevHomeAlt = 0 - -local yawRibbonPoints = {} - -yawRibbonPoints[0]="N" -yawRibbonPoints[1]="" -yawRibbonPoints[2]="NE" -yawRibbonPoints[3]="" -yawRibbonPoints[4]="E" -yawRibbonPoints[5]="" -yawRibbonPoints[6]="SE" -yawRibbonPoints[7]="" -yawRibbonPoints[8]="S" -yawRibbonPoints[9]="" -yawRibbonPoints[10]="SW" -yawRibbonPoints[11]="" -yawRibbonPoints[12]="W" -yawRibbonPoints[13]="" -yawRibbonPoints[14]="NW" -yawRibbonPoints[15]="" - -local function drawHud(drawLib,conf,telemetry,status,battery,getMaxValue) - -- compass ribbon centered +/- 90 on yaw -#ifdef X9 - local centerYaw = (telemetry.yaw+270)%360 -#else - local centerYaw = (telemetry.yaw+270+3)%360 -- +3 to center the ribbon on screen -#endif - -- this is the first point left to be drawn on the compass ribbon - local nextPoint = math.floor(centerYaw/22.5) * 22.5 - -- x coord of first ribbon letter - local nextPointX = 2 + YAW_X_MIN + (nextPoint - centerYaw)/22.5 * YAW_STEPWIDTH - - local i = (nextPoint / 22.5) % 16 - for idx=1,12 - do - local letterOffset = 0 - local lineOffset = 2 - if #yawRibbonPoints[i] > 1 then - letterOffset = -2 - lineOffset = 3 - end - if nextPointX >= YAW_X_MIN -3 and nextPointX < YAW_X_MAX then - if #yawRibbonPoints[i] == 0 then - lcd.drawLine(nextPointX + lineOffset, YAW_Y, nextPointX + lineOffset, YAW_Y + 2, SOLID, 0) - else - lcd.drawText(nextPointX + letterOffset,YAW_Y+1 ,yawRibbonPoints[i],SMLSIZE) - end - end - i = (i + 1) % 16 - nextPointX = nextPointX + YAW_STEPWIDTH - end - -- home icon - local homeOffset = 0 --YAW_WIDTH-14 - local angle = telemetry.homeAngle - telemetry.yaw - if angle < 0 then - angle = 360 + angle - end - if angle > 270 or angle < 90 then - homeOffset = ((angle + 90) % 180)/180 * (YAW_WIDTH-12) - elseif angle >= 90 and angle <= 180 then - homeOffset = YAW_WIDTH-10--0 - end - drawLib.drawHomeIcon(YAW_X_MIN + homeOffset,YAW_Y + 12) - -- clean right and left - lcd.drawFilledRectangle(HUD_X-2, YAW_Y, 5, 10, ERASE, 0) - lcd.drawFilledRectangle(HUD_X+HUD_WIDTH-7, YAW_Y, 8, 10, ERASE, 0) - -- HUD - local r = -telemetry.roll - local cx,cy,dx,dy,ccx,ccy - local yPos = TOPBAR_Y + TOPBAR_HEIGHT + 8 - ----------------------- - -- artificial horizon - ----------------------- - -- no roll ==> segments are vertical, offsets are multiples of R2 - if ( telemetry.roll == 0) then - dx=0 - dy=telemetry.pitch - cx=0 - cy=HUD_R2 - ccx=0 - ccy=2*HUD_R2 - else - -- center line offsets - dx = math.cos(math.rad(90 - r)) * -telemetry.pitch - dy = math.sin(math.rad(90 - r)) * telemetry.pitch - -- 1st line offsets - cx = math.cos(math.rad(90 - r)) * HUD_R2 - cy = math.sin(math.rad(90 - r)) * HUD_R2 - -- 2nd line offsets - ccx = math.cos(math.rad(90 - r)) * 2 * HUD_R2 - ccy = math.sin(math.rad(90 - r)) * 2 * HUD_R2 - end - local rollX = LCD_W/2 - 1 - 2 - -- parallel lines above and below horizon line - drawLib.drawLineWithClipping(rollX + dx - ccx,dy + HUD_X_MID + ccy,r,20,DOTTED,HUD_X,HUD_X + HUD_WIDTH,8,BOTTOMBAR_Y - 1) - drawLib.drawLineWithClipping(rollX + dx - cx,dy + HUD_X_MID + cy,r,8,DOTTED,HUD_X,HUD_X + HUD_WIDTH,8,BOTTOMBAR_Y - 1) - drawLib.drawLineWithClipping(rollX + dx + cx,dy + HUD_X_MID - cy,r,8,DOTTED,HUD_X,HUD_X + HUD_WIDTH,8,BOTTOMBAR_Y - 1) - drawLib.drawLineWithClipping(rollX + dx + ccx,dy + HUD_X_MID - ccy,r,20,DOTTED,HUD_X,HUD_X + HUD_WIDTH,8,BOTTOMBAR_Y - 1) - ----------------------- - -- dark color for "ground" - ----------------------- - local minY = 8 - local minX = HUD_X + 1 - -- vario width is 6 - local maxX = HUD_X + HUD_WIDTH - 8 -#ifdef X9 - local maxY = 54 - local ox = 106 + dx - 2 -#else --X9 - local maxY = 55 - local ox = 64 + dx - 2 -#endif --X7 - local oy = HUD_X_MID + dy - local yy = 0 - -- angle of the line passing on point(ox,oy) - local angle = math.tan(math.rad(-telemetry.roll)) - -- for each pixel of the hud base/top draw vertical black - -- lines from hud border to horizon line - -- horizon line moves with pitch/roll - for xx= minX,maxX - do - yy = (oy - ox*angle) + math.floor(xx*angle) - if telemetry.roll > 90 or telemetry.roll < -90 then - if yy > minY then - lcd.drawLine(xx, minY, xx, math.min(yy,maxY),SOLID,0) - end - else - if yy < maxY then - lcd.drawLine(xx, maxY, xx, math.max(yy,minY),SOLID,0) - end - end - end -#ifdef SYNTHVSPEED - ------------------------------------ - -- synthetic vSpeed based on - -- home altitude when EKF is disabled - -- updated at 1Hz (i.e every 1000ms) - ------------------------------------- - if conf.enableSynthVSpeed == true then - if (synthVSpeedTime == 0) then - -- first time do nothing - synthVSpeedTime = getTime() - prevHomeAlt = telemetry.homeAlt -- dm - elseif (getTime() - synthVSpeedTime > 100) then - -- calc vspeed - vspd = 1000*(telemetry.homeAlt-prevHomeAlt)/(getTime()-synthVSpeedTime) -- m/s - -- update counters - synthVSpeedTime = getTime() - prevHomeAlt = telemetry.homeAlt -- m - end - else - vspd = telemetry.vSpeed - end -#else - vspd = telemetry.vSpeed -#endif - ------------------------------------- - -- vario indicator on right - ------------------------------------- - lcd.drawLine(HUD_X + HUD_WIDTH - 6, 7, HUD_X + HUD_WIDTH - 6, yPos + 40, SOLID, 0) - - local varioMax = 10 - local varioSpeed = math.min(math.abs(0.1*vspd),10) - local varioY = 0 - local arrowY = -1 - if vspd > 0 then - varioY = HUD_X_MID - 4 - varioSpeed/varioMax*22 - else - varioY = HUD_X_MID + 6 - arrowY = 1 - end - lcd.drawFilledRectangle(HUD_X + HUD_WIDTH - 6, varioY, 6, varioSpeed/varioMax*22, FORCE, 0) - for i=0,16 - do - lcd.drawLine(HUD_X + HUD_WIDTH - 4, 9+i*3, HUD_X + HUD_WIDTH-2, 9+i*3, SOLID, ERASE) - lcd.drawLine(HUD_X + HUD_WIDTH - 3, arrowY+9+i*3, HUD_X + HUD_WIDTH-3, arrowY+9+i*3, SOLID, ERASE) - end - -- hashmarks - local offset = 0 - for i=0,5 - do - -- left hashmarks - offset = 48 - ((telemetry.hSpeed - i*8) % 46)/46 * 46 - lcd.drawLine(HUD_X+1, YAW_Y + offset, HUD_X + 2, YAW_Y + offset, SOLID, 0) - -- right hashmarks - offset = 48 - ((telemetry.homeAlt - i*8) % 46)/46 * 46 - lcd.drawLine(HUD_X + HUD_WIDTH - 9, YAW_Y + offset, HUD_X + HUD_WIDTH - 8, YAW_Y + offset, SOLID, 0) - end - ------------------------------------- - -- left and right indicators on HUD - ------------------------------------- - -- lets erase to hide the artificial horizon lines - -- black borders - lcd.drawRectangle(HUD_X, HUD_X_MID - 5, LEFTWIDTH, 11, FORCE, 0) - lcd.drawRectangle(HUD_X + HUD_WIDTH - RIGHTWIDTH - 1, HUD_X_MID - 5, RIGHTWIDTH+1, 11, FORCE, 0) - -- erase area - lcd.drawFilledRectangle(HUD_X, HUD_X_MID - 4, LEFTWIDTH, 9, ERASE, 0) - lcd.drawFilledRectangle(HUD_X + HUD_WIDTH - RIGHTWIDTH - 1, HUD_X_MID - 4, RIGHTWIDTH+2, 9, ERASE, 0) - -- erase tips - lcd.drawLine(HUD_X + LEFTWIDTH,HUD_X_MID - 3,HUD_X + LEFTWIDTH,HUD_X_MID + 3, SOLID, ERASE) - lcd.drawLine(HUD_X + LEFTWIDTH+1,HUD_X_MID - 2,HUD_X + LEFTWIDTH+1,HUD_X_MID + 2, SOLID, ERASE) - lcd.drawLine(HUD_X + HUD_WIDTH - RIGHTWIDTH - 2,HUD_X_MID - 3,HUD_X + HUD_WIDTH - RIGHTWIDTH - 2,HUD_X_MID + 3, SOLID, ERASE) - lcd.drawLine(HUD_X + HUD_WIDTH - RIGHTWIDTH - 3,HUD_X_MID - 2,HUD_X + HUD_WIDTH - RIGHTWIDTH - 3,HUD_X_MID + 2, SOLID, ERASE) - -- left tip - lcd.drawLine(HUD_X + LEFTWIDTH+2,HUD_X_MID - 2,HUD_X + LEFTWIDTH+2,HUD_X_MID + 2, SOLID, FORCE) - lcd.drawLine(HUD_X + LEFTWIDTH-1,HUD_X_MID - 5,HUD_X + LEFTWIDTH+1,HUD_X_MID - 3, SOLID, FORCE) - lcd.drawLine(HUD_X + LEFTWIDTH-1,HUD_X_MID + 5,HUD_X + LEFTWIDTH+1,HUD_X_MID + 3, SOLID, FORCE) - -- right tip - lcd.drawLine(HUD_X + HUD_WIDTH - RIGHTWIDTH - 4,HUD_X_MID - 2,HUD_X + HUD_WIDTH - RIGHTWIDTH - 4,HUD_X_MID + 2, SOLID, FORCE) - lcd.drawLine(HUD_X + HUD_WIDTH - RIGHTWIDTH - 3,HUD_X_MID - 3,HUD_X + HUD_WIDTH - RIGHTWIDTH - 1,HUD_X_MID - 5, SOLID, FORCE) - lcd.drawLine(HUD_X + HUD_WIDTH - RIGHTWIDTH - 3,HUD_X_MID + 3,HUD_X + HUD_WIDTH - RIGHTWIDTH - 1,HUD_X_MID + 5, SOLID, FORCE) - -- altitude - local alt = getMaxValue(telemetry.homeAlt,MINMAX_ALT) * UNIT_ALT_SCALE -- homeAlt is meters*3.28 = feet - - if math.abs(alt) < 10 then - lcd.drawNumber(HUD_X + HUD_WIDTH,HUD_X_MID - 3,alt * 10,PREC1+RIGHT) - else - lcd.drawNumber(HUD_X + HUD_WIDTH,HUD_X_MID - 3,alt,RIGHT) - end - -- hspeed - local speed = getMaxValue(telemetry.hSpeed,MAX_HSPEED) * UNIT_HSPEED_SCALE - if math.abs(speed) > 99 then - lcd.drawNumber(HUD_X+1,HUD_X_MID - 3,speed*0.1,0) - else - lcd.drawNumber(HUD_X+1,HUD_X_MID - 3,speed,PREC1) - end - - lcd.drawLine(LCD_W/2-9-3,HUD_X_MID,LCD_W/2-4-3,HUD_X_MID ,SOLID,0) -- -1 to compensate for H offset - lcd.drawLine(LCD_W/2-3-3,HUD_X_MID,LCD_W/2-3-3,HUD_X_MID+3 ,SOLID,0) - - lcd.drawLine(LCD_W/2+4-3,HUD_X_MID,LCD_W/2+9-3,HUD_X_MID ,SOLID,0) - lcd.drawLine(LCD_W/2+3-3,HUD_X_MID,LCD_W/2+3-3,HUD_X_MID+3 ,SOLID,0) - -- vspeed box (dm/s) - local xx = math.abs(vspd*UNIT_VSPEED_SCALE) > 9999 and 4 or 3 - xx = xx + (vspd*UNIT_VSPEED_SCALE < 0 and 1 or 0) - - lcd.drawFilledRectangle((LCD_W)/2 - (xx/2)*5 - 2, LCD_H - 17, xx*5+3, 10, ERASE) - - if math.abs(vspd*UNIT_VSPEED_SCALE) > 99 then -- - lcd.drawNumber((LCD_W)/2 + (xx/2)*5, LCD_H - 15, vspd*0.1*UNIT_VSPEED_SCALE, HSPEED_FLAGS+RIGHT) - else - lcd.drawNumber((LCD_W)/2 + (xx/2)*5, LCD_H - 15, vspd*UNIT_VSPEED_SCALE, HSPEED_FLAGS+RIGHT+PREC1) - end - lcd.drawRectangle((LCD_W)/2 - (xx/2)*5 - 2, LCD_H - 17, xx*5+3, 10, FORCE+SOLID) - - if status.showMinMaxValues == true then - drawLib.drawVArrow(HUD_X + LEFTWIDTH + 4, HUD_X_MID - 4,6,true,false) - end - -- min/max arrows - if status.showMinMaxValues == true then - drawLib.drawVArrow(HUD_X + HUD_WIDTH - 24, HUD_X_MID - 4,6,true,false) - end - -- arming status, show only if timer is not running, hide otherwise - if telemetry.ekfFailsafe == 0 and telemetry.battFailsafe == 0 and status.timerRunning == 0 then - if (telemetry.statusArmed == 1) then - lcd.drawText(HUD_X + HUD_WIDTH/2 - 15, 20, " ARMED ", SMLSIZE+INVERS) - else - lcd.drawText(HUD_X + HUD_WIDTH/2 - 21, 20, " DISARMED ", SMLSIZE+INVERS+BLINK) - end - end - -- yaw angle box - xx = telemetry.yaw < 10 and 1 or ( telemetry.yaw < 100 and -2 or -5 ) - lcd.drawNumber(LCD_W/2 + xx - 8, YAW_Y-1, telemetry.yaw, MIDSIZE+INVERS) -end - -#ifdef CUSTOM_BG_CALL -local function background(conf,telemetry,status,getMaxValue,checkAlarm) -end -#endif --CUSTOM_BG_CALL - -return { - drawHud=drawHud, -#ifdef CUSTOM_BG_CALL - background=background, -#endif --CUSTOM_BG_CALL - yawRibbonPoints=yawRibbonPoints -} \ No newline at end of file diff --git a/TARANIS/SOURCES/PP/lib/left.lua b/TARANIS/SOURCES/PP/lib/left.lua deleted file mode 100644 index 6c15d955..00000000 --- a/TARANIS/SOURCES/PP/lib/left.lua +++ /dev/null @@ -1,252 +0,0 @@ -#include "includes/yaapu_inc.lua" - -#ifdef X9 - -#define GPS_X 0 -#define GPS_Y 6 -#define GPS_BORDER 0 - -#define ALTASL_X 61 -#define ALTASL_Y 24 -#define ALTASL_XLABEL 4 -#define ALTASL_YLABEL 23 -#define ALTASL_FLAGS RIGHT - -#define HOMEDIST_X 60 -#define HOMEDIST_Y 34 -#define HOMEDIST_XLABEL 2 -#define HOMEDIST_YLABEL 37 -#define HOMEDIST_FLAGS RIGHT+MIDSIZE -#define HOMEDIST_ARROW_WIDTH 8 - -#define TOTDIST_X 61 -#define TOTDIST_Y 49 -#define TOTDIST_XLABEL 2 -#define TOTDIST_YLABEL 49 -#define TOTDIST_FLAGS RIGHT -#define TOTDIST_ARROW_WIDTH 8 - - -#else - -#define GPS_X 1 -#define GPS_Y 6 -#define GPS_BORDER 0 - -#define TOTDIST_X 32 -#define TOTDIST_Y 50 -#define TOTDIST_XLABEL 0 -#define TOTDIST_YLABEL 30 -#define TOTDIST_FLAGS RIGHT -#define TOTDIST_ARROW_WIDTH 4 - -#define ALTASL_X 31 -#define ALTASL_Y 30 -#define ALTASL_XLABEL 1 -#define ALTASL_YLABEL 30 -#define ALTASL_FLAGS SMLSIZE - -#define HOMEDIST_X 31 -#define HOMEDIST_Y 40 -#define HOMEDIST_XLABEL 1 -#define HOMEDIST_YLABEL 42 -#define HOMEDIST_FLAGS SMLSIZE+RIGHT -#define HOMEDIST_ARROW_WIDTH 7 - -#endif - -#ifdef X9 -local function drawPane(x,drawLib,conf,telemetry,status,battery,battId,getMaxValue,gpsStatuses) - -- gps status - local strStatus = gpsStatuses[telemetry.gpsStatus] - local strNumSats = "" - local flags = BLINK - local mult = 1 - if telemetry.gpsStatus > 2 then - if telemetry.homeAngle ~= -1 then - flags = PREC1 - end - if telemetry.gpsHdopC > 99 then - flags = 0 - mult=0.1 - end - lcd.drawText(GPS_X,GPS_Y + 2, strStatus, SMLSIZE) - if telemetry.numSats >= 15 then - strNumSats = string.format("%d+",15) - else - strNumSats = string.format("%d",telemetry.numSats) - end - lcd.drawText(GPS_X + 35, GPS_Y+1, strNumSats, MIDSIZE+RIGHT) - lcd.drawText(GPS_X + 37, GPS_Y + 2 , "H", SMLSIZE) - lcd.drawNumber(GPS_X + 60, GPS_Y+1, telemetry.gpsHdopC*mult , MIDSIZE+flags+RIGHT) - lcd.drawLine(GPS_X + 35,GPS_Y+1,GPS_X+35,GPS_Y + 12,SOLID,FORCE) - else - lcd.drawText(GPS_X + 10, GPS_Y+1, strStatus, MIDSIZE+INVERS+BLINK) - end - lcd.drawLine(GPS_X ,GPS_Y + 13,GPS_X+60,GPS_Y + 13,SOLID,FORCE) - if status.showMinMaxValues == true then - flags = 0 - end - -- varrow is shared - if conf.rangeFinderMax > 0 then - -- rng finder - flags = 0 - local rng = telemetry.range - -- rng is centimeters, RANGE_MAX is feet - if rng > conf.rangeFinderMax then - flags = BLINK+INVERS - end - rng = getMaxValue(rng,MAX_RANGE) - lcd.drawText(ALTASL_XLABEL + 4, ALTASL_YLABEL, "Rng", SMLSIZE) - lcd.drawText(ALTASL_X, ALTASL_Y , UNIT_ALT_LABEL, SMLSIZE+RIGHT) - lcd.drawNumber(lcd.getLastLeftPos()-1, ALTASL_Y-1 , rng*0.01*UNIT_ALT_SCALE*100, PREC2+ALTASL_FLAGS+flags) - else - -- alt asl, always display gps altitude even without 3d lock - local alt = telemetry.gpsAlt/10 -- meters - flags = BLINK - if telemetry.gpsStatus > 2 then - flags = 0 - -- update max only with 3d or better lock - alt = getMaxValue(alt,MAX_GPSALT) - end - lcd.drawText(ALTASL_XLABEL + 4, ALTASL_YLABEL, "Asl", SMLSIZE) - lcd.drawText(ALTASL_X, ALTASL_Y, UNIT_ALT_LABEL, SMLSIZE+RIGHT) - lcd.drawNumber(lcd.getLastLeftPos()-1, ALTASL_Y-1 , alt*UNIT_ALT_SCALE, ALTASL_FLAGS+flags) - end - -- home distance - flags = 0 - if telemetry.homeAngle == -1 then - flags = BLINK - end - local dist = getMaxValue(telemetry.homeDist,MAX_DIST) - if status.showMinMaxValues == true then - flags = 0 - end - lcd.drawText(HOMEDIST_X, HOMEDIST_Y+4, UNIT_DIST_LABEL,SMLSIZE+RIGHT) - lcd.drawNumber(lcd.getLastLeftPos()-1, HOMEDIST_Y-1, dist*UNIT_DIST_SCALE, HOMEDIST_FLAGS+flags) - -- total distance - drawLib.drawHArrow(TOTDIST_XLABEL,TOTDIST_YLABEL + 2,TOTDIST_ARROW_WIDTH,true,true) - lcd.drawText(TOTDIST_X, TOTDIST_Y, UNIT_DIST_LONG_LABEL, RIGHT+SMLSIZE) - lcd.drawNumber(lcd.getLastLeftPos()-1, TOTDIST_Y, telemetry.totalDist*UNIT_DIST_LONG_SCALE*100, RIGHT+SMLSIZE+PREC2) - - if status.showMinMaxValues == true then - drawLib.drawVArrow(HOMEDIST_XLABEL + 1, HOMEDIST_Y+1,6,true,false) - drawLib.drawVArrow(ALTASL_XLABEL - 1, ALTASL_Y-2,6,true,false) - else - drawLib.drawVArrow(ALTASL_XLABEL,ALTASL_YLABEL - 1,7,true,true) - drawLib.drawHomeIcon(HOMEDIST_XLABEL + 1,HOMEDIST_YLABEL,7) - end -end -#endif --X9 - -#ifdef X7 ---------------------- --- Single long function much more memory efficient than many little functions ---------------------- -local function drawPane(x,drawLib,conf,telemetry,status,battery,battId,getMaxValue,gpsStatuses) - -- GPS status - local strStatus = gpsStatuses[telemetry.gpsStatus] - flags = BLINK+PREC1 - local mult = 1 - lcd.drawLine(x,GPS_Y + 20,GPS_X+30,GPS_Y + 20,SOLID,FORCE) - if telemetry.gpsStatus > 2 then - if telemetry.homeAngle ~= -1 then - flags = PREC1 - end - if telemetry.gpsHdopC > 99 then - flags = 0 - mult=0.1 - end - lcd.drawText(x+GPS_X, GPS_Y+13, strStatus, SMLSIZE) - local strNumSats - if telemetry.numSats >= 15 then - strNumSats = string.format("%d+",15) - else - strNumSats = string.format("%d",telemetry.numSats) - end - lcd.drawText(x+GPS_X + 29, GPS_Y + 13, strNumSats, SMLSIZE+RIGHT) - lcd.drawText(x+GPS_X, GPS_Y + 2 , "Hd", SMLSIZE) - lcd.drawNumber(x+GPS_X + 29, GPS_Y+1, telemetry.gpsHdopC*mult ,MIDSIZE+flags+RIGHT) - - else - lcd.drawText(x+GPS_X + 8, GPS_Y+3, "No", SMLSIZE+INVERS+BLINK) - lcd.drawText(x+GPS_X + 5, GPS_Y+12, strStatus, SMLSIZE+INVERS+BLINK) - end - -- alt asl/rng - if status.showMinMaxValues == true then - flags = 0 - end - -- varrow is shared - flags = 0 - if conf.rangeFinderMax > 0 then - -- rng finder - local rng = telemetry.range - if rng > conf.rangeFinderMax then - flags = BLINK+INVERS - end - -- update max only with 3d or better lock - rng = getMaxValue(rng,MAX_RANGE) - lcd.drawText(x+ALTASL_X, ALTASL_Y+1 , UNIT_ALT_LABEL, SMLSIZE+RIGHT) - - if rng*UNIT_ALT_SCALE*0.01 > 10 then - lcd.drawNumber(lcd.getLastLeftPos(), ALTASL_Y, rng*UNIT_ALT_SCALE*0.1, flags+RIGHT+ALTASL_FLAGS+PREC1) - else - lcd.drawNumber(lcd.getLastLeftPos(), ALTASL_Y, rng*UNIT_ALT_SCALE, flags+RIGHT+ALTASL_FLAGS+PREC2) - end - - if status.showMinMaxValues == true then - drawLib.drawVArrow(x+ALTASL_XLABEL+1, ALTASL_YLABEL,5,true,false) - else - lcd.drawText(x+ALTASL_XLABEL, ALTASL_YLABEL, "R", SMLSIZE) - end - else - -- alt asl, always display gps altitude even without 3d lock - local alt = telemetry.gpsAlt/10 - flags = BLINK - if telemetry.gpsStatus > 2 then - flags = 0 - -- update max only with 3d or better lock - alt = getMaxValue(alt,MAX_GPSALT) - end - lcd.drawText(x+ALTASL_X, ALTASL_Y,UNIT_ALT_LABEL, SMLSIZE+RIGHT) - lcd.drawNumber(lcd.getLastLeftPos(), ALTASL_Y, alt*UNIT_ALT_SCALE, flags+RIGHT+ALTASL_FLAGS) - - if status.showMinMaxValues == true then - drawLib.drawVArrow(x+ALTASL_XLABEL+1, ALTASL_YLABEL + 1,5,true,false) - else - drawLib.drawVArrow(x+ALTASL_XLABEL+1,ALTASL_YLABEL,5,true,true) - end - end - -- home dist - local flags = 0 - if telemetry.homeAngle == -1 then - flags = BLINK - end - local dist = getMaxValue(telemetry.homeDist,MAX_DIST) - if status.showMinMaxValues == true then - flags = 0 - end - lcd.drawText(x+HOMEDIST_X, HOMEDIST_Y, UNIT_DIST_LABEL,SMLSIZE+RIGHT) - lcd.drawNumber(lcd.getLastLeftPos(), HOMEDIST_Y, dist*UNIT_DIST_SCALE,HOMEDIST_FLAGS+flags) - if status.showMinMaxValues == true then - drawLib.drawVArrow(x+HOMEDIST_XLABEL+1, HOMEDIST_YLABEL-2,5,true,false) - else - drawLib.drawHomeIcon(x+HOMEDIST_XLABEL, HOMEDIST_YLABEL) - end - -- total distance - lcd.drawText(TOTDIST_X, TOTDIST_Y, UNIT_DIST_LONG_LABEL, RIGHT+SMLSIZE) - lcd.drawNumber(lcd.getLastLeftPos(), TOTDIST_Y, telemetry.totalDist*UNIT_DIST_LONG_SCALE*10, RIGHT+SMLSIZE+PREC1) -end -#endif --X7 - -#ifdef CUSTOM_BG_CALL -local function background(conf,telemetry,status,getMaxValue,checkAlarm) -end -#endif - -return { - drawPane=drawPane, -#ifdef CUSTOM_BG_CALL - background=background -#endif --CUSTOM_BG_CALL -} \ No newline at end of file diff --git a/TARANIS/SOURCES/PP/lib/left_m2f.lua b/TARANIS/SOURCES/PP/lib/left_m2f.lua deleted file mode 100644 index df104160..00000000 --- a/TARANIS/SOURCES/PP/lib/left_m2f.lua +++ /dev/null @@ -1,293 +0,0 @@ -#include "includes/yaapu_inc.lua" - -#ifdef X9 - -#define GPS_X 0 -#define GPS_Y 6 -#define GPS_BORDER 0 - -#define ALTASL_X 60 -#define ALTASL_Y 31 -#define ALTASL_XLABEL 2 -#define ALTASL_YLABEL 30 -#define ALTASL_FLAGS RIGHT+SMLSIZE - -#define WPN_X 0 -#define WPN_Y 21 - -#define WPB_X 27 -#define WPB_Y 25 -#define WPB_R 5 - -#define WPD_X 60 -#define WPD_Y 21 - -#define HOMEDIST_X 60 -#define HOMEDIST_Y 37 -#define HOMEDIST_XLABEL 0 -#define HOMEDIST_YLABEL 41 -#define HOMEDIST_FLAGS RIGHT+MIDSIZE -#define HOMEDIST_ARROW_WIDTH 8 - -#define TOTDIST_X 60 -#define TOTDIST_Y 49 -#define TOTDIST_XLABEL 0 -#define TOTDIST_YLABEL 49 -#define TOTDIST_FLAGS RIGHT+SMLSIZE -#define TOTDIST_ARROW_WIDTH 8 - -#define THROTTLE_X 0 -#define THROTTLE_Y 49 - -#else - -#define GPS_X 1 -#define GPS_Y 6 -#define GPS_BORDER 0 - -#define ALTASL_X 31 -#define ALTASL_Y 43 -#define ALTASL_XLABEL 1 -#define ALTASL_YLABEL 43 -#define ALTASL_FLAGS SMLSIZE - -#define HOMEDIST_X 31 -#define HOMEDIST_Y 50 -#define HOMEDIST_XLABEL 1 -#define HOMEDIST_YLABEL 52 -#define HOMEDIST_FLAGS SMLSIZE+RIGHT -#define HOMEDIST_ARROW_WIDTH 7 - -#define WPB_X 5 -#define WPB_Y 32 -#define WPB_R 5 - -#define WPN_X 31 -#define WPN_Y 29 - -#define WPD_X 31 -#define WPD_Y 36 - - -#endif - -#ifdef X9 -local function drawPane(x,drawLib,conf,telemetry,status,battery,battId,getMaxValue,gpsStatuses) - -- gps status - local strStatus = gpsStatuses[telemetry.gpsStatus] - local strNumSats = "" - local flags = BLINK - local mult = 1 - if telemetry.gpsStatus > 2 then - if telemetry.homeAngle ~= -1 then - flags = PREC1 - end - if telemetry.gpsHdopC > 99 then - flags = 0 - mult=0.1 - end - lcd.drawText(x+GPS_X,GPS_Y + 2, strStatus, SMLSIZE) - if telemetry.numSats >= 15 then - strNumSats = string.format("%d+",15) - else - strNumSats = string.format("%d",telemetry.numSats) - end - lcd.drawText(x+GPS_X + 35, GPS_Y+1, strNumSats, MIDSIZE+RIGHT) - lcd.drawText(x+GPS_X + 37, GPS_Y + 2 , "H", SMLSIZE) - lcd.drawNumber(x+GPS_X + 60, GPS_Y+1, telemetry.gpsHdopC*mult , MIDSIZE+flags+RIGHT) - lcd.drawLine(x+GPS_X + 35,GPS_Y+1,x+GPS_X+35,GPS_Y + 12,SOLID,FORCE) - else - lcd.drawText(x+GPS_X + 10, GPS_Y+1, strStatus, MIDSIZE+INVERS+BLINK) - end - lcd.drawLine(x+GPS_X ,GPS_Y + 13,x+GPS_X+60,GPS_Y + 13,SOLID,FORCE) - if status.showMinMaxValues == true then - flags = 0 - end - if conf.rangeFinderMax > 0 then - -- rng finder - flags = 0 - local rng = telemetry.range - -- rng is centimeters, RANGE_MAX is feet - if rng > conf.rangeFinderMax then - flags = BLINK+INVERS - end - rng = getMaxValue(rng,MAX_RANGE) - lcd.drawText(x+ALTASL_XLABEL + 4, ALTASL_YLABEL, "Rng", SMLSIZE) - lcd.drawText(x+ALTASL_X, ALTASL_Y , UNIT_ALT_LABEL, SMLSIZE+RIGHT) - lcd.drawNumber(lcd.getLastLeftPos(), ALTASL_Y-1 , rng*0.01*UNIT_ALT_SCALE*100, PREC2+ALTASL_FLAGS+flags) - else - -- alt asl, always display gps altitude even without 3d lock - local alt = telemetry.gpsAlt/10 -- meters - flags = BLINK - if telemetry.gpsStatus > 2 then - flags = 0 - -- update max only with 3d or better lock - alt = getMaxValue(alt,MAX_GPSALT) - end - lcd.drawText(x+ALTASL_XLABEL + 4, ALTASL_YLABEL, "Asl", SMLSIZE) - lcd.drawText(x+ALTASL_X, ALTASL_Y, UNIT_ALT_LABEL, SMLSIZE+RIGHT) - lcd.drawNumber(lcd.getLastLeftPos(), ALTASL_Y-1 ,alt*UNIT_ALT_SCALE, ALTASL_FLAGS+flags) - end - flags = 0 - if telemetry.homeAngle == -1 then - flags = BLINK - end - local dist = getMaxValue(telemetry.homeDist,MAX_DIST) - if status.showMinMaxValues == true then - flags = 0 - end - -- home distance - lcd.drawText(x+HOMEDIST_X, HOMEDIST_Y+5, UNIT_DIST_LABEL,SMLSIZE+RIGHT) - lcd.drawNumber(lcd.getLastLeftPos(), HOMEDIST_Y, dist*UNIT_DIST_SCALE, HOMEDIST_FLAGS+flags) - -- waypoints - lcd.drawNumber(x+WPN_X, WPN_Y, telemetry.wpNumber, SMLSIZE) - drawLib.drawRArrow(lcd.getLastRightPos()+4,WPB_Y,WPB_R,telemetry.wpBearing*45,FORCE) - lcd.drawText(x+WPD_X, WPD_Y+1, UNIT_DIST_LABEL,SMLSIZE+RIGHT) - lcd.drawNumber(lcd.getLastLeftPos(), WPD_Y, telemetry.wpDistance*UNIT_DIST_SCALE, RIGHT) - -- total distance - lcd.drawText(x+TOTDIST_X, TOTDIST_Y, UNIT_DIST_LONG_LABEL, RIGHT+SMLSIZE) - lcd.drawNumber(lcd.getLastLeftPos(), TOTDIST_Y, telemetry.totalDist*UNIT_DIST_LONG_SCALE*10, RIGHT+SMLSIZE+PREC1) - -- throttle - lcd.drawNumber(x+THROTTLE_X, THROTTLE_Y, telemetry.throttle,SMLSIZE) - lcd.drawText(lcd.getLastRightPos(), THROTTLE_Y, "%", SMLSIZE) - -- minmax - if status.showMinMaxValues == true then - drawLib.drawVArrow(x+HOMEDIST_XLABEL + 2, HOMEDIST_YLABEL-2,6,true,false) - drawLib.drawVArrow(x+ALTASL_XLABEL,ALTASL_YLABEL - 1,6,true,false) - else - drawLib.drawVArrow(x+ALTASL_XLABEL,ALTASL_YLABEL - 1,7,true,true) - drawLib.drawHomeIcon(x+HOMEDIST_XLABEL + 1,HOMEDIST_YLABEL,7) - end - -- airspeed - local speed = telemetry.airspeed*UNIT_HSPEED_SCALE - if math.abs(speed) > 99 then - lcd.drawNumber(HUD_X+6,HUD_X_MID + 10,speed*0.1,SMLSIZE) - else - lcd.drawNumber(HUD_X+6,HUD_X_MID + 10,speed,SMLSIZE+PREC1) - end -end -#endif --X9 - -#ifdef X7 ---------------------- --- Single long function much more memory efficient than many little functions ---------------------- -local function drawPane(x,drawLib,conf,telemetry,status,battery,battId,getMaxValue,gpsStatuses) - -- GPS status - local strStatus = gpsStatuses[telemetry.gpsStatus] - flags = BLINK+PREC1 - local mult = 1 - lcd.drawLine(x,GPS_Y + 20,GPS_X+30,GPS_Y + 20,SOLID,FORCE) - if telemetry.gpsStatus > 2 then - if telemetry.homeAngle ~= -1 then - flags = PREC1 - end - if telemetry.gpsHdopC > 99 then - flags = 0 - mult=0.1 - end - lcd.drawText(x+GPS_X, GPS_Y+13, strStatus, SMLSIZE) - local strNumSats - if telemetry.numSats >= 15 then - strNumSats = string.format("%d+",15) - else - strNumSats = string.format("%d",telemetry.numSats) - end - lcd.drawText(x+GPS_X + 29, GPS_Y + 13, strNumSats, SMLSIZE+RIGHT) - lcd.drawText(x+GPS_X, GPS_Y + 2 , "Hd", SMLSIZE) - lcd.drawNumber(x+GPS_X + 29, GPS_Y+1, telemetry.gpsHdopC*mult ,MIDSIZE+flags+RIGHT) - - else - lcd.drawText(x+GPS_X + 8, GPS_Y+3, "No", SMLSIZE+INVERS+BLINK) - lcd.drawText(x+GPS_X + 5, GPS_Y+12, strStatus, SMLSIZE+INVERS+BLINK) - end - -- alt asl/rng - if status.showMinMaxValues == true then - flags = 0 - end - -- varrow is shared - flags = 0 - if conf.rangeFinderMax > 0 then - -- rng finder - local rng = telemetry.range - if rng > conf.rangeFinderMax then - flags = BLINK+INVERS - end - -- update max only with 3d or better lock - rng = getMaxValue(rng,MAX_RANGE) - lcd.drawText(x+ALTASL_X, ALTASL_Y+1 , UNIT_ALT_LABEL, SMLSIZE+RIGHT) - - if rng*UNIT_ALT_SCALE*0.01 > 10 then - lcd.drawNumber(lcd.getLastLeftPos(), ALTASL_Y, rng*UNIT_ALT_SCALE*0.1, flags+RIGHT+ALTASL_FLAGS+PREC1) - else - lcd.drawNumber(lcd.getLastLeftPos(), ALTASL_Y, rng*UNIT_ALT_SCALE, flags+RIGHT+ALTASL_FLAGS+PREC2) - end - - if status.showMinMaxValues == true then - drawLib.drawVArrow(x+ALTASL_XLABEL, ALTASL_YLABEL,5,true,false) - else - lcd.drawText(x+ALTASL_XLABEL, ALTASL_YLABEL, "R", SMLSIZE) - end - else - -- alt asl, always display gps altitude even without 3d lock - local alt = telemetry.gpsAlt/10 - flags = BLINK - if telemetry.gpsStatus > 2 then - flags = 0 - -- update max only with 3d or better lock - alt = getMaxValue(alt,MAX_GPSALT) - end - lcd.drawText(x+ALTASL_X, ALTASL_Y,UNIT_ALT_LABEL, SMLSIZE+RIGHT) - lcd.drawNumber(lcd.getLastLeftPos(), ALTASL_Y, alt*UNIT_ALT_SCALE, flags+RIGHT+ALTASL_FLAGS) - - if status.showMinMaxValues == true then - drawLib.drawVArrow(x+ALTASL_XLABEL+1, ALTASL_YLABEL + 1,5,true,false) - else - drawLib.drawVArrow(x+ALTASL_XLABEL+1,ALTASL_YLABEL,5,true,true) - end - end - -- home dist - local flags = 0 - if telemetry.homeAngle == -1 then - flags = BLINK - end - local dist = getMaxValue(telemetry.homeDist,MAX_DIST) - if status.showMinMaxValues == true then - flags = 0 - end - lcd.drawText(x+HOMEDIST_X, HOMEDIST_Y, UNIT_DIST_LABEL,SMLSIZE+RIGHT) - lcd.drawNumber(lcd.getLastLeftPos(), HOMEDIST_Y, dist*UNIT_DIST_SCALE,HOMEDIST_FLAGS+flags) - - if status.showMinMaxValues == true then - drawLib.drawVArrow(x+HOMEDIST_XLABEL+1, HOMEDIST_YLABEL-2,5,true,false) - else - drawLib.drawHomeIcon(x+HOMEDIST_XLABEL, HOMEDIST_YLABEL) - end - -- WP - drawLib.drawRArrow(x+WPB_X,WPB_Y,WPB_R,telemetry.wpBearing*45,FORCE) - lcd.drawNumber(x+WPN_X, WPN_Y, telemetry.wpNumber, SMLSIZE+RIGHT) - - lcd.drawText(WPD_X, WPD_Y, UNIT_DIST_LABEL,SMLSIZE+RIGHT) - lcd.drawNumber(lcd.getLastLeftPos(), WPD_Y, telemetry.wpDistance*UNIT_DIST_SCALE, SMLSIZE+RIGHT) - -- airspeed - local speed = telemetry.airspeed*UNIT_HSPEED_SCALE - if math.abs(speed) > 99 then - lcd.drawNumber(HUD_X+5,HUD_X_MID + 7,speed*0.1,SMLSIZE) - else - lcd.drawNumber(HUD_X+5,HUD_X_MID + 7,speed,SMLSIZE+PREC1) - end -end -#endif --X7 - - -#ifdef CUSTOM_BG_CALL -local function background(conf,telemetry,status,getMaxValue,checkAlarm) -end -#endif - -return { - drawPane=drawPane, -#ifdef CUSTOM_BG_CALL - background=background -#endif -} \ No newline at end of file diff --git a/TARANIS/SOURCES/PP/lib/menu.lua b/TARANIS/SOURCES/PP/lib/menu.lua deleted file mode 100644 index 1323854e..00000000 --- a/TARANIS/SOURCES/PP/lib/menu.lua +++ /dev/null @@ -1,382 +0,0 @@ -#include "includes/yaapu_inc.lua" - ---[[ - -TYPEVALUE - menu option to select a numeric value -{description, type,name,default value,min,max,uit of measure,precision,increment step} -example {"batt alert level 1:", TYPEVALUE, "V1", 375, 0,5000,"V",PREC2,5,"L2",350 }, - -TYPECOMBO - menu option to select a value from a list -{description, type, name, default, label list, value list} -example {"center pane layout:", TYPECOMBO, "CPANE", 1, { "hud","radar" }, { 1, 2 }}, - ---]] -#ifdef X9 -local menuItems = { - {"voice language:", TYPECOMBO, "L1", 1, { "english", "italian", "french", "german" } , {"en","it","fr","de"} }, - {"batt alert level 1:", TYPEVALUE, "V1", 375, 0,5000,"V",PREC2,5 }, - {"batt alert level 2:", TYPEVALUE, "V2", 350, 0,5000,"V",PREC2,5 }, - {"batt[1] capacity override:", TYPEVALUE, "B1", 0, 0,5000,"Ah",PREC2,10 }, - {"batt[2] capacity override:", TYPEVALUE, "B2", 0, 0,5000,"Ah",PREC2,10 }, - {"disable all sounds:", TYPECOMBO, "S1", 1, { "no", "yes" }, { false, true } }, - {"disable msg beep:", TYPECOMBO, "S2", 1, { "no", "info", "all" }, { 1, 2, 3 } }, - {"enable haptic:", TYPECOMBO, "VIBR", 1, { "no", "yes" }, { false, true } }, - {"default voltage source:", TYPECOMBO, "VS", 1, { "auto", "FLVSS", "fc" }, { nil, "vs", "fc" } }, - {"dual battery config:", TYPECOMBO, "BC", 1, { "par", "ser", "other" }, { 1, 2, 3 } }, - {"batt[1] cell count override:", TYPEVALUE, "CC", 0, 0,12," cells",0,1 }, - {"batt[2] cell count override:", TYPEVALUE, "CC2", 0, 0,12," cells",0,1 }, - {"timer alert every:", TYPEVALUE, "T1", 0, 0,600,"min",PREC1,5 }, - {"min altitude alert:", TYPEVALUE, "A1", 0, 0,500,"m",PREC1,5 }, - {"max altitude alert:", TYPEVALUE, "A2", 0, 0,10000,"m",0,1 }, - {"max distance alert:", TYPEVALUE, "D1", 0, 0,100000,"m",0,10 }, -#ifdef HDOP_ALARM - {"max hdop alert:", TYPEVALUE, "HDOP", 20, 0,50,"m",PREC1,2 }, -#endif - {"repeat alerts every:", TYPEVALUE, "T2", 10, 5,600,"sec",0,5 }, -#ifdef MONITOR - {"altitude alert interval:", TYPEVALUE, "ALTM", 0, 0,1000,unitLabel,0,1 }, - {"distance alert interval:", TYPEVALUE, "DISTM", 0, 0,1000,unitLabel,0,1 }, -#endif --MONITOR - {"rangefinder max:", TYPEVALUE, "RM", 0, 0,10000," cm",0,10 }, -#ifdef SYNTHVSPEED - {"enable synthetic vspeed:", TYPECOMBO, "SVS", 1, { "no", "yes" }, { false, true } }, -#endif - {"air/groundspeed unit:", TYPECOMBO, "HSPD", 1, { "m/s", "km/h", "mph", "kn" }, { 1, 3.6, 2.23694, 1.94384} }, - {"vertical speed unit:", TYPECOMBO, "VSPD", 1, { "m/s", "ft/s", "ft/min" }, { 1, 3.28084, 196.85} }, - {"center panel layout:", TYPECOMBO, "CPANE", 1, { "def" }, { 1 } }, - {"right panel layout:", TYPECOMBO, "RPANE", 1, { "def" }, { 1 } }, - {"left panel layout:", TYPECOMBO, "LPANE", 1, { "def","m2f" }, { 1, 2 } }, - {"second view layout:", TYPECOMBO, "AVIEW", 1, { "def" }, { 1 } }, ---[[ - {"gas rpm label:", TYPECOMBO, "GAS_RPM", 1, { "Eng","Head" }, { 1, 2 },"RPANE",2 }, ---]] -#ifdef LOGTELEMETRY - {"log messages to file:", TYPECOMBO, "LOG", 1, { "no","yes"}, { 1, 2 } }, -#endif - {"enable px4 flightmodes:", TYPECOMBO, "PX4", 1, { "no", "yes" }, { false, true } }, -} -#else -local menuItems = { - {"voice language:", TYPECOMBO, "L1", 1, { "eng", "ita", "fre", "ger" } , {"en","it","fr","de"} }, - {"batt alert level 1:", TYPEVALUE, "V1", 375, 0,5000,"V",PREC2,5 }, - {"batt alert level 2:", TYPEVALUE, "V2", 350, 0,5000,"V",PREC2,5 }, - {"batt[1] cap override:", TYPEVALUE, "B1", 0, 0,5000,"Ah",PREC2,10 }, - {"batt[2] cap override:", TYPEVALUE, "B2", 0, 0,5000,"Ah",PREC2,10 }, - {"disable all sounds:", TYPECOMBO, "S1", 1, { "no", "yes" }, { false, true } }, - {"disable msg beep:", TYPECOMBO, "S2", 1, { "no", "info", "all" }, { 1, 2, 3 } }, - {"enable haptic:", TYPECOMBO, "VIBR", 1, { "no", "yes" }, { false, true } }, - {"def voltage source:", TYPECOMBO, "VS", 1, { "auto", "FLVSS", "fc" }, { nil, "vs", "fc" } }, - {"dual battery config:", TYPECOMBO, "BC", 1, { "par", "ser", "other" }, { 1, 2, 3 } }, - {"batt[1] cells override:", TYPEVALUE, "CC", 0, 0,12,"s",0,1 }, - {"batt[2] cells override:", TYPEVALUE, "CC2", 0, 0,12,"s",0,1 }, - {"timer alert every:", TYPEVALUE, "T1", 0, 0,600,"min",PREC1,5 }, - {"min altitude alert:", TYPEVALUE, "A1", 0, 0,500,"m",PREC1,5 }, - {"max altitude alert:", TYPEVALUE, "A2", 0, 0,10000,"m",0,1 }, - {"max distance alert:", TYPEVALUE, "D1", 0, 0,100000,"m",0,10 }, -#ifdef HDOP_ALARM - {"max hdop alert:", TYPEVALUE, "HDOP", 20, 0,50,"m",PREC1,2 }, -#endif - {"repeat alerts every:", TYPEVALUE, "T2", 10, 5,600,"sec",0,5 }, -#ifdef MONITOR - {"alt alert interval:", TYPEVALUE, "ALTM", 0, 0,1000,unitLabel,0,1 }, - {"dist alert interval:", TYPEVALUE, "DISTM", 0, 0,1000,unitLabel,0,1 }, -#endif --MONITOR - {"rangefinder max:", TYPEVALUE, "RM", 0, 0,10000," cm",0,10 }, -#ifdef SYNTHVSPEED - {"enable synth.vspeed:", TYPECOMBO, "SVS", 1, { "no", "yes" }, { false, true } }, -#endif - {"air/groundspd unit:", TYPECOMBO, "HSPD", 1, { "m/s", "km/h", "mph", "kn" }, { 1, 3.6, 2.23694, 1.94384} }, - {"vert speed unit:", TYPECOMBO, "VSPD", 1, { "m/s", "ft/s", "ft/min" }, { 1, 3.28084, 196.85} }, - {"center panel layout:", TYPECOMBO, "CPANE", 1, { "def" }, { 1 } }, - {"right panel layout:", TYPECOMBO, "RPANE", 1, { "def" }, { 1 } }, - {"left panel layout:", TYPECOMBO, "LPANE", 1, { "def","m2f" }, { 1, 2 } }, - {"second view layout:", TYPECOMBO, "AVIEW", 1, { "def" }, { 1 } }, ---[[ - {"gas rpm label:", TYPECOMBO, "GAS_RPM", 1, { "eng","head" }, { 1, 2 },"RPANE",2 }, ---]] -#ifdef LOGTELEMETRY - {"enable message log:", TYPECOMBO, "LOG", 1, { "no","yes" }, { 1, 2 } }, -#endif - {"enable px4 modes:", TYPECOMBO, "PX4", 1, { "no", "yes" }, { false, true } }, -} -#endif --X9 - -local menu = { - selectedItem = 1, - editSelected = false, - offset = 0, -} - -#ifdef X9 -local centerPanelFiles = {"hud9"} -local rightPanelFiles = {"right9"} -local leftPanelFiles = {"left9","left9_m2f"} -local altViewFiles = {"alt9_view"} -#else -local centerPanelFiles = {"hud7"} -local rightPanelFiles = {"right7"} -local leftPanelFiles = {"left7","left7_m2f"} -local altViewFiles = {"alt7_view"} -#endif - ------------------------------------------- --- returns item's VALUE,LABEL,IDX ------------------------------------------- -local function getMenuItemByName(items,name) - for idx=1,#items - do - -- items[idx][3] is the menu item's name as it appears in the config file - if items[idx][3] == name then - if items[idx][2] == TYPECOMBO then - -- return item's value, label and index - return items[idx][6][items[idx][4]], items[idx][5][items[idx][4]], idx - else - -- return item's value, label and index - return items[idx][4], name, idx - end - end - end - return nil -end - -local function getConfigFilename() - local info = model.getInfo() - return "/MODELS/yaapu/" .. string.lower(string.gsub(info.name, "[%c%p%s%z]", "")..".cfg") -end - -#ifdef LOGTELEMETRY -local function getLogFilename() - local date = getDateTime() - local info = model.getInfo() - local modelName = string.lower(string.gsub(info.name, "[%c%p%s%z]", "")) - return string.format("/LOGS/%s-%04d%02d%02d_%02d%02d%02d.ylog",modelName,date.year,date.mon,date.day,date.hour,date.min,date.sec) -end -#endif --LOGTELEMETRY - -local function applyConfigValues(items,conf) - conf.language = getMenuItemByName(items,"L1") - conf.battAlertLevel1 = getMenuItemByName(items,"V1") - conf.battAlertLevel2 = getMenuItemByName(items,"V2") - conf.battCapOverride1 = getMenuItemByName(items,"B1") - conf.battCapOverride2 = getMenuItemByName(items,"B2") - conf.disableAllSounds = getMenuItemByName(items,"S1") - conf.disableMsgBeep = getMenuItemByName(items,"S2") - conf.timerAlert = math.floor(getMenuItemByName(items,"T1")*0.1*60) - conf.minAltitudeAlert = getMenuItemByName(items,"A1")*0.1 - conf.maxAltitudeAlert = getMenuItemByName(items,"A2") - conf.maxDistanceAlert = getMenuItemByName(items,"D1") - conf.repeatAlertsPeriod = getMenuItemByName(items,"T2") - conf.battConf = getMenuItemByName(items,"BC") - conf.cell1Count = getMenuItemByName(items,"CC") - conf.cell2Count = getMenuItemByName(items,"CC2") - conf.rangeFinderMax = getMenuItemByName(items,"RM") - conf.horSpeedMultiplier, conf.horSpeedLabel = getMenuItemByName(items,"HSPD") - conf.vertSpeedMultiplier, conf.vertSpeedLabel = getMenuItemByName(items,"VSPD") - conf.enablePX4Modes = getMenuItemByName(items,"PX4") - - conf.centerPanel = centerPanelFiles[getMenuItemByName(items,"CPANE")] - conf.rightPanel = rightPanelFiles[getMenuItemByName(items,"RPANE")] - conf.leftPanel = leftPanelFiles[getMenuItemByName(items,"LPANE")] - conf.altView = altViewFiles[getMenuItemByName(items,"AVIEW")] - - if getMenuItemByName(items,"VS") ~= nil then - conf.defaultBattSource = getMenuItemByName(items,"VS") - end - -#ifdef SYNTHVSPEED - conf.enableSynthVSpeed = getMenuItemByName(items,"SVS") -#endif -#ifdef LOGTELEMETRY - conf.logLevel = getMenuItemByName(items,"LOG") - conf.logFilename = conf.logLevel > 1 and (conf.logFilename == nil and getLogFilename() or conf.logFilename) or nil -#endif --LOGTELEMETRY -#ifdef MONITOR - conf.altMonitorInterval = getMenuItemByName(items,"ALTM") - conf.distMonitorInterval = getMenuItemByName(items,"DISTM") -#endif -#ifdef HDOP_ALARM - conf.maxHdopAlert = getMenuItemByName(items,"HDOP") -#endif - conf.enableHaptic = getMenuItemByName(items,"VIBR") - menu.editSelected = false - collectgarbage() - collectgarbage() -end - -local function loadConfig(conf) - local cfg = io.open(getConfigFilename(),"r") - collectgarbage() - collectgarbage() - if cfg ~= nil then - local str = io.read(cfg,200) - io.close(cfg) - if string.len(str) > 0 then - for i=1,#menuItems - do - local value = string.match(str, menuItems[i][3]..":([-%d]+)") - collectgarbage() - if value ~= nil then - menuItems[i][4] = tonumber(value) - end - end - end - end - collectgarbage() - collectgarbage() - applyConfigValues(menuItems,conf) -end - -local function saveConfig(conf) - local myConfig = "" - for i=1,#menuItems - do - myConfig = myConfig..menuItems[i][3]..":"..menuItems[i][4] - if i < #menuItems then - myConfig = myConfig.."," - end - end - local cfg = assert(io.open(getConfigFilename(),"w")) - collectgarbage() - collectgarbage() - if cfg ~= nil then - io.write(cfg,myConfig) - io.close(cfg) - end - myConfig = nil - collectgarbage() - collectgarbage() - applyConfigValues(menuItems,conf) -end - -local function drawConfigMenuBars() - local itemIdx = string.format("%d/%d",menu.selectedItem,#menuItems) -#ifdef X9 - lcd.drawFilledRectangle(0,TOPBAR_Y, TOPBAR_WIDTH, 7, SOLID) - lcd.drawText(0,0,VERSION,SMLSIZE+INVERS) - lcd.drawFilledRectangle(0,BOTTOMBAR_Y, BOTTOMBAR_WIDTH, 8, SOLID) - lcd.drawText(0,BOTTOMBAR_Y+1,getConfigFilename(),SMLSIZE+INVERS) -#endif --X9 -#ifdef X7 - lcd.drawFilledRectangle(0,TOPBAR_Y, TOPBAR_WIDTH, 7, SOLID) - lcd.drawText(0,0,VERSION,SMLSIZE+INVERS) - lcd.drawFilledRectangle(0,BOTTOMBAR_Y-2, BOTTOMBAR_WIDTH, 9, SOLID) - lcd.drawText(0,BOTTOMBAR_Y-1,string.sub(getConfigFilename(),8),SMLSIZE+INVERS) -#endif --X7 - lcd.drawText(BOTTOMBAR_WIDTH,BOTTOMBAR_Y+1,itemIdx,SMLSIZE+INVERS+RIGHT) -end - -local function incMenuItem(idx) - if menuItems[idx][2] == TYPEVALUE then - menuItems[idx][4] = menuItems[idx][4] + menuItems[idx][9] - if menuItems[idx][4] > menuItems[idx][6] then - menuItems[idx][4] = menuItems[idx][6] - end - else - menuItems[idx][4] = menuItems[idx][4] + 1 - if menuItems[idx][4] > #menuItems[idx][5] then - menuItems[idx][4] = 1 - end - end -end - -local function decMenuItem(idx) - if menuItems[idx][2] == TYPEVALUE then - menuItems[idx][4] = menuItems[idx][4] - menuItems[idx][9] - if menuItems[idx][4] < menuItems[idx][5] then - menuItems[idx][4] = menuItems[idx][5] - end - else - menuItems[idx][4] = menuItems[idx][4] - 1 - if menuItems[idx][4] < 1 then - menuItems[idx][4] = #menuItems[idx][5] - end - end -end - -local function drawItem(idx,flags) - if menuItems[idx][2] == TYPEVALUE then - if menuItems[idx][4] == 0 then - lcd.drawText(MENU_ITEM_X,MENU_Y + (idx-menu.offset-1)*7, "---",0+SMLSIZE+flags+menuItems[idx][8]) - else - lcd.drawNumber(MENU_ITEM_X,MENU_Y + (idx-menu.offset-1)*7, menuItems[idx][4],0+SMLSIZE+flags+menuItems[idx][8]) - lcd.drawText(lcd.getLastRightPos(),MENU_Y + (idx-menu.offset-1)*7, menuItems[idx][7],SMLSIZE+flags) - end - else - lcd.drawText(MENU_ITEM_X,MENU_Y + (idx-menu.offset-1)*7, menuItems[idx][5][menuItems[idx][4]],SMLSIZE+flags) - end -end - -local function drawConfigMenu(event) - drawConfigMenuBars() - if event == EVT_ENTER_BREAK or event == XLITE_ENTER then - menu.editSelected = not menu.editSelected - menu.updated = true - elseif menu.editSelected and (event == EVT_PLUS_BREAK or event == EVT_ROT_LEFT or event == EVT_PLUS_REPT or event == XLITE_UP) then - incMenuItem(menu.selectedItem) - elseif menu.editSelected and (event == EVT_MINUS_BREAK or event == EVT_ROT_RIGHT or event == EVT_MINUS_REPT or event == XLITE_DOWN) then - decMenuItem(menu.selectedItem) - elseif not menu.editSelected and (event == EVT_PLUS_BREAK or event == EVT_ROT_LEFT or event == XLITE_UP) then - menu.selectedItem = (menu.selectedItem - 1) - if menu.offset >= menu.selectedItem then - menu.offset = menu.offset - 1 - end - elseif not menu.editSelected and (event == EVT_MINUS_BREAK or event == EVT_ROT_RIGHT or event == XLITE_DOWN) then - menu.selectedItem = (menu.selectedItem + 1) - if menu.selectedItem - MENU_PAGESIZE > menu.offset then - menu.offset = menu.offset + 1 - end - end - --wrap - if menu.selectedItem > #menuItems then - menu.selectedItem = 1 - menu.offset = 0 - elseif menu.selectedItem < 1 then - menu.selectedItem = #menuItems - menu.offset = #menuItems - MENU_PAGESIZE - end - -- - for m=1+menu.offset,math.min(#menuItems,MENU_PAGESIZE+menu.offset) do - lcd.drawText(2,MENU_Y + (m-menu.offset-1)*7, menuItems[m][1],0+SMLSIZE) - if m == menu.selectedItem then - if menu.editSelected then - drawItem(m,INVERS+BLINK) - else - drawItem(m,INVERS) - end - else - drawItem(m,0) - end - end -end - -#ifdef COMPILE -local function compilePanels() - -- compile all layouts for all panes - for i=1,#centerPanelFiles do - loadScript(LIB_BASE_PATH..centerPanelFiles[i]..".lua","c") - end - for i=1,#rightPanelFiles do - loadScript(LIB_BASE_PATH..rightPanelFiles[i]..".lua","c") - end - for i=1,#leftPanelFiles do - loadScript(LIB_BASE_PATH..leftPanelFiles[i]..".lua","c") - end - for i=1,#altViewFiles do - loadScript(LIB_BASE_PATH..altViewFiles[i]..".lua","c") - end -end -#endif - -return { - drawConfigMenu=drawConfigMenu, -#ifdef LOGTELEMETRY - getLogFilename=getLogFilename, -#endif --LOGTELEMETRY - loadConfig=loadConfig, - saveConfig=saveConfig, - menuItems=menuItems, - menu=menu, -#ifdef COMPILE - compilePanels=compilePanels -#endif -} \ No newline at end of file diff --git a/TARANIS/SOURCES/PP/lib/plane.lua b/TARANIS/SOURCES/PP/lib/plane.lua deleted file mode 100644 index f95bb522..00000000 --- a/TARANIS/SOURCES/PP/lib/plane.lua +++ /dev/null @@ -1,57 +0,0 @@ ---[[ -enum FlightMode { - MANUAL = 0, - CIRCLE = 1, - STABILIZE = 2, - TRAINING = 3, - ACRO = 4, - FLY_BY_WIRE_A = 5, - FLY_BY_WIRE_B = 6, - CRUISE = 7, - AUTOTUNE = 8, - AUTO = 10, - RTL = 11, - LOITER = 12, - TAKEOFF = 13, - AVOID_ADSB = 14, - GUIDED = 15, - INITIALISING = 16, - QSTABILIZE = 17, - QHOVER = 18, - QLOITER = 19, - QLAND = 20, - QRTL = 21, - QAUTOTUNE = 22, - QACRO = 23, -}; ---]] - -local flightModes = {} --- plane flight modes -flightModes[0]="" -flightModes[1]="Manual" -flightModes[2]="Circle" -flightModes[3]="Stabilize" -flightModes[4]="Training" -flightModes[5]="Acro" -flightModes[6]="FlyByWireA" -flightModes[7]="FlyByWireB" -flightModes[8]="Cruise" -flightModes[9]="Autotune" -flightModes[10]="" -flightModes[11]="Auto" -flightModes[12]="RTL" -flightModes[13]="Loiter" -flightModes[14]="Takeoff" -flightModes[15]="AvoidADSB" -flightModes[16]="Guided" -flightModes[17]="Initializing" -flightModes[18]="QStabilize" -flightModes[19]="QHover" -flightModes[20]="QLoiter" -flightModes[21]="Qland" -flightModes[22]="QRTL" -flightModes[23]="QAutotune" -flightModes[24]="QAcro" --- -return {flightModes=flightModes} diff --git a/TARANIS/SOURCES/PP/lib/plane_px4.lua b/TARANIS/SOURCES/PP/lib/plane_px4.lua deleted file mode 100644 index f1bb2c01..00000000 --- a/TARANIS/SOURCES/PP/lib/plane_px4.lua +++ /dev/null @@ -1,28 +0,0 @@ -local flightModes = {} --- plane flight modes -flightModes[0]="" -flightModes[1]="Manual" -flightModes[2]="AltCtl" --px4 specific -flightModes[3]="PosCtl" --px4 specific -flightModes[4]="Ready" --px4 specific -flightModes[5]="Takeoff" --px4 specific -flightModes[6]="Loiter" -flightModes[7]="Mission" --px4 specific -flightModes[8]="RTL" -flightModes[9]="Land" -flightModes[10]="RTGS" --px4 specific -flightModes[11]="Follow" -flightModes[12]="PrecLand" --px4 specific -flightModes[13]="" -flightModes[14]="Acro" -flightModes[15]="OffBoard" --px4 specific -flightModes[16]="Stabilize" -flightModes[17]="RAttitude" --px4 specific -flightModes[18]="Simple" --px4 specific -flightModes[19]="" -flightModes[20]="" -flightModes[21]="" -flightModes[22]="" -flightModes[23]="" --- -return {flightModes=flightModes} diff --git a/TARANIS/SOURCES/PP/lib/reset.lua b/TARANIS/SOURCES/PP/lib/reset.lua deleted file mode 100644 index c30ef728..00000000 --- a/TARANIS/SOURCES/PP/lib/reset.lua +++ /dev/null @@ -1,89 +0,0 @@ -#include "includes/yaapu_inc.lua" - -local function resetTelemetry(status,telemetry,battery,alarms,transitions) - ----------------------------- - -- TELEMETRY - ----------------------------- - telemetry.flightMode = 0 - telemetry.simpleMode = 0 - telemetry.landComplete = 0 - telemetry.statusArmed = 0 - telemetry.battFailsafe = 0 - telemetry.ekfFailsafe = 0 - telemetry.imuTemp = 0 - -- GPS - telemetry.numSats = 0 - telemetry.gpsStatus = 0 - telemetry.gpsHdopC = 100 - telemetry.gpsAlt = 0 - -- BATT 1 - telemetry.batt1volt = 0 - telemetry.batt1current = 0 - telemetry.batt1mah = 0 - -- BATT 2 - telemetry.batt2volt = 0 - telemetry.batt2current = 0 - telemetry.batt2mah = 0 - -- HOME - telemetry.homeDist = 0 - telemetry.homeAlt = 0 - telemetry.homeAngle = -1 - -- VELANDYAW - telemetry.vSpeed = 0 - telemetry.hSpeed = 0 - telemetry.yaw = 0 - -- ROLLPITCH - telemetry.roll = 0 - telemetry.pitch = 0 - telemetry.range = 0 - -- PARAMS - telemetry.frameType = -1 - telemetry.batt1Capacity = 0 - telemetry.batt2Capacity = 0 - -- WP - telemetry.wpNumber = 0 - telemetry.wpDistance = 0 - telemetry.wpXTError = 0 - telemetry.wpBearing = 0 - telemetry.wpCommands = 0 - -- VFR - telemetry.airspeed = 0 - telemetry.throttle = 0 - telemetry.baroAlt = 0 - -- TOTAL DISTANCE - telemetry.totalDist = 0 - - ----------------------------- - -- SCRIPT STATUS - ----------------------------- - status.battAlertLevel1 = false - status.battAlertLevel2 = false - status.flightTime = 0 -- updated from model timer 3 - status.timerRunning = 0 -- triggered by landcomplete from AP - - -- reset alarms - alarms = { - --{ notified, alarm_start, armed, type(0=min,1=max,2=timer,3=batt), grace, ready, last_alarm} - { false, 0 , false, ALARM_TYPE_MIN, 0, false, 0}, --MIN_ALT - { false, 0 , true, ALARM_TYPE_MAX, 0, false, 0 }, --MAX_ALT - { false, 0 , true, ALARM_TYPE_MAX, 0, false, 0 }, --MAX_DIST - { false, 0 , true, ALARM_TYPE_MAX, 0, false, 0 }, --FS_EKF - { false, 0 , true, ALARM_TYPE_MAX, 0, false, 0 }, --FS_BAT - { false, 0 , true, ALARM_TYPE_TIMER, 0, false, 0 }, --FLIGTH_TIME - { false, 0 , false, ALARM_TYPE_BATT, ALARM_TYPE_BATT_GRACE, false, 0 }, --BATT L1 - { false, 0 , false, ALARM_TYPE_BATT_CRT, ALARM_TYPE_BATT_GRACE, false, 0 } --BATT L2 - } - - transitions = { - --{ last_value, last_changed, transition_done, delay } - { 0, 0, false, 30 }, -- flightmode - } - - battery = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0} - - -- stop and reset timer - model.setTimer(2,{mode=0}) - model.setTimer(2,{value=0}) -end - -return {resetTelemetry=resetTelemetry} \ No newline at end of file diff --git a/TARANIS/SOURCES/PP/lib/right.lua b/TARANIS/SOURCES/PP/lib/right.lua deleted file mode 100644 index 0236bcf7..00000000 --- a/TARANIS/SOURCES/PP/lib/right.lua +++ /dev/null @@ -1,200 +0,0 @@ -#include "includes/yaapu_inc.lua" - -#ifdef X9 - -#define BATTVOLT_X 0 -#define BATTVOLT_Y 36 -#define BATTVOLT_YV 36 -#define BATTVOLT_FLAGS MIDSIZE+PREC1 -#define BATTVOLT_FLAGSV SMLSIZE - -#define BATTCELL_X 21 -#define BATTCELL_Y 7 -#define BATTCELL_YV 8 -#define BATTCELL_YS 17 -#define BATTCELL_FLAGS DBLSIZE - -#define BATTCURR_X 61 -#define BATTCURR_Y 36 -#define BATTCURR_YA 36 -#define BATTCURR_FLAGS MIDSIZE+PREC1 -#define BATTCURR_FLAGSA SMLSIZE - -#define BATTPERC_X 0 -#define BATTPERC_Y 11 -#define BATTPERC_YPERC 16 -#define BATTPERC_FLAGS MIDSIZE -#define BATTPERC_FLAGSPERC SMLSIZE - -#define BATTGAUGE_X 5 -#define BATTGAUGE_Y 24 -#define BATTGAUGE_WIDTH 50 -#define BATTGAUGE_HEIGHT 3 -#define BATTGAUGE_STEPS 10 - -#define BATTMAH_X 5 -#define BATTMAH_Y 29 -#define BATTMAH_FLAGS SMLSIZE+PREC1 - --- power and efficiency -#define BATTPOWER_X 61 -#define BATTPOWER_Y 49 -#define BATTPOWER_XLABEL 0 -#define BATTPOWER_YLABEL 49 -#define BATTPOWER_FLAGS SMLSIZE+RIGHT - -#else - -#define BATTCELL_X 1 -#define BATTCELL_Y 7 -#define BATTCELL_YV 7 -#define BATTCELL_YS 13 -#define BATTCELL_FLAGS MIDSIZE - -#define BATTVOLT_X 30 -#define BATTVOLT_Y 19 -#define BATTVOLT_YV 19 -#define BATTVOLT_FLAGS SMLSIZE -#define BATTVOLT_FLAGSV SMLSIZE - -#define BATTCURR_X 30 -#define BATTCURR_Y 26 -#define BATTCURR_YA 26 -#define BATTCURR_FLAGS SMLSIZE -#define BATTCURR_FLAGSA SMLSIZE - -#define BATTPERC_X 1 -#define BATTPERC_Y 32 -#define BATTPERC_YPERC 36 -#define BATTPERC_FLAGS MIDSIZE -#define BATTPERC_FLAGSPERC SMLSIZE - -#define BATTMAH_X 1 -#define BATTMAH_Y 44 -#define BATTMAH_FLAGS SMLSIZE+PREC1 - -#endif - --------------------- --- Single long function much more memory efficient than many little functions ---------------------- -#ifdef X9 -local function drawPane(x,drawLib,conf,telemetry,status,battery,battId,getMaxValue,gpsStatuses) - local perc = 0 - if (battery[BATT_CAP+battId] > 0) then - perc = math.min(math.max((1 - (battery[BATT_MAH+battId]/battery[BATT_CAP+battId]))*100,0),99) - end - -- battery min cell - local flags = 0 - local dimFlags = 0 - if status.showMinMaxValues == false then - if status.battAlertLevel2 == true then - flags = BLINK - dimFlags = BLINK - elseif status.battAlertLevel1 == true then - dimFlags = BLINK+INVERS - end - end - -- cell voltage - -- +0.5 because PREC2 does a math.floor() and not a math.round() - lcd.drawNumber(x+BATTCELL_X, BATTCELL_Y, (battery[BATT_CELL+battId] + 0.5)*(battery[BATT_CELL+battId] < 1000 and 1 or 0.1), BATTCELL_FLAGS+flags+(battery[BATT_CELL+battId] < 1000 and PREC2 or PREC1)) - -- save pos to print source and V - local lx = lcd.getLastRightPos() - -- battery voltage - lcd.drawNumber(x+BATTVOLT_X, BATTVOLT_Y, battery[BATT_VOLT+battId]/10,MIDSIZE) - lcd.drawText(lcd.getLastRightPos() - 1, BATTVOLT_Y, ".",MIDSIZE) - lcd.drawNumber(lcd.getLastRightPos() - 1, BATTVOLT_Y+4, battery[BATT_VOLT+battId]%10,0) - lcd.drawText(lcd.getLastRightPos()-1, BATTVOLT_YV, "V", SMLSIZE) - -- battery current - lcd.drawText(x+BATTCURR_X, BATTCURR_YA, "A", SMLSIZE+RIGHT) - lcd.drawNumber(lcd.getLastLeftPos()-1, BATTCURR_Y+4, battery[BATT_CURR+battId]%10,RIGHT) - lcd.drawText(lcd.getLastLeftPos(), BATTCURR_Y, ".",MIDSIZE+RIGHT) - lcd.drawNumber(lcd.getLastLeftPos(), BATTCURR_Y, battery[BATT_CURR+battId]/10,MIDSIZE+RIGHT) - -- battery percentage - lcd.drawNumber(x+BATTPERC_X, BATTPERC_Y, perc, BATTPERC_FLAGS) - lcd.drawText(lcd.getLastRightPos(), BATTPERC_YPERC, "%", BATTPERC_FLAGSPERC) - -- display capacity bar % - lcd.drawFilledRectangle(x+BATTGAUGE_X, BATTGAUGE_Y, perc/100*BATTGAUGE_WIDTH, BATTGAUGE_HEIGHT, SOLID+FORCE) - local step = BATTGAUGE_WIDTH/BATTGAUGE_STEPS - for s=1,BATTGAUGE_STEPS - 1 do - lcd.drawLine(x+BATTGAUGE_X + s*step - 1,BATTGAUGE_Y, x+BATTGAUGE_X + s*step - 1, BATTGAUGE_Y + BATTGAUGE_HEIGHT - 1,SOLID,0) - end - -- battery mah - lcd.drawNumber(x+BATTMAH_X, BATTMAH_Y, battery[BATT_MAH+battId]/10, SMLSIZE+PREC2) - lcd.drawText(lcd.getLastRightPos(), BATTMAH_Y, "/", SMLSIZE) - lcd.drawNumber(lcd.getLastRightPos(), BATTMAH_Y, battery[BATT_CAP+battId]/100, BATTMAH_FLAGS) - lcd.drawText(lcd.getLastRightPos(), BATTMAH_Y, "Ah", SMLSIZE) - -- efficiency - local eff = telemetry.hSpeed*0.1 > 2 and 1000*battery[BATT_CURR+battId]*0.1/(telemetry.hSpeed*0.1*UNIT_HSPEED_SCALE) or 0 - lcd.drawText(x+BATTPOWER_XLABEL, BATTPOWER_YLABEL, "Eff", SMLSIZE) - lcd.drawText(x+BATTPOWER_X,BATTPOWER_Y,string.format("%d mAh",eff),BATTPOWER_FLAGS) - --minmax - if status.showMinMaxValues == true then - drawLib.drawVArrow(x+BATTVOLT_X+23,BATTVOLT_Y + 8, 4,false,true) - drawLib.drawVArrow(x+BATTCURR_X-3,BATTCURR_Y + 8,4,true,false) - drawLib.drawVArrow(x+BATTCELL_X+33, BATTCELL_Y + 2 ,6,false,true) - else - lcd.drawText(lx, BATTCELL_YV, "V", dimFlags) - lcd.drawText(lx, BATTCELL_YS, status.battsource, SMLSIZE) - end -end -#endif - -#ifdef X7 -local function drawPane(x,drawLib,conf,telemetry,status,battery,battId,getMaxValue,gpsStatuses) - local perc = 0 - if (battery[BATT_CAP+battId] > 0) then - perc = math.min(math.max((1 - (battery[BATT_MAH+battId]/battery[BATT_CAP+battId]))*100,0),99) - end - -- battery min cell - local flags = 0 - local dimFlags = 0 - if status.showMinMaxValues == false then - if status.battAlertLevel2 == true then - flags = BLINK - dimFlags = BLINK - elseif status.battAlertLevel1 == true then - dimFlags = BLINK+INVERS - end - end - -- +0.5 because PREC2 does a math.floor() and not a math.round() - lcd.drawNumber(x+BATTCELL_X, BATTCELL_Y, (battery[BATT_CELL+battId] + 0.5)*(battery[BATT_CELL+battId] < 1000 and 1 or 0.1), BATTCELL_FLAGS+flags+(battery[BATT_CELL+battId] < 1000 and PREC2 or PREC1)) - -- - if status.showMinMaxValues == true then - drawLib.drawVArrow(x+BATTCELL_X+26, BATTCELL_Y+2,6,false,true) - else - local lx = lcd.getLastRightPos() - lcd.drawText(lx-1, BATTCELL_YV, "V", dimFlags+SMLSIZE) - --local xx = telemetry.yaw < 10 and 1 or ( telemetry.yaw < 100 and -2 or -5 ) - local s = status.battsource == "a2" and "a" or (status.battsource == "vs" and "s" or "f") - lcd.drawText(lx, BATTCELL_YS, s, SMLSIZE) - end - -- battery voltage - lcd.drawText(x+BATTVOLT_X, BATTVOLT_YV, "V", SMLSIZE+RIGHT) - lcd.drawNumber(lcd.getLastLeftPos(), BATTVOLT_Y, battery[BATT_VOLT+battId],SMLSIZE+PREC1+RIGHT) - -- battery current - lcd.drawText(x+BATTCURR_X, BATTCURR_YA, "A", SMLSIZE+RIGHT) - lcd.drawNumber(lcd.getLastLeftPos(), BATTCURR_Y, battery[BATT_CURR+battId],PREC1+SMLSIZE+RIGHT) - -- battery percentage - lcd.drawNumber(x+BATTPERC_X, BATTPERC_Y, perc, BATTPERC_FLAGS) - lcd.drawText(lcd.getLastRightPos()+1, BATTPERC_YPERC, "%", BATTPERC_FLAGSPERC) - -- battery mah - lcd.drawNumber(x+BATTMAH_X, BATTMAH_Y, battery[BATT_MAH+battId]/10, SMLSIZE+PREC2) - lcd.drawText(lcd.getLastRightPos(), BATTMAH_Y, "Ah", SMLSIZE) - -- battery cap - lcd.drawNumber(x+BATTMAH_X, BATTMAH_Y+7, battery[BATT_CAP+battId]/10, SMLSIZE+PREC2) - lcd.drawText(lcd.getLastRightPos(), BATTMAH_Y+7, "Ah", SMLSIZE) -end -#endif - -#ifdef CUSTOM_BG_CALL -local function background(conf,telemetry,status,getMaxValue,checkAlarm) -end -#endif - -return { - drawPane=drawPane, -#ifdef CUSTOM_BG_CALL - background=background -#endif -} \ No newline at end of file diff --git a/TARANIS/SOURCES/PP/lib/rover.lua b/TARANIS/SOURCES/PP/lib/rover.lua deleted file mode 100644 index 1abb7481..00000000 --- a/TARANIS/SOURCES/PP/lib/rover.lua +++ /dev/null @@ -1,47 +0,0 @@ ---[[ - // Auto Pilot modes - // ---------------- - enum Number { - MANUAL = 0, - ACRO = 1, - STEERING = 3, - HOLD = 4, - LOITER = 5, - FOLLOW = 6, - SIMPLE = 7, - AUTO = 10, - RTL = 11, - SMART_RTL = 12, - GUIDED = 15, - INITIALISING = 16 - }; ---]] - -local flightModes = {} - --- rover modes -flightModes[0]="" -flightModes[1]="Manual" -flightModes[2]="Acro" -flightModes[3]="" -flightModes[4]="Steering" -flightModes[5]="Hold" -flightModes[6]="Loiter" -flightModes[7]="Follow" -flightModes[8]="Simple" -flightModes[9]="" -flightModes[10]="" -flightModes[11]="Auto" -flightModes[12]="RTL" -flightModes[13]="SmartRTL" -flightModes[14]="" -flightModes[15]="" -flightModes[16]="Guided" -flightModes[17]="Initializing" -flightModes[18]="" -flightModes[19]="" -flightModes[20]="" -flightModes[21]="" -flightModes[22]="" --- -return {flightModes=flightModes} diff --git a/TARANIS/SOURCES/PP/yaapu.lua b/TARANIS/SOURCES/PP/yaapu.lua deleted file mode 100644 index 6a5848db..00000000 --- a/TARANIS/SOURCES/PP/yaapu.lua +++ /dev/null @@ -1,2083 +0,0 @@ -#include "includes/yaapu_inc.lua" - -local frameTypes = {} --- copter -frameTypes[0] = "c" -frameTypes[2] = "c" -frameTypes[3] = "c" -frameTypes[4] = "c" -frameTypes[13] = "c" -frameTypes[14] = "c" -frameTypes[15] = "c" -frameTypes[29] = "c" --- plane -frameTypes[1] = "p" -frameTypes[16] = "p" -frameTypes[19] = "p" -frameTypes[20] = "p" -frameTypes[21] = "p" -frameTypes[22] = "p" -frameTypes[23] = "p" -frameTypes[24] = "p" -frameTypes[25] = "p" -frameTypes[28] = "p" --- rover -frameTypes[10] = "r" --- boat -frameTypes[11] = "b" - -#ifdef TESTMODE --- undefined -frameTypes[5] = "" -frameTypes[6] = "" -frameTypes[7] = "" -frameTypes[8] = "" -frameTypes[9] = "" -frameTypes[12] = "" -frameTypes[17] = "" -frameTypes[18] = "" -frameTypes[26] = "" -frameTypes[27] = "" -frameTypes[30] = "" -#endif --TESTMODE - -local frame = {} -local frameType = nil - -local soundFileBasePath = "/SOUNDS/yaapu0" - -#ifdef X9 -local gpsStatuses = { - [0]="NoGPS", - [1]="NoLock", - [2]="2D", - [3]="3D", - [4]="DGP", - [5]="RTK", - [6]="RTK", -} -#else --X9 -local gpsStatuses = { - [0]="GPS", - [1]="Lock", - [2]="2D", - [3]="3D", - [4]="DG", - [5]="RT", - [6]="RT", -} -#endif --X9 - --- EMR,ALR,CRT,ERR,WRN,NOT,INF,DBG -local mavSeverity = { - [0] = "EMR", - [1] = "ALR", - [2] = "CRT", - [3] = "ERR", - [4] = "WRN", - [5] = "NOT", - [6] = "INF", - [7] = "DBG", -} - -#define CELLFULL 4.36 --------------------------------- --- FLVSS 1 -local cell1min = 0 -local cell1sum = 0 --- FLVSS 2 -local cell2min = 0 -local cell2sum = 0 --- FC 1 -local cell1sumFC = 0 --- used to calculate cellcount -local cell1maxFC = 0 -local cell2maxFC = 0 --- FC 2 -local cell2sumFC = 0 --------------------------------- --- BATT -local battery = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0} -local cell1count = 0 -local cell2count = 0 - -local batt1sources = { - vs = false, - fc = false -} -local batt2sources = { - vs = false, - fc = false -} --- TELEMETRY -local noTelemetryData = 1 -local hideNoTelemetry = false -local telemetry = {} --- STATUS -telemetry.flightMode = 0 -telemetry.simpleMode = 0 -telemetry.landComplete = 0 -telemetry.statusArmed = 0 -telemetry.battFailsafe = 0 -telemetry.ekfFailsafe = 0 -telemetry.imuTemp = 0 --- GPS -telemetry.numSats = 0 -telemetry.gpsStatus = 0 -telemetry.gpsHdopC = 100 -telemetry.gpsAlt = 0 -telemetry.gpsLat = nil -telemetry.gpsLon = nil --- BATT 1 -telemetry.batt1volt = 0 -telemetry.batt1current = 0 -telemetry.batt1mah = 0 --- BATT 2 -telemetry.batt2volt = 0 -telemetry.batt2current = 0 -telemetry.batt2mah = 0 --- HOME -telemetry.homeDist = 0 -telemetry.homeAlt = 0 -telemetry.homeAngle = -1 --- VELANDYAW -telemetry.vSpeed = 0 -telemetry.hSpeed = 0 -telemetry.yaw = 0 --- ROLLPITCH -telemetry.roll = 0 -telemetry.pitch = 0 -telemetry.range = 0 --- PARAMS -telemetry.frameType = -1 -telemetry.batt1Capacity = 0 -telemetry.batt2Capacity = 0 --- WP -telemetry.wpNumber = 0 -telemetry.wpDistance = 0 -telemetry.wpXTError = 0 -telemetry.wpBearing = 0 -telemetry.wpCommands = 0 --- VFR -telemetry.airspeed = 0 -telemetry.throttle = 0 -telemetry.baroAlt = 0 --- TOTAL DISTANCE -telemetry.totalDist = 0 - --- FLIGHT TIME -local lastTimerStart = 0 --- MESSAGES -local msgBuffer = "" -local lastMsgValue = 0 -local lastMsgTime = 0 -local lastMessage -local lastMessageSeverity = 0 -local lastMessageCount = 1 -local messageCount = 0 -local messages = {} --- EVENTS -local lastStatusArmed = 0 -local lastGpsStatus = 0 -local lastFlightMode = 0 -local lastSimpleMode = 0 --- BATTERY LEVELS -local batLevel = 99 -local lastBattLevel = 13 --- TOTAL DISTANCE -local lastUpdateTotDist = 0 -local lastSpeed = 0 --- STATUS -local status = {} --- BLINK SUPPORT -local blinktime = getTime() -local blinkon = false - - -status.showDualBattery = false -status.battAlertLevel1 = false -status.battAlertLevel2 = false -status.battsource = "na" -status.flightTime = 0 -- updated from model timer 3 -status.timerRunning = 0 -- triggered by landcomplete from AP -status.showMinMaxValues = false - --- 00 05 10 15 20 25 30 40 50 60 70 80 90 -#define batLevels(idx) tonumber(string.sub("00051015202530405060708090",idx*2+1,idx*2+2)) --- MIN MAX -local minmaxValues = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0} --- LIBRARY LOADING -local libBasePath = LIB_BASE_PATH -#ifdef X9 -local menuLibFile = "menu9" -local drawLibFile = "draw9" -#else --X9 -local menuLibFile = "menu7" -local drawLibFile = "draw7" -#endif --X9 - -local drawLib = nil -local menuLib = nil -#ifdef RESET -local resetLib = nil -#endif - -local centerPanel = nil -local rightPanel = nil -local leftPanel = nil -local altView = nil - -#ifdef MEMDEBUG -local maxmem = 0 -#endif -#ifdef TESTMODE -local thrOut = 0 -#endif --TESTMODE ------------------------- --- CONFIGURATION ------------------------- -local conf = { - language = "en", - battAlertLevel1 = 0, - battAlertLevel2 = 0, - battCapOverride1 = 0, - battCapOverride2 = 0, - disableAllSounds = false, - disableMsgBeep = 1, - timerAlert = 0, - minAltitudeAlert = 0, - maxAltitudeAlert = 0, - maxDistanceAlert = 0, - repeatAlertsPeriod = 10, - battConf = BATTCONF_PARALLEL, -- 1=parallel,2=other - cell1Count = 0, - cell2Count = 0, - rangeFinderMax = 0, - horSpeedMultiplier = 1, - vertSpeedMultiplier = 1, - horSpeedLabel = "m", - vertSpeedLabel = "m/s", - centerPanel = nil, - rightPanel = nil, - leftPanel = nil, - altView = nil, - defaultBattSource = "na", - enablePX4Modes = false, -#ifdef SYNTHVSPEED - enableSynthVSpeed = false, -#endif --SYNTHVSPEED -#ifdef LOGTELEMETRY - logLevel = false, - logFilename = nil, -#endif --LOGTELEMETRY -#ifdef MONITOR - altMonitorInterval = 0, - distMonitorInterval = 0, -#endif - enableHaptic = false, -#ifdef HDOP_ALARM - maxHdopAlert = 0, -#endif -} ---[[ - ALARM_TYPE_MIN needs arming (min has to be reached first), value below level for grace, once armed is periodic, reset on landing - ALARM_TYPE_MAX no arming, value above level for grace, once armed is periodic, reset on landing - ALARM_TYPE_TIMER no arming, fired periodically, spoken time, reset on landing - ALARM_TYPE_BATT needs arming (min has to be reached first), value below level for grace, no reset on landing -{ - 1 = notified, - 2 = alarm start, - 3 = armed, - 4 = type(0=min,1=max,2=timer,3=batt), - 5 = grace duration - 6 = ready - 7 = last alarm -} ---]] -------------------------- --- alarms -------------------------- -local alarms = { - --{ notified, alarm_start, armed, type(0=min,1=max,2=timer,3=batt), grace, ready, last_alarm} - { false, 0 , false, ALARM_TYPE_MIN, 0, false, 0}, --MIN_ALT - { false, 0 , true, ALARM_TYPE_MAX, 0, false, 0 }, --MAX_ALT - { false, 0 , true, ALARM_TYPE_MAX, 0, false, 0 }, --MAX_DIST - { false, 0 , true, ALARM_TYPE_MAX, 0, false, 0 }, --FS_EKF - { false, 0 , true, ALARM_TYPE_MAX, 0, false, 0 }, --FS_BAT - { false, 0 , true, ALARM_TYPE_TIMER, 0, false, 0 }, --FLIGTH_TIME - { false, 0 , false, ALARM_TYPE_BATT, ALARM_TYPE_BATT_GRACE, false, 0 }, --BATT L1 - { false, 0 , false, ALARM_TYPE_BATT_CRT, ALARM_TYPE_BATT_GRACE, false, 0 }, --BATT L2 -#ifdef HDOP_ALARM - { false, 0 , true, ALARM_TYPE_MAX, 0, false, 0 } --MAX_HDOP -#endif -} - -------------------------- --- value transitions -------------------------- -local transitions = { - --{ last_value, last_changed, transition_done, delay } - { 0, 0, false, 30 }, -- flightmode -} - -#ifdef MONITOR -------------------------- --- sensor monitoring -------------------------- -local monitors = { -1, -1} -#endif - -#ifdef FNV_HASH -------------------------- --- message hash support, uses 312 bytes -------------------------- -local shortHashes = { - -- 16 bytes hashes, requires 88 bytes - {554623408}, -- "554623408.wav", "Takeoff complete" - {3025044912}, -- "3025044912.wav", "SmartRTL deactiv" - {3956583920}, -- "3956583920.wav", "EKF2 IMU0 is usi" - {1309405592}, -- "1309405592.wav", "EKF3 IMU0 is usi" - {4091124880,true}, -- "4091124880.wav", "Reached command " - {3311875476,true}, -- "3311875476.wav", "Reached waypoint" - {1997782032,true}, -- "1997782032.wav", "Passed waypoint " -} - -local shortHash = nil -local parseShortHash = false -local hashByteIndex = 0 -local hash = 2166136261 -#endif --FNV_HASH - -#ifdef TELEMETRY_STATS ----------------- --- TELEMETRY STATS ----------------- -local packetCount = { - [0x5000] = 0, - [0x5001] = 0, - [0x5002] = 0, - [0x5003] = 0, - [0x5004] = 0, - [0x5005] = 0, - [0x5006] = 0, - [0x5007] = 0, - [0x5008] = 0, - [0x5009] = 0 -} - -local packetStats = { - [0x5000] = 0, - [0x5001] = 0, - [0x5002] = 0, - [0x5003] = 0, - [0x5004] = 0, - [0x5005] = 0, - [0x5006] = 0, - [0x5007] = 0, - [0x5008] = 0, - [0x5009] = 0 -} -local lastPacketCountReset = getTime() -#endif --TELEMETRY_STATS - -local showMessages = false -local showConfigMenu = false -local showAltView = false -local loadCycle = 0 -#ifdef MEMDEBUG -local errorCounter = 0 -#endif - ------------------------------ --- clears the loaded table --- and recovers memory ------------------------------ -local function clearTable(t) - if type(t)=="table" then - for i,v in pairs(t) do - if type(v) == "table" then - clearTable(v) - end - t[i] = nil - end - end - t = nil - -- call collectgarbage twice - collectgarbage() - collectgarbage() -#ifdef MEMDEBUG - maxmem = 0 -#endif -end - -local function doLibrary(filename) -#ifdef LOADSCRIPT - local success,f = pcall(loadScript,libBasePath..filename..".lua") -#else --LOADSCRIPT -#ifdef LOAD_LUA - local success,f = pcall(loadfile,libBasePath..filename..".lua") -#else --LOAD_LUA - local success,f = pcall(loadfile,libBasePath..filename..".luac") -#endif --LOAD_LUA -#endif --LOADSCRIPT - if success then - local ret = f() - collectgarbage() - collectgarbage() - return ret - else -#ifdef MEMDEBUG - errorCounter = errorCounter+1 -#endif - collectgarbage() - collectgarbage() - return nil - end -end - -local function unloadPanels() - clearTable(centerPanel) - clearTable(rightPanel) - clearTable(leftPanel) - - centerPanel = nil - rightPanel = nil - leftPanel = nil - - collectgarbage() - collectgarbage() -end - -local function loadPanels() - if centerPanel == nil and loadCycle == CENTER_LOAD_CYCLE then - centerPanel = doLibrary(conf.centerPanel) - end - - if rightPanel == nil and loadCycle == RIGHT_LOAD_CYCLE then - rightPanel = doLibrary(conf.rightPanel) - end - - if leftPanel == nil and loadCycle == LEFT_LOAD_CYCLE then - leftPanel = doLibrary(conf.leftPanel) - end - - collectgarbage() - collectgarbage() -end - --- prevent same file from beeing played too fast -local lastSoundTime = 0 - -local function playSound(soundFile,skipHaptic) - if conf.enableHaptic and skipHaptic == nil then - playHaptic(HAPTIC_DURATION,0) - end - if conf.disableAllSounds then - return - end - -- prevent OpenTX play queue from getting too big - if soundFile == "../inf" then - if getTime() - lastSoundTime > 65 then - lastSoundTime = getTime() - else - return - end - end - - playFile(soundFileBasePath .."/"..conf.language.."/".. soundFile..".wav") -end - ----------------------------------------------- --- sound file has same name as flightmode all lowercase with .wav extension ----------------------------------------------- -local function playFlightMode(flightMode) - if conf.enableHaptic then - playHaptic(HAPTIC_DURATION,0) - end - if conf.disableAllSounds then - return - end - if frame.flightModes then - if frame.flightModes[flightMode] ~= nil then - playFile(soundFileBasePath.."/"..conf.language.."/".. string.lower(frame.flightModes[flightMode]) .. (frameType=="r" and "_r.wav" or ".wav")) - end - end -end - -#ifdef X9 -local function formatMessage(severity,msg) - local shortMsg = msg - if lastMessageCount > 1 then - if #msg > 36 then - shortMsg = string.sub(msg,1,36) - collectgarbage() - end - local pmsg = string.format("%02d:%s %s (x%d)", messageCount, mavSeverity[severity], shortMsg, lastMessageCount) - msg=nil - shortMsg = nil - collectgarbage() - return pmsg - else - if #msg > 40 then - shortMsg = string.sub(msg,1,40) - collectgarbage() - end - local pmsg = string.format("%02d:%s %s", messageCount, mavSeverity[severity], shortMsg) - msg=nil - shortMsg = nil - collectgarbage() - return pmsg - end -end -#else --X9 -local function formatMessage(severity,msg) - local shortMsg = msg - if lastMessageCount > 1 then - if #msg > 16 then - shortMsg = string.sub(msg,1,16) - collectgarbage() - end - local pmsg = string.format("%d:%s %s (x%d)", messageCount, mavSeverity[severity], shortMsg, lastMessageCount) - msg=nil - collectgarbage() - return pmsg - else - if #msg > 23 then - shortMsg = string.sub(msg,1,23) - collectgarbage() - end - local pmsg = string.format("%d:%s %s", messageCount, mavSeverity[severity], shortMsg) - msg=nil - collectgarbage() - return pmsg - end -end -#endif --X9 - ---[[ --------------------- --- FNV HASH --------------------- -function fnv(str) - local hash = 2166136261 - for char in string.gmatch(str, ".") do - hash = bit32.bxor(hash, string.byte(char)) - hash = (hash * 16777619) % 2^32 - end - return hash -end ---]] - -#define MAX_MESSAGES 9 - -local function pushMessage(severity, msg) - if conf.enableHaptic then - playHaptic(HAPTIC_DURATION,0) - end - if conf.disableAllSounds == false then - if ( severity < 5 and conf.disableMsgBeep < 3 ) then - playSound("../err",true) - else - if conf.disableMsgBeep < 2 then - playSound("../inf",true) - end - end - end - if msg == lastMessage then - lastMessageCount = lastMessageCount + 1 - else - lastMessageCount = 1 - messageCount = messageCount + 1 - end - messages[(messageCount-1) % MAX_MESSAGES] = formatMessage(severity,msg) - --print("count=",messageCount,"pos=%",(messageCount-1) % MAX_MESSAGES,msg,"#messages",#messages) - lastMessage = msg - lastMessageSeverity = severity - collectgarbage() - collectgarbage() -end - -local function startTimer() - lastTimerStart = getTime()/100 - model.setTimer(2,{mode=1}) -end - -local function stopTimer() - model.setTimer(2,{mode=0}) - lastTimerStart = 0 -end - -#ifdef RESET -local function reset() - --------------- - -- BATT - --------------- - cell1min = 0 - cell1sum = 0 - cell2min = 0 - cell2sum = 0 - cell1sumFC = 0 - cell1maxFC = 0 - cell2sumFC = 0 - cell1count = 0 - cell2count = 0 - clearTable(minmaxValues) - minmaxValues = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0} - --------------- - -- TELEMETRY - --------------- - noTelemetryData = 1 - hideNoTelemetry = false - --------------- - -- FLIGHT TIME - --------------- - lastTimerStart = 0 - --------------- - -- MESSAGES - --------------- - msgBuffer = "" - lastMsgValue = 0 - lastMsgTime = 0 - lastMessage = nil - lastMessageSeverity = 0 - lastMessageCount = 1 - messageCount = 0 - clearTable(messages) - messages = {} - --------------- - -- EVENTS - --------------- - lastStatusArmed = 0 - lastGpsStatus = 0 - lastFlightMode = 0 - lastSimpleMode = 0 - --------------- - -- BATTERY LEVELS - --------------- - batLevel = 99 - lastBattLevel = 13 - --------------- - -- TOTAL DISTANCE - --------------- - lastUpdateTotDist = 0 - lastSpeed = 0 - - -- unload DRAW - clearTable(drawLib) - drawLib = nil - - if resetLib == nil then - resetLib = doLibrary("reset") - end - -- reset all - resetLib.resetTelemetry(status,telemetry,battery,alarms,transitions) - -- release resources - clearTable(resetLib) - resetLib = nil - -- recover memory - collectgarbage() - collectgarbage() - -- done - pushMessage(6,"Telemetry reset done.") - playSound("yaapu") -end -#endif --RESET - -#ifdef TESTMODE ------------------------------------------------------ --- TEST MODE ------------------------------------------------------ -local function symTimer() -#ifdef DEMO - seconds = 60 * 9 + 30 -#endif --DEMO - thrOut = getValue("thr") - if (thrOut > -500 ) then - telemetry.landComplete = 1 - else - telemetry.landComplete = 0 - end -end - -local function symGPS() - thrOut = getValue("thr") - if thrOut > 500 then - telemetry.numSats = 17 - telemetry.gpsStatus = 4 - telemetry.gpsHdopC = 6 - telemetry.ekfFailsafe = 0 - telemetry.battFailsafe = 0 - telemetry.statusArmed = 1 - noTelemetryData = 0 - elseif thrOut < 500 and thrOut > 0 then - telemetry.numSats = 13 - telemetry.gpsStatus = 5 - telemetry.gpsHdopC = 6 - telemetry.ekfFailsafe = 1 - telemetry.battFailsafe = 0 - telemetry.statusArmed = 1 - noTelemetryData = 0 - elseif thrOut > -500 then - telemetry.numSats = 6 - telemetry.gpsStatus = 3 - telemetry.gpsHdopC = 120 - telemetry.ekfFailsafe = 0 - telemetry.battFailsafe = 1 - telemetry.statusArmed = 0 - noTelemetryData = 0 - else - telemetry.numSats = 0 - telemetry.gpsStatus = 0 - telemetry.gpsHdopC = 100 - telemetry.ekfFailsafe = 0 - telemetry.battFailsafe = 0 - telemetry.statusArmed = 0 - noTelemetryData = 1 - end -end - -local function symFrameType() - local ch11 = getValue("ch11") - if ch11 < -300 then - telemetry.frameType = 2 - telemetry.simpleMode = 0 - elseif ch11 < 300 then - telemetry.frameType = 1 - telemetry.simpleMode = 1 - else - telemetry.frameType = 10 - telemetry.simpleMode = 2 - end -end - -local function symBatt() - thrOut = getValue("thr") - if (thrOut > -500 ) then -#ifdef DEMO - if battFailsafe == 1 then - minmaxValues[MIN_BATT1_FC] = CELLCOUNT * 3.40 * 10 - minmaxValues[MIN_BATT2_FC] = CELLCOUNT * 3.43 * 10 - minmaxValues[MAX_CURR] = 341 + 335 - minmaxValues[MAX_CURR1] = 341 - minmaxValues[MAX_CURR2] = 335 - minmaxValues[MAX_POWER] = (CELLCOUNT * 3.43)*(34.1 + 33.5) - -- battery voltage - telemetry.batt1current = 235 - telemetry.batt1volt = CELLCOUNT * 3.43 * 10 - telemetry.batt1Capacity = 5200 - telemetry.batt1mah = 4400 -#ifdef BATT2TEST - telemetry.batt2current = 238 - telemetry.batt2volt = CELLCOUNT * 3.44 * 10 - telemetry.batt2Capacity = 5200 - telemetry.batt2mah = 4500 -#endif --BATT2TEST - else - minmaxValues[MIN_BATT1_FC] = CELLCOUNT * 3.75 * 10 - minmaxValues[MIN_BATT2_FC] = CELLCOUNT * 3.77 * 10 - minmaxValues[MAX_CURR] = 341+335 - minmaxValues[MAX_CURR1] = 341 - minmaxValues[MAX_CURR2] = 335 - minmaxValues[MAX_POWER] = (CELLCOUNT * 3.89)*(34.1+33.5) - -- battery voltage - telemetry.batt1current = 235 - telemetry.batt1volt = CELLCOUNT * 3.87 * 10 - telemetry.batt1Capacity = 5200 - telemetry.batt1mah = 2800 -#ifdef BATT2TEST - telemetry.batt2current = 238 - telemetry.batt2volt = CELLCOUNT * 3.89 * 10 - telemetry.batt2Capacity = 5200 - telemetry.batt2mah = 2700 -#endif --BATT2TEST - end -#else --DEMO - -- battery voltage - telemetry.batt1current = 2*(100 + ((thrOut)*0.01 * 30)) - telemetry.batt1volt = CELLCOUNT * (32 + 10*math.abs(thrOut)*0.001) - telemetry.batt1Capacity = 5200 - telemetry.batt1mah = math.abs(1000*(thrOut/200)) -#ifdef BATT2TEST - telemetry.batt2current = 2*(100 + ((thrOut)*0.01 * 30)) - telemetry.batt2volt = CELLCOUNT * (32 + 10*math.abs(thrOut)*0.001) - telemetry.batt2Capacity = 5200 - telemetry.batt2mah = math.abs(1000*(thrOut/200)) -#endif --BATT2TEST -#endif --DEMO - -- flightmode -#ifdef DEMO - telemetry.flightMode = 1 - minmaxValues[MAX_GPSALT] = 270*0.1 - minmaxValues[MAX_DIST] = 130 - telemetry.gpsAlt = 200 - telemetry.homeDist = 95 -#else --DEMO - telemetry.flightMode = math.floor(20 * math.abs(thrOut)*0.001) - telemetry.gpsAlt = math.floor(10 * math.abs(thrOut)*0.1) - telemetry.homeDist = math.floor(15 * math.abs(thrOut)*0.1) -#endif --DEMO - else - telemetry.batt1mah = 0 - end -end - --- simulates attitude by using channel 1 for roll, channel 2 for pitch and channel 4 for yaw -local function symAttitude() -#ifdef DEMO - telemetry.roll = 14 - telemetry.pitch = -0.8 - telemetry.yaw = 33 -#else --DEMO - local rollCh = 0 - local pitchCh = 0 - local yawCh = 0 - -- roll [-1024,1024] ==> [-180,180] - rollCh = getValue("ch1") * 0.5 - -- pitch [1024,-1024] ==> [-90,90] - pitchCh = getValue("ch2") * 0.0878 - -- yaw [-1024,1024] ==> [0,360] - yawCh = getValue("ch10") - if ( yawCh >= 0) then - yawCh = yawCh * 0.175 - else - yawCh = 360 + (yawCh * 0.175) - end - telemetry.roll = rollCh/3 - telemetry.pitch = pitchCh/2 - telemetry.yaw = yawCh - telemetry.throttle = math.abs(getValue("ch3"))/10 -#endif --DEMO -end - -local function symHome() - local yawCh = 0 - local S2Ch = 0 - -- home angle in deg [0-360] - S2Ch = getValue("ch12") - yawCh = getValue("ch4") -#ifdef DEMO - minmaxValues[MINMAX_ALT] = 45 - minmaxValues[MAX_VSPEED] = 4 - minmaxValues[MAX_HSPEED] = 77 - telemetry.homeAlt = 24 - telemetry.vSpeed = 55 - telemetry.hSpeed = 88 - telemetry.airspeed = 83 -#else --DEMO - telemetry.homeAlt = yawCh * 0.01 - telemetry.range = 10 * yawCh * 0.1 - telemetry.vSpeed = yawCh * 0.1 * -1 - telemetry.hSpeed = telemetry.vSpeed - telemetry.airspeed = telemetry.vSpeed -#endif --DEMO - if ( yawCh >= 0) then - yawCh = yawCh * 0.175 - else - yawCh = 360 + (yawCh * 0.175) - end - telemetry.yaw = yawCh - if ( S2Ch >= 0) then - S2Ch = S2Ch * 0.175 - else - S2Ch = 360 + (S2Ch * 0.175) - end - if (thrOut > 0 ) then - telemetry.homeAngle = S2Ch - else - telemetry.homeAngle = -1 - end - telemetry.wpNumber = math.min(telemetry.homeDist,1023) - telemetry.wpDistance = telemetry.homeDist - telemetry.totalDist = telemetry.homeDist * 100 - telemetry.wpBearing = (telemetry.yaw / 45) % 8 -end - -local function symMode() - symGPS() - symAttitude() - symTimer() - symHome() - symBatt() - symFrameType() -end -#endif --TESTMODE - -local function processTelemetry(telemetry,DATA_ID,VALUE) - if DATA_ID == 0x5006 then -- ROLLPITCH - -- roll [0,1800] ==> [-180,180] - telemetry.roll = (math.min(bit32.extract(VALUE,0,11),1800) - 900) * 0.2 - -- pitch [0,900] ==> [-90,90] - telemetry.pitch = (math.min(bit32.extract(VALUE,11,10),900) - 450) * 0.2 - -- #define ATTIANDRNG_RNGFND_OFFSET 21 - -- number encoded on 11 bits: 10 bits for digits + 1 for 10^power - telemetry.range = bit32.extract(VALUE,22,10) * (10^bit32.extract(VALUE,21,1)) -- cm - elseif DATA_ID == 0x5005 then -- VELANDYAW - telemetry.vSpeed = bit32.extract(VALUE,1,7) * (10^bit32.extract(VALUE,0,1)) * (bit32.extract(VALUE,8,1) == 1 and -1 or 1) - telemetry.hSpeed = bit32.extract(VALUE,10,7) * (10^bit32.extract(VALUE,9,1)) - telemetry.yaw = bit32.extract(VALUE,17,11) * 0.2 - elseif DATA_ID == 0x5001 then -- AP STATUS - telemetry.flightMode = bit32.extract(VALUE,0,5) - telemetry.simpleMode = bit32.extract(VALUE,5,2) - telemetry.landComplete = bit32.extract(VALUE,7,1) - telemetry.statusArmed = bit32.extract(VALUE,8,1) - telemetry.battFailsafe = bit32.extract(VALUE,9,1) - telemetry.ekfFailsafe = bit32.extract(VALUE,10,2) - -- IMU temperature: 0 means temp =< 19°, 63 means temp => 82° - telemetry.imuTemp = bit32.extract(VALUE,26,6) + 19 -- C° - elseif DATA_ID == 0x5002 then -- GPS STATUS - telemetry.numSats = bit32.extract(VALUE,0,4) - -- offset 4: NO_GPS = 0, NO_FIX = 1, GPS_OK_FIX_2D = 2, GPS_OK_FIX_3D or GPS_OK_FIX_3D_DGPS or GPS_OK_FIX_3D_RTK_FLOAT or GPS_OK_FIX_3D_RTK_FIXED = 3 - -- offset 14: 0: no advanced fix, 1: GPS_OK_FIX_3D_DGPS, 2: GPS_OK_FIX_3D_RTK_FLOAT, 3: GPS_OK_FIX_3D_RTK_FIXED - telemetry.gpsStatus = bit32.extract(VALUE,4,2) + bit32.extract(VALUE,14,2) - telemetry.gpsHdopC = bit32.extract(VALUE,7,7) * (10^bit32.extract(VALUE,6,1)) -- dm - telemetry.gpsAlt = bit32.extract(VALUE,24,7) * (10^bit32.extract(VALUE,22,2)) * (bit32.extract(VALUE,31,1) == 1 and -1 or 1) -- dm - elseif DATA_ID == 0x5003 then -- BATT - telemetry.batt1volt = bit32.extract(VALUE,0,9) -- dV - -- telemetry max is 51.1V, 51.2 is reported as 0.0, 52.3 is 0.1...60 is 88 - -- if 12S and V > 51.1 ==> Vreal = 51.2 + telemetry.batt1volt - if conf.cell1Count == 12 and telemetry.batt1volt < 240 then - -- assume a 2Vx12 as minimum acceptable "real" voltage - telemetry.batt1volt = 512 + telemetry.batt1volt - end - telemetry.batt1current = bit32.extract(VALUE,10,7) * (10^bit32.extract(VALUE,9,1)) --dA - telemetry.batt1mah = bit32.extract(VALUE,17,15) -#ifdef BATT2TEST - telemetry.batt2volt = bit32.extract(VALUE,0,9) - -- telemetry max is 51.1V, 51.2 is reported as 0.0, 52.3 is 0.1...60 is 88 - -- if 12S and V > 51.1 ==> Vreal = 51.2 + telemetry.batt1volt - if conf.cell2Count == 12 and telemetry.batt2volt < 240 then - -- assume a 2Vx12 as minimum acceptable "real" voltage - telemetry.batt2volt = 512 + telemetry.batt2volt - end - telemetry.batt2current = bit32.extract(VALUE,10,7) * (10^bit32.extract(VALUE,9,1)) - telemetry.batt2mah = bit32.extract(VALUE,17,15) -#endif --BATT2TEST - elseif DATA_ID == 0x5008 then -- BATT2 - telemetry.batt2volt = bit32.extract(VALUE,0,9) - -- telemetry max is 51.1V, 51.2 is reported as 0.0, 52.3 is 0.1...60 is 88 - -- if 12S and V > 51.1 ==> Vreal = 51.2 + telemetry.batt1volt - if conf.cell2Count == 12 and telemetry.batt2volt < 240 then - -- assume a 2Vx12 as minimum acceptable "real" voltage - telemetry.batt2volt = 512 + telemetry.batt2volt - end - telemetry.batt2current = bit32.extract(VALUE,10,7) * (10^bit32.extract(VALUE,9,1)) - telemetry.batt2mah = bit32.extract(VALUE,17,15) - elseif DATA_ID == 0x5004 then -- HOME - telemetry.homeDist = bit32.extract(VALUE,2,10) * (10^bit32.extract(VALUE,0,2)) - telemetry.homeAlt = bit32.extract(VALUE,14,10) * (10^bit32.extract(VALUE,12,2)) * 0.1 * (bit32.extract(VALUE,24,1) == 1 and -1 or 1) --m - telemetry.homeAngle = bit32.extract(VALUE, 25, 7) * 3 - elseif DATA_ID == 0x5000 then -- MESSAGES - if VALUE ~= lastMsgValue then - lastMsgValue = VALUE - local c - local msgEnd = false - for i=3,0,-1 - do - c = bit32.extract(VALUE,i*8,7) - if c ~= 0 then - msgBuffer = msgBuffer .. string.char(c) - collectgarbage() - collectgarbage() -#ifdef FNV_HASH - hash = bit32.bxor(hash, c) - hash = (hash * 16777619) % 2^32 - hashByteIndex = hashByteIndex+1 - -- check if this hash matches any 16bytes prefix hash - if hashByteIndex == 16 then - for i=1,#shortHashes - do - if hash == shortHashes[i][1] then - -- ok found - shortHash = hash - -- check if needs parsing - parseShortHash = shortHashes[i][2] == nil and false or true - break; - end - end - end -#endif --FNV_HASH - else - msgEnd = true; - break; - end - end - if msgEnd then - -- push and display message - local severity = (bit32.extract(VALUE,7,1) * 1) + (bit32.extract(VALUE,15,1) * 2) + (bit32.extract(VALUE,23,1) * 4) - pushMessage( severity, msgBuffer) -#ifdef LOGTELEMETRY - -- log message to file - if conf.logLevel > 1 then - -- calling this in protected mode - -- io error should not block the script - local success,logfile = pcall(io.open,conf.logFilename,"a") - if success and logfile ~= nil then - io.write(logfile,getTime(),";",status.flightTime,";",mavSeverity[severity],";",msgBuffer,"\r\n") - io.close(logfile) - end - end -#endif -#ifdef FNV_HASH - -- play shortHash if found otherwise "try" the full hash - -- if it does not exist OpenTX will gracefully ignore it - playSound(tostring(shortHash == nil and hash or shortHash),true) - -- if required parse parameter and play it! - if parseShortHash then - local param = string.match(msgBuffer, ".*#(%d+).*") - collectgarbage() - collectgarbage() - if param ~= nil then - playNumber(tonumber(param),0) - collectgarbage() - collectgarbage() - end - end - -- reset hash for next string - parseShortHash = false - shortHash = nil - hash = 2166136261 - hashByteIndex = 0 -#endif --FNV_HASH - msgBuffer = nil - -- recover memory - collectgarbage() - collectgarbage() - msgBuffer = "" - end - end - elseif DATA_ID == 0x5007 then -- PARAMS - local paramId = bit32.extract(VALUE,24,4) - local paramValue = bit32.extract(VALUE,0,24) - if paramId == 1 then - telemetry.frameType = paramValue - elseif paramId == 4 then - telemetry.batt1Capacity = paramValue -#ifdef BATT2TEST - telemetry.batt2Capacity = paramValue -#endif --BATT2TEST - elseif paramId == 5 then - telemetry.batt2Capacity = paramValue - end - elseif DATA_ID == 0x5009 then -- WAYPOINTS @1Hz - telemetry.wpNumber = bit32.extract(VALUE,0,10) -- wp index - telemetry.wpDistance = bit32.extract(VALUE,12,10) * (10^bit32.extract(VALUE,10,2)) -- meters - telemetry.wpXTError = bit32.extract(VALUE,23,4) * (10^bit32.extract(VALUE,22,1)) * (bit32.extract(VALUE,27,1) == 1 and -1 or 1)-- meters - telemetry.wpBearing = bit32.extract(VALUE,29,3) -- offset from cog with 45° resolution ---[[ - elseif DATA_ID == 0x50F1 then -- RC CHANNELS - -- channels 1 - 32 - local offset = bit32.extract(VALUE,0,4) * 4 - rcchannels[1 + offset] = 100 * (bit32.extract(VALUE,4,6)/63) * (bit32.extract(VALUE,10,1) == 1 and -1 or 1) - rcchannels[2 + offset] = 100 * (bit32.extract(VALUE,11,6)/63) * (bit32.extract(VALUE,17,1) == 1 and -1 or 1) - rcchannels[3 + offset] = 100 * (bit32.extract(VALUE,18,6)/63) * (bit32.extract(VALUE,24,1) == 1 and -1 or 1) - rcchannels[4 + offset] = 100 * (bit32.extract(VALUE,25,6)/63) * (bit32.extract(VALUE,31,1) == 1 and -1 or 1) ---]] - elseif DATA_ID == 0x50F2 then -- VFR - telemetry.airspeed = bit32.extract(VALUE,1,7) * (10^bit32.extract(VALUE,0,1)) -- dm/s - telemetry.throttle = bit32.extract(VALUE,8,7) - telemetry.baroAlt = bit32.extract(VALUE,17,10) * (10^bit32.extract(VALUE,15,2)) * 0.1 * (bit32.extract(VALUE,27,1) == 1 and -1 or 1) - end -end - -#ifdef TESTMODE -local function telemetryEnabled() - return true -end -#else --TESTMODE -local function telemetryEnabled() - if getRSSI() == 0 then - noTelemetryData = 1 - end - return noTelemetryData == 0 -end -#endif --TESTMODE - -local function getMaxValue(value,idx) - minmaxValues[idx] = math.max(value,minmaxValues[idx]) - return status.showMinMaxValues and minmaxValues[idx] or value -end - -local function calcMinValue(value,min) - return min == 0 and value or math.min( value, min ) -end - --- returns the actual minimun only if both are > 0 -local function getNonZeroMin(v1,v2) - return v1 == 0 and v2 or ( v2 == 0 and v1 or math.min(v1,v2)) -end - -local function calcCellCount() - -- cellcount override from menu - local c1 = 0 - local c2 = 0 - - if conf.cell1Count ~= nil and conf.cell1Count > 0 then - c1 = conf.cell1Count - elseif batt1sources.vs == true and cell1count > 1 then - c1 = cell1count - else - c1 = math.floor( ((cell1maxFC*0.1) / CELLFULL) + 1) - end - - if conf.cell2Count ~= nil and conf.cell2Count > 0 then - c2 = conf.cell2Count - elseif batt2sources.vs == true and cell2count > 1 then - c2 = cell2count - else - c2 = math.floor(((cell2maxFC*0.1)/CELLFULL) + 1) - end - - return c1,c2 -end - --- gets the voltage based on source and min value, battId = [1|2] -local function getMinVoltageBySource(source, cell, cellFC, battId) - -- offset 0 for cell voltage, 2 for pack voltage - local offset = 0 - -- - if cell > CELLFULL*2 or cellFC > CELLFULL*2 then - offset = 2 - end - -- - if source == "vs" then - return status.showMinMaxValues == true and minmaxValues[2+offset+battId] or cell - elseif source == "fc" then - -- FC only tracks batt1 and batt2 no cell voltage tracking - local minmax = (offset == 2 and minmaxValues[battId] or minmaxValues[battId]/calcCellCount()) - return status.showMinMaxValues == true and minmax or cellFC - end - -- - return 0 -end - -local function getBatt1Capacity() - return conf.battCapOverride1 > 0 and conf.battCapOverride1*10 or telemetry.batt1Capacity -end - -local function getBatt2Capacity() - return conf.battCapOverride2 > 0 and conf.battCapOverride2*10 or telemetry.batt2Capacity -end - -local function calcFLVSSBatt(battIdx) - local cellMin,cellSum,cellCount - local battSources = battIdx == 1 and batt1sources or batt2sources -#ifdef FLVSS2TEST - local cellResult = battIdx == 1 and getValue("Cels") or getValue("Cels") -#else - local cellResult = battIdx == 1 and getValue("Cels") or getValue("Cel2") -#endif - if type(cellResult) == "table" then - cellMin = CELLFULL - cellSum = 0 - -- cellcount is global and shared - cellCount = #cellResult - for i, v in pairs(cellResult) do - cellSum = cellSum + v - if cellMin > v then - cellMin = v - end - end - -- if connected after script started - if battSources.vs == false then - status.battsource = "na" - end - if status.battsource == "na" then - status.battsource = "vs" - end - battSources.vs = true - else - battSources.vs = false - cellMin = 0 - cellSum = 0 - end - return cellMin,cellSum,cellCount,battSources -end - -local function calcBattery() - ------------ - -- FLVSS 1 - ------------ - cell1min, cell1sum, cell1count = calcFLVSSBatt(1) --1 = Cels - - ------------ - -- FLVSS 2 - ------------ - cell2min, cell2sum, cell2count = calcFLVSSBatt(2) --2 = Cel2 - - -------------------------------- - -- flight controller battery 1 - -------------------------------- - if telemetry.batt1volt > 0 then - -- needed to calculate cell count - cell1maxFC = math.max(telemetry.batt1volt,cell1maxFC) - cell1sumFC = telemetry.batt1volt*0.1 - if status.battsource == "na" then - status.battsource = "fc" - end - batt1sources.fc = true - else - batt1sources.fc = false - cell1sumFC = 0 - end - -------------------------------- - -- flight controller battery 2 - -------------------------------- - if telemetry.batt2volt > 0 then - cell2maxFC = math.max(telemetry.batt2volt,cell2maxFC) - cell2sumFC = telemetry.batt2volt*0.1 - if status.battsource == "na" then - status.battsource = "fc" - end - batt2sources.fc = true - else - batt2sources.fc = false - cell2sumFC = 0 - end - -- batt fc - minmaxValues[MIN_BATT1_FC] = calcMinValue(cell1sumFC,minmaxValues[MIN_BATT1_FC]) - minmaxValues[MIN_BATT2_FC] = calcMinValue(cell2sumFC,minmaxValues[MIN_BATT2_FC]) - -- cell flvss - minmaxValues[MIN_CELL1_VS] = calcMinValue(cell1min,minmaxValues[MIN_CELL1_VS]) - minmaxValues[MIN_CELL2_VS] = calcMinValue(cell2min,minmaxValues[MIN_CELL2_VS]) - -- batt flvss - minmaxValues[MIN_BATT1_VS] = calcMinValue(cell1sum,minmaxValues[MIN_BATT1_VS]) - minmaxValues[MIN_BATT2_VS] = calcMinValue(cell2sum,minmaxValues[MIN_BATT2_VS]) - ------------------------------------------ - -- table to pass battery info to panels - -- offsets are: 1 celm, 4 batt, 7 curr, 10 mah, 13 cap, indexing starts at 1 - -- value = offset + [0 aggregate|1 for batt 1| 2 for batt2] - -- batt2 = 4 + 2 = 6 - ------------------------------------------ - -- Note: these can be calculated. not necessary to track them as min/max - -- cell1minFC = cell1sumFC/calcCellCount() - -- cell2minFC = cell2sumFC/calcCellCount() - -- cell1minA2 = cell1sumA2/calcCellCount() - - local count1,count2 = calcCellCount() - -- 3 cases here - -- 1) parallel => all values depend on both batteries - -- 2) other => all values depend on battery 1 - -- 3) serial => celm(vs) and vbatt(vs) depend on both batteries, all other values on PM battery 1 (this is not supported: 1 PM + 2xFLVSS) - - battery[BATT_CELL+1] = getMinVoltageBySource(status.battsource, cell1min, cell1sumFC/count1, 1)*100 --cel1m - battery[BATT_CELL+2] = getMinVoltageBySource(status.battsource, cell2min, cell2sumFC/count2, 2)*100 --cel2m - battery[BATT_CELL] = (conf.battConf == BATTCONF_OTHER and battery[2] or getNonZeroMin(battery[2],battery[3]) ) - - battery[BATT_VOLT+1] = getMinVoltageBySource(status.battsource, cell1sum, cell1sumFC, 1)*10 --batt1 - battery[BATT_VOLT+2] = getMinVoltageBySource(status.battsource, cell2sum, cell2sumFC, 2)*10 --batt2 - battery[BATT_VOLT] = (conf.battConf == BATTCONF_OTHER and battery[5] or (conf.battConf == BATTCONF_SERIAL and battery[5]+battery[6] or getNonZeroMin(battery[5],battery[6]))) - - battery[BATT_CURR] = getMaxValue((conf.battConf == BATTCONF_OTHER and telemetry.batt1current or telemetry.batt1current + telemetry.batt2current),MAX_CURR) - battery[BATT_CURR+1] = getMaxValue(telemetry.batt1current,MAX_CURR1) --curr1 - battery[BATT_CURR+2] = getMaxValue(telemetry.batt2current,MAX_CURR2) --curr2 - - battery[BATT_MAH] = (conf.battConf == BATTCONF_OTHER and telemetry.batt1mah or telemetry.batt1mah + telemetry.batt2mah) - battery[BATT_MAH+1] = telemetry.batt1mah --mah1 - battery[BATT_MAH+2] = telemetry.batt2mah --mah2 - - battery[BATT_CAP] = (conf.battConf == BATTCONF_PARALLEL and getBatt1Capacity() + getBatt2Capacity() or getBatt1Capacity()) - battery[BATT_CAP+1] = getBatt1Capacity() --cap1 - battery[BATT_CAP+2] = getBatt2Capacity() --cap2 - - if status.showDualBattery == true and conf.battConf == BATTCONF_PARALLEL then - -- dual parallel battery: do I have also dual current monitor? - if battery[BATT_CURR+1] > 0 and battery[BATT_CURR+2] == 0 then - -- special case: assume 1 power brick is monitoring batt1+batt2 in parallel - battery[BATT_CURR+1] = battery[BATT_CURR+1]/2 --curr1 - battery[BATT_CURR+2] = battery[BATT_CURR+1] --curr2 - -- - battery[BATT_MAH+1] = battery[BATT_MAH+1]/2 --mah1 - battery[BATT_MAH+2] = battery[BATT_MAH+1] --mah2 - -- - battery[BATT_CAP+1] = battery[BATT_CAP+1]/2 --cap1 - battery[BATT_CAP+2] = battery[BATT_CAP+1] --cap2 - end - end -end - -local function checkLandingStatus() - if ( status.timerRunning == 0 and telemetry.landComplete == 1 and lastTimerStart == 0) then - startTimer() - end - if (status.timerRunning == 1 and telemetry.landComplete == 0 and lastTimerStart ~= 0) then - stopTimer() - -- play landing complete only if motorts are armed - if telemetry.statusArmed == 1 then - playSound("landing") - end - end - status.timerRunning = telemetry.landComplete -end - -local function calcFlightTime() -#ifdef RESET - if model.getTimer(2).value < status.flightTime then - if telemetry.statusArmed == 0 then - reset() - else - model.setTimer(2,{value=status.flightTime}) - pushMessage(4,"Reset ignored while armed") - end - end -#endif --RESET - -- update local variable with timer 3 value - status.flightTime = model.getTimer(2).value -end - -local function setSensorValues() - if (not telemetryEnabled()) then - return - end - local battmah = telemetry.batt1mah - local battcapacity = getBatt1Capacity() - if telemetry.batt2mah > 0 then - battcapacity = getBatt1Capacity() + getBatt2Capacity() - battmah = telemetry.batt1mah + telemetry.batt2mah - end - local perc = 0 - if (battcapacity > 0) then - perc = math.min(math.max((1 - (battmah/battcapacity))*100,0),99) - end - - setTelemetryValue(Fuel_ID, Fuel_SUBID, Fuel_INSTANCE, perc, 13 , Fuel_PRECISION , Fuel_NAME) - setTelemetryValue(VFAS_ID, VFAS_SUBID, VFAS_INSTANCE, getNonZeroMin(telemetry.batt1volt,telemetry.batt2volt)*10, 1 , VFAS_PRECISION , VFAS_NAME) - setTelemetryValue(CURR_ID, CURR_SUBID, CURR_INSTANCE, telemetry.batt1current+telemetry.batt2current, 2 , CURR_PRECISION , CURR_NAME) - setTelemetryValue(VSpd_ID, VSpd_SUBID, VSpd_INSTANCE, telemetry.vSpeed, 5 , VSpd_PRECISION , VSpd_NAME) - setTelemetryValue(GSpd_ID, GSpd_SUBID, GSpd_INSTANCE, telemetry.hSpeed*0.1, 4 , GSpd_PRECISION , GSpd_NAME) - setTelemetryValue(Alt_ID, Alt_SUBID, Alt_INSTANCE, telemetry.homeAlt*10, 9 , Alt_PRECISION , Alt_NAME) - setTelemetryValue(GAlt_ID, GAlt_SUBID, GAlt_INSTANCE, math.floor(telemetry.gpsAlt*0.1), 9 , GAlt_PRECISION , GAlt_NAME) - setTelemetryValue(Hdg_ID, Hdg_SUBID, Hdg_INSTANCE, math.floor(telemetry.yaw), 20 , Hdg_PRECISION , Hdg_NAME) - setTelemetryValue(IMUTmp_ID, IMUTmp_SUBID, IMUTmp_INSTANCE, telemetry.imuTemp, 11 , IMUTmp_PRECISION , IMUTmp_NAME) - setTelemetryValue(ARM_ID, ARM_SUBID, ARM_INSTANCE, telemetry.statusArmed*100, 0 , ARM_PRECISION , ARM_NAME) -end - -local function drawAllMessages() - for i=0,#messages do - lcd.drawText(1,1+7*i, messages[(messageCount + i) % (#messages+1)],SMLSIZE) - end -end ---------------------------------- --- This function checks alarm condition and as long as the condition persists it plays --- a warning sound. ---------------------------------- -local function checkAlarm(level,value,idx,sign,sound,delay) - -- once landed reset all alarms except battery alerts - if status.timerRunning == 0 then - if alarms[idx][ALARM_TYPE] == ALARM_TYPE_MIN then - alarms[idx] = { false, 0, false, ALARM_TYPE_MIN, 0, false, 0} - elseif alarms[idx][ALARM_TYPE] == ALARM_TYPE_MAX then - alarms[idx] = { false, 0, true, ALARM_TYPE_MAX, 0, false, 0} - elseif alarms[idx][ALARM_TYPE] == ALARM_TYPE_TIMER then - alarms[idx] = { false, 0, true, ALARM_TYPE_TIMER, 0, false, 0} - elseif alarms[idx][ALARM_TYPE] == ALARM_TYPE_BATT then - alarms[idx] = { false, 0 , false, ALARM_TYPE_BATT, ALARM_TYPE_BATT_GRACE, false, 0} - elseif alarms[idx][ALARM_TYPE] == ALARM_TYPE_BATT_CRT then - alarms[idx] = { false, 0 , false, ALARM_TYPE_BATT_CRT, ALARM_TYPE_BATT_GRACE, false, 0} - end - -- reset done - return - end - -- if needed arm the alarm only after value has reached level - if alarms[idx][ALARM_ARMED] == false and level > 0 and -1 * sign*value > -1 * sign*level then - alarms[idx][ALARM_ARMED] = true - end - -- - if alarms[idx][ALARM_TYPE] == ALARM_TYPE_TIMER then - if status.flightTime > 0 and math.floor(status.flightTime) % delay == 0 then - if alarms[idx][ALARM_NOTIFIED] == false then - alarms[idx][ALARM_NOTIFIED] = true - playSound(sound) - playDuration(status.flightTime,(status.flightTime > 3600 and 1 or 0)) -- minutes,seconds - end - else - alarms[idx][ALARM_NOTIFIED] = false - end - else - if alarms[idx][ALARM_ARMED] == true then - if level > 0 and sign*value > sign*level then - -- value is outside level - if alarms[idx][ALARM_START] == 0 then - -- first time outside level after last reset - alarms[idx][ALARM_START] = status.flightTime - -- status: START - end - else - -- value back to normal ==> reset - alarms[idx][ALARM_START] = 0 - alarms[idx][ALARM_NOTIFIED] = false - alarms[idx][ALARM_READY] = false - -- status: RESET - end - if alarms[idx][ALARM_START] > 0 and (status.flightTime ~= alarms[idx][ALARM_START]) and (status.flightTime - alarms[idx][ALARM_START]) >= alarms[idx][ALARM_GRACE] then - -- enough time has passed after START - alarms[idx][ALARM_READY] = true - -- status: READY - end - -- - if alarms[idx][ALARM_READY] == true and alarms[idx][ALARM_NOTIFIED] == false then - playSound(sound) - alarms[idx][ALARM_NOTIFIED] = true - alarms[idx][ALARM_LAST_ALARM] = status.flightTime - -- status: BEEP - end - -- all but battery alarms - if alarms[idx][ALARM_TYPE] ~= ALARM_TYPE_BATT then - if alarms[idx][ALARM_READY] == true and status.flightTime ~= alarms[idx][ALARM_LAST_ALARM] and (status.flightTime - alarms[idx][ALARM_LAST_ALARM]) % delay == 0 then - alarms[idx][ALARM_NOTIFIED] = false - -- status: REPEAT - end - end - end - end -end - -local function loadFlightModes() - if frame.flightModes then - return - end - if telemetry.frameType ~= -1 then -#ifdef COMPILE - if frameTypes[telemetry.frameType] == "c" then - frame = dofile(libBasePath..(conf.enablePX4Modes and "copter_px4.lua" or "copter.lua")) - elseif frameTypes[telemetry.frameType] == "p" then - frame = dofile(libBasePath..(conf.enablePX4Modes and "plane_px4.lua" or "plane.lua")) - elseif frameTypes[telemetry.frameType] == "r" then - frame = dofile(libBasePath.."rover.lua") - end -#else - if frameTypes[telemetry.frameType] == "c" then - frame = dofile(libBasePath..(conf.enablePX4Modes and "copter_px4.luac" or "copter.luac")) - elseif frameTypes[telemetry.frameType] == "p" then - frame = dofile(libBasePath..(conf.enablePX4Modes and "plane_px4.luac" or "plane.luac")) - elseif frameTypes[telemetry.frameType] == "r" then - frame = dofile(libBasePath.."rover.luac") - end -#endif - if frame.flightModes then - frameType = frameTypes[telemetry.frameType] - -- recover some memory - clearTable(frameTypes) - end - end -end - -local function getFlightMode() - if frame.flightModes then - return frame.flightModes[telemetry.flightMode] - else - return nil - end -end - ---------------------------------- --- This function checks state transitions and only returns true if a specific delay has passed --- new transitions reset the delay timer ---------------------------------- -local function checkTransition(idx,value) - if value ~= transitions[idx][TRANSITION_LASTVALUE] then - -- value has changed - transitions[idx][TRANSITION_LASTVALUE] = value - transitions[idx][TRANSITION_LASTCHANGED] = getTime() - transitions[idx][TRANSITION_DONE] = false - -- status: RESET - return false - end - if transitions[idx][TRANSITION_DONE] == false and (getTime() - transitions[idx][TRANSITION_LASTCHANGED]) >= transitions[idx][TRANSITION_DELAY] then - -- enough time has passed after RESET - transitions[idx][TRANSITION_DONE] = true - -- status: FIRE - return true; - end -end - -#ifdef MONITOR -local function monitorValue(idx,value,unit,multiple,sound) - if multiple == 0 then - return - end - - --{ last_value, last_changed, transition_done, delay } - if math.floor(value) > 0 and math.floor(value) % multiple == 0 then - if monitors[idx] ~= math.floor(value) then - monitors[idx] = math.floor(value) - playSound(sound) - playNumber(math.floor(value), unit, 0) - end - end -end -#endif --MONITOR - -local function checkEvents() - loadFlightModes() - - checkAlarm(conf.minAltitudeAlert,telemetry.homeAlt,ALARMS_MIN_ALT,-1,"minalt",conf.repeatAlertsPeriod) - checkAlarm(conf.maxAltitudeAlert,telemetry.homeAlt,ALARMS_MAX_ALT,1,"maxalt",conf.repeatAlertsPeriod) - checkAlarm(conf.maxDistanceAlert,telemetry.homeDist,ALARMS_MAX_DIST,1,"maxdist",conf.repeatAlertsPeriod) - checkAlarm(1,2*telemetry.ekfFailsafe,ALARMS_FS_EKF,1,"ekf",conf.repeatAlertsPeriod) - checkAlarm(1,2*telemetry.battFailsafe,ALARMS_FS_BATT,1,"lowbat",conf.repeatAlertsPeriod) - checkAlarm(math.floor(conf.timerAlert),status.flightTime,ALARMS_TIMER,1,"timealert",math.floor(conf.timerAlert)) -#ifdef HDOP_ALARM - if telemetry.gpsStatus > 2 and conf.maxHdopAlert > 0 then - checkAlarm(conf.maxHdopAlert,telemetry.gpsHdopC,ALARMS_MAX_HDOP,1,"badgps",conf.repeatAlertsPeriod) - end -#endif - - local capacity = getBatt1Capacity() - local mah = telemetry.batt1mah - - -- only if dual battery has been detected - if (batt2sources.fc or batt2sources.vs) and conf.battConf == BATTCONF_PARALLEL then - capacity = capacity + getBatt2Capacity() - mah = mah + telemetry.batt2mah - end - - if (capacity > 0) then - batLevel = (1 - (mah/capacity))*100 - else - batLevel = 99 - end - - for l=0,12 do - -- trigger alarm as as soon as it falls below level + 1 (i.e 91%,81%,71%,...) - local level = batLevels(l) - if batLevel <= level + 1 and l < lastBattLevel then - lastBattLevel = l - playSound("bat"..level) - break - end - end - - if telemetry.statusArmed ~= lastStatusArmed then - if telemetry.statusArmed == 1 then playSound("armed") else playSound("disarmed") end - lastStatusArmed = telemetry.statusArmed - end - - if telemetry.gpsStatus > 2 and lastGpsStatus <= 2 then - lastGpsStatus = telemetry.gpsStatus - playSound("gpsfix") - elseif telemetry.gpsStatus <= 2 and lastGpsStatus > 2 then - lastGpsStatus = telemetry.gpsStatus - playSound("gpsnofix") - end - - -- flightmode transitions have a grace period to prevent unwanted flightmode call out - -- on quick radio mode switches - if frame.flightModes ~= nil and checkTransition(TRANSITIONS_FLIGHTMODE,telemetry.flightMode) then - playFlightMode(telemetry.flightMode) - end - - if telemetry.simpleMode ~= lastSimpleMode then - if telemetry.simpleMode == 0 then - playSound( lastSimpleMode == 1 and "simpleoff" or "ssimpleoff" ) - else - playSound( telemetry.simpleMode == 1 and "simpleon" or "ssimpleon" ) - end - lastSimpleMode = telemetry.simpleMode - end -#ifdef MONITOR - -- monitor altitude and distance for changes, play vocal alert if required - local feetOrMeters = getGeneralSettings().imperial == 0 and OPENTX_UNIT_METERS or OPENTX_UNIT_FEET - monitorValue(MONITOR_ALTITUDE, telemetry.homeAlt*UNIT_ALT_SCALE, feetOrMeters, conf.altMonitorInterval, "alt") - monitorValue(MONITOR_DISTANCE, telemetry.homeDist*UNIT_DIST_SCALE, feetOrMeters, conf.distMonitorInterval, "dist") -#endif --MONITOR -end - -local function checkCellVoltage(celm) - -- check alarms - checkAlarm(conf.battAlertLevel1,celm,ALARMS_BATT_L1,-1,"batalert1",conf.repeatAlertsPeriod) - checkAlarm(conf.battAlertLevel2,celm,ALARMS_BATT_L2,-1,"batalert2",conf.repeatAlertsPeriod) - - if status.battAlertLevel1 == false then status.battAlertLevel1 = alarms[ALARMS_BATT_L1][ALARM_NOTIFIED] end - if status.battAlertLevel2 == false then status.battAlertLevel2 = alarms[ALARMS_BATT_L2][ALARM_NOTIFIED] end -end - -local function cycleBatteryInfo() - if status.showDualBattery == false and (batt2sources.fc or batt2sources.vs) and conf.battConf ~= BATTCONF_SERIAL then - status.showDualBattery = true - return - end - status.battsource = status.battsource == "vs" and "fc" or "vs" -end - -local function updateTotalDist() - if telemetry.armingStatus == 0 then - lastUpdateTotDist = getTime() - return - end - local delta = getTime() - lastUpdateTotDist - local avgSpeed = (telemetry.hSpeed + lastSpeed)/2 - lastUpdateTotDist = getTime() - lastSpeed = telemetry.hSpeed - if avgSpeed * 0.1 > 1 then - telemetry.totalDist = telemetry.totalDist + (avgSpeed * 0.1 * delta * 0.01) --hSpeed dm/s, getTime()/100 secs - end -end - --------------------------------------------------------------------------------- --- MAIN LOOP --------------------------------------------------------------------------------- -local bgclock = 0 -#ifdef BGRATE -local counter = 0 -local bgrate = 0 -local bgstart = 0 -#endif --BGRATE -#ifdef FGRATE -local fgcounter = 0 -local fgrate = 0 -local fgstart = 0 -#endif --FGRATE -#ifdef HUDRATE -local hudcounter = 0 -local hudrate = 0 -local hudstart = 0 -#endif --HUDRATE -#ifdef BGTELERATE -local bgtelecounter = 0 -local bgtelerate = 0 -local bgtelestart = 0 -#endif --BGTELERATE -------------------------------- --- running at 20Hz (every 50ms) -------------------------------- -local function background() -#ifdef BGRATE - ------------------------ - -- CALC BG LOOP RATE - ------------------------ - -- skip first iteration - local now = getTime()/100 - if counter == 0 then - bgstart = now - else - bgrate = counter / (now - bgstart) - end - -- - counter=counter+1 -#endif --BGRATE - -- FAST: this runs at 60Hz (every 16ms) - for i=1,3 - do - local sensor_id,frame_id,data_id,value = sportTelemetryPop() - - if frame_id == 0x10 then - processTelemetry(telemetry,data_id,value) -#ifdef TELEMETRY_STATS - -- update packet stats - if getTime() - lastPacketCountReset > 200 then - lastPacketCountReset = getTime() - for i=0,9 do - packetStats[0x5000+i] = packetCount[0x5000+i]/2 - packetCount[0x5000+i] = 0 - end - end - if packetCount[data_id] ~= nil then - packetCount[data_id] = packetCount[data_id] + 1 - end -#endif --TELEMETRY_STATS - -- update telemetry status - noTelemetryData = 0 - hideNoTelemetry = true - end -#ifdef BGTELERATE - ------------------------ - -- CALC BG TELE PROCESSING RATE - ------------------------ - -- skip first iteration - local now = getTime()/100 - if bgtelecounter == 0 then - bgtelestart = now - else - bgtelerate = bgtelecounter / (now - bgtelestart) - end - -- - bgtelecounter=bgtelecounter+1 -#endif --BGTELERATE - end - -- SLOW: this runs at 4Hz (every 250ms) - if (bgclock % 4 == 0) then - setSensorValues() - updateTotalDist() - end - -- SLOWER: this runs at 2Hz (every 500ms) - if (bgclock % 8 == 0) then - calcBattery() - calcFlightTime() - -- prepare celm based on status.battsource - local count1,count2 = calcCellCount() - local cellVoltage = 0 - - if conf.battConf == BATTCONF_OTHER then - -- alarms are based on battery 1 - cellVoltage = 100*(status.battsource == "vs" and cell1min or cell1sumFC/count1) - else - -- alarms are based on battery 1 and battery 2 - cellVoltage = 100*(status.battsource == "vs" and getNonZeroMin(cell1min,cell2min) or getNonZeroMin(cell1sumFC/count1,cell2sumFC/count2)) - end - -- - checkEvents() - checkLandingStatus() - -- no need for alarms if reported voltage is 0 - if cellVoltage > 0 then - checkCellVoltage(cellVoltage) - end - -- aggregate value - minmaxValues[MAX_CURR] = math.max((conf.battConf == BATTCONF_OTHER and telemetry.batt1current or telemetry.batt1current+telemetry.batt2current), minmaxValues[MAX_CURR]) - - -- indipendent values - minmaxValues[MAX_CURR1] = math.max(telemetry.batt1current,minmaxValues[MAX_CURR1]) - minmaxValues[MAX_CURR2] = math.max(telemetry.batt2current,minmaxValues[MAX_CURR2]) - -#ifdef CUSTOM_BG_CALL - -- call custom panel background functions - if leftPanel ~= nil then - leftPanel.background(conf,telemetry,status,getMaxValue,checkAlarm) - end - if centerPanel ~= nil then - centerPanel.background(conf,telemetry,status,getMaxValue,checkAlarm) - end - if rightPanel ~= nil then - rightPanel.background(conf,telemetry,status,getMaxValue,checkAlarm) - end - if altView ~= nil then - altView.background(conf,telemetry,status,getMaxValue,checkAlarm) - end -#endif --CUSTOM_BG_CALL - - -- update GPS coordinates - local gpsData = getValue("GPS") - - if type(gpsData) == "table" and gpsData.lat ~= nil and gpsData.lon ~= nil then - telemetry.gpsLat = math.floor(gpsData.lat * 100000) / 100000 - telemetry.gpsLon = math.floor(gpsData.lon * 100000) / 100000 - collectgarbage() - collectgarbage() - end - - bgclock=0 - end - -- blinking support - if (getTime() - blinktime) > 65 then - blinkon = not blinkon - blinktime = getTime() - end - bgclock = bgclock+1 - collectgarbage() - collectgarbage() -end - -local function run(event) - lcd.clear() -#ifdef DEBUGEVT - if event > 0 then - pushMessage(7,tostring(event)) - end -#endif -#ifdef FGRATE - ------------------------ - -- CALC FG LOOP RATE - ------------------------ - -- skip first iteration - local now = getTime()/100 - if fgcounter == 0 then - fgstart = now - else - fgrate = fgcounter / (now - fgstart) - end - -- - fgcounter=fgcounter+1 -#endif --FGRATE - -#ifdef HUDRATE - ------------------------ - -- CALC HUD REFRESH RATE - ------------------------ - -- skip first iteration - local hudnow = getTime()/100 - if hudcounter == 0 then - hudstart = hudnow - else - hudrate = hudcounter / (hudnow - hudstart) - end - hudcounter=hudcounter+1 -#endif --HUDRATE - -#ifdef TESTMODE - symMode() -#endif --TESTMODE - - if showMessages then - --------------------- - -- MESSAGES - --------------------- - drawAllMessages() - - if event == EVT_MINUS_BREAK or event == EVT_ROT_LEFT or event == XLITE_DOWN or event == EVT_EXIT_BREAK or event == XLITE_RTN then - showMessages = false - elseif event == EVT_ENTER_BREAK or event == XLITE_ENTER then - if showAltView == false then - -- main --> altview - unloadPanels() - showAltView = true - else - -- altview --> main - clearTable(altView) - altView = nil - showAltView = false - end - showMessages = false - collectgarbage() - collectgarbage() - elseif event == EVT_PLUS_BREAK or event == EVT_ROT_RIGHT or event == XLITE_UP then - showMessages = false - end - elseif showConfigMenu then - --------------------- - -- CONFIG MENU - --------------------- - -- top bars - lcd.drawFilledRectangle(0,TOPBAR_Y, TOPBAR_WIDTH, 7, SOLID+FORCE) - -- bottom bar - lcd.drawFilledRectangle(0,BOTTOMBAR_Y, BOTTOMBAR_WIDTH, 8, SOLID+FORCE) - - if menuLib == nil and loadCycle == MENU_LOAD_CYCLE then - menuLib = doLibrary(menuLibFile) - if menuLib ~= nil then - menuLib.loadConfig(conf) - collectgarbage() - collectgarbage() - end - end - - if menuLib ~= nil then - menuLib.drawConfigMenu(event) - end - - - if event == EVT_EXIT_BREAK then - showConfigMenu = false - -- unload MENU - menuLib.saveConfig(conf) - clearTable(menuLib) - menuLib = nil -#ifdef LOGTELEMETRY - pushMessage(7,conf.logLevel > 1 and "msg logging enabled" or "msg logging disabled") -#endif --LOGTELEMETRY - collectgarbage() - collectgarbage() - end - else - --------------------- - -- MAIN VIEW - --------------------- - if event == EVT_ENTER_BREAK or event == XLITE_ENTER then - cycleBatteryInfo() - end - if event == EVT_MENU_BREAK or event == XLITE_MENU then - status.showMinMaxValues = not status.showMinMaxValues - end - - if status.showDualBattery == true and (event == EVT_EXIT_BREAK or event == XLITE_RTN) then - status.showDualBattery = false - end - - if drawLib == nil and loadCycle == DRAWLIB_LOAD_CYCLE then - -- load draw library - drawLib = doLibrary(drawLibFile) - collectgarbage() - collectgarbage() - end - - -- top bars - lcd.drawFilledRectangle(0,TOPBAR_Y, TOPBAR_WIDTH, 7, FORCE) - - if showAltView then - if altView == nil and loadCycle == ALTVIEW_LOAD_CYCLE then - -- load ALTVIEW - altView = doLibrary(conf.altView) - collectgarbage() - collectgarbage() - end - - if drawLib ~= nil and altView ~= nil then - altView.drawView(drawLib,conf,telemetry,status,battery,(batt2sources.fc or batt2sources.vs) and BATT_IDALL or BATT_ID1,getMaxValue,gpsStatuses) - end - - if event == EVT_EXIT_BREAK or event == XLITE_RTN then - showMessages = false - showAltView = false - - clearTable(altView) - altView = nil - collectgarbage() - collectgarbage() - elseif event == EVT_PLUS_BREAK or event == EVT_ROT_RIGHT or event == XLITE_UP then - showMessages = true - end - else - -- draw PANELS - loadPanels() - - if centerPanel ~= nil and rightPanel ~= nil and leftPanel ~= nil and drawLib ~= nil then - -- with dual battery default is to show aggregate view - if batt2sources.fc or batt2sources.vs then - if status.showDualBattery == false then - -- dual battery: aggregate view - rightPanel.drawPane(RIGHTPANE_X,drawLib,conf,telemetry,status,battery,BATT_IDALL,getMaxValue,gpsStatuses) -- 0=aggregate view - #ifdef X9 - lcd.drawText(RIGHTPANE_X-5, 0, "2B", SMLSIZE+INVERS) - #else --X9 - lcd.drawText(HUD_X+5, LCD_H-16, "2B", SMLSIZE) - #endif --X9 - else - -- dual battery:battery 1 right pane - rightPanel.drawPane(RIGHTPANE_X,drawLib,conf,telemetry,status,battery,BATT_ID1,getMaxValue,gpsStatuses) -- 1=battery 1 - -- dual battery:battery 2 left pane - rightPanel.drawPane(LEFTPANE_X,drawLib,conf,telemetry,status,battery,BATT_ID2,getMaxValue,gpsStatuses) -- 2=battery 2 - end - else - -- battery 1 right pane in single battery mode - rightPanel.drawPane(RIGHTPANE_X,drawLib,conf,telemetry,status,battery,BATT_ID1,getMaxValue,gpsStatuses) -- 1=battery 1 - end - -- left pane info when not in dual battery mode - if status.showDualBattery == false then - leftPanel.drawPane(LEFTPANE_X,drawLib,conf,telemetry,status,battery,BATT_IDALL,getMaxValue,gpsStatuses) -- 0=aggregate view - end - - centerPanel.drawHud(drawLib,conf,telemetry,status,battery,getMaxValue) - - drawLib.drawGrid() - drawLib.drawRArrow(HOMEDIR_X,HOMEDIR_Y,HOMEDIR_R,telemetry.homeAngle - telemetry.yaw,1) - drawLib.drawFailSafe(status.showDualBattery,telemetry.ekfFailsafe,telemetry.battFailsafe) - end - end - -- bottom bar - lcd.drawFilledRectangle(0,BOTTOMBAR_Y, BOTTOMBAR_WIDTH, 8, FORCE) - - if drawLib ~= nil then - drawLib.drawTopBar(getFlightMode(),telemetry.simpleMode,status.flightTime,telemetryEnabled) - drawLib.drawBottomBar(messages[(messageCount + #messages) % (#messages+1)],lastMsgTime) - drawLib.drawNoTelemetry(telemetryEnabled,hideNoTelemetry) - end - -- event handler - if event == EVT_PLUS_BREAK or event == EVT_ROT_RIGHT or event == XLITE_UP then - --------------------- - -- SHOW MESSAGES - --------------------- - showMessages = true - elseif event == EVT_MENU_LONG or event == XLITE_MENU_LONG then - --------------------- - -- SHOW CONFIG MENU - --------------------- - clearTable(drawLib) - clearTable(altView) - unloadPanels() - altView = nil - drawLib = nil - collectgarbage() - collectgarbage() - showConfigMenu = true - end - end -#ifdef BGRATE - lcd.drawNumber(0,39,bgrate*10,PREC1+SMLSIZE+INVERS) - lcd.drawText(lcd.getLastRightPos(),39,"Hz",SMLSIZE+INVERS) -#endif --BGRATE -#ifdef FGRATE - lcd.drawNumber(0,39,fgrate*10,PREC1+SMLSIZE+INVERS) - lcd.drawText(lcd.getLastRightPos(),39,"Hz",SMLSIZE+INVERS) -#endif --FGRATE -#ifdef HUDRATE - lcd.drawNumber(0,39,hudrate*10,PREC1+SMLSIZE+INVERS) - lcd.drawText(lcd.getLastRightPos(),39,"Hz",SMLSIZE+INVERS) -#endif --HUDRATE -#ifdef BGTELERATE - lcd.drawNumber(20,39,bgtelerate,SMLSIZE+INVERS) -#endif --BGTELERATE -#ifdef MEMDEBUG - -- debug info, allocated memory - maxmem = math.max(maxmem,collectgarbage("count")*1024) - lcd.drawNumber(LCD_W,LCD_H-6,maxmem,SMLSIZE+RIGHT+INVERS) - lcd.drawNumber(LCD_W,LCD_H-14,errorCounter,SMLSIZE+RIGHT+INVERS) -#endif -#ifdef TELEMETRY_STATS - for i=0,8 do - lcd.drawText(1,1+7*(i),string.format("%s%d: %.01f","500",i,packetStats[0x5000+i]),INVERS+SMLSIZE) - end -#endif -#ifdef NOTELEM_BLINK - if not telemetryEnabled() and blinkon then - lcd.drawRectangle(0,0,LCD_W,LCD_H,showMessages and SOLID or ERASE) - end -#endif - loadCycle=(loadCycle+1)%LOAD_CYCLE_MAX - collectgarbage() - collectgarbage() -end - -local function init() --- initialize flight timer - model.setTimer(2,{mode=0}) - model.setTimer(2,{value=0}) -#ifdef COMPILE - loadScript(libBasePath.."copter.lua","c") - loadScript(libBasePath.."plane.lua","c") - loadScript(libBasePath.."copter_px4.lua","c") - loadScript(libBasePath.."plane_px4.lua","c") - loadScript(libBasePath.."rover.lua","c") - loadScript(libBasePath.."reset.lua","c") - loadScript(libBasePath..menuLibFile..".lua","c") - loadScript(libBasePath..drawLibFile..".lua","c") -#endif - -- load menu library - menuLib = doLibrary(menuLibFile) - menuLib.loadConfig(conf) - collectgarbage() - collectgarbage() -#ifdef COMPILE - menuLib.compilePanels() -#endif - -- ok configuration loaded - status.battsource = conf.defaultBattSource - -- configuration loaded, releasing menu library memory - clearTable(menuLib) - menuLib = nil -#ifdef X9 - pushMessage(7,VERSION) -#endif --X9 -#ifdef X7 - pushMessage(7,VERSION) -#endif --X7 -#ifdef TESTMODE -#ifdef DEMO - pushMessage(6,"APM:Copter V3.5.4 (284349c3) QUAD") - pushMessage(6,"Calibrating barometer") - pushMessage(6,"Initialising APM") - pushMessage(6,"Barometer calibration complete") - pushMessage(6,"EKF2 IMU0 initial yaw alignment complete") - pushMessage(6,"EKF2 IMU1 initial yaw alignment complete") - pushMessage(4,"Bad AHRS") - pushMessage(6,"GPS 1: detected as u-blox at 115200 baud") - pushMessage(6,"EKF2 IMU0 tilt alignment complete") - pushMessage(6,"EKF2 IMU1 tilt alignment complete") - pushMessage(6,"u-blox 1 HW: 00080000 SW: 2.01 (75331)") - pushMessage(4,"Bad AHRS") - pushMessage(4,"Bad AHRS") - pushMessage(4,"Bad AHRS") - --]] -#endif --DEMO -#endif --TESTMODE -#ifdef LOGTELEMETRY - if conf.logLevel > 1 then - pushMessage(7,"msg logging enabled") - end -#endif - collectgarbage() - collectgarbage() - playSound("yaapu") -end - --------------------------------------------------------------------------------- --- SCRIPT END --------------------------------------------------------------------------------- -return {run=run, background=background, init=init} diff --git a/TARANIS/SOURCES/README.md b/TARANIS/SOURCES/README.md index dec124ee..4fe04d05 100644 --- a/TARANIS/SOURCES/README.md +++ b/TARANIS/SOURCES/README.md @@ -1,5 +1,4 @@ Note -- files in the PP folder have to be preprocessed first with /TOOLS/pp.lua prior to compiling in OpenTX companion - files in the SRC folder are ready to be copied to the /SCRIPTS/TELEMETRY folder of the virtual SD Card in OpenTX companion for compilation diff --git a/TARANIS/SOURCES/SRC/yaapu/alt7_view.lua b/TARANIS/SOURCES/SRC/yaapu/alt7_view.lua index 13edbdff..f3f7585b 100644 --- a/TARANIS/SOURCES/SRC/yaapu/alt7_view.lua +++ b/TARANIS/SOURCES/SRC/yaapu/alt7_view.lua @@ -34,32 +34,17 @@ --------------------- -- FEATURES --------------------- ---#define BATTMAH3DEC --- enable altitude/distance monitor and vocal alert (experimental) ---#define MONITOR --- show incoming DIY packet rates ---#define TELEMETRY_STATS --- enable synthetic vspeed when ekf is disabled ---#define SYNTHVSPEED --- enable telemetry reset on timer 3 reset --- always calculate FNV hash and play sound msg_.wav --- enable telemetry logging menu option ---#define LOGTELEMETRY --- enable max HDOP alert ---#define HDOP_ALARM -- enable support for custom background functions --#define CUSTOM_BG_CALL --- enable alert window for no telemetry ---#define NOTELEM_ALERT --- enable popups for no telemetry data ---#define NOTELEM_POPUP --- enable blinking rectangle on no telemetry +-- enable battery % by voltage (x9d 2019 only) +--#define BATTPERC_BY_VOLTAGE + --------------------- -- DEBUG --------------------- ---#define DEBUG +-- show button event code on message screen --#define DEBUGEVT ---#define DEV +-- display memory info --#define MEMDEBUG -- calc and show background function rate --#define BGRATE @@ -69,6 +54,7 @@ --#define HUDRATE -- calc and show telemetry process rate --#define BGTELERATE + --------------------- -- TESTMODE --------------------- @@ -146,6 +132,7 @@ --]] + ----------------------- -- UNIT SCALING ----------------------- @@ -180,7 +167,6 @@ local unitLongLabel = getGeneralSettings().imperial == 0 and "km" or "mi" - -------------------------------- -- Layout 128x64 QX7/X-Lite -------------------------------- @@ -255,24 +241,7 @@ local function drawLeftPane(x,drawLib,conf,telemetry,status,battery,battId,getMa else drawLib.drawHomeIcon(x+1, 25) end - --[[ - -- altitude on right side - local alt = getMaxValue(telemetry.homeAlt,MINMAX_ALT) * UNIT_ALT_SCALE -- homeAlt is meters*3.28 = feet - - if math.abs(alt) < 10 then - lcd.drawNumber(ALT_ALT_X+1,ALT_ALT_Y,alt * 10,PREC1+RIGHT+MIDSIZE) - else - lcd.drawNumber(ALT_ALT_X+1,ALT_ALT_Y,alt,RIGHT+MIDSIZE) - end - -- hspeed - local speed = getMaxValue(telemetry.hSpeed,MAX_HSPEED) * UNIT_HSPEED_SCALE - - if math.abs(speed) > 99 then - lcd.drawNumber(ALT_HSPEED_X+1,ALT_HSPEED_Y,speed*0.1,RIGHT+MIDSIZE) - else - lcd.drawNumber(ALT_HSPEED_X+1,ALT_HSPEED_Y,speed,PREC1+RIGHT+MIDSIZE) - end - --]] -- needs to be called ofter for strings created by decToDMSFull() fragment memory + -- needs to be called ofter for strings created by decToDMSFull() fragment memory collectgarbage() end @@ -296,6 +265,19 @@ local function loadSensors() collectgarbage() customSensors = sensorScript() sensorScript = nil + -- handle nil values for warning and critical levels + for i=1,6 + do + if customSensors.sensors[i] ~= nil then + local sign = customSensors.sensors[i][6] == "+" and 1 or -1 + if customSensors.sensors[i][9] == nil then + customSensors.sensors[i][9] = math.huge*sign + end + if customSensors.sensors[i][8] == nil then + customSensors.sensors[i][8] = math.huge*sign + end + end + end collectgarbage() collectgarbage() end @@ -456,7 +438,8 @@ local function drawMiniHud(drawLib,conf,telemetry,status,battery,getMaxValue) lcd.drawLine(ALT_HUD_X + ALT_HUD_WIDTH - 3, 8+i*3, ALT_HUD_X + ALT_HUD_WIDTH -1, 8+i*3, SOLID, ERASE) lcd.drawLine(ALT_HUD_X + ALT_HUD_WIDTH - 2, arrowY+8+i*3, ALT_HUD_X + ALT_HUD_WIDTH-2, arrowY+8+i*3, SOLID, ERASE) end - --]] lcd.drawLine(31 + 64 - 5, 19, 31 + 64, 19, SOLID, FORCE) + --]] + lcd.drawLine(31 + 64 - 5, 19, 31 + 64, 19, SOLID, FORCE) ------------------------------------- -- left and right indicators on HUD ------------------------------------- @@ -504,10 +487,7 @@ local function drawMiniHud(drawLib,conf,telemetry,status,battery,getMaxValue) end local function drawRightPane(x,drawLib,conf,telemetry,status,battery,battId,getMaxValue,gpsStatuses) - local perc = 0 - if (battery[13+battId] > 0) then - perc = math.min(math.max((1 - (battery[10+battId]/battery[13+battId]))*100,0),99) - end + local perc = battery[16+battId] -- battery min cell local flags = 0 local dimFlags = 0 diff --git a/TARANIS/SOURCES/SRC/yaapu/alt9_view.lua b/TARANIS/SOURCES/SRC/yaapu/alt9_view.lua index 230a8330..f31a232f 100644 --- a/TARANIS/SOURCES/SRC/yaapu/alt9_view.lua +++ b/TARANIS/SOURCES/SRC/yaapu/alt9_view.lua @@ -34,32 +34,17 @@ --------------------- -- FEATURES --------------------- ---#define BATTMAH3DEC --- enable altitude/distance monitor and vocal alert (experimental) ---#define MONITOR --- show incoming DIY packet rates ---#define TELEMETRY_STATS --- enable synthetic vspeed when ekf is disabled ---#define SYNTHVSPEED --- enable telemetry reset on timer 3 reset --- always calculate FNV hash and play sound msg_.wav --- enable telemetry logging menu option ---#define LOGTELEMETRY --- enable max HDOP alert ---#define HDOP_ALARM -- enable support for custom background functions --#define CUSTOM_BG_CALL --- enable alert window for no telemetry ---#define NOTELEM_ALERT --- enable popups for no telemetry data ---#define NOTELEM_POPUP --- enable blinking rectangle on no telemetry +-- enable battery % by voltage (x9d 2019 only) +--#define BATTPERC_BY_VOLTAGE + --------------------- -- DEBUG --------------------- ---#define DEBUG +-- show button event code on message screen --#define DEBUGEVT ---#define DEV +-- display memory info --#define MEMDEBUG -- calc and show background function rate --#define BGRATE @@ -69,6 +54,7 @@ --#define HUDRATE -- calc and show telemetry process rate --#define BGTELERATE + --------------------- -- TESTMODE --------------------- @@ -145,6 +131,7 @@ --]] + ----------------------- -- UNIT SCALING ----------------------- @@ -179,7 +166,6 @@ local unitLongLabel = getGeneralSettings().imperial == 0 and "km" or "mi" - -------------------------------- -- Layout 212x64 taranis X9D+ -------------------------------- @@ -291,6 +277,19 @@ local function loadSensors() collectgarbage() customSensors = sensorScript() sensorScript = nil + -- handle nil values for warning and critical levels + for i=1,6 + do + if customSensors.sensors[i] ~= nil then + local sign = customSensors.sensors[i][6] == "+" and 1 or -1 + if customSensors.sensors[i][9] == nil then + customSensors.sensors[i][9] = math.huge*sign + end + if customSensors.sensors[i][8] == nil then + customSensors.sensors[i][8] = math.huge*sign + end + end + end collectgarbage() collectgarbage() end @@ -525,10 +524,7 @@ end local function drawRightPane(x,drawLib,conf,telemetry,status,battery,battId,getMaxValue,gpsStatuses) - local perc = 0 - if (battery[13+battId] > 0) then - perc = math.min(math.max((1 - (battery[10+battId]/battery[13+battId]))*100,0),99) - end + local perc = battery[16+battId] -- battery min cell local flags = 0 local dimFlags = 0 diff --git a/TARANIS/SOURCES/SRC/yaapu/copter.lua b/TARANIS/SOURCES/SRC/yaapu/copter.lua index cf18a422..b91d0262 100644 --- a/TARANIS/SOURCES/SRC/yaapu/copter.lua +++ b/TARANIS/SOURCES/SRC/yaapu/copter.lua @@ -23,8 +23,11 @@ FLOWHOLD = 22, // FLOWHOLD holds position with optical flow without rangefinder FOLLOW = 23, // follow attempts to follow another vehicle or ground station ZIGZAG = 24, // ZIGZAG mode is able to fly in a zigzag manner with predefined point A and point B + SYSTEMID = 25, // System ID mode produces automated system identification signals in the controllers + AUTOROTATE = 26, // Autonomous autorotation }; - --]] local flightModes = {} + --]] + local flightModes = {} -- copter flight modes flightModes[0]="" @@ -53,6 +56,7 @@ flightModes[23]="FlowHold" flightModes[24]="Follow" flightModes[25]="ZigZag" - flightModes[26]="Initializing" + flightModes[26]="SystemID" + flightModes[27]="Autorotate" return {flightModes=flightModes} diff --git a/TARANIS/SOURCES/SRC/yaapu/copter_px4.lua b/TARANIS/SOURCES/SRC/yaapu/copter_px4.lua index d143e236..d068aaf9 100644 --- a/TARANIS/SOURCES/SRC/yaapu/copter_px4.lua +++ b/TARANIS/SOURCES/SRC/yaapu/copter_px4.lua @@ -1,29 +1,86 @@ +--[[ + MavToPT 2.63 + + uint8_t PX4FlightModeNum(uint8_t main, uint8_t sub) { + switch(main) { + case 1: + return 0; // MANUAL + case 2: + return 1; // ALTITUDE + case 3: + return 2; // POSCTL + case 4: + switch(sub) { + case 1: + return 12; // AUTO READY + case 2: + return 13; // AUTO TAKEOFF + case 3: + return 14; // AUTO LOITER + case 4: + return 15; // AUTO MISSION + case 5: + return 16; // AUTO RTL + case 6: + return 17; // AUTO LAND + case 7: + return 18; // AUTO RTGS + case 8: + return 19; // AUTO FOLLOW ME + case 9: + return 20; // AUTO PRECLAND + default: + return 31; // AUTO UNKNOWN + } + case 5: + return 3; // ACRO + case 6: + return 4; // OFFBOARD + case 7: + return 5; // STABILIZED + case 8: + return 6; // RATTITUDE + case 9: + return 7; // SIMPLE + default: + return 11; // UNKNOWN + } + } +--]] local flightModes = {} -- plane flight modes -flightModes[0]="" -flightModes[1]="Manual" -flightModes[2]="AltCtl" --px4 specific -flightModes[3]="PosCtl" --px4 specific -flightModes[4]="Ready" --px4 specific -flightModes[5]="Takeoff" --px4 specific -flightModes[6]="Loiter" -flightModes[7]="Mission" --px4 specific -flightModes[8]="RTL" -flightModes[9]="Land" -flightModes[10]="RTGS" --px4 specific -flightModes[11]="Follow" -flightModes[12]="PrecLand" --px4 specific -flightModes[13]="" -flightModes[14]="Acro" -flightModes[15]="OffBoard" --px4 specific -flightModes[16]="Stabilize" -flightModes[17]="RAttitude" --px4 specific -flightModes[18]="Simple" --px4 specific -flightModes[19]="" -flightModes[20]="" -flightModes[21]="" -flightModes[22]="" -flightModes[23]="" --- +flightModes[0] = "Manual" +flightModes[1] = "AltCtl" --px4 specific +flightModes[2] = "PosCtl" --px4 specific +flightModes[3] = "Acro" +flightModes[4] = "OffBoard" --px4 specific +flightModes[5] = "Stabilize" +flightModes[6] = "RAttitude" --px4 specific +flightModes[7] = "Simple" --px4 specific +flightModes[8] = "" +flightModes[9] = "" +flightModes[10] = "" +flightModes[11] = "" +flightModes[12] = "Ready" --px4 specific +flightModes[13] = "Takeoff" --px4 specific +flightModes[14] = "Loiter" +flightModes[15] = "Mission" --px4 specific +flightModes[16] = "RTL" +flightModes[17] = "Land" +flightModes[18] = "" +flightModes[19] = "Follow" +flightModes[20] = "PrecLand" --px4 specific +flightModes[21] = "" +flightModes[22] = "" +flightModes[23] = "" +flightModes[24] = "" +flightModes[25] = "" +flightModes[26] = "" +flightModes[27] = "" +flightModes[28] = "" +flightModes[29] = "" +flightModes[30] = "" +flightModes[31] = "Unknown" + return {flightModes=flightModes} diff --git a/TARANIS/SOURCES/SRC/yaapu/draw7.lua b/TARANIS/SOURCES/SRC/yaapu/draw7.lua index 4d215590..abc70d15 100644 --- a/TARANIS/SOURCES/SRC/yaapu/draw7.lua +++ b/TARANIS/SOURCES/SRC/yaapu/draw7.lua @@ -34,32 +34,17 @@ --------------------- -- FEATURES --------------------- ---#define BATTMAH3DEC --- enable altitude/distance monitor and vocal alert (experimental) ---#define MONITOR --- show incoming DIY packet rates ---#define TELEMETRY_STATS --- enable synthetic vspeed when ekf is disabled ---#define SYNTHVSPEED --- enable telemetry reset on timer 3 reset --- always calculate FNV hash and play sound msg_.wav --- enable telemetry logging menu option ---#define LOGTELEMETRY --- enable max HDOP alert ---#define HDOP_ALARM -- enable support for custom background functions --#define CUSTOM_BG_CALL --- enable alert window for no telemetry ---#define NOTELEM_ALERT --- enable popups for no telemetry data ---#define NOTELEM_POPUP --- enable blinking rectangle on no telemetry +-- enable battery % by voltage (x9d 2019 only) +--#define BATTPERC_BY_VOLTAGE + --------------------- -- DEBUG --------------------- ---#define DEBUG +-- show button event code on message screen --#define DEBUGEVT ---#define DEV +-- display memory info --#define MEMDEBUG -- calc and show background function rate --#define BGRATE @@ -69,6 +54,7 @@ --#define HUDRATE -- calc and show telemetry process rate --#define BGTELERATE + --------------------- -- TESTMODE --------------------- @@ -146,6 +132,7 @@ --]] + ----------------------- -- UNIT SCALING ----------------------- @@ -180,7 +167,6 @@ local unitLongLabel = getGeneralSettings().imperial == 0 and "km" or "mi" - local function drawHArrow(x,y,width,left,right) lcd.drawLine(x, y, x + width,y, SOLID, 0) if left == true then @@ -305,7 +291,7 @@ local function drawGrid() lcd.drawLine(32 + 64, 7, 32 + 64, 55, SOLID, FORCE) end -local function drawTopBar(strMode,simpleMode,flightTime,telemetryEnabled) +local function drawTopBar(strMode,simpleMode,flightTime,telemetryEnabled,rssi) -- flight mode -- simplemode if strMode ~= nil then @@ -315,13 +301,17 @@ local function drawTopBar(strMode,simpleMode,flightTime,telemetryEnabled) lcd.drawText(lcd.getLastRightPos(), 0, strSimpleMode, SMLSIZE+INVERS) end end - lcd.drawTimer(98, 0, flightTime, SMLSIZE+INVERS) + local sec = flightTime % 60 + local min = flightTime / 60 + lcd.drawText(128, 0, string.format("%02d:%02d",min,sec), INVERS+RIGHT+SMLSIZE) + local vTx = string.format("%.1fv",getValue(getFieldInfo("tx-voltage").id)) + lcd.drawText(102, 0, vTx, SMLSIZE+INVERS+RIGHT) -- RSSI if (not telemetryEnabled()) then - lcd.drawText(70-24, 0, "no telem!", SMLSIZE+BLINK+INVERS) + lcd.drawText(78-24, 0, "no telem!", SMLSIZE+BLINK+INVERS) else - lcd.drawText(70, 0, "RS:", SMLSIZE+INVERS ) - lcd.drawText(lcd.getLastRightPos(), 0, getRSSI(), SMLSIZE+INVERS ) + lcd.drawText(78, 0, rssi, SMLSIZE+INVERS+RIGHT) + lcd.drawText(lcd.getLastLeftPos(), 0, "R:", SMLSIZE+INVERS+RIGHT) end end diff --git a/TARANIS/SOURCES/SRC/yaapu/draw9.lua b/TARANIS/SOURCES/SRC/yaapu/draw9.lua index 7f45a872..2536f422 100644 --- a/TARANIS/SOURCES/SRC/yaapu/draw9.lua +++ b/TARANIS/SOURCES/SRC/yaapu/draw9.lua @@ -34,32 +34,17 @@ --------------------- -- FEATURES --------------------- ---#define BATTMAH3DEC --- enable altitude/distance monitor and vocal alert (experimental) ---#define MONITOR --- show incoming DIY packet rates ---#define TELEMETRY_STATS --- enable synthetic vspeed when ekf is disabled ---#define SYNTHVSPEED --- enable telemetry reset on timer 3 reset --- always calculate FNV hash and play sound msg_.wav --- enable telemetry logging menu option ---#define LOGTELEMETRY --- enable max HDOP alert ---#define HDOP_ALARM -- enable support for custom background functions --#define CUSTOM_BG_CALL --- enable alert window for no telemetry ---#define NOTELEM_ALERT --- enable popups for no telemetry data ---#define NOTELEM_POPUP --- enable blinking rectangle on no telemetry +-- enable battery % by voltage (x9d 2019 only) +--#define BATTPERC_BY_VOLTAGE + --------------------- -- DEBUG --------------------- ---#define DEBUG +-- show button event code on message screen --#define DEBUGEVT ---#define DEV +-- display memory info --#define MEMDEBUG -- calc and show background function rate --#define BGRATE @@ -69,6 +54,7 @@ --#define HUDRATE -- calc and show telemetry process rate --#define BGTELERATE + --------------------- -- TESTMODE --------------------- @@ -145,6 +131,7 @@ --]] + ----------------------- -- UNIT SCALING ----------------------- @@ -179,7 +166,6 @@ local unitLongLabel = getGeneralSettings().imperial == 0 and "km" or "mi" - local function drawHArrow(x,y,width,left,right) lcd.drawLine(x, y, x + width,y, SOLID, 0) if left == true then @@ -305,7 +291,7 @@ local function drawGrid() lcd.drawLine(62 + 88, 7, 62 + 88, 55, SOLID, FORCE) end -local function drawTopBar(strMode,simpleMode,flightTime,telemetryEnabled) +local function drawTopBar(strMode,simpleMode,flightTime,telemetryEnabled,rssi) -- flight mode -- simplemode if strMode ~= nil then @@ -316,16 +302,16 @@ local function drawTopBar(strMode,simpleMode,flightTime,telemetryEnabled) end end lcd.drawTimer(212-1, 0, flightTime, SMLSIZE+INVERS+TIMEHOUR+RIGHT) + -- tx voltage + local vTx = string.format("Tx%.1fv",getValue(getFieldInfo("tx-voltage").id)) + lcd.drawText(115, 0, vTx, SMLSIZE+INVERS) -- RSSI if (not telemetryEnabled()) then - lcd.drawText(69, 0, "no telem!", SMLSIZE+BLINK+INVERS) + lcd.drawText(105, 0, "no telem!", SMLSIZE+BLINK+INVERS) else - lcd.drawText(69, 0, "RS:", SMLSIZE+INVERS ) - lcd.drawText(lcd.getLastRightPos(), 0, getRSSI(), SMLSIZE+INVERS ) + lcd.drawText(105, 0, rssi, SMLSIZE+INVERS+RIGHT) + lcd.drawText(lcd.getLastLeftPos(), 0, "R:", SMLSIZE+INVERS+RIGHT) end - -- tx voltage - local vTx = string.format("Tx%.1fv",getValue(getFieldInfo("tx-voltage").id)) - lcd.drawText(115, 0, vTx, SMLSIZE+INVERS) end local function drawFailSafe(showDualBattery,ekfFailsafe,battFailsafe) diff --git a/TARANIS/SOURCES/SRC/yaapu/hud7.lua b/TARANIS/SOURCES/SRC/yaapu/hud7.lua index 69e9975c..7406c73a 100644 --- a/TARANIS/SOURCES/SRC/yaapu/hud7.lua +++ b/TARANIS/SOURCES/SRC/yaapu/hud7.lua @@ -34,32 +34,17 @@ --------------------- -- FEATURES --------------------- ---#define BATTMAH3DEC --- enable altitude/distance monitor and vocal alert (experimental) ---#define MONITOR --- show incoming DIY packet rates ---#define TELEMETRY_STATS --- enable synthetic vspeed when ekf is disabled ---#define SYNTHVSPEED --- enable telemetry reset on timer 3 reset --- always calculate FNV hash and play sound msg_.wav --- enable telemetry logging menu option ---#define LOGTELEMETRY --- enable max HDOP alert ---#define HDOP_ALARM -- enable support for custom background functions --#define CUSTOM_BG_CALL --- enable alert window for no telemetry ---#define NOTELEM_ALERT --- enable popups for no telemetry data ---#define NOTELEM_POPUP --- enable blinking rectangle on no telemetry +-- enable battery % by voltage (x9d 2019 only) +--#define BATTPERC_BY_VOLTAGE + --------------------- -- DEBUG --------------------- ---#define DEBUG +-- show button event code on message screen --#define DEBUGEVT ---#define DEV +-- display memory info --#define MEMDEBUG -- calc and show background function rate --#define BGRATE @@ -69,6 +54,7 @@ --#define HUDRATE -- calc and show telemetry process rate --#define BGTELERATE + --------------------- -- TESTMODE --------------------- @@ -146,6 +132,7 @@ --]] + ----------------------- -- UNIT SCALING ----------------------- @@ -180,11 +167,7 @@ local unitLongLabel = getGeneralSettings().imperial == 0 and "km" or "mi" - --- SYNTH VSPEED SUPPORT local vspd = 0 -local synthVSpeedTime = 0 -local prevHomeAlt = 0 local yawRibbonPoints = {} diff --git a/TARANIS/SOURCES/SRC/yaapu/hud9.lua b/TARANIS/SOURCES/SRC/yaapu/hud9.lua index aadcefcc..fdce8d5d 100644 --- a/TARANIS/SOURCES/SRC/yaapu/hud9.lua +++ b/TARANIS/SOURCES/SRC/yaapu/hud9.lua @@ -34,32 +34,17 @@ --------------------- -- FEATURES --------------------- ---#define BATTMAH3DEC --- enable altitude/distance monitor and vocal alert (experimental) ---#define MONITOR --- show incoming DIY packet rates ---#define TELEMETRY_STATS --- enable synthetic vspeed when ekf is disabled ---#define SYNTHVSPEED --- enable telemetry reset on timer 3 reset --- always calculate FNV hash and play sound msg_.wav --- enable telemetry logging menu option ---#define LOGTELEMETRY --- enable max HDOP alert ---#define HDOP_ALARM -- enable support for custom background functions --#define CUSTOM_BG_CALL --- enable alert window for no telemetry ---#define NOTELEM_ALERT --- enable popups for no telemetry data ---#define NOTELEM_POPUP --- enable blinking rectangle on no telemetry +-- enable battery % by voltage (x9d 2019 only) +--#define BATTPERC_BY_VOLTAGE + --------------------- -- DEBUG --------------------- ---#define DEBUG +-- show button event code on message screen --#define DEBUGEVT ---#define DEV +-- display memory info --#define MEMDEBUG -- calc and show background function rate --#define BGRATE @@ -69,6 +54,7 @@ --#define HUDRATE -- calc and show telemetry process rate --#define BGTELERATE + --------------------- -- TESTMODE --------------------- @@ -145,6 +131,7 @@ --]] + ----------------------- -- UNIT SCALING ----------------------- @@ -179,11 +166,7 @@ local unitLongLabel = getGeneralSettings().imperial == 0 and "km" or "mi" - --- SYNTH VSPEED SUPPORT local vspd = 0 -local synthVSpeedTime = 0 -local prevHomeAlt = 0 local yawRibbonPoints = {} diff --git a/TARANIS/SOURCES/SRC/yaapu/left7.lua b/TARANIS/SOURCES/SRC/yaapu/left7.lua index 8305a4da..9a13700c 100644 --- a/TARANIS/SOURCES/SRC/yaapu/left7.lua +++ b/TARANIS/SOURCES/SRC/yaapu/left7.lua @@ -34,32 +34,17 @@ --------------------- -- FEATURES --------------------- ---#define BATTMAH3DEC --- enable altitude/distance monitor and vocal alert (experimental) ---#define MONITOR --- show incoming DIY packet rates ---#define TELEMETRY_STATS --- enable synthetic vspeed when ekf is disabled ---#define SYNTHVSPEED --- enable telemetry reset on timer 3 reset --- always calculate FNV hash and play sound msg_.wav --- enable telemetry logging menu option ---#define LOGTELEMETRY --- enable max HDOP alert ---#define HDOP_ALARM -- enable support for custom background functions --#define CUSTOM_BG_CALL --- enable alert window for no telemetry ---#define NOTELEM_ALERT --- enable popups for no telemetry data ---#define NOTELEM_POPUP --- enable blinking rectangle on no telemetry +-- enable battery % by voltage (x9d 2019 only) +--#define BATTPERC_BY_VOLTAGE + --------------------- -- DEBUG --------------------- ---#define DEBUG +-- show button event code on message screen --#define DEBUGEVT ---#define DEV +-- display memory info --#define MEMDEBUG -- calc and show background function rate --#define BGRATE @@ -69,6 +54,7 @@ --#define HUDRATE -- calc and show telemetry process rate --#define BGTELERATE + --------------------- -- TESTMODE --------------------- @@ -146,6 +132,7 @@ --]] + ----------------------- -- UNIT SCALING ----------------------- @@ -187,7 +174,6 @@ local unitLongLabel = getGeneralSettings().imperial == 0 and "km" or "mi" - --------------------- -- Single long function much more memory efficient than many little functions --------------------- diff --git a/TARANIS/SOURCES/SRC/yaapu/left7_m2f.lua b/TARANIS/SOURCES/SRC/yaapu/left7_m2f.lua index 1fdd6087..d71f92ec 100644 --- a/TARANIS/SOURCES/SRC/yaapu/left7_m2f.lua +++ b/TARANIS/SOURCES/SRC/yaapu/left7_m2f.lua @@ -34,32 +34,17 @@ --------------------- -- FEATURES --------------------- ---#define BATTMAH3DEC --- enable altitude/distance monitor and vocal alert (experimental) ---#define MONITOR --- show incoming DIY packet rates ---#define TELEMETRY_STATS --- enable synthetic vspeed when ekf is disabled ---#define SYNTHVSPEED --- enable telemetry reset on timer 3 reset --- always calculate FNV hash and play sound msg_.wav --- enable telemetry logging menu option ---#define LOGTELEMETRY --- enable max HDOP alert ---#define HDOP_ALARM -- enable support for custom background functions --#define CUSTOM_BG_CALL --- enable alert window for no telemetry ---#define NOTELEM_ALERT --- enable popups for no telemetry data ---#define NOTELEM_POPUP --- enable blinking rectangle on no telemetry +-- enable battery % by voltage (x9d 2019 only) +--#define BATTPERC_BY_VOLTAGE + --------------------- -- DEBUG --------------------- ---#define DEBUG +-- show button event code on message screen --#define DEBUGEVT ---#define DEV +-- display memory info --#define MEMDEBUG -- calc and show background function rate --#define BGRATE @@ -69,6 +54,7 @@ --#define HUDRATE -- calc and show telemetry process rate --#define BGTELERATE + --------------------- -- TESTMODE --------------------- @@ -146,6 +132,7 @@ --]] + ----------------------- -- UNIT SCALING ----------------------- @@ -190,7 +177,6 @@ local unitLongLabel = getGeneralSettings().imperial == 0 and "km" or "mi" - --------------------- -- Single long function much more memory efficient than many little functions --------------------- diff --git a/TARANIS/SOURCES/SRC/yaapu/left9.lua b/TARANIS/SOURCES/SRC/yaapu/left9.lua index 877bd185..f4e659db 100644 --- a/TARANIS/SOURCES/SRC/yaapu/left9.lua +++ b/TARANIS/SOURCES/SRC/yaapu/left9.lua @@ -34,32 +34,17 @@ --------------------- -- FEATURES --------------------- ---#define BATTMAH3DEC --- enable altitude/distance monitor and vocal alert (experimental) ---#define MONITOR --- show incoming DIY packet rates ---#define TELEMETRY_STATS --- enable synthetic vspeed when ekf is disabled ---#define SYNTHVSPEED --- enable telemetry reset on timer 3 reset --- always calculate FNV hash and play sound msg_.wav --- enable telemetry logging menu option ---#define LOGTELEMETRY --- enable max HDOP alert ---#define HDOP_ALARM -- enable support for custom background functions --#define CUSTOM_BG_CALL --- enable alert window for no telemetry ---#define NOTELEM_ALERT --- enable popups for no telemetry data ---#define NOTELEM_POPUP --- enable blinking rectangle on no telemetry +-- enable battery % by voltage (x9d 2019 only) +--#define BATTPERC_BY_VOLTAGE + --------------------- -- DEBUG --------------------- ---#define DEBUG +-- show button event code on message screen --#define DEBUGEVT ---#define DEV +-- display memory info --#define MEMDEBUG -- calc and show background function rate --#define BGRATE @@ -69,6 +54,7 @@ --#define HUDRATE -- calc and show telemetry process rate --#define BGTELERATE + --------------------- -- TESTMODE --------------------- @@ -145,6 +131,7 @@ --]] + ----------------------- -- UNIT SCALING ----------------------- @@ -186,7 +173,6 @@ local unitLongLabel = getGeneralSettings().imperial == 0 and "km" or "mi" - local function drawPane(x,drawLib,conf,telemetry,status,battery,battId,getMaxValue,gpsStatuses) -- gps status local strStatus = gpsStatuses[telemetry.gpsStatus] diff --git a/TARANIS/SOURCES/SRC/yaapu/left9_m2f.lua b/TARANIS/SOURCES/SRC/yaapu/left9_m2f.lua index c3a90161..b794e470 100644 --- a/TARANIS/SOURCES/SRC/yaapu/left9_m2f.lua +++ b/TARANIS/SOURCES/SRC/yaapu/left9_m2f.lua @@ -34,32 +34,17 @@ --------------------- -- FEATURES --------------------- ---#define BATTMAH3DEC --- enable altitude/distance monitor and vocal alert (experimental) ---#define MONITOR --- show incoming DIY packet rates ---#define TELEMETRY_STATS --- enable synthetic vspeed when ekf is disabled ---#define SYNTHVSPEED --- enable telemetry reset on timer 3 reset --- always calculate FNV hash and play sound msg_.wav --- enable telemetry logging menu option ---#define LOGTELEMETRY --- enable max HDOP alert ---#define HDOP_ALARM -- enable support for custom background functions --#define CUSTOM_BG_CALL --- enable alert window for no telemetry ---#define NOTELEM_ALERT --- enable popups for no telemetry data ---#define NOTELEM_POPUP --- enable blinking rectangle on no telemetry +-- enable battery % by voltage (x9d 2019 only) +--#define BATTPERC_BY_VOLTAGE + --------------------- -- DEBUG --------------------- ---#define DEBUG +-- show button event code on message screen --#define DEBUGEVT ---#define DEV +-- display memory info --#define MEMDEBUG -- calc and show background function rate --#define BGRATE @@ -69,6 +54,7 @@ --#define HUDRATE -- calc and show telemetry process rate --#define BGTELERATE + --------------------- -- TESTMODE --------------------- @@ -145,6 +131,7 @@ --]] + ----------------------- -- UNIT SCALING ----------------------- @@ -189,7 +176,6 @@ local unitLongLabel = getGeneralSettings().imperial == 0 and "km" or "mi" - local function drawPane(x,drawLib,conf,telemetry,status,battery,battId,getMaxValue,gpsStatuses) -- gps status local strStatus = gpsStatuses[telemetry.gpsStatus] diff --git a/TARANIS/SOURCES/SRC/yaapu/menu7.lua b/TARANIS/SOURCES/SRC/yaapu/menu7.lua index a0240f8a..ee382329 100644 --- a/TARANIS/SOURCES/SRC/yaapu/menu7.lua +++ b/TARANIS/SOURCES/SRC/yaapu/menu7.lua @@ -34,32 +34,17 @@ --------------------- -- FEATURES --------------------- ---#define BATTMAH3DEC --- enable altitude/distance monitor and vocal alert (experimental) ---#define MONITOR --- show incoming DIY packet rates ---#define TELEMETRY_STATS --- enable synthetic vspeed when ekf is disabled ---#define SYNTHVSPEED --- enable telemetry reset on timer 3 reset --- always calculate FNV hash and play sound msg_.wav --- enable telemetry logging menu option ---#define LOGTELEMETRY --- enable max HDOP alert ---#define HDOP_ALARM -- enable support for custom background functions --#define CUSTOM_BG_CALL --- enable alert window for no telemetry ---#define NOTELEM_ALERT --- enable popups for no telemetry data ---#define NOTELEM_POPUP --- enable blinking rectangle on no telemetry +-- enable battery % by voltage (x9d 2019 only) +--#define BATTPERC_BY_VOLTAGE + --------------------- -- DEBUG --------------------- ---#define DEBUG +-- show button event code on message screen --#define DEBUGEVT ---#define DEV +-- display memory info --#define MEMDEBUG -- calc and show background function rate --#define BGRATE @@ -69,6 +54,7 @@ --#define HUDRATE -- calc and show telemetry process rate --#define BGTELERATE + --------------------- -- TESTMODE --------------------- @@ -146,6 +132,7 @@ --]] + ----------------------- -- UNIT SCALING ----------------------- @@ -180,45 +167,33 @@ local unitLongLabel = getGeneralSettings().imperial == 0 and "km" or "mi" - ---[[ - -TYPEVALUE - menu option to select a numeric value -{description, type,name,default value,min,max,uit of measure,precision,increment step} -example {"batt alert level 1:", TYPEVALUE, "V1", 375, 0,5000,"V",PREC2,5,"L2",350 }, - -TYPECOMBO - menu option to select a value from a list -{description, type, name, default, label list, value list} -example {"center pane layout:", TYPECOMBO, "CPANE", 1, { "hud","radar" }, { 1, 2 }}, - ---]]local menuItems = { - {"voice language:", 1, "L1", 1, { "eng", "ita", "fre", "ger" } , {"en","it","fr","de"} }, - {"batt alert level 1:", 0, "V1", 375, 0,5000,"V",PREC2,5 }, - {"batt alert level 2:", 0, "V2", 350, 0,5000,"V",PREC2,5 }, - {"batt[1] cap override:", 0, "B1", 0, 0,5000,"Ah",PREC2,10 }, - {"batt[2] cap override:", 0, "B2", 0, 0,5000,"Ah",PREC2,10 }, - {"disable all sounds:", 1, "S1", 1, { "no", "yes" }, { false, true } }, - {"disable msg beep:", 1, "S2", 1, { "no", "info", "all" }, { 1, 2, 3 } }, - {"enable haptic:", 1, "VIBR", 1, { "no", "yes" }, { false, true } }, - {"def voltage source:", 1, "VS", 1, { "auto", "FLVSS", "fc" }, { nil, "vs", "fc" } }, - {"dual battery config:", 1, "BC", 1, { "par", "ser", "other" }, { 1, 2, 3 } }, - {"batt[1] cells override:", 0, "CC", 0, 0,12,"s",0,1 }, - {"batt[2] cells override:", 0, "CC2", 0, 0,12,"s",0,1 }, - {"timer alert every:", 0, "T1", 0, 0,600,"min",PREC1,5 }, - {"min altitude alert:", 0, "A1", 0, 0,500,"m",PREC1,5 }, - {"max altitude alert:", 0, "A2", 0, 0,10000,"m",0,1 }, - {"max distance alert:", 0, "D1", 0, 0,100000,"m",0,10 }, - {"repeat alerts every:", 0, "T2", 10, 5,600,"sec",0,5 }, - {"rangefinder max:", 0, "RM", 0, 0,10000," cm",0,10 }, - {"air/groundspd unit:", 1, "HSPD", 1, { "m/s", "km/h", "mph", "kn" }, { 1, 3.6, 2.23694, 1.94384} }, - {"vert speed unit:", 1, "VSPD", 1, { "m/s", "ft/s", "ft/min" }, { 1, 3.28084, 196.85} }, - {"center panel layout:", 1, "CPANE", 1, { "def" }, { 1 } }, - {"right panel layout:", 1, "RPANE", 1, { "def" }, { 1 } }, - {"left panel layout:", 1, "LPANE", 1, { "def","m2f" }, { 1, 2 } }, - {"second view layout:", 1, "AVIEW", 1, { "def" }, { 1 } }, ---[[ - {"gas rpm label:", TYPECOMBO, "GAS_RPM", 1, { "eng","head" }, { 1, 2 },"RPANE",2 }, ---]] {"enable px4 modes:", 1, "PX4", 1, { "no", "yes" }, { false, true } }, +local menuItems = { + {"voice language:", "L1", 1, { "eng", "ita", "fre", "ger" } , {"en","it","fr","de"} }, + {"batt alert level 1:", "V1", 375, 0,5000,"V",PREC2,5 }, + {"batt alert level 2:", "V2", 350, 0,5000,"V",PREC2,5 }, + {"batt[1] cap override:", "B1", 0, 0,5000,"Ah",PREC2,10 }, + {"batt[2] cap override:", "B2", 0, 0,5000,"Ah",PREC2,10 }, + {"batt[1] cells override:", "CC", 0, 0,12,"s",0,1 }, + {"batt[2] cells override:", "CC2", 0, 0,12,"s",0,1 }, + {"dual battery conf:", "BC", 1, { "par", "ser", "other-1", "other-2" }, { 1, 2, 3, 4 } }, + {"def voltage source:", "VS", 1, { "auto", "FLVSS", "fc" }, { nil, "vs", "fc" } }, + {"disable all sounds:", "S1", 1, { "no", "yes" }, { false, true } }, + {"disable msg beep:", "S2", 1, { "no", "info", "all" }, { 1, 2, 3 } }, + {"enable haptic:", "VIBR", 1, { "no", "yes" }, { false, true } }, + {"timer alert every:", "T1", 0, 0,600,"min",PREC1,5 }, + {"min altitude alert:", "A1", 0, 0,500,"m",PREC1,5 }, + {"max altitude alert:", "A2", 0, 0,10000,"m",0,1 }, + {"max distance alert:", "D1", 0, 0,100000,"m",0,10 }, + {"repeat alerts every:", "T2", 10, 5,600,"sec",0,5 }, + {"rangefinder max:", "RM", 0, 0,10000," cm",0,10 }, + {"air/groundspd unit:", "HSPD", 1, { "m/s", "km/h", "mph", "kn" }, { 1, 3.6, 2.23694, 1.94384} }, + {"vert speed unit:", "VSPD", 1, { "m/s", "ft/s", "ft/min" }, { 1, 3.28084, 196.85} }, + {"center panel layout:", "CPANE", 1, { "def" }, { 1 } }, + {"right panel layout:", "RPANE", 1, { "def" }, { 1 } }, + {"left panel layout:", "LPANE", 1, { "def","m2f" }, { 1, 2 } }, + {"second view layout:", "AVIEW", 1, { "def" }, { 1 } }, + {"enable px4 modes:", "PX4", 1, { "no", "yes" }, { false, true } }, + {"enable CRSF:", "CRSF", 1, { "no", "yes" }, { false, true } }, } local menu = { @@ -238,14 +213,14 @@ local altViewFiles = {"alt7_view"} local function getMenuItemByName(items,name) for idx=1,#items do - -- items[idx][3] is the menu item's name as it appears in the config file - if items[idx][3] == name then - if items[idx][2] == 1 then + -- items[idx][2] is the menu item's name as it appears in the config file + if items[idx][2] == name then + if type(items[idx][4]) == "table" then -- return item's value, label and index - return items[idx][6][items[idx][4]], items[idx][5][items[idx][4]], idx + return items[idx][5][items[idx][3]], items[idx][4][items[idx][3]], idx else -- return item's value, label and index - return items[idx][4], name, idx + return items[idx][3], name, idx end end end @@ -278,6 +253,7 @@ local function applyConfigValues(items,conf) conf.horSpeedMultiplier, conf.horSpeedLabel = getMenuItemByName(items,"HSPD") conf.vertSpeedMultiplier, conf.vertSpeedLabel = getMenuItemByName(items,"VSPD") conf.enablePX4Modes = getMenuItemByName(items,"PX4") + conf.enableCRSF = getMenuItemByName(items,"CRSF") conf.centerPanel = centerPanelFiles[getMenuItemByName(items,"CPANE")] conf.rightPanel = rightPanelFiles[getMenuItemByName(items,"RPANE")] @@ -304,10 +280,15 @@ local function loadConfig(conf) if string.len(str) > 0 then for i=1,#menuItems do - local value = string.match(str, menuItems[i][3]..":([-%d]+)") + local value = string.match(str, menuItems[i][2]..":([-%d]+)") collectgarbage() if value ~= nil then - menuItems[i][4] = tonumber(value) + menuItems[i][3] = tonumber(value) + -- check if the value read from file is compatible with available options + if type(menuItems[i][4]) == "table" and tonumber(value) > #menuItems[i][4] then + --if not force default + menuItems[i][3] = 1 + end end end end @@ -321,7 +302,7 @@ local function saveConfig(conf) local myConfig = "" for i=1,#menuItems do - myConfig = myConfig..menuItems[i][3]..":"..menuItems[i][4] + myConfig = myConfig..menuItems[i][2]..":"..menuItems[i][3] if i < #menuItems then myConfig = myConfig.."," end @@ -342,50 +323,50 @@ end local function drawConfigMenuBars() local itemIdx = string.format("%d/%d",menu.selectedItem,#menuItems) lcd.drawFilledRectangle(0,0, 128, 7, SOLID) - lcd.drawText(0,0,"Yaapu X7 1.8.0",SMLSIZE+INVERS) - lcd.drawFilledRectangle(0,57-2, 128, 9, SOLID) + lcd.drawText(0,0,"Yaapu X7 1.9.1 beta1",SMLSIZE+INVERS) + lcd.drawFilledRectangle(0,LCD_H-8, 128, 8, SOLID) lcd.drawText(0,57-1,string.sub(getConfigFilename(),8),SMLSIZE+INVERS) lcd.drawText(128,57+1,itemIdx,SMLSIZE+INVERS+RIGHT) end local function incMenuItem(idx) - if menuItems[idx][2] == 0 then - menuItems[idx][4] = menuItems[idx][4] + menuItems[idx][9] - if menuItems[idx][4] > menuItems[idx][6] then - menuItems[idx][4] = menuItems[idx][6] + if type(menuItems[idx][4]) == "table" then + menuItems[idx][3] = menuItems[idx][3] + 1 + if menuItems[idx][3] > #menuItems[idx][4] then + menuItems[idx][3] = 1 end else - menuItems[idx][4] = menuItems[idx][4] + 1 - if menuItems[idx][4] > #menuItems[idx][5] then - menuItems[idx][4] = 1 + menuItems[idx][3] = menuItems[idx][3] + menuItems[idx][8] + if menuItems[idx][3] > menuItems[idx][5] then + menuItems[idx][3] = menuItems[idx][5] end end end local function decMenuItem(idx) - if menuItems[idx][2] == 0 then - menuItems[idx][4] = menuItems[idx][4] - menuItems[idx][9] - if menuItems[idx][4] < menuItems[idx][5] then - menuItems[idx][4] = menuItems[idx][5] + if type(menuItems[idx][4]) == "table" then + menuItems[idx][3] = menuItems[idx][3] - 1 + if menuItems[idx][3] < 1 then + menuItems[idx][3] = #menuItems[idx][4] end else - menuItems[idx][4] = menuItems[idx][4] - 1 - if menuItems[idx][4] < 1 then - menuItems[idx][4] = #menuItems[idx][5] + menuItems[idx][3] = menuItems[idx][3] - menuItems[idx][8] + if menuItems[idx][3] < menuItems[idx][4] then + menuItems[idx][3] = menuItems[idx][4] end end end local function drawItem(idx,flags) - if menuItems[idx][2] == 0 then - if menuItems[idx][4] == 0 then - lcd.drawText(102,7 + (idx-menu.offset-1)*7, "---",0+SMLSIZE+flags+menuItems[idx][8]) + if type(menuItems[idx][4]) == "table" then + lcd.drawText(128-2,7 + (idx-menu.offset-1)*7, menuItems[idx][4][menuItems[idx][3]],SMLSIZE+flags+RIGHT) + else + if menuItems[idx][3] == 0 then + lcd.drawText(128-2,7 + (idx-menu.offset-1)*7, "---",SMLSIZE+flags+menuItems[idx][7]+RIGHT) else - lcd.drawNumber(102,7 + (idx-menu.offset-1)*7, menuItems[idx][4],0+SMLSIZE+flags+menuItems[idx][8]) - lcd.drawText(lcd.getLastRightPos(),7 + (idx-menu.offset-1)*7, menuItems[idx][7],SMLSIZE+flags) + lcd.drawText(128-2,7 + (idx-menu.offset-1)*7, menuItems[idx][6],SMLSIZE+flags+RIGHT) + lcd.drawNumber(lcd.getLastLeftPos(),7 + (idx-menu.offset-1)*7, menuItems[idx][3],0+SMLSIZE+flags+menuItems[idx][7]+RIGHT) end - else - lcd.drawText(102,7 + (idx-menu.offset-1)*7, menuItems[idx][5][menuItems[idx][4]],SMLSIZE+flags) end end @@ -419,7 +400,7 @@ local function drawConfigMenu(event) end -- for m=1+menu.offset,math.min(#menuItems,7+menu.offset) do - lcd.drawText(2,7 + (m-menu.offset-1)*7, menuItems[m][1],0+SMLSIZE) + lcd.drawText(1,7 + (m-menu.offset-1)*7, menuItems[m][1],0+SMLSIZE) if m == menu.selectedItem then if menu.editSelected then drawItem(m,INVERS+BLINK) diff --git a/TARANIS/SOURCES/SRC/yaapu/menu9.lua b/TARANIS/SOURCES/SRC/yaapu/menu9.lua index 6f4b6e6a..cc4efc41 100644 --- a/TARANIS/SOURCES/SRC/yaapu/menu9.lua +++ b/TARANIS/SOURCES/SRC/yaapu/menu9.lua @@ -34,32 +34,17 @@ --------------------- -- FEATURES --------------------- ---#define BATTMAH3DEC --- enable altitude/distance monitor and vocal alert (experimental) ---#define MONITOR --- show incoming DIY packet rates ---#define TELEMETRY_STATS --- enable synthetic vspeed when ekf is disabled ---#define SYNTHVSPEED --- enable telemetry reset on timer 3 reset --- always calculate FNV hash and play sound msg_.wav --- enable telemetry logging menu option ---#define LOGTELEMETRY --- enable max HDOP alert ---#define HDOP_ALARM -- enable support for custom background functions --#define CUSTOM_BG_CALL --- enable alert window for no telemetry ---#define NOTELEM_ALERT --- enable popups for no telemetry data ---#define NOTELEM_POPUP --- enable blinking rectangle on no telemetry +-- enable battery % by voltage (x9d 2019 only) +--#define BATTPERC_BY_VOLTAGE + --------------------- -- DEBUG --------------------- ---#define DEBUG +-- show button event code on message screen --#define DEBUGEVT ---#define DEV +-- display memory info --#define MEMDEBUG -- calc and show background function rate --#define BGRATE @@ -69,6 +54,7 @@ --#define HUDRATE -- calc and show telemetry process rate --#define BGTELERATE + --------------------- -- TESTMODE --------------------- @@ -145,6 +131,7 @@ --]] + ----------------------- -- UNIT SCALING ----------------------- @@ -179,45 +166,33 @@ local unitLongLabel = getGeneralSettings().imperial == 0 and "km" or "mi" - ---[[ - -TYPEVALUE - menu option to select a numeric value -{description, type,name,default value,min,max,uit of measure,precision,increment step} -example {"batt alert level 1:", TYPEVALUE, "V1", 375, 0,5000,"V",PREC2,5,"L2",350 }, - -TYPECOMBO - menu option to select a value from a list -{description, type, name, default, label list, value list} -example {"center pane layout:", TYPECOMBO, "CPANE", 1, { "hud","radar" }, { 1, 2 }}, - ---]]local menuItems = { - {"voice language:", 1, "L1", 1, { "english", "italian", "french", "german" } , {"en","it","fr","de"} }, - {"batt alert level 1:", 0, "V1", 375, 0,5000,"V",PREC2,5 }, - {"batt alert level 2:", 0, "V2", 350, 0,5000,"V",PREC2,5 }, - {"batt[1] capacity override:", 0, "B1", 0, 0,5000,"Ah",PREC2,10 }, - {"batt[2] capacity override:", 0, "B2", 0, 0,5000,"Ah",PREC2,10 }, - {"disable all sounds:", 1, "S1", 1, { "no", "yes" }, { false, true } }, - {"disable msg beep:", 1, "S2", 1, { "no", "info", "all" }, { 1, 2, 3 } }, - {"enable haptic:", 1, "VIBR", 1, { "no", "yes" }, { false, true } }, - {"default voltage source:", 1, "VS", 1, { "auto", "FLVSS", "fc" }, { nil, "vs", "fc" } }, - {"dual battery config:", 1, "BC", 1, { "par", "ser", "other" }, { 1, 2, 3 } }, - {"batt[1] cell count override:", 0, "CC", 0, 0,12," cells",0,1 }, - {"batt[2] cell count override:", 0, "CC2", 0, 0,12," cells",0,1 }, - {"timer alert every:", 0, "T1", 0, 0,600,"min",PREC1,5 }, - {"min altitude alert:", 0, "A1", 0, 0,500,"m",PREC1,5 }, - {"max altitude alert:", 0, "A2", 0, 0,10000,"m",0,1 }, - {"max distance alert:", 0, "D1", 0, 0,100000,"m",0,10 }, - {"repeat alerts every:", 0, "T2", 10, 5,600,"sec",0,5 }, - {"rangefinder max:", 0, "RM", 0, 0,10000," cm",0,10 }, - {"air/groundspeed unit:", 1, "HSPD", 1, { "m/s", "km/h", "mph", "kn" }, { 1, 3.6, 2.23694, 1.94384} }, - {"vertical speed unit:", 1, "VSPD", 1, { "m/s", "ft/s", "ft/min" }, { 1, 3.28084, 196.85} }, - {"center panel layout:", 1, "CPANE", 1, { "def" }, { 1 } }, - {"right panel layout:", 1, "RPANE", 1, { "def" }, { 1 } }, - {"left panel layout:", 1, "LPANE", 1, { "def","m2f" }, { 1, 2 } }, - {"second view layout:", 1, "AVIEW", 1, { "def" }, { 1 } }, ---[[ - {"gas rpm label:", TYPECOMBO, "GAS_RPM", 1, { "Eng","Head" }, { 1, 2 },"RPANE",2 }, ---]] {"enable px4 flightmodes:", 1, "PX4", 1, { "no", "yes" }, { false, true } }, +local menuItems = { + {"voice language:", "L1", 1, { "english", "italian", "french", "german" } , {"en","it","fr","de"} }, + {"batt alert level 1:", "V1", 375, 0,5000,"V",PREC2,5 }, + {"batt alert level 2:", "V2", 350, 0,5000,"V",PREC2,5 }, + {"batt[1] capacity override:", "B1", 0, 0,5000,"Ah",PREC2,10 }, + {"batt[2] capacity override:", "B2", 0, 0,5000,"Ah",PREC2,10 }, + {"batt[1] cell count override:", "CC", 0, 0,12," cells",0,1 }, + {"batt[2] cell count override:", "CC2", 0, 0,12," cells",0,1 }, + {"dual battery config:", "BC", 1, { "par", "ser", "other-1", "other-2" }, { 1, 2, 3, 4 } }, + {"default voltage source:", "VS", 1, { "auto", "FLVSS", "fc" }, { nil, "vs", "fc" } }, + {"disable all sounds:", "S1", 1, { "no", "yes" }, { false, true } }, + {"disable msg beep:", "S2", 1, { "no", "info", "all" }, { 1, 2, 3 } }, + {"enable haptic:", "VIBR", 1, { "no", "yes" }, { false, true } }, + {"timer alert every:", "T1", 0, 0,600,"min",PREC1,5 }, + {"min altitude alert:", "A1", 0, 0,500,"m",PREC1,5 }, + {"max altitude alert:", "A2", 0, 0,10000,"m",0,1 }, + {"max distance alert:", "D1", 0, 0,100000,"m",0,10 }, + {"repeat alerts every:", "T2", 10, 5,600,"sec",0,5 }, + {"rangefinder max:", "RM", 0, 0,10000," cm",0,10 }, + {"air/groundspeed unit:", "HSPD", 1, { "m/s", "km/h", "mph", "kn" }, { 1, 3.6, 2.23694, 1.94384} }, + {"vertical speed unit:", "VSPD", 1, { "m/s", "ft/s", "ft/min" }, { 1, 3.28084, 196.85} }, + {"center panel layout:", "CPANE", 1, { "def" }, { 1 } }, + {"right panel layout:", "RPANE", 1, { "def" }, { 1 } }, + {"left panel layout:", "LPANE", 1, { "def","m2f" }, { 1, 2 } }, + {"second view layout:", "AVIEW", 1, { "def" }, { 1 } }, + {"enable px4 flightmodes:", "PX4", 1, { "no", "yes" }, { false, true } }, + {"enable CRSF:", "CRSF", 1, { "no", "yes" }, { false, true } }, } local menu = { @@ -237,14 +212,14 @@ local altViewFiles = {"alt9_view"} local function getMenuItemByName(items,name) for idx=1,#items do - -- items[idx][3] is the menu item's name as it appears in the config file - if items[idx][3] == name then - if items[idx][2] == 1 then + -- items[idx][2] is the menu item's name as it appears in the config file + if items[idx][2] == name then + if type(items[idx][4]) == "table" then -- return item's value, label and index - return items[idx][6][items[idx][4]], items[idx][5][items[idx][4]], idx + return items[idx][5][items[idx][3]], items[idx][4][items[idx][3]], idx else -- return item's value, label and index - return items[idx][4], name, idx + return items[idx][3], name, idx end end end @@ -277,6 +252,7 @@ local function applyConfigValues(items,conf) conf.horSpeedMultiplier, conf.horSpeedLabel = getMenuItemByName(items,"HSPD") conf.vertSpeedMultiplier, conf.vertSpeedLabel = getMenuItemByName(items,"VSPD") conf.enablePX4Modes = getMenuItemByName(items,"PX4") + conf.enableCRSF = getMenuItemByName(items,"CRSF") conf.centerPanel = centerPanelFiles[getMenuItemByName(items,"CPANE")] conf.rightPanel = rightPanelFiles[getMenuItemByName(items,"RPANE")] @@ -303,10 +279,15 @@ local function loadConfig(conf) if string.len(str) > 0 then for i=1,#menuItems do - local value = string.match(str, menuItems[i][3]..":([-%d]+)") + local value = string.match(str, menuItems[i][2]..":([-%d]+)") collectgarbage() if value ~= nil then - menuItems[i][4] = tonumber(value) + menuItems[i][3] = tonumber(value) + -- check if the value read from file is compatible with available options + if type(menuItems[i][4]) == "table" and tonumber(value) > #menuItems[i][4] then + --if not force default + menuItems[i][3] = 1 + end end end end @@ -320,7 +301,7 @@ local function saveConfig(conf) local myConfig = "" for i=1,#menuItems do - myConfig = myConfig..menuItems[i][3]..":"..menuItems[i][4] + myConfig = myConfig..menuItems[i][2]..":"..menuItems[i][3] if i < #menuItems then myConfig = myConfig.."," end @@ -341,50 +322,50 @@ end local function drawConfigMenuBars() local itemIdx = string.format("%d/%d",menu.selectedItem,#menuItems) lcd.drawFilledRectangle(0,0, 212, 7, SOLID) - lcd.drawText(0,0,"Yaapu X9 telemetry script 1.8.0",SMLSIZE+INVERS) + lcd.drawText(0,0,"Yaapu X9 Telemetry Script 1.9.1 beta1",SMLSIZE+INVERS) lcd.drawFilledRectangle(0,56, 212, 8, SOLID) lcd.drawText(0,56+1,getConfigFilename(),SMLSIZE+INVERS) lcd.drawText(212,56+1,itemIdx,SMLSIZE+INVERS+RIGHT) end local function incMenuItem(idx) - if menuItems[idx][2] == 0 then - menuItems[idx][4] = menuItems[idx][4] + menuItems[idx][9] - if menuItems[idx][4] > menuItems[idx][6] then - menuItems[idx][4] = menuItems[idx][6] + if type(menuItems[idx][4]) == "table" then + menuItems[idx][3] = menuItems[idx][3] + 1 + if menuItems[idx][3] > #menuItems[idx][4] then + menuItems[idx][3] = 1 end else - menuItems[idx][4] = menuItems[idx][4] + 1 - if menuItems[idx][4] > #menuItems[idx][5] then - menuItems[idx][4] = 1 + menuItems[idx][3] = menuItems[idx][3] + menuItems[idx][8] + if menuItems[idx][3] > menuItems[idx][5] then + menuItems[idx][3] = menuItems[idx][5] end end end local function decMenuItem(idx) - if menuItems[idx][2] == 0 then - menuItems[idx][4] = menuItems[idx][4] - menuItems[idx][9] - if menuItems[idx][4] < menuItems[idx][5] then - menuItems[idx][4] = menuItems[idx][5] + if type(menuItems[idx][4]) == "table" then + menuItems[idx][3] = menuItems[idx][3] - 1 + if menuItems[idx][3] < 1 then + menuItems[idx][3] = #menuItems[idx][4] end else - menuItems[idx][4] = menuItems[idx][4] - 1 - if menuItems[idx][4] < 1 then - menuItems[idx][4] = #menuItems[idx][5] + menuItems[idx][3] = menuItems[idx][3] - menuItems[idx][8] + if menuItems[idx][3] < menuItems[idx][4] then + menuItems[idx][3] = menuItems[idx][4] end end end local function drawItem(idx,flags) - if menuItems[idx][2] == 0 then - if menuItems[idx][4] == 0 then - lcd.drawText(150,7 + (idx-menu.offset-1)*7, "---",0+SMLSIZE+flags+menuItems[idx][8]) + if type(menuItems[idx][4]) == "table" then + lcd.drawText(212-2,7 + (idx-menu.offset-1)*7, menuItems[idx][4][menuItems[idx][3]],SMLSIZE+flags+RIGHT) + else + if menuItems[idx][3] == 0 then + lcd.drawText(212-2,7 + (idx-menu.offset-1)*7, "---",SMLSIZE+flags+menuItems[idx][7]+RIGHT) else - lcd.drawNumber(150,7 + (idx-menu.offset-1)*7, menuItems[idx][4],0+SMLSIZE+flags+menuItems[idx][8]) - lcd.drawText(lcd.getLastRightPos(),7 + (idx-menu.offset-1)*7, menuItems[idx][7],SMLSIZE+flags) + lcd.drawText(212-2,7 + (idx-menu.offset-1)*7, menuItems[idx][6],SMLSIZE+flags+RIGHT) + lcd.drawNumber(lcd.getLastLeftPos(),7 + (idx-menu.offset-1)*7, menuItems[idx][3],0+SMLSIZE+flags+menuItems[idx][7]+RIGHT) end - else - lcd.drawText(150,7 + (idx-menu.offset-1)*7, menuItems[idx][5][menuItems[idx][4]],SMLSIZE+flags) end end @@ -418,7 +399,7 @@ local function drawConfigMenu(event) end -- for m=1+menu.offset,math.min(#menuItems,7+menu.offset) do - lcd.drawText(2,7 + (m-menu.offset-1)*7, menuItems[m][1],0+SMLSIZE) + lcd.drawText(1,7 + (m-menu.offset-1)*7, menuItems[m][1],0+SMLSIZE) if m == menu.selectedItem then if menu.editSelected then drawItem(m,INVERS+BLINK) diff --git a/TARANIS/SOURCES/SRC/yaapu/plane.lua b/TARANIS/SOURCES/SRC/yaapu/plane.lua index f95bb522..7f57a9b3 100644 --- a/TARANIS/SOURCES/SRC/yaapu/plane.lua +++ b/TARANIS/SOURCES/SRC/yaapu/plane.lua @@ -23,6 +23,7 @@ enum FlightMode { QRTL = 21, QAUTOTUNE = 22, QACRO = 23, + THERMAL = 24, }; --]] @@ -53,5 +54,7 @@ flightModes[21]="Qland" flightModes[22]="QRTL" flightModes[23]="QAutotune" flightModes[24]="QAcro" +flightModes[25]="Thermal" -- return {flightModes=flightModes} + diff --git a/TARANIS/SOURCES/SRC/yaapu/plane_px4.lua b/TARANIS/SOURCES/SRC/yaapu/plane_px4.lua index d143e236..d068aaf9 100644 --- a/TARANIS/SOURCES/SRC/yaapu/plane_px4.lua +++ b/TARANIS/SOURCES/SRC/yaapu/plane_px4.lua @@ -1,29 +1,86 @@ +--[[ + MavToPT 2.63 + + uint8_t PX4FlightModeNum(uint8_t main, uint8_t sub) { + switch(main) { + case 1: + return 0; // MANUAL + case 2: + return 1; // ALTITUDE + case 3: + return 2; // POSCTL + case 4: + switch(sub) { + case 1: + return 12; // AUTO READY + case 2: + return 13; // AUTO TAKEOFF + case 3: + return 14; // AUTO LOITER + case 4: + return 15; // AUTO MISSION + case 5: + return 16; // AUTO RTL + case 6: + return 17; // AUTO LAND + case 7: + return 18; // AUTO RTGS + case 8: + return 19; // AUTO FOLLOW ME + case 9: + return 20; // AUTO PRECLAND + default: + return 31; // AUTO UNKNOWN + } + case 5: + return 3; // ACRO + case 6: + return 4; // OFFBOARD + case 7: + return 5; // STABILIZED + case 8: + return 6; // RATTITUDE + case 9: + return 7; // SIMPLE + default: + return 11; // UNKNOWN + } + } +--]] local flightModes = {} -- plane flight modes -flightModes[0]="" -flightModes[1]="Manual" -flightModes[2]="AltCtl" --px4 specific -flightModes[3]="PosCtl" --px4 specific -flightModes[4]="Ready" --px4 specific -flightModes[5]="Takeoff" --px4 specific -flightModes[6]="Loiter" -flightModes[7]="Mission" --px4 specific -flightModes[8]="RTL" -flightModes[9]="Land" -flightModes[10]="RTGS" --px4 specific -flightModes[11]="Follow" -flightModes[12]="PrecLand" --px4 specific -flightModes[13]="" -flightModes[14]="Acro" -flightModes[15]="OffBoard" --px4 specific -flightModes[16]="Stabilize" -flightModes[17]="RAttitude" --px4 specific -flightModes[18]="Simple" --px4 specific -flightModes[19]="" -flightModes[20]="" -flightModes[21]="" -flightModes[22]="" -flightModes[23]="" --- +flightModes[0] = "Manual" +flightModes[1] = "AltCtl" --px4 specific +flightModes[2] = "PosCtl" --px4 specific +flightModes[3] = "Acro" +flightModes[4] = "OffBoard" --px4 specific +flightModes[5] = "Stabilize" +flightModes[6] = "RAttitude" --px4 specific +flightModes[7] = "Simple" --px4 specific +flightModes[8] = "" +flightModes[9] = "" +flightModes[10] = "" +flightModes[11] = "" +flightModes[12] = "Ready" --px4 specific +flightModes[13] = "Takeoff" --px4 specific +flightModes[14] = "Loiter" +flightModes[15] = "Mission" --px4 specific +flightModes[16] = "RTL" +flightModes[17] = "Land" +flightModes[18] = "" +flightModes[19] = "Follow" +flightModes[20] = "PrecLand" --px4 specific +flightModes[21] = "" +flightModes[22] = "" +flightModes[23] = "" +flightModes[24] = "" +flightModes[25] = "" +flightModes[26] = "" +flightModes[27] = "" +flightModes[28] = "" +flightModes[29] = "" +flightModes[30] = "" +flightModes[31] = "Unknown" + return {flightModes=flightModes} diff --git a/TARANIS/SOURCES/SRC/yaapu/reset.lua b/TARANIS/SOURCES/SRC/yaapu/reset.lua index e4d05690..9bc9eb9e 100644 --- a/TARANIS/SOURCES/SRC/yaapu/reset.lua +++ b/TARANIS/SOURCES/SRC/yaapu/reset.lua @@ -23,8 +23,8 @@ --------------------- -- GLOBAL DEFINES --------------------- ---#define X9 --#define +--#define X7 -- always use loadscript() instead of loadfile() -- force a loadscript() on init() to compile all .lua in .luac --#define COMPILE @@ -34,32 +34,17 @@ --------------------- -- FEATURES --------------------- ---#define BATTMAH3DEC --- enable altitude/distance monitor and vocal alert (experimental) ---#define MONITOR --- show incoming DIY packet rates ---#define TELEMETRY_STATS --- enable synthetic vspeed when ekf is disabled ---#define SYNTHVSPEED --- enable telemetry reset on timer 3 reset --- always calculate FNV hash and play sound msg_.wav --- enable telemetry logging menu option ---#define LOGTELEMETRY --- enable max HDOP alert ---#define HDOP_ALARM -- enable support for custom background functions --#define CUSTOM_BG_CALL --- enable alert window for no telemetry ---#define NOTELEM_ALERT --- enable popups for no telemetry data ---#define NOTELEM_POPUP --- enable blinking rectangle on no telemetry +-- enable battery % by voltage (x9d 2019 only) +--#define BATTPERC_BY_VOLTAGE + --------------------- -- DEBUG --------------------- ---#define DEBUG +-- show button event code on message screen --#define DEBUGEVT ---#define DEV +-- display memory info --#define MEMDEBUG -- calc and show background function rate --#define BGRATE @@ -69,6 +54,7 @@ --#define HUDRATE -- calc and show telemetry process rate --#define BGTELERATE + --------------------- -- TESTMODE --------------------- @@ -116,7 +102,6 @@ ---#define HOMEDIR_X 42 @@ -146,6 +131,7 @@ --]] + ----------------------- -- UNIT SCALING ----------------------- @@ -180,7 +166,6 @@ local unitLongLabel = getGeneralSettings().imperial == 0 and "km" or "mi" - local function resetTelemetry(status,telemetry,battery,alarms,transitions) ----------------------------- -- TELEMETRY diff --git a/TARANIS/SOURCES/SRC/yaapu/right7.lua b/TARANIS/SOURCES/SRC/yaapu/right7.lua index 6475ea74..8ed68161 100644 --- a/TARANIS/SOURCES/SRC/yaapu/right7.lua +++ b/TARANIS/SOURCES/SRC/yaapu/right7.lua @@ -34,32 +34,17 @@ --------------------- -- FEATURES --------------------- ---#define BATTMAH3DEC --- enable altitude/distance monitor and vocal alert (experimental) ---#define MONITOR --- show incoming DIY packet rates ---#define TELEMETRY_STATS --- enable synthetic vspeed when ekf is disabled ---#define SYNTHVSPEED --- enable telemetry reset on timer 3 reset --- always calculate FNV hash and play sound msg_.wav --- enable telemetry logging menu option ---#define LOGTELEMETRY --- enable max HDOP alert ---#define HDOP_ALARM -- enable support for custom background functions --#define CUSTOM_BG_CALL --- enable alert window for no telemetry ---#define NOTELEM_ALERT --- enable popups for no telemetry data ---#define NOTELEM_POPUP --- enable blinking rectangle on no telemetry +-- enable battery % by voltage (x9d 2019 only) +--#define BATTPERC_BY_VOLTAGE + --------------------- -- DEBUG --------------------- ---#define DEBUG +-- show button event code on message screen --#define DEBUGEVT ---#define DEV +-- display memory info --#define MEMDEBUG -- calc and show background function rate --#define BGRATE @@ -69,6 +54,7 @@ --#define HUDRATE -- calc and show telemetry process rate --#define BGTELERATE + --------------------- -- TESTMODE --------------------- @@ -146,6 +132,7 @@ --]] + ----------------------- -- UNIT SCALING ----------------------- @@ -187,7 +174,6 @@ local unitLongLabel = getGeneralSettings().imperial == 0 and "km" or "mi" - -------------------- -- Single long function much more memory efficient than many little functions --------------------- diff --git a/TARANIS/SOURCES/SRC/yaapu/right9.lua b/TARANIS/SOURCES/SRC/yaapu/right9.lua index 3976e3a1..842f681f 100644 --- a/TARANIS/SOURCES/SRC/yaapu/right9.lua +++ b/TARANIS/SOURCES/SRC/yaapu/right9.lua @@ -34,32 +34,17 @@ --------------------- -- FEATURES --------------------- ---#define BATTMAH3DEC --- enable altitude/distance monitor and vocal alert (experimental) ---#define MONITOR --- show incoming DIY packet rates ---#define TELEMETRY_STATS --- enable synthetic vspeed when ekf is disabled ---#define SYNTHVSPEED --- enable telemetry reset on timer 3 reset --- always calculate FNV hash and play sound msg_.wav --- enable telemetry logging menu option ---#define LOGTELEMETRY --- enable max HDOP alert ---#define HDOP_ALARM -- enable support for custom background functions --#define CUSTOM_BG_CALL --- enable alert window for no telemetry ---#define NOTELEM_ALERT --- enable popups for no telemetry data ---#define NOTELEM_POPUP --- enable blinking rectangle on no telemetry +-- enable battery % by voltage (x9d 2019 only) +--#define BATTPERC_BY_VOLTAGE + --------------------- -- DEBUG --------------------- ---#define DEBUG +-- show button event code on message screen --#define DEBUGEVT ---#define DEV +-- display memory info --#define MEMDEBUG -- calc and show background function rate --#define BGRATE @@ -69,6 +54,7 @@ --#define HUDRATE -- calc and show telemetry process rate --#define BGTELERATE + --------------------- -- TESTMODE --------------------- @@ -145,6 +131,7 @@ --]] + ----------------------- -- UNIT SCALING ----------------------- @@ -186,7 +173,6 @@ local unitLongLabel = getGeneralSettings().imperial == 0 and "km" or "mi" - -- power and efficiency @@ -194,10 +180,7 @@ local unitLongLabel = getGeneralSettings().imperial == 0 and "km" or "mi" -- Single long function much more memory efficient than many little functions --------------------- local function drawPane(x,drawLib,conf,telemetry,status,battery,battId,getMaxValue,gpsStatuses) - local perc = 0 - if (battery[13+battId] > 0) then - perc = math.min(math.max((1 - (battery[10+battId]/battery[13+battId]))*100,0),99) - end + local perc = battery[16+battId] -- battery min cell local flags = 0 local dimFlags = 0 diff --git a/TARANIS/SOURCES/SRC/yaapu/rover.lua b/TARANIS/SOURCES/SRC/yaapu/rover.lua index 29e08ab0..aee6cd0f 100644 --- a/TARANIS/SOURCES/SRC/yaapu/rover.lua +++ b/TARANIS/SOURCES/SRC/yaapu/rover.lua @@ -16,6 +16,7 @@ INITIALISING = 16 }; --]] + local flightModes = {} -- rover modes diff --git a/TARANIS/SOURCES/SRC/yaapu7.lua b/TARANIS/SOURCES/SRC/yaapu7.lua index d9066906..7cc3a213 100644 --- a/TARANIS/SOURCES/SRC/yaapu7.lua +++ b/TARANIS/SOURCES/SRC/yaapu7.lua @@ -34,32 +34,17 @@ --------------------- -- FEATURES --------------------- ---#define BATTMAH3DEC --- enable altitude/distance monitor and vocal alert (experimental) ---#define MONITOR --- show incoming DIY packet rates ---#define TELEMETRY_STATS --- enable synthetic vspeed when ekf is disabled ---#define SYNTHVSPEED --- enable telemetry reset on timer 3 reset --- always calculate FNV hash and play sound msg_.wav --- enable telemetry logging menu option ---#define LOGTELEMETRY --- enable max HDOP alert ---#define HDOP_ALARM -- enable support for custom background functions --#define CUSTOM_BG_CALL --- enable alert window for no telemetry ---#define NOTELEM_ALERT --- enable popups for no telemetry data ---#define NOTELEM_POPUP --- enable blinking rectangle on no telemetry +-- enable battery % by voltage (x9d 2019 only) +--#define BATTPERC_BY_VOLTAGE + --------------------- -- DEBUG --------------------- ---#define DEBUG +-- show button event code on message screen --#define DEBUGEVT ---#define DEV +-- display memory info --#define MEMDEBUG -- calc and show background function rate --#define BGRATE @@ -69,6 +54,7 @@ --#define HUDRATE -- calc and show telemetry process rate --#define BGTELERATE + --------------------- -- TESTMODE --------------------- @@ -146,6 +132,7 @@ --]] + ----------------------- -- UNIT SCALING ----------------------- @@ -180,7 +167,6 @@ local unitLongLabel = getGeneralSettings().imperial == 0 and "km" or "mi" - local frameTypes = {} -- copter frameTypes[0] = "c" @@ -251,7 +237,7 @@ local cell2maxFC = 0 local cell2sumFC = 0 -------------------------------- -- BATT -local battery = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0} +local battery = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0} local cell1count = 0 local cell2count = 0 @@ -346,7 +332,8 @@ local status = {} -- BLINK SUPPORT local blinktime = getTime() local blinkon = false - +-- CRSF rssi support +local rssiCRSF = 0 status.showDualBattery = false status.battAlertLevel1 = false @@ -404,6 +391,7 @@ local conf = { defaultBattSource = "na", enablePX4Modes = false, enableHaptic = false, + enableCRSF = false, } --[[ ALARM_TYPE_MIN needs arming (min has to be reached first), value below level for grace, once armed is periodic, reset on landing @@ -419,7 +407,8 @@ local conf = { 6 = ready 7 = last alarm } ---]]------------------------- +--]] +------------------------- -- alarms ------------------------- local alarms = { @@ -442,32 +431,32 @@ local transitions = { { 0, 0, false, 30 }, -- flightmode } - ------------------------- --- message hash support, uses 312 bytes +-- message hash support ------------------------- -local shortHashes = { - -- 16 bytes hashes, requires 88 bytes - {554623408}, -- "554623408.wav", "Takeoff complete" - {3025044912}, -- "3025044912.wav", "SmartRTL deactiv" - {3956583920}, -- "3956583920.wav", "EKF2 IMU0 is usi" - {1309405592}, -- "1309405592.wav", "EKF3 IMU0 is usi" - {4091124880,true}, -- "4091124880.wav", "Reached command " - {3311875476,true}, -- "3311875476.wav", "Reached waypoint" - {1997782032,true}, -- "1997782032.wav", "Passed waypoint " -} +local shortHashes = {} +-- 16 bytes hashes +shortHashes[554623408] = false -- "554623408.wav", "Takeoff complete" +shortHashes[3025044912] = false -- "3025044912.wav", "SmartRTL deactiv" +shortHashes[3956583920] = false -- "3956583920.wav", "EKF2 IMU0 is usi" +shortHashes[1309405592] = false -- "1309405592.wav", "EKF3 IMU0 is usi" +shortHashes[4091124880] = true -- "4091124880.wav", "Reached command " +shortHashes[3311875476] = true -- "3311875476.wav", "Reached waypoint" +shortHashes[1997782032] = true -- "1997782032.wav", "Passed waypoint " local shortHash = nil local parseShortHash = false local hashByteIndex = 0 local hash = 2166136261 - local showMessages = false local showConfigMenu = false local showAltView = false local loadCycle = 0 +-- telemetry pop function, either SPort or CRSF +local telemetryPop = nil + ----------------------------- -- clears the loaded table -- and recovers memory @@ -565,7 +554,7 @@ local function playFlightMode(flightMode) end if frame.flightModes then if frame.flightModes[flightMode] ~= nil then - playFile(soundFileBasePath.."/"..conf.language.."/".. string.lower(frame.flightModes[flightMode]) .. (frameType=="r" and "_r.wav" or ".wav")) + playFile(soundFileBasePath.."/"..conf.language.."/".. string.lower(frame.flightModes[flightMode]) .. ((frameType=="r" or frameType=="b") and "_r.wav" or ".wav")) end end end @@ -607,6 +596,7 @@ function fnv(str) end --]] + local function pushMessage(severity, msg) if conf.enableHaptic then playHaptic(12,0) @@ -719,7 +709,39 @@ local function reset() end -local function processTelemetry(telemetry,DATA_ID,VALUE) +local function updateHash(c) + hash = bit32.bxor(hash, c) + hash = (hash * 16777619) % 2^32 + hashByteIndex = hashByteIndex+1 + -- check if this hash matches any 16bytes prefix hash + if hashByteIndex == 16 then + parseShortHash = shortHashes[hash] + shortHash = hash + end +end + +local function playHash() + -- try to play the hash sound file without checking for existence + -- OpenTX will gracefully ignore it :-) + playSound(tostring(shortHash == nil and hash or shortHash),true) + -- if required parse parameter and play it! + if parseShortHash == true then + local param = string.match(status.msgBuffer, ".*#(%d+).*") + if param ~= nil then + playNumber(tonumber(param),0) + end + end +end + +local function resetHash() + -- reset hash for next string + parseShortHash = false + shortHash = nil + hash = 2166136261 + hashByteIndex = 0 +end + +local function processTelemetry(DATA_ID, VALUE) if DATA_ID == 0x5006 then -- ROLLPITCH -- roll [0,1800] ==> [-180,180] telemetry.roll = (math.min(bit32.extract(VALUE,0,11),1800) - 900) * 0.2 @@ -782,52 +804,20 @@ local function processTelemetry(telemetry,DATA_ID,VALUE) c = bit32.extract(VALUE,i*8,7) if c ~= 0 then msgBuffer = msgBuffer .. string.char(c) - collectgarbage() - collectgarbage() - hash = bit32.bxor(hash, c) - hash = (hash * 16777619) % 2^32 - hashByteIndex = hashByteIndex+1 - -- check if this hash matches any 16bytes prefix hash - if hashByteIndex == 16 then - for i=1,#shortHashes - do - if hash == shortHashes[i][1] then - -- ok found - shortHash = hash - -- check if needs parsing - parseShortHash = shortHashes[i][2] == nil and false or true - break; - end - end - end + updateHash(c) else msgEnd = true; break; end end + collectgarbage() + collectgarbage() if msgEnd then -- push and display message local severity = (bit32.extract(VALUE,7,1) * 1) + (bit32.extract(VALUE,15,1) * 2) + (bit32.extract(VALUE,23,1) * 4) pushMessage( severity, msgBuffer) - -- play shortHash if found otherwise "try" the full hash - -- if it does not exist OpenTX will gracefully ignore it - playSound(tostring(shortHash == nil and hash or shortHash),true) - -- if required parse parameter and play it! - if parseShortHash then - local param = string.match(msgBuffer, ".*#(%d+).*") - collectgarbage() - collectgarbage() - if param ~= nil then - playNumber(tonumber(param),0) - collectgarbage() - collectgarbage() - end - end - -- reset hash for next string - parseShortHash = false - shortHash = nil - hash = 2166136261 - hashByteIndex = 0 + playHash() + resetHash() msgBuffer = nil -- recover memory collectgarbage() @@ -858,13 +848,60 @@ local function processTelemetry(telemetry,DATA_ID,VALUE) rcchannels[2 + offset] = 100 * (bit32.extract(VALUE,11,6)/63) * (bit32.extract(VALUE,17,1) == 1 and -1 or 1) rcchannels[3 + offset] = 100 * (bit32.extract(VALUE,18,6)/63) * (bit32.extract(VALUE,24,1) == 1 and -1 or 1) rcchannels[4 + offset] = 100 * (bit32.extract(VALUE,25,6)/63) * (bit32.extract(VALUE,31,1) == 1 and -1 or 1) ---]] elseif DATA_ID == 0x50F2 then -- VFR +--]] + elseif DATA_ID == 0x50F2 then -- VFR telemetry.airspeed = bit32.extract(VALUE,1,7) * (10^bit32.extract(VALUE,0,1)) -- dm/s telemetry.throttle = bit32.extract(VALUE,8,7) telemetry.baroAlt = bit32.extract(VALUE,17,10) * (10^bit32.extract(VALUE,15,2)) * 0.1 * (bit32.extract(VALUE,27,1) == 1 and -1 or 1) end end + +local function crossfirePop() + local command, data = crossfireTelemetryPop() + -- command is 0x80 CRSF_FRAMETYPE_ARDUPILOT + if (command == 0x80 or command == 0x7F) and data ~= nil then + -- actual payload starts at data[2] + if #data >= 7 and data[1] == 0xF0 then + local app_id = bit32.lshift(data[3],8) + data[2] + local value = bit32.lshift(data[7],24) + bit32.lshift(data[6],16) + bit32.lshift(data[5],8) + data[4] + return 0x00, 0x10, app_id, value + elseif #data > 4 and data[1] == 0xF1 then + -- minimum text messages of 1 char + local severity = data[2] + -- copy the terminator as well + for i=3,#data + do + msgBuffer = msgBuffer .. string.char(data[i]) + -- hash support + updateHash(data[i]) + end + pushMessage(severity, msgBuffer) + -- hash audio support + playHash() + -- hash reset + resetHash() + msgBuffer = nil + collectgarbage() + collectgarbage() + msgBuffer = "" + elseif #data > 48 and data[1] == 0xF2 then + -- passthrough array + local app_id, value + for i=0,data[2]-1 + do + app_id = bit32.lshift(data[4+(6*i)],8) + data[3+(6*i)] + value = bit32.lshift(data[8+(6*i)],24) + bit32.lshift(data[7+(6*i)],16) + bit32.lshift(data[6+(6*i)],8) + data[5+(6*i)] + --pushMessage(7,string.format("CRSF:%d - %04X:%08X",i, app_id, value)) + processTelemetry(app_id, value) + end + noTelemetryData = 0 + hideNoTelemetry = true + end + end + return nil, nil ,nil ,nil +end + local function telemetryEnabled() if getRSSI() == 0 then noTelemetryData = 1 @@ -910,6 +947,7 @@ local function calcCellCount() return c1,c2 end + -- gets the voltage based on source and min value, battId = [1|2] local function getMinVoltageBySource(source, cell, cellFC, battId) -- offset 0 for cell voltage, 2 for pack voltage @@ -1030,31 +1068,69 @@ local function calcBattery() -- cell1minA2 = cell1sumA2/calcCellCount() local count1,count2 = calcCellCount() - -- 3 cases here - -- 1) parallel => all values depend on both batteries - -- 2) other => all values depend on battery 1 - -- 3) serial => celm(vs) and vbatt(vs) depend on both batteries, all other values on PM battery 1 (this is not supported: 1 PM + 2xFLVSS) battery[1+1] = getMinVoltageBySource(status.battsource, cell1min, cell1sumFC/count1, 1)*100 --cel1m battery[1+2] = getMinVoltageBySource(status.battsource, cell2min, cell2sumFC/count2, 2)*100 --cel2m - battery[1] = (conf.battConf == 3 and battery[2] or getNonZeroMin(battery[2],battery[3]) ) battery[4+1] = getMinVoltageBySource(status.battsource, cell1sum, cell1sumFC, 1)*10 --batt1 battery[4+2] = getMinVoltageBySource(status.battsource, cell2sum, cell2sumFC, 2)*10 --batt2 - battery[4] = (conf.battConf == 3 and battery[5] or (conf.battConf == 2 and battery[5]+battery[6] or getNonZeroMin(battery[5],battery[6]))) - battery[7] = getMaxValue((conf.battConf == 3 and telemetry.batt1current or telemetry.batt1current + telemetry.batt2current),7) battery[7+1] = getMaxValue(telemetry.batt1current,8) --curr1 battery[7+2] = getMaxValue(telemetry.batt2current,9) --curr2 - battery[10] = (conf.battConf == 3 and telemetry.batt1mah or telemetry.batt1mah + telemetry.batt2mah) battery[10+1] = telemetry.batt1mah --mah1 battery[10+2] = telemetry.batt2mah --mah2 - battery[13] = (conf.battConf == 1 and getBatt1Capacity() + getBatt2Capacity() or getBatt1Capacity()) battery[13+1] = getBatt1Capacity() --cap1 battery[13+2] = getBatt2Capacity() --cap2 + --[[ + 4 cases here + 1) parallel => all values depend on both batteries + 2) other1 => all values depend on battery 1 + 3) other2 => all values depend on battery 2 + 4) series => celm(vs) and vbatt(vs) depend on both batteries, all other values on PM battery 1 (this is not supported: 1 PM + 2xFLVSS) + --]] + if (conf.battConf == 1) then + battery[1] = getNonZeroMin(battery[2], battery[3]) + battery[4] = getNonZeroMin(battery[5],battery[6]) + battery[7] = getMaxValue(telemetry.batt1current + telemetry.batt2current, 7) + battery[10] = telemetry.batt1mah + telemetry.batt2mah + battery[13] = getBatt2Capacity() + getBatt1Capacity() + elseif (conf.battConf == 2) then + battery[1] = getNonZeroMin(battery[2], battery[3]) + battery[4] = battery[5] + battery[6] + battery[7] = getMaxValue(telemetry.batt1current,7) + battery[10] = telemetry.batt1mah + battery[13] = getBatt1Capacity() + elseif (conf.battConf == 3) then + battery[1] = battery[2] + battery[4] = battery[5] + battery[7] = getMaxValue(telemetry.batt1current,7) + battery[10] = telemetry.batt1mah + battery[13] = getBatt1Capacity() + else + battery[1] = battery[3] + battery[4] = battery[6] + battery[7] = getMaxValue(telemetry.batt2current,7) + battery[10] = telemetry.batt2mah + battery[13] = getBatt2Capacity() + end + + for battId=0,2 + do + if (battery[13+battId] > 0) then + battery[16+battId] = (1 - (battery[10+battId]/battery[13+battId]))*100 + if battery[16+battId] > 99 then + battery[16+battId] = 99 + elseif battery[16+battId] < 0 then + battery[16+battId] = 0 + end + else + battery[16+battId] = 99 + end + end + if status.showDualBattery == true and conf.battConf == 1 then -- dual parallel battery: do I have also dual current monitor? if battery[7+1] > 0 and battery[7+2] == 0 then @@ -1112,15 +1188,17 @@ local function setSensorValues() if (battcapacity > 0) then perc = math.min(math.max((1 - (battmah/battcapacity))*100,0),99) end - - setTelemetryValue(0x060F, 0, 0, perc, 13 , 0 , "Fuel") + -- CRSF + if not conf.enableCRSF then + setTelemetryValue(0x060F, 0, 0, perc, 13 , 0 , "Fuel") + setTelemetryValue(0x020F, 0, 0, telemetry.batt1current+telemetry.batt2current, 2 , 1 , "CURR") + setTelemetryValue(0x084F, 0, 0, math.floor(telemetry.yaw), 20 , 0 , "Hdg") + setTelemetryValue(0x010F, 0, 0, telemetry.homeAlt*10, 9 , 1 , "Alt") + setTelemetryValue(0x083F, 0, 0, telemetry.hSpeed*0.1, 4 , 0 , "GSpd") + end setTelemetryValue(0x021F, 0, 0, getNonZeroMin(telemetry.batt1volt,telemetry.batt2volt)*10, 1 , 2 , "VFAS") - setTelemetryValue(0x020F, 0, 0, telemetry.batt1current+telemetry.batt2current, 2 , 1 , "CURR") setTelemetryValue(0x011F, 0, 0, telemetry.vSpeed, 5 , 1 , "VSpd") - setTelemetryValue(0x083F, 0, 0, telemetry.hSpeed*0.1, 4 , 0 , "GSpd") - setTelemetryValue(0x010F, 0, 0, telemetry.homeAlt*10, 9 , 1 , "Alt") setTelemetryValue(0x082F, 0, 0, math.floor(telemetry.gpsAlt*0.1), 9 , 0 , "GAlt") - setTelemetryValue(0x084F, 0, 0, math.floor(telemetry.yaw), 20 , 0 , "Hdg") setTelemetryValue(0x041F, 0, 0, telemetry.imuTemp, 11 , 0 , "IMUt") setTelemetryValue(0x060F, 0, 1, telemetry.statusArmed*100, 0 , 0 , "ARM") end @@ -1180,7 +1258,7 @@ local function checkAlarm(level,value,idx,sign,sound,delay) alarms[idx][2] = 0 alarms[idx][1] = false alarms[idx][6] = false - -- status: + -- status: RESET end if alarms[idx][2] > 0 and (status.flightTime ~= alarms[idx][2]) and (status.flightTime - alarms[idx][2]) >= alarms[idx][5] then -- enough time has passed after START @@ -1211,11 +1289,11 @@ local function loadFlightModes() end if telemetry.frameType ~= -1 then if frameTypes[telemetry.frameType] == "c" then - frame = dofile(libBasePath..(conf.enablePX4Modes and "copter_px4.luac" or "copter.luac")) + frame = doLibrary(conf.enablePX4Modes and "copter_px4" or "copter") elseif frameTypes[telemetry.frameType] == "p" then - frame = dofile(libBasePath..(conf.enablePX4Modes and "plane_px4.luac" or "plane.luac")) - elseif frameTypes[telemetry.frameType] == "r" then - frame = dofile(libBasePath.."rover.luac") + frame = doLibrary(conf.enablePX4Modes and "plane_px4" or "plane") + elseif frameTypes[telemetry.frameType] == "r" or frameTypes[telemetry.frameType] == "b" then + frame = doLibrary("rover") end if frame.flightModes then frameType = frameTypes[telemetry.frameType] @@ -1225,6 +1303,7 @@ local function loadFlightModes() end end + local function getFlightMode() if frame.flightModes then return frame.flightModes[telemetry.flightMode] @@ -1243,19 +1322,18 @@ local function checkTransition(idx,value) transitions[idx][1] = value transitions[idx][2] = getTime() transitions[idx][3] = false - -- status: + -- status: RESET return false end if transitions[idx][3] == false and (getTime() - transitions[idx][2]) >= transitions[idx][4] then - -- enough time has passed after + -- enough time has passed after RESET transitions[idx][3] = true -- status: FIRE return true; end end - -local function checkEvents() +local function checkEvents(cellVoltage) loadFlightModes() checkAlarm(conf.minAltitudeAlert,telemetry.homeAlt,1,-1,"minalt",conf.repeatAlertsPeriod) @@ -1265,21 +1343,23 @@ local function checkEvents() checkAlarm(1,2*telemetry.battFailsafe,5,1,"lowbat",conf.repeatAlertsPeriod) checkAlarm(math.floor(conf.timerAlert),status.flightTime,6,1,"timealert",math.floor(conf.timerAlert)) + --[[ local capacity = getBatt1Capacity() local mah = telemetry.batt1mah -- only if dual battery has been detected - if (batt2sources.fc or batt2sources.vs) and conf.battConf == 1 then + if (batt2sources.fc or batt2sources.vs) and conf.battConf == BATTCONF_PARALLEL then + if (batt2sources.fc or batt2sources.vs) and conf.battConf == BATTCONF_PARALLEL then capacity = capacity + getBatt2Capacity() mah = mah + telemetry.batt2mah end + --]] + if (battery[13] > 0) then + batLevel = (1 - (battery[10]/battery[13]))*100 + else + batLevel = 99 + end - if (capacity > 0) then - batLevel = (1 - (mah/capacity))*100 - else - batLevel = 99 - end - for l=0,12 do -- trigger alarm as as soon as it falls below level + 1 (i.e 91%,81%,71%,...) local level = tonumber(string.sub("00051015202530405060708090",l*2+1,l*2+2)) @@ -1359,13 +1439,12 @@ local bgclock = 0 ------------------------------- local function background() -- FAST: this runs at 60Hz (every 16ms) - for i=1,3 + for i=1,7 do - local sensor_id,frame_id,data_id,value = sportTelemetryPop() + local sensor_id,frame_id,data_id,value = telemetryPop() if frame_id == 0x10 then - processTelemetry(telemetry,data_id,value) - -- update telemetry status + processTelemetry(data_id,value) noTelemetryData = 0 hideNoTelemetry = true end @@ -1383,22 +1462,25 @@ local function background() local count1,count2 = calcCellCount() local cellVoltage = 0 - if conf.battConf == 3 then + if conf.battConf == 3 then -- alarms are based on battery 1 cellVoltage = 100*(status.battsource == "vs" and cell1min or cell1sumFC/count1) + elseif conf.battConf == 4 then + -- alarms are based on battery 1 + cellVoltage = 100*(status.battsource == "vs" and cell2min or cell2sumFC/count2) else -- alarms are based on battery 1 and battery 2 cellVoltage = 100*(status.battsource == "vs" and getNonZeroMin(cell1min,cell2min) or getNonZeroMin(cell1sumFC/count1,cell2sumFC/count2)) end -- - checkEvents() + checkEvents(cellVoltage) checkLandingStatus() -- no need for alarms if reported voltage is 0 if cellVoltage > 0 then checkCellVoltage(cellVoltage) end -- aggregate value - minmaxValues[7] = math.max((conf.battConf == 3 and telemetry.batt1current or telemetry.batt1current+telemetry.batt2current), minmaxValues[7]) + minmaxValues[7] = math.max((conf.battConf == 3 and telemetry.batt1current or (conf.battConf == 4 and telemetry.batt2current or telemetry.batt1current+telemetry.batt2current)), minmaxValues[7]) -- indipendent values minmaxValues[8] = math.max(telemetry.batt1current,minmaxValues[8]) @@ -1415,6 +1497,10 @@ local function background() collectgarbage() end + -- CRSF: take the best signal and apply same algo used by ardupilot to estimate a 0-100 rssi value + -- rssi = roundf((1.0f - (rssi_dbm - 50.0f) / 70.0f) * 255.0f); + rssiCRSF = string.format("%d/%d", math.min(100, math.floor(0.5 + ((1-(math.min(getValue("1RSS"), getValue("2RSS")) - 50)/70)*100))), getValue("RFMD")) + bgclock=0 end -- blinking support @@ -1574,9 +1660,9 @@ local function run(event) lcd.drawFilledRectangle(0,57, 128, 8, FORCE) if drawLib ~= nil then - drawLib.drawTopBar(getFlightMode(),telemetry.simpleMode,status.flightTime,telemetryEnabled) + drawLib.drawTopBar(getFlightMode(), telemetry.simpleMode, status.flightTime, telemetryEnabled, conf.enableCRSF and rssiCRSF or getRSSI()) drawLib.drawBottomBar(messages[(messageCount + #messages) % (#messages+1)],lastMsgTime) - drawLib.drawNoTelemetry(telemetryEnabled,hideNoTelemetry) + drawLib.drawNoTelemetry(telemetryEnabled, hideNoTelemetry) end -- event handler if event == EVT_PLUS_BREAK or event == EVT_ROT_RIGHT or event == 36 then @@ -1617,10 +1703,16 @@ local function init() collectgarbage() -- ok configuration loaded status.battsource = conf.defaultBattSource + -- CRSF or SPORT? + telemetryPop = sportTelemetryPop + if conf.enableCRSF == true then + telemetryPop = crossfirePop + end -- configuration loaded, releasing menu library memory clearTable(menuLib) menuLib = nil - pushMessage(7,"Yaapu X7 1.8.0") + + pushMessage(7,"Yaapu X7 1.9.1 beta1") collectgarbage() collectgarbage() playSound("yaapu") diff --git a/TARANIS/SOURCES/SRC/yaapu9.lua b/TARANIS/SOURCES/SRC/yaapu9.lua index e8675ada..9e9d9623 100644 --- a/TARANIS/SOURCES/SRC/yaapu9.lua +++ b/TARANIS/SOURCES/SRC/yaapu9.lua @@ -34,32 +34,17 @@ --------------------- -- FEATURES --------------------- ---#define BATTMAH3DEC --- enable altitude/distance monitor and vocal alert (experimental) ---#define MONITOR --- show incoming DIY packet rates ---#define TELEMETRY_STATS --- enable synthetic vspeed when ekf is disabled ---#define SYNTHVSPEED --- enable telemetry reset on timer 3 reset --- always calculate FNV hash and play sound msg_.wav --- enable telemetry logging menu option ---#define LOGTELEMETRY --- enable max HDOP alert ---#define HDOP_ALARM -- enable support for custom background functions --#define CUSTOM_BG_CALL --- enable alert window for no telemetry ---#define NOTELEM_ALERT --- enable popups for no telemetry data ---#define NOTELEM_POPUP --- enable blinking rectangle on no telemetry +-- enable battery % by voltage (x9d 2019 only) +--#define BATTPERC_BY_VOLTAGE + --------------------- -- DEBUG --------------------- ---#define DEBUG +-- show button event code on message screen --#define DEBUGEVT ---#define DEV +-- display memory info --#define MEMDEBUG -- calc and show background function rate --#define BGRATE @@ -69,6 +54,7 @@ --#define HUDRATE -- calc and show telemetry process rate --#define BGTELERATE + --------------------- -- TESTMODE --------------------- @@ -145,6 +131,7 @@ --]] + ----------------------- -- UNIT SCALING ----------------------- @@ -179,7 +166,6 @@ local unitLongLabel = getGeneralSettings().imperial == 0 and "km" or "mi" - local frameTypes = {} -- copter frameTypes[0] = "c" @@ -250,7 +236,7 @@ local cell2maxFC = 0 local cell2sumFC = 0 -------------------------------- -- BATT -local battery = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0} +local battery = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0} local cell1count = 0 local cell2count = 0 @@ -345,7 +331,8 @@ local status = {} -- BLINK SUPPORT local blinktime = getTime() local blinkon = false - +-- CRSF rssi support +local rssiCRSF = 0 status.showDualBattery = false status.battAlertLevel1 = false @@ -403,6 +390,7 @@ local conf = { defaultBattSource = "na", enablePX4Modes = false, enableHaptic = false, + enableCRSF = false, } --[[ ALARM_TYPE_MIN needs arming (min has to be reached first), value below level for grace, once armed is periodic, reset on landing @@ -418,7 +406,8 @@ local conf = { 6 = ready 7 = last alarm } ---]]------------------------- +--]] +------------------------- -- alarms ------------------------- local alarms = { @@ -441,32 +430,32 @@ local transitions = { { 0, 0, false, 30 }, -- flightmode } - ------------------------- --- message hash support, uses 312 bytes +-- message hash support ------------------------- -local shortHashes = { - -- 16 bytes hashes, requires 88 bytes - {554623408}, -- "554623408.wav", "Takeoff complete" - {3025044912}, -- "3025044912.wav", "SmartRTL deactiv" - {3956583920}, -- "3956583920.wav", "EKF2 IMU0 is usi" - {1309405592}, -- "1309405592.wav", "EKF3 IMU0 is usi" - {4091124880,true}, -- "4091124880.wav", "Reached command " - {3311875476,true}, -- "3311875476.wav", "Reached waypoint" - {1997782032,true}, -- "1997782032.wav", "Passed waypoint " -} +local shortHashes = {} +-- 16 bytes hashes +shortHashes[554623408] = false -- "554623408.wav", "Takeoff complete" +shortHashes[3025044912] = false -- "3025044912.wav", "SmartRTL deactiv" +shortHashes[3956583920] = false -- "3956583920.wav", "EKF2 IMU0 is usi" +shortHashes[1309405592] = false -- "1309405592.wav", "EKF3 IMU0 is usi" +shortHashes[4091124880] = true -- "4091124880.wav", "Reached command " +shortHashes[3311875476] = true -- "3311875476.wav", "Reached waypoint" +shortHashes[1997782032] = true -- "1997782032.wav", "Passed waypoint " local shortHash = nil local parseShortHash = false local hashByteIndex = 0 local hash = 2166136261 - local showMessages = false local showConfigMenu = false local showAltView = false local loadCycle = 0 +-- telemetry pop function, either SPort or CRSF +local telemetryPop = nil + ----------------------------- -- clears the loaded table -- and recovers memory @@ -564,7 +553,7 @@ local function playFlightMode(flightMode) end if frame.flightModes then if frame.flightModes[flightMode] ~= nil then - playFile(soundFileBasePath.."/"..conf.language.."/".. string.lower(frame.flightModes[flightMode]) .. (frameType=="r" and "_r.wav" or ".wav")) + playFile(soundFileBasePath.."/"..conf.language.."/".. string.lower(frame.flightModes[flightMode]) .. ((frameType=="r" or frameType=="b") and "_r.wav" or ".wav")) end end end @@ -608,6 +597,7 @@ function fnv(str) end --]] + local function pushMessage(severity, msg) if conf.enableHaptic then playHaptic(12,0) @@ -720,7 +710,39 @@ local function reset() end -local function processTelemetry(telemetry,DATA_ID,VALUE) +local function updateHash(c) + hash = bit32.bxor(hash, c) + hash = (hash * 16777619) % 2^32 + hashByteIndex = hashByteIndex+1 + -- check if this hash matches any 16bytes prefix hash + if hashByteIndex == 16 then + parseShortHash = shortHashes[hash] + shortHash = hash + end +end + +local function playHash() + -- try to play the hash sound file without checking for existence + -- OpenTX will gracefully ignore it :-) + playSound(tostring(shortHash == nil and hash or shortHash),true) + -- if required parse parameter and play it! + if parseShortHash == true then + local param = string.match(status.msgBuffer, ".*#(%d+).*") + if param ~= nil then + playNumber(tonumber(param),0) + end + end +end + +local function resetHash() + -- reset hash for next string + parseShortHash = false + shortHash = nil + hash = 2166136261 + hashByteIndex = 0 +end + +local function processTelemetry(DATA_ID, VALUE) if DATA_ID == 0x5006 then -- ROLLPITCH -- roll [0,1800] ==> [-180,180] telemetry.roll = (math.min(bit32.extract(VALUE,0,11),1800) - 900) * 0.2 @@ -783,52 +805,20 @@ local function processTelemetry(telemetry,DATA_ID,VALUE) c = bit32.extract(VALUE,i*8,7) if c ~= 0 then msgBuffer = msgBuffer .. string.char(c) - collectgarbage() - collectgarbage() - hash = bit32.bxor(hash, c) - hash = (hash * 16777619) % 2^32 - hashByteIndex = hashByteIndex+1 - -- check if this hash matches any 16bytes prefix hash - if hashByteIndex == 16 then - for i=1,#shortHashes - do - if hash == shortHashes[i][1] then - -- ok found - shortHash = hash - -- check if needs parsing - parseShortHash = shortHashes[i][2] == nil and false or true - break; - end - end - end + updateHash(c) else msgEnd = true; break; end end + collectgarbage() + collectgarbage() if msgEnd then -- push and display message local severity = (bit32.extract(VALUE,7,1) * 1) + (bit32.extract(VALUE,15,1) * 2) + (bit32.extract(VALUE,23,1) * 4) pushMessage( severity, msgBuffer) - -- play shortHash if found otherwise "try" the full hash - -- if it does not exist OpenTX will gracefully ignore it - playSound(tostring(shortHash == nil and hash or shortHash),true) - -- if required parse parameter and play it! - if parseShortHash then - local param = string.match(msgBuffer, ".*#(%d+).*") - collectgarbage() - collectgarbage() - if param ~= nil then - playNumber(tonumber(param),0) - collectgarbage() - collectgarbage() - end - end - -- reset hash for next string - parseShortHash = false - shortHash = nil - hash = 2166136261 - hashByteIndex = 0 + playHash() + resetHash() msgBuffer = nil -- recover memory collectgarbage() @@ -859,13 +849,60 @@ local function processTelemetry(telemetry,DATA_ID,VALUE) rcchannels[2 + offset] = 100 * (bit32.extract(VALUE,11,6)/63) * (bit32.extract(VALUE,17,1) == 1 and -1 or 1) rcchannels[3 + offset] = 100 * (bit32.extract(VALUE,18,6)/63) * (bit32.extract(VALUE,24,1) == 1 and -1 or 1) rcchannels[4 + offset] = 100 * (bit32.extract(VALUE,25,6)/63) * (bit32.extract(VALUE,31,1) == 1 and -1 or 1) ---]] elseif DATA_ID == 0x50F2 then -- VFR +--]] + elseif DATA_ID == 0x50F2 then -- VFR telemetry.airspeed = bit32.extract(VALUE,1,7) * (10^bit32.extract(VALUE,0,1)) -- dm/s telemetry.throttle = bit32.extract(VALUE,8,7) telemetry.baroAlt = bit32.extract(VALUE,17,10) * (10^bit32.extract(VALUE,15,2)) * 0.1 * (bit32.extract(VALUE,27,1) == 1 and -1 or 1) end end + +local function crossfirePop() + local command, data = crossfireTelemetryPop() + -- command is 0x80 CRSF_FRAMETYPE_ARDUPILOT + if (command == 0x80 or command == 0x7F) and data ~= nil then + -- actual payload starts at data[2] + if #data >= 7 and data[1] == 0xF0 then + local app_id = bit32.lshift(data[3],8) + data[2] + local value = bit32.lshift(data[7],24) + bit32.lshift(data[6],16) + bit32.lshift(data[5],8) + data[4] + return 0x00, 0x10, app_id, value + elseif #data > 4 and data[1] == 0xF1 then + -- minimum text messages of 1 char + local severity = data[2] + -- copy the terminator as well + for i=3,#data + do + msgBuffer = msgBuffer .. string.char(data[i]) + -- hash support + updateHash(data[i]) + end + pushMessage(severity, msgBuffer) + -- hash audio support + playHash() + -- hash reset + resetHash() + msgBuffer = nil + collectgarbage() + collectgarbage() + msgBuffer = "" + elseif #data > 48 and data[1] == 0xF2 then + -- passthrough array + local app_id, value + for i=0,data[2]-1 + do + app_id = bit32.lshift(data[4+(6*i)],8) + data[3+(6*i)] + value = bit32.lshift(data[8+(6*i)],24) + bit32.lshift(data[7+(6*i)],16) + bit32.lshift(data[6+(6*i)],8) + data[5+(6*i)] + --pushMessage(7,string.format("CRSF:%d - %04X:%08X",i, app_id, value)) + processTelemetry(app_id, value) + end + noTelemetryData = 0 + hideNoTelemetry = true + end + end + return nil, nil ,nil ,nil +end + local function telemetryEnabled() if getRSSI() == 0 then noTelemetryData = 1 @@ -911,6 +948,7 @@ local function calcCellCount() return c1,c2 end + -- gets the voltage based on source and min value, battId = [1|2] local function getMinVoltageBySource(source, cell, cellFC, battId) -- offset 0 for cell voltage, 2 for pack voltage @@ -1031,31 +1069,69 @@ local function calcBattery() -- cell1minA2 = cell1sumA2/calcCellCount() local count1,count2 = calcCellCount() - -- 3 cases here - -- 1) parallel => all values depend on both batteries - -- 2) other => all values depend on battery 1 - -- 3) serial => celm(vs) and vbatt(vs) depend on both batteries, all other values on PM battery 1 (this is not supported: 1 PM + 2xFLVSS) battery[1+1] = getMinVoltageBySource(status.battsource, cell1min, cell1sumFC/count1, 1)*100 --cel1m battery[1+2] = getMinVoltageBySource(status.battsource, cell2min, cell2sumFC/count2, 2)*100 --cel2m - battery[1] = (conf.battConf == 3 and battery[2] or getNonZeroMin(battery[2],battery[3]) ) battery[4+1] = getMinVoltageBySource(status.battsource, cell1sum, cell1sumFC, 1)*10 --batt1 battery[4+2] = getMinVoltageBySource(status.battsource, cell2sum, cell2sumFC, 2)*10 --batt2 - battery[4] = (conf.battConf == 3 and battery[5] or (conf.battConf == 2 and battery[5]+battery[6] or getNonZeroMin(battery[5],battery[6]))) - battery[7] = getMaxValue((conf.battConf == 3 and telemetry.batt1current or telemetry.batt1current + telemetry.batt2current),7) battery[7+1] = getMaxValue(telemetry.batt1current,8) --curr1 battery[7+2] = getMaxValue(telemetry.batt2current,9) --curr2 - battery[10] = (conf.battConf == 3 and telemetry.batt1mah or telemetry.batt1mah + telemetry.batt2mah) battery[10+1] = telemetry.batt1mah --mah1 battery[10+2] = telemetry.batt2mah --mah2 - battery[13] = (conf.battConf == 1 and getBatt1Capacity() + getBatt2Capacity() or getBatt1Capacity()) battery[13+1] = getBatt1Capacity() --cap1 battery[13+2] = getBatt2Capacity() --cap2 + --[[ + 4 cases here + 1) parallel => all values depend on both batteries + 2) other1 => all values depend on battery 1 + 3) other2 => all values depend on battery 2 + 4) series => celm(vs) and vbatt(vs) depend on both batteries, all other values on PM battery 1 (this is not supported: 1 PM + 2xFLVSS) + --]] + if (conf.battConf == 1) then + battery[1] = getNonZeroMin(battery[2], battery[3]) + battery[4] = getNonZeroMin(battery[5],battery[6]) + battery[7] = getMaxValue(telemetry.batt1current + telemetry.batt2current, 7) + battery[10] = telemetry.batt1mah + telemetry.batt2mah + battery[13] = getBatt2Capacity() + getBatt1Capacity() + elseif (conf.battConf == 2) then + battery[1] = getNonZeroMin(battery[2], battery[3]) + battery[4] = battery[5] + battery[6] + battery[7] = getMaxValue(telemetry.batt1current,7) + battery[10] = telemetry.batt1mah + battery[13] = getBatt1Capacity() + elseif (conf.battConf == 3) then + battery[1] = battery[2] + battery[4] = battery[5] + battery[7] = getMaxValue(telemetry.batt1current,7) + battery[10] = telemetry.batt1mah + battery[13] = getBatt1Capacity() + else + battery[1] = battery[3] + battery[4] = battery[6] + battery[7] = getMaxValue(telemetry.batt2current,7) + battery[10] = telemetry.batt2mah + battery[13] = getBatt2Capacity() + end + + for battId=0,2 + do + if (battery[13+battId] > 0) then + battery[16+battId] = (1 - (battery[10+battId]/battery[13+battId]))*100 + if battery[16+battId] > 99 then + battery[16+battId] = 99 + elseif battery[16+battId] < 0 then + battery[16+battId] = 0 + end + else + battery[16+battId] = 99 + end + end + if status.showDualBattery == true and conf.battConf == 1 then -- dual parallel battery: do I have also dual current monitor? if battery[7+1] > 0 and battery[7+2] == 0 then @@ -1113,15 +1189,17 @@ local function setSensorValues() if (battcapacity > 0) then perc = math.min(math.max((1 - (battmah/battcapacity))*100,0),99) end - - setTelemetryValue(0x060F, 0, 0, perc, 13 , 0 , "Fuel") + -- CRSF + if not conf.enableCRSF then + setTelemetryValue(0x060F, 0, 0, perc, 13 , 0 , "Fuel") + setTelemetryValue(0x020F, 0, 0, telemetry.batt1current+telemetry.batt2current, 2 , 1 , "CURR") + setTelemetryValue(0x084F, 0, 0, math.floor(telemetry.yaw), 20 , 0 , "Hdg") + setTelemetryValue(0x010F, 0, 0, telemetry.homeAlt*10, 9 , 1 , "Alt") + setTelemetryValue(0x083F, 0, 0, telemetry.hSpeed*0.1, 4 , 0 , "GSpd") + end setTelemetryValue(0x021F, 0, 0, getNonZeroMin(telemetry.batt1volt,telemetry.batt2volt)*10, 1 , 2 , "VFAS") - setTelemetryValue(0x020F, 0, 0, telemetry.batt1current+telemetry.batt2current, 2 , 1 , "CURR") setTelemetryValue(0x011F, 0, 0, telemetry.vSpeed, 5 , 1 , "VSpd") - setTelemetryValue(0x083F, 0, 0, telemetry.hSpeed*0.1, 4 , 0 , "GSpd") - setTelemetryValue(0x010F, 0, 0, telemetry.homeAlt*10, 9 , 1 , "Alt") setTelemetryValue(0x082F, 0, 0, math.floor(telemetry.gpsAlt*0.1), 9 , 0 , "GAlt") - setTelemetryValue(0x084F, 0, 0, math.floor(telemetry.yaw), 20 , 0 , "Hdg") setTelemetryValue(0x041F, 0, 0, telemetry.imuTemp, 11 , 0 , "IMUt") setTelemetryValue(0x060F, 0, 1, telemetry.statusArmed*100, 0 , 0 , "ARM") end @@ -1181,7 +1259,7 @@ local function checkAlarm(level,value,idx,sign,sound,delay) alarms[idx][2] = 0 alarms[idx][1] = false alarms[idx][6] = false - -- status: + -- status: RESET end if alarms[idx][2] > 0 and (status.flightTime ~= alarms[idx][2]) and (status.flightTime - alarms[idx][2]) >= alarms[idx][5] then -- enough time has passed after START @@ -1212,11 +1290,11 @@ local function loadFlightModes() end if telemetry.frameType ~= -1 then if frameTypes[telemetry.frameType] == "c" then - frame = dofile(libBasePath..(conf.enablePX4Modes and "copter_px4.luac" or "copter.luac")) + frame = doLibrary(conf.enablePX4Modes and "copter_px4" or "copter") elseif frameTypes[telemetry.frameType] == "p" then - frame = dofile(libBasePath..(conf.enablePX4Modes and "plane_px4.luac" or "plane.luac")) - elseif frameTypes[telemetry.frameType] == "r" then - frame = dofile(libBasePath.."rover.luac") + frame = doLibrary(conf.enablePX4Modes and "plane_px4" or "plane") + elseif frameTypes[telemetry.frameType] == "r" or frameTypes[telemetry.frameType] == "b" then + frame = doLibrary("rover") end if frame.flightModes then frameType = frameTypes[telemetry.frameType] @@ -1226,6 +1304,7 @@ local function loadFlightModes() end end + local function getFlightMode() if frame.flightModes then return frame.flightModes[telemetry.flightMode] @@ -1244,19 +1323,18 @@ local function checkTransition(idx,value) transitions[idx][1] = value transitions[idx][2] = getTime() transitions[idx][3] = false - -- status: + -- status: RESET return false end if transitions[idx][3] == false and (getTime() - transitions[idx][2]) >= transitions[idx][4] then - -- enough time has passed after + -- enough time has passed after RESET transitions[idx][3] = true -- status: FIRE return true; end end - -local function checkEvents() +local function checkEvents(cellVoltage) loadFlightModes() checkAlarm(conf.minAltitudeAlert,telemetry.homeAlt,1,-1,"minalt",conf.repeatAlertsPeriod) @@ -1266,21 +1344,23 @@ local function checkEvents() checkAlarm(1,2*telemetry.battFailsafe,5,1,"lowbat",conf.repeatAlertsPeriod) checkAlarm(math.floor(conf.timerAlert),status.flightTime,6,1,"timealert",math.floor(conf.timerAlert)) + --[[ local capacity = getBatt1Capacity() local mah = telemetry.batt1mah -- only if dual battery has been detected - if (batt2sources.fc or batt2sources.vs) and conf.battConf == 1 then + if (batt2sources.fc or batt2sources.vs) and conf.battConf == BATTCONF_PARALLEL then + if (batt2sources.fc or batt2sources.vs) and conf.battConf == BATTCONF_PARALLEL then capacity = capacity + getBatt2Capacity() mah = mah + telemetry.batt2mah end + --]] + if (battery[13] > 0) then + batLevel = (1 - (battery[10]/battery[13]))*100 + else + batLevel = 99 + end - if (capacity > 0) then - batLevel = (1 - (mah/capacity))*100 - else - batLevel = 99 - end - for l=0,12 do -- trigger alarm as as soon as it falls below level + 1 (i.e 91%,81%,71%,...) local level = tonumber(string.sub("00051015202530405060708090",l*2+1,l*2+2)) @@ -1360,13 +1440,12 @@ local bgclock = 0 ------------------------------- local function background() -- FAST: this runs at 60Hz (every 16ms) - for i=1,3 + for i=1,7 do - local sensor_id,frame_id,data_id,value = sportTelemetryPop() + local sensor_id,frame_id,data_id,value = telemetryPop() if frame_id == 0x10 then - processTelemetry(telemetry,data_id,value) - -- update telemetry status + processTelemetry(data_id,value) noTelemetryData = 0 hideNoTelemetry = true end @@ -1384,22 +1463,25 @@ local function background() local count1,count2 = calcCellCount() local cellVoltage = 0 - if conf.battConf == 3 then + if conf.battConf == 3 then -- alarms are based on battery 1 cellVoltage = 100*(status.battsource == "vs" and cell1min or cell1sumFC/count1) + elseif conf.battConf == 4 then + -- alarms are based on battery 1 + cellVoltage = 100*(status.battsource == "vs" and cell2min or cell2sumFC/count2) else -- alarms are based on battery 1 and battery 2 cellVoltage = 100*(status.battsource == "vs" and getNonZeroMin(cell1min,cell2min) or getNonZeroMin(cell1sumFC/count1,cell2sumFC/count2)) end -- - checkEvents() + checkEvents(cellVoltage) checkLandingStatus() -- no need for alarms if reported voltage is 0 if cellVoltage > 0 then checkCellVoltage(cellVoltage) end -- aggregate value - minmaxValues[7] = math.max((conf.battConf == 3 and telemetry.batt1current or telemetry.batt1current+telemetry.batt2current), minmaxValues[7]) + minmaxValues[7] = math.max((conf.battConf == 3 and telemetry.batt1current or (conf.battConf == 4 and telemetry.batt2current or telemetry.batt1current+telemetry.batt2current)), minmaxValues[7]) -- indipendent values minmaxValues[8] = math.max(telemetry.batt1current,minmaxValues[8]) @@ -1416,6 +1498,10 @@ local function background() collectgarbage() end + -- CRSF: take the best signal and apply same algo used by ardupilot to estimate a 0-100 rssi value + -- rssi = roundf((1.0f - (rssi_dbm - 50.0f) / 70.0f) * 255.0f); + rssiCRSF = string.format("%d/%d", math.min(100, math.floor(0.5 + ((1-(math.min(getValue("1RSS"), getValue("2RSS")) - 50)/70)*100))), getValue("RFMD")) + bgclock=0 end -- blinking support @@ -1575,9 +1661,9 @@ local function run(event) lcd.drawFilledRectangle(0,56, 212, 8, FORCE) if drawLib ~= nil then - drawLib.drawTopBar(getFlightMode(),telemetry.simpleMode,status.flightTime,telemetryEnabled) + drawLib.drawTopBar(getFlightMode(), telemetry.simpleMode, status.flightTime, telemetryEnabled, conf.enableCRSF and rssiCRSF or getRSSI()) drawLib.drawBottomBar(messages[(messageCount + #messages) % (#messages+1)],lastMsgTime) - drawLib.drawNoTelemetry(telemetryEnabled,hideNoTelemetry) + drawLib.drawNoTelemetry(telemetryEnabled, hideNoTelemetry) end -- event handler if event == EVT_PLUS_BREAK or event == EVT_ROT_RIGHT or event == 36 then @@ -1618,10 +1704,16 @@ local function init() collectgarbage() -- ok configuration loaded status.battsource = conf.defaultBattSource + -- CRSF or SPORT? + telemetryPop = sportTelemetryPop + if conf.enableCRSF == true then + telemetryPop = crossfirePop + end -- configuration loaded, releasing menu library memory clearTable(menuLib) menuLib = nil - pushMessage(7,"Yaapu X9 telemetry script 1.8.0") + + pushMessage(7,"Yaapu X9 Telemetry Script 1.9.1 beta1") collectgarbage() collectgarbage() playSound("yaapu") diff --git a/horus-changelog.txt b/horus-changelog.txt index ee6f13e6..134835a1 100644 --- a/horus-changelog.txt +++ b/horus-changelog.txt @@ -95,4 +95,22 @@ Horus version 1.8.1 - fix for custom sensor min/max nil support - +Horus version 1.9.1 (beta) + +- added support for crossfire +- added new dual battery modes +- added new right pane layouts +- added support for THERMAL flight mode +- fixed boat flight modes +- fixed PX4 flight modes + +Horus version 1.9.3 (beta) + +- added support for google maps downloaded via MissionPlanner +- new tiles resize tool for google maps supporting sat and hybrid maps +- new zoom control using a switch as up/down wheel emulator +- added scrollable status message history (up to 200 messages) using the emulated wheel +- added flight time to message history +- added a status bar in message view with flight mode and flight time +- improved mini HUD in maps view +- many memory and speed optimizations diff --git a/taranis-changelog.txt b/taranis-changelog.txt index 9dca560b..35b79f44 100644 --- a/taranis-changelog.txt +++ b/taranis-changelog.txt @@ -115,3 +115,10 @@ Taranis version 1.8.0 - added new message alert silencing options - fix for quick flight mode switch - fix for rover modes vocal playback + +Taranis version 1.9.1 + +- added support for crossfire +- added support for THERMAL flight mode +- fixed boat flight modes +- fixed PX4 flight modes