From d6b84371a9759af4998715feaf645e201be7b4be Mon Sep 17 00:00:00 2001 From: 3djc Date: Sun, 15 Jan 2017 15:27:58 +0100 Subject: [PATCH] Create a home for x7 sdcard data (#4230) --- .../{taranis => taranis-x7}/EEPROM/readme.txt | 0 .../FIRMWARE/readme.txt | 0 .../{taranis => taranis-x7}/LOGS/readme.txt | 0 .../{taranis => taranis-x7}/MODELS/readme.txt | 0 .../SCREENSHOTS/readme.txt | 0 .../SCRIPTS/FUNCTIONS/readme.txt | 0 .../SCRIPTS/MIXES/readme.txt | 0 .../SCRIPTS/TELEMETRY/readme.txt | 0 .../SCRIPTS/TEMPLATES/readme.txt | 0 .../{taranis => taranis-x7}/SCRIPTS/snake.lua | 0 .../CROSSFIRE/crossfire.lua | 0 .../CROSSFIRE/device.lua | 0 radio/sdcard/taranis-x9/EEPROM/readme.txt | 2 + radio/sdcard/taranis-x9/FIRMWARE/readme.txt | 2 + .../{taranis => taranis-x9}/IMAGES/readme.txt | 0 radio/sdcard/taranis-x9/LOGS/readme.txt | 1 + radio/sdcard/taranis-x9/MODELS/readme.txt | 1 + .../{taranis => taranis-x9}/S6R/S6R.lua | 0 .../S6R/S6R_Calibrate.lua | 0 .../{taranis => taranis-x9}/S6R/bmp/back.bmp | Bin .../{taranis => taranis-x9}/S6R/bmp/delta.bmp | Bin .../{taranis => taranis-x9}/S6R/bmp/done.bmp | Bin .../{taranis => taranis-x9}/S6R/bmp/down.bmp | Bin .../S6R/bmp/forward.bmp | Bin .../S6R/bmp/horz-r.bmp | Bin .../{taranis => taranis-x9}/S6R/bmp/horz.bmp | Bin .../{taranis => taranis-x9}/S6R/bmp/left.bmp | Bin .../{taranis => taranis-x9}/S6R/bmp/plane.bmp | Bin .../{taranis => taranis-x9}/S6R/bmp/right.bmp | Bin .../{taranis => taranis-x9}/S6R/bmp/up.bmp | Bin .../S6R/bmp/vert-r.bmp | Bin .../{taranis => taranis-x9}/S6R/bmp/vert.bmp | Bin .../{taranis => taranis-x9}/S6R/bmp/vtail.bmp | Bin .../sdcard/taranis-x9/SCREENSHOTS/readme.txt | 1 + .../taranis-x9/SCRIPTS/FUNCTIONS/readme.txt | 1 + .../taranis-x9/SCRIPTS/MIXES/readme.txt | 1 + .../taranis-x9/SCRIPTS/TELEMETRY/readme.txt | 2 + .../taranis-x9/SCRIPTS/TEMPLATES/readme.txt | 1 + .../SCRIPTS/WIZARD/ailerons-0.bmp | Bin .../SCRIPTS/WIZARD/ailerons-1.bmp | Bin .../SCRIPTS/WIZARD/ailerons-2.bmp | Bin .../SCRIPTS/WIZARD/brakes-1.bmp | Bin .../SCRIPTS/WIZARD/brakes-2.bmp | Bin .../SCRIPTS/WIZARD/confirm-plane.bmp | Bin .../SCRIPTS/WIZARD/confirm-tick.bmp | Bin .../SCRIPTS/WIZARD/delta.bmp | Bin .../SCRIPTS/WIZARD/delta.lua | 0 .../SCRIPTS/WIZARD/drudder-0.bmp | Bin .../SCRIPTS/WIZARD/drudder-1.bmp | Bin .../SCRIPTS/WIZARD/elevons.bmp | Bin .../SCRIPTS/WIZARD/engine-0.bmp | Bin .../SCRIPTS/WIZARD/engine-1.bmp | Bin .../SCRIPTS/WIZARD/flaps-1.bmp | Bin .../SCRIPTS/WIZARD/flaps-2.bmp | Bin .../SCRIPTS/WIZARD/heli.bmp | Bin .../SCRIPTS/WIZARD/mark.bmp | Bin .../SCRIPTS/WIZARD/multi-pitch.bmp | Bin .../SCRIPTS/WIZARD/multi-roll.bmp | Bin .../SCRIPTS/WIZARD/multi-thr.bmp | Bin .../SCRIPTS/WIZARD/multi-yaw.bmp | Bin .../SCRIPTS/WIZARD/multi.lua | 0 .../SCRIPTS/WIZARD/plane.bmp | Bin .../SCRIPTS/WIZARD/plane.lua | 0 .../SCRIPTS/WIZARD/quadri.bmp | Bin .../SCRIPTS/WIZARD/servo.bmp | Bin .../SCRIPTS/WIZARD/tail-e.bmp | Bin .../SCRIPTS/WIZARD/tail-eer.bmp | Bin .../SCRIPTS/WIZARD/tail-er.bmp | Bin .../SCRIPTS/WIZARD/tail-v.bmp | Bin .../SCRIPTS/WIZARD/wizard.lua | 0 radio/sdcard/taranis-x9/SCRIPTS/snake.lua | 176 ++++++++++++++++++ tools/nightly22/build-sdcard.sh | 14 +- 72 files changed, 196 insertions(+), 6 deletions(-) rename radio/sdcard/{taranis => taranis-x7}/EEPROM/readme.txt (100%) rename radio/sdcard/{taranis => taranis-x7}/FIRMWARE/readme.txt (100%) rename radio/sdcard/{taranis => taranis-x7}/LOGS/readme.txt (100%) rename radio/sdcard/{taranis => taranis-x7}/MODELS/readme.txt (100%) rename radio/sdcard/{taranis => taranis-x7}/SCREENSHOTS/readme.txt (100%) rename radio/sdcard/{taranis => taranis-x7}/SCRIPTS/FUNCTIONS/readme.txt (100%) rename radio/sdcard/{taranis => taranis-x7}/SCRIPTS/MIXES/readme.txt (100%) rename radio/sdcard/{taranis => taranis-x7}/SCRIPTS/TELEMETRY/readme.txt (100%) rename radio/sdcard/{taranis => taranis-x7}/SCRIPTS/TEMPLATES/readme.txt (100%) rename radio/sdcard/{taranis => taranis-x7}/SCRIPTS/snake.lua (100%) rename radio/sdcard/{taranis => taranis-x9}/CROSSFIRE/crossfire.lua (100%) rename radio/sdcard/{taranis => taranis-x9}/CROSSFIRE/device.lua (100%) create mode 100644 radio/sdcard/taranis-x9/EEPROM/readme.txt create mode 100644 radio/sdcard/taranis-x9/FIRMWARE/readme.txt rename radio/sdcard/{taranis => taranis-x9}/IMAGES/readme.txt (100%) create mode 100644 radio/sdcard/taranis-x9/LOGS/readme.txt create mode 100644 radio/sdcard/taranis-x9/MODELS/readme.txt rename radio/sdcard/{taranis => taranis-x9}/S6R/S6R.lua (100%) rename radio/sdcard/{taranis => taranis-x9}/S6R/S6R_Calibrate.lua (100%) rename radio/sdcard/{taranis => taranis-x9}/S6R/bmp/back.bmp (100%) rename radio/sdcard/{taranis => taranis-x9}/S6R/bmp/delta.bmp (100%) rename radio/sdcard/{taranis => taranis-x9}/S6R/bmp/done.bmp (100%) rename radio/sdcard/{taranis => taranis-x9}/S6R/bmp/down.bmp (100%) rename radio/sdcard/{taranis => taranis-x9}/S6R/bmp/forward.bmp (100%) rename radio/sdcard/{taranis => taranis-x9}/S6R/bmp/horz-r.bmp (100%) rename radio/sdcard/{taranis => taranis-x9}/S6R/bmp/horz.bmp (100%) rename radio/sdcard/{taranis => taranis-x9}/S6R/bmp/left.bmp (100%) rename radio/sdcard/{taranis => taranis-x9}/S6R/bmp/plane.bmp (100%) rename radio/sdcard/{taranis => taranis-x9}/S6R/bmp/right.bmp (100%) rename radio/sdcard/{taranis => taranis-x9}/S6R/bmp/up.bmp (100%) rename radio/sdcard/{taranis => taranis-x9}/S6R/bmp/vert-r.bmp (100%) rename radio/sdcard/{taranis => taranis-x9}/S6R/bmp/vert.bmp (100%) rename radio/sdcard/{taranis => taranis-x9}/S6R/bmp/vtail.bmp (100%) create mode 100644 radio/sdcard/taranis-x9/SCREENSHOTS/readme.txt create mode 100644 radio/sdcard/taranis-x9/SCRIPTS/FUNCTIONS/readme.txt create mode 100644 radio/sdcard/taranis-x9/SCRIPTS/MIXES/readme.txt create mode 100644 radio/sdcard/taranis-x9/SCRIPTS/TELEMETRY/readme.txt create mode 100644 radio/sdcard/taranis-x9/SCRIPTS/TEMPLATES/readme.txt rename radio/sdcard/{taranis => taranis-x9}/SCRIPTS/WIZARD/ailerons-0.bmp (100%) rename radio/sdcard/{taranis => taranis-x9}/SCRIPTS/WIZARD/ailerons-1.bmp (100%) rename radio/sdcard/{taranis => taranis-x9}/SCRIPTS/WIZARD/ailerons-2.bmp (100%) rename radio/sdcard/{taranis => taranis-x9}/SCRIPTS/WIZARD/brakes-1.bmp (100%) rename radio/sdcard/{taranis => taranis-x9}/SCRIPTS/WIZARD/brakes-2.bmp (100%) rename radio/sdcard/{taranis => taranis-x9}/SCRIPTS/WIZARD/confirm-plane.bmp (100%) rename radio/sdcard/{taranis => taranis-x9}/SCRIPTS/WIZARD/confirm-tick.bmp (100%) rename radio/sdcard/{taranis => taranis-x9}/SCRIPTS/WIZARD/delta.bmp (100%) rename radio/sdcard/{taranis => taranis-x9}/SCRIPTS/WIZARD/delta.lua (100%) rename radio/sdcard/{taranis => taranis-x9}/SCRIPTS/WIZARD/drudder-0.bmp (100%) rename radio/sdcard/{taranis => taranis-x9}/SCRIPTS/WIZARD/drudder-1.bmp (100%) rename radio/sdcard/{taranis => taranis-x9}/SCRIPTS/WIZARD/elevons.bmp (100%) rename radio/sdcard/{taranis => taranis-x9}/SCRIPTS/WIZARD/engine-0.bmp (100%) rename radio/sdcard/{taranis => taranis-x9}/SCRIPTS/WIZARD/engine-1.bmp (100%) rename radio/sdcard/{taranis => taranis-x9}/SCRIPTS/WIZARD/flaps-1.bmp (100%) rename radio/sdcard/{taranis => taranis-x9}/SCRIPTS/WIZARD/flaps-2.bmp (100%) rename radio/sdcard/{taranis => taranis-x9}/SCRIPTS/WIZARD/heli.bmp (100%) rename radio/sdcard/{taranis => taranis-x9}/SCRIPTS/WIZARD/mark.bmp (100%) rename radio/sdcard/{taranis => taranis-x9}/SCRIPTS/WIZARD/multi-pitch.bmp (100%) rename radio/sdcard/{taranis => taranis-x9}/SCRIPTS/WIZARD/multi-roll.bmp (100%) rename radio/sdcard/{taranis => taranis-x9}/SCRIPTS/WIZARD/multi-thr.bmp (100%) rename radio/sdcard/{taranis => taranis-x9}/SCRIPTS/WIZARD/multi-yaw.bmp (100%) rename radio/sdcard/{taranis => taranis-x9}/SCRIPTS/WIZARD/multi.lua (100%) rename radio/sdcard/{taranis => taranis-x9}/SCRIPTS/WIZARD/plane.bmp (100%) rename radio/sdcard/{taranis => taranis-x9}/SCRIPTS/WIZARD/plane.lua (100%) rename radio/sdcard/{taranis => taranis-x9}/SCRIPTS/WIZARD/quadri.bmp (100%) rename radio/sdcard/{taranis => taranis-x9}/SCRIPTS/WIZARD/servo.bmp (100%) rename radio/sdcard/{taranis => taranis-x9}/SCRIPTS/WIZARD/tail-e.bmp (100%) rename radio/sdcard/{taranis => taranis-x9}/SCRIPTS/WIZARD/tail-eer.bmp (100%) rename radio/sdcard/{taranis => taranis-x9}/SCRIPTS/WIZARD/tail-er.bmp (100%) rename radio/sdcard/{taranis => taranis-x9}/SCRIPTS/WIZARD/tail-v.bmp (100%) rename radio/sdcard/{taranis => taranis-x9}/SCRIPTS/WIZARD/wizard.lua (100%) create mode 100644 radio/sdcard/taranis-x9/SCRIPTS/snake.lua diff --git a/radio/sdcard/taranis/EEPROM/readme.txt b/radio/sdcard/taranis-x7/EEPROM/readme.txt similarity index 100% rename from radio/sdcard/taranis/EEPROM/readme.txt rename to radio/sdcard/taranis-x7/EEPROM/readme.txt diff --git a/radio/sdcard/taranis/FIRMWARE/readme.txt b/radio/sdcard/taranis-x7/FIRMWARE/readme.txt similarity index 100% rename from radio/sdcard/taranis/FIRMWARE/readme.txt rename to radio/sdcard/taranis-x7/FIRMWARE/readme.txt diff --git a/radio/sdcard/taranis/LOGS/readme.txt b/radio/sdcard/taranis-x7/LOGS/readme.txt similarity index 100% rename from radio/sdcard/taranis/LOGS/readme.txt rename to radio/sdcard/taranis-x7/LOGS/readme.txt diff --git a/radio/sdcard/taranis/MODELS/readme.txt b/radio/sdcard/taranis-x7/MODELS/readme.txt similarity index 100% rename from radio/sdcard/taranis/MODELS/readme.txt rename to radio/sdcard/taranis-x7/MODELS/readme.txt diff --git a/radio/sdcard/taranis/SCREENSHOTS/readme.txt b/radio/sdcard/taranis-x7/SCREENSHOTS/readme.txt similarity index 100% rename from radio/sdcard/taranis/SCREENSHOTS/readme.txt rename to radio/sdcard/taranis-x7/SCREENSHOTS/readme.txt diff --git a/radio/sdcard/taranis/SCRIPTS/FUNCTIONS/readme.txt b/radio/sdcard/taranis-x7/SCRIPTS/FUNCTIONS/readme.txt similarity index 100% rename from radio/sdcard/taranis/SCRIPTS/FUNCTIONS/readme.txt rename to radio/sdcard/taranis-x7/SCRIPTS/FUNCTIONS/readme.txt diff --git a/radio/sdcard/taranis/SCRIPTS/MIXES/readme.txt b/radio/sdcard/taranis-x7/SCRIPTS/MIXES/readme.txt similarity index 100% rename from radio/sdcard/taranis/SCRIPTS/MIXES/readme.txt rename to radio/sdcard/taranis-x7/SCRIPTS/MIXES/readme.txt diff --git a/radio/sdcard/taranis/SCRIPTS/TELEMETRY/readme.txt b/radio/sdcard/taranis-x7/SCRIPTS/TELEMETRY/readme.txt similarity index 100% rename from radio/sdcard/taranis/SCRIPTS/TELEMETRY/readme.txt rename to radio/sdcard/taranis-x7/SCRIPTS/TELEMETRY/readme.txt diff --git a/radio/sdcard/taranis/SCRIPTS/TEMPLATES/readme.txt b/radio/sdcard/taranis-x7/SCRIPTS/TEMPLATES/readme.txt similarity index 100% rename from radio/sdcard/taranis/SCRIPTS/TEMPLATES/readme.txt rename to radio/sdcard/taranis-x7/SCRIPTS/TEMPLATES/readme.txt diff --git a/radio/sdcard/taranis/SCRIPTS/snake.lua b/radio/sdcard/taranis-x7/SCRIPTS/snake.lua similarity index 100% rename from radio/sdcard/taranis/SCRIPTS/snake.lua rename to radio/sdcard/taranis-x7/SCRIPTS/snake.lua diff --git a/radio/sdcard/taranis/CROSSFIRE/crossfire.lua b/radio/sdcard/taranis-x9/CROSSFIRE/crossfire.lua similarity index 100% rename from radio/sdcard/taranis/CROSSFIRE/crossfire.lua rename to radio/sdcard/taranis-x9/CROSSFIRE/crossfire.lua diff --git a/radio/sdcard/taranis/CROSSFIRE/device.lua b/radio/sdcard/taranis-x9/CROSSFIRE/device.lua similarity index 100% rename from radio/sdcard/taranis/CROSSFIRE/device.lua rename to radio/sdcard/taranis-x9/CROSSFIRE/device.lua diff --git a/radio/sdcard/taranis-x9/EEPROM/readme.txt b/radio/sdcard/taranis-x9/EEPROM/readme.txt new file mode 100644 index 000000000..52977efaf --- /dev/null +++ b/radio/sdcard/taranis-x9/EEPROM/readme.txt @@ -0,0 +1,2 @@ +EEprom backups go in this folder. +EEprom backups can be generated from VERSION screen in RADIO SETUP diff --git a/radio/sdcard/taranis-x9/FIRMWARE/readme.txt b/radio/sdcard/taranis-x9/FIRMWARE/readme.txt new file mode 100644 index 000000000..4ba9522c9 --- /dev/null +++ b/radio/sdcard/taranis-x9/FIRMWARE/readme.txt @@ -0,0 +1,2 @@ +You can put firmware for your modules or radio in this folder. +Files in this folder are NOT automaticaly applied. diff --git a/radio/sdcard/taranis/IMAGES/readme.txt b/radio/sdcard/taranis-x9/IMAGES/readme.txt similarity index 100% rename from radio/sdcard/taranis/IMAGES/readme.txt rename to radio/sdcard/taranis-x9/IMAGES/readme.txt diff --git a/radio/sdcard/taranis-x9/LOGS/readme.txt b/radio/sdcard/taranis-x9/LOGS/readme.txt new file mode 100644 index 000000000..f9c005b26 --- /dev/null +++ b/radio/sdcard/taranis-x9/LOGS/readme.txt @@ -0,0 +1 @@ +Logs files created by "SD Logs" special function will be stored in this directory. diff --git a/radio/sdcard/taranis-x9/MODELS/readme.txt b/radio/sdcard/taranis-x9/MODELS/readme.txt new file mode 100644 index 000000000..5c5707a4d --- /dev/null +++ b/radio/sdcard/taranis-x9/MODELS/readme.txt @@ -0,0 +1 @@ +Individual model files for the Backup/Restore model features go here, as well as model note text files. diff --git a/radio/sdcard/taranis/S6R/S6R.lua b/radio/sdcard/taranis-x9/S6R/S6R.lua similarity index 100% rename from radio/sdcard/taranis/S6R/S6R.lua rename to radio/sdcard/taranis-x9/S6R/S6R.lua diff --git a/radio/sdcard/taranis/S6R/S6R_Calibrate.lua b/radio/sdcard/taranis-x9/S6R/S6R_Calibrate.lua similarity index 100% rename from radio/sdcard/taranis/S6R/S6R_Calibrate.lua rename to radio/sdcard/taranis-x9/S6R/S6R_Calibrate.lua diff --git a/radio/sdcard/taranis/S6R/bmp/back.bmp b/radio/sdcard/taranis-x9/S6R/bmp/back.bmp similarity index 100% rename from radio/sdcard/taranis/S6R/bmp/back.bmp rename to radio/sdcard/taranis-x9/S6R/bmp/back.bmp diff --git a/radio/sdcard/taranis/S6R/bmp/delta.bmp b/radio/sdcard/taranis-x9/S6R/bmp/delta.bmp similarity index 100% rename from radio/sdcard/taranis/S6R/bmp/delta.bmp rename to radio/sdcard/taranis-x9/S6R/bmp/delta.bmp diff --git a/radio/sdcard/taranis/S6R/bmp/done.bmp b/radio/sdcard/taranis-x9/S6R/bmp/done.bmp similarity index 100% rename from radio/sdcard/taranis/S6R/bmp/done.bmp rename to radio/sdcard/taranis-x9/S6R/bmp/done.bmp diff --git a/radio/sdcard/taranis/S6R/bmp/down.bmp b/radio/sdcard/taranis-x9/S6R/bmp/down.bmp similarity index 100% rename from radio/sdcard/taranis/S6R/bmp/down.bmp rename to radio/sdcard/taranis-x9/S6R/bmp/down.bmp diff --git a/radio/sdcard/taranis/S6R/bmp/forward.bmp b/radio/sdcard/taranis-x9/S6R/bmp/forward.bmp similarity index 100% rename from radio/sdcard/taranis/S6R/bmp/forward.bmp rename to radio/sdcard/taranis-x9/S6R/bmp/forward.bmp diff --git a/radio/sdcard/taranis/S6R/bmp/horz-r.bmp b/radio/sdcard/taranis-x9/S6R/bmp/horz-r.bmp similarity index 100% rename from radio/sdcard/taranis/S6R/bmp/horz-r.bmp rename to radio/sdcard/taranis-x9/S6R/bmp/horz-r.bmp diff --git a/radio/sdcard/taranis/S6R/bmp/horz.bmp b/radio/sdcard/taranis-x9/S6R/bmp/horz.bmp similarity index 100% rename from radio/sdcard/taranis/S6R/bmp/horz.bmp rename to radio/sdcard/taranis-x9/S6R/bmp/horz.bmp diff --git a/radio/sdcard/taranis/S6R/bmp/left.bmp b/radio/sdcard/taranis-x9/S6R/bmp/left.bmp similarity index 100% rename from radio/sdcard/taranis/S6R/bmp/left.bmp rename to radio/sdcard/taranis-x9/S6R/bmp/left.bmp diff --git a/radio/sdcard/taranis/S6R/bmp/plane.bmp b/radio/sdcard/taranis-x9/S6R/bmp/plane.bmp similarity index 100% rename from radio/sdcard/taranis/S6R/bmp/plane.bmp rename to radio/sdcard/taranis-x9/S6R/bmp/plane.bmp diff --git a/radio/sdcard/taranis/S6R/bmp/right.bmp b/radio/sdcard/taranis-x9/S6R/bmp/right.bmp similarity index 100% rename from radio/sdcard/taranis/S6R/bmp/right.bmp rename to radio/sdcard/taranis-x9/S6R/bmp/right.bmp diff --git a/radio/sdcard/taranis/S6R/bmp/up.bmp b/radio/sdcard/taranis-x9/S6R/bmp/up.bmp similarity index 100% rename from radio/sdcard/taranis/S6R/bmp/up.bmp rename to radio/sdcard/taranis-x9/S6R/bmp/up.bmp diff --git a/radio/sdcard/taranis/S6R/bmp/vert-r.bmp b/radio/sdcard/taranis-x9/S6R/bmp/vert-r.bmp similarity index 100% rename from radio/sdcard/taranis/S6R/bmp/vert-r.bmp rename to radio/sdcard/taranis-x9/S6R/bmp/vert-r.bmp diff --git a/radio/sdcard/taranis/S6R/bmp/vert.bmp b/radio/sdcard/taranis-x9/S6R/bmp/vert.bmp similarity index 100% rename from radio/sdcard/taranis/S6R/bmp/vert.bmp rename to radio/sdcard/taranis-x9/S6R/bmp/vert.bmp diff --git a/radio/sdcard/taranis/S6R/bmp/vtail.bmp b/radio/sdcard/taranis-x9/S6R/bmp/vtail.bmp similarity index 100% rename from radio/sdcard/taranis/S6R/bmp/vtail.bmp rename to radio/sdcard/taranis-x9/S6R/bmp/vtail.bmp diff --git a/radio/sdcard/taranis-x9/SCREENSHOTS/readme.txt b/radio/sdcard/taranis-x9/SCREENSHOTS/readme.txt new file mode 100644 index 000000000..8b89b3c6c --- /dev/null +++ b/radio/sdcard/taranis-x9/SCREENSHOTS/readme.txt @@ -0,0 +1 @@ +Screenshots created by "Screenshot" special function will be stored in this directory. diff --git a/radio/sdcard/taranis-x9/SCRIPTS/FUNCTIONS/readme.txt b/radio/sdcard/taranis-x9/SCRIPTS/FUNCTIONS/readme.txt new file mode 100644 index 000000000..e14fc62df --- /dev/null +++ b/radio/sdcard/taranis-x9/SCRIPTS/FUNCTIONS/readme.txt @@ -0,0 +1 @@ +This directory is for lua functions scripts. diff --git a/radio/sdcard/taranis-x9/SCRIPTS/MIXES/readme.txt b/radio/sdcard/taranis-x9/SCRIPTS/MIXES/readme.txt new file mode 100644 index 000000000..8a5e2e738 --- /dev/null +++ b/radio/sdcard/taranis-x9/SCRIPTS/MIXES/readme.txt @@ -0,0 +1 @@ +This directory is for lua mixer scripts. diff --git a/radio/sdcard/taranis-x9/SCRIPTS/TELEMETRY/readme.txt b/radio/sdcard/taranis-x9/SCRIPTS/TELEMETRY/readme.txt new file mode 100644 index 000000000..26b887558 --- /dev/null +++ b/radio/sdcard/taranis-x9/SCRIPTS/TELEMETRY/readme.txt @@ -0,0 +1,2 @@ +This directory is for lua telemetry scripts. +Those scripts can be selected using DISPLAY page. diff --git a/radio/sdcard/taranis-x9/SCRIPTS/TEMPLATES/readme.txt b/radio/sdcard/taranis-x9/SCRIPTS/TEMPLATES/readme.txt new file mode 100644 index 000000000..5bbb8b87f --- /dev/null +++ b/radio/sdcard/taranis-x9/SCRIPTS/TEMPLATES/readme.txt @@ -0,0 +1 @@ +This directory is for template lua scripts. diff --git a/radio/sdcard/taranis/SCRIPTS/WIZARD/ailerons-0.bmp b/radio/sdcard/taranis-x9/SCRIPTS/WIZARD/ailerons-0.bmp similarity index 100% rename from radio/sdcard/taranis/SCRIPTS/WIZARD/ailerons-0.bmp rename to radio/sdcard/taranis-x9/SCRIPTS/WIZARD/ailerons-0.bmp diff --git a/radio/sdcard/taranis/SCRIPTS/WIZARD/ailerons-1.bmp b/radio/sdcard/taranis-x9/SCRIPTS/WIZARD/ailerons-1.bmp similarity index 100% rename from radio/sdcard/taranis/SCRIPTS/WIZARD/ailerons-1.bmp rename to radio/sdcard/taranis-x9/SCRIPTS/WIZARD/ailerons-1.bmp diff --git a/radio/sdcard/taranis/SCRIPTS/WIZARD/ailerons-2.bmp b/radio/sdcard/taranis-x9/SCRIPTS/WIZARD/ailerons-2.bmp similarity index 100% rename from radio/sdcard/taranis/SCRIPTS/WIZARD/ailerons-2.bmp rename to radio/sdcard/taranis-x9/SCRIPTS/WIZARD/ailerons-2.bmp diff --git a/radio/sdcard/taranis/SCRIPTS/WIZARD/brakes-1.bmp b/radio/sdcard/taranis-x9/SCRIPTS/WIZARD/brakes-1.bmp similarity index 100% rename from radio/sdcard/taranis/SCRIPTS/WIZARD/brakes-1.bmp rename to radio/sdcard/taranis-x9/SCRIPTS/WIZARD/brakes-1.bmp diff --git a/radio/sdcard/taranis/SCRIPTS/WIZARD/brakes-2.bmp b/radio/sdcard/taranis-x9/SCRIPTS/WIZARD/brakes-2.bmp similarity index 100% rename from radio/sdcard/taranis/SCRIPTS/WIZARD/brakes-2.bmp rename to radio/sdcard/taranis-x9/SCRIPTS/WIZARD/brakes-2.bmp diff --git a/radio/sdcard/taranis/SCRIPTS/WIZARD/confirm-plane.bmp b/radio/sdcard/taranis-x9/SCRIPTS/WIZARD/confirm-plane.bmp similarity index 100% rename from radio/sdcard/taranis/SCRIPTS/WIZARD/confirm-plane.bmp rename to radio/sdcard/taranis-x9/SCRIPTS/WIZARD/confirm-plane.bmp diff --git a/radio/sdcard/taranis/SCRIPTS/WIZARD/confirm-tick.bmp b/radio/sdcard/taranis-x9/SCRIPTS/WIZARD/confirm-tick.bmp similarity index 100% rename from radio/sdcard/taranis/SCRIPTS/WIZARD/confirm-tick.bmp rename to radio/sdcard/taranis-x9/SCRIPTS/WIZARD/confirm-tick.bmp diff --git a/radio/sdcard/taranis/SCRIPTS/WIZARD/delta.bmp b/radio/sdcard/taranis-x9/SCRIPTS/WIZARD/delta.bmp similarity index 100% rename from radio/sdcard/taranis/SCRIPTS/WIZARD/delta.bmp rename to radio/sdcard/taranis-x9/SCRIPTS/WIZARD/delta.bmp diff --git a/radio/sdcard/taranis/SCRIPTS/WIZARD/delta.lua b/radio/sdcard/taranis-x9/SCRIPTS/WIZARD/delta.lua similarity index 100% rename from radio/sdcard/taranis/SCRIPTS/WIZARD/delta.lua rename to radio/sdcard/taranis-x9/SCRIPTS/WIZARD/delta.lua diff --git a/radio/sdcard/taranis/SCRIPTS/WIZARD/drudder-0.bmp b/radio/sdcard/taranis-x9/SCRIPTS/WIZARD/drudder-0.bmp similarity index 100% rename from radio/sdcard/taranis/SCRIPTS/WIZARD/drudder-0.bmp rename to radio/sdcard/taranis-x9/SCRIPTS/WIZARD/drudder-0.bmp diff --git a/radio/sdcard/taranis/SCRIPTS/WIZARD/drudder-1.bmp b/radio/sdcard/taranis-x9/SCRIPTS/WIZARD/drudder-1.bmp similarity index 100% rename from radio/sdcard/taranis/SCRIPTS/WIZARD/drudder-1.bmp rename to radio/sdcard/taranis-x9/SCRIPTS/WIZARD/drudder-1.bmp diff --git a/radio/sdcard/taranis/SCRIPTS/WIZARD/elevons.bmp b/radio/sdcard/taranis-x9/SCRIPTS/WIZARD/elevons.bmp similarity index 100% rename from radio/sdcard/taranis/SCRIPTS/WIZARD/elevons.bmp rename to radio/sdcard/taranis-x9/SCRIPTS/WIZARD/elevons.bmp diff --git a/radio/sdcard/taranis/SCRIPTS/WIZARD/engine-0.bmp b/radio/sdcard/taranis-x9/SCRIPTS/WIZARD/engine-0.bmp similarity index 100% rename from radio/sdcard/taranis/SCRIPTS/WIZARD/engine-0.bmp rename to radio/sdcard/taranis-x9/SCRIPTS/WIZARD/engine-0.bmp diff --git a/radio/sdcard/taranis/SCRIPTS/WIZARD/engine-1.bmp b/radio/sdcard/taranis-x9/SCRIPTS/WIZARD/engine-1.bmp similarity index 100% rename from radio/sdcard/taranis/SCRIPTS/WIZARD/engine-1.bmp rename to radio/sdcard/taranis-x9/SCRIPTS/WIZARD/engine-1.bmp diff --git a/radio/sdcard/taranis/SCRIPTS/WIZARD/flaps-1.bmp b/radio/sdcard/taranis-x9/SCRIPTS/WIZARD/flaps-1.bmp similarity index 100% rename from radio/sdcard/taranis/SCRIPTS/WIZARD/flaps-1.bmp rename to radio/sdcard/taranis-x9/SCRIPTS/WIZARD/flaps-1.bmp diff --git a/radio/sdcard/taranis/SCRIPTS/WIZARD/flaps-2.bmp b/radio/sdcard/taranis-x9/SCRIPTS/WIZARD/flaps-2.bmp similarity index 100% rename from radio/sdcard/taranis/SCRIPTS/WIZARD/flaps-2.bmp rename to radio/sdcard/taranis-x9/SCRIPTS/WIZARD/flaps-2.bmp diff --git a/radio/sdcard/taranis/SCRIPTS/WIZARD/heli.bmp b/radio/sdcard/taranis-x9/SCRIPTS/WIZARD/heli.bmp similarity index 100% rename from radio/sdcard/taranis/SCRIPTS/WIZARD/heli.bmp rename to radio/sdcard/taranis-x9/SCRIPTS/WIZARD/heli.bmp diff --git a/radio/sdcard/taranis/SCRIPTS/WIZARD/mark.bmp b/radio/sdcard/taranis-x9/SCRIPTS/WIZARD/mark.bmp similarity index 100% rename from radio/sdcard/taranis/SCRIPTS/WIZARD/mark.bmp rename to radio/sdcard/taranis-x9/SCRIPTS/WIZARD/mark.bmp diff --git a/radio/sdcard/taranis/SCRIPTS/WIZARD/multi-pitch.bmp b/radio/sdcard/taranis-x9/SCRIPTS/WIZARD/multi-pitch.bmp similarity index 100% rename from radio/sdcard/taranis/SCRIPTS/WIZARD/multi-pitch.bmp rename to radio/sdcard/taranis-x9/SCRIPTS/WIZARD/multi-pitch.bmp diff --git a/radio/sdcard/taranis/SCRIPTS/WIZARD/multi-roll.bmp b/radio/sdcard/taranis-x9/SCRIPTS/WIZARD/multi-roll.bmp similarity index 100% rename from radio/sdcard/taranis/SCRIPTS/WIZARD/multi-roll.bmp rename to radio/sdcard/taranis-x9/SCRIPTS/WIZARD/multi-roll.bmp diff --git a/radio/sdcard/taranis/SCRIPTS/WIZARD/multi-thr.bmp b/radio/sdcard/taranis-x9/SCRIPTS/WIZARD/multi-thr.bmp similarity index 100% rename from radio/sdcard/taranis/SCRIPTS/WIZARD/multi-thr.bmp rename to radio/sdcard/taranis-x9/SCRIPTS/WIZARD/multi-thr.bmp diff --git a/radio/sdcard/taranis/SCRIPTS/WIZARD/multi-yaw.bmp b/radio/sdcard/taranis-x9/SCRIPTS/WIZARD/multi-yaw.bmp similarity index 100% rename from radio/sdcard/taranis/SCRIPTS/WIZARD/multi-yaw.bmp rename to radio/sdcard/taranis-x9/SCRIPTS/WIZARD/multi-yaw.bmp diff --git a/radio/sdcard/taranis/SCRIPTS/WIZARD/multi.lua b/radio/sdcard/taranis-x9/SCRIPTS/WIZARD/multi.lua similarity index 100% rename from radio/sdcard/taranis/SCRIPTS/WIZARD/multi.lua rename to radio/sdcard/taranis-x9/SCRIPTS/WIZARD/multi.lua diff --git a/radio/sdcard/taranis/SCRIPTS/WIZARD/plane.bmp b/radio/sdcard/taranis-x9/SCRIPTS/WIZARD/plane.bmp similarity index 100% rename from radio/sdcard/taranis/SCRIPTS/WIZARD/plane.bmp rename to radio/sdcard/taranis-x9/SCRIPTS/WIZARD/plane.bmp diff --git a/radio/sdcard/taranis/SCRIPTS/WIZARD/plane.lua b/radio/sdcard/taranis-x9/SCRIPTS/WIZARD/plane.lua similarity index 100% rename from radio/sdcard/taranis/SCRIPTS/WIZARD/plane.lua rename to radio/sdcard/taranis-x9/SCRIPTS/WIZARD/plane.lua diff --git a/radio/sdcard/taranis/SCRIPTS/WIZARD/quadri.bmp b/radio/sdcard/taranis-x9/SCRIPTS/WIZARD/quadri.bmp similarity index 100% rename from radio/sdcard/taranis/SCRIPTS/WIZARD/quadri.bmp rename to radio/sdcard/taranis-x9/SCRIPTS/WIZARD/quadri.bmp diff --git a/radio/sdcard/taranis/SCRIPTS/WIZARD/servo.bmp b/radio/sdcard/taranis-x9/SCRIPTS/WIZARD/servo.bmp similarity index 100% rename from radio/sdcard/taranis/SCRIPTS/WIZARD/servo.bmp rename to radio/sdcard/taranis-x9/SCRIPTS/WIZARD/servo.bmp diff --git a/radio/sdcard/taranis/SCRIPTS/WIZARD/tail-e.bmp b/radio/sdcard/taranis-x9/SCRIPTS/WIZARD/tail-e.bmp similarity index 100% rename from radio/sdcard/taranis/SCRIPTS/WIZARD/tail-e.bmp rename to radio/sdcard/taranis-x9/SCRIPTS/WIZARD/tail-e.bmp diff --git a/radio/sdcard/taranis/SCRIPTS/WIZARD/tail-eer.bmp b/radio/sdcard/taranis-x9/SCRIPTS/WIZARD/tail-eer.bmp similarity index 100% rename from radio/sdcard/taranis/SCRIPTS/WIZARD/tail-eer.bmp rename to radio/sdcard/taranis-x9/SCRIPTS/WIZARD/tail-eer.bmp diff --git a/radio/sdcard/taranis/SCRIPTS/WIZARD/tail-er.bmp b/radio/sdcard/taranis-x9/SCRIPTS/WIZARD/tail-er.bmp similarity index 100% rename from radio/sdcard/taranis/SCRIPTS/WIZARD/tail-er.bmp rename to radio/sdcard/taranis-x9/SCRIPTS/WIZARD/tail-er.bmp diff --git a/radio/sdcard/taranis/SCRIPTS/WIZARD/tail-v.bmp b/radio/sdcard/taranis-x9/SCRIPTS/WIZARD/tail-v.bmp similarity index 100% rename from radio/sdcard/taranis/SCRIPTS/WIZARD/tail-v.bmp rename to radio/sdcard/taranis-x9/SCRIPTS/WIZARD/tail-v.bmp diff --git a/radio/sdcard/taranis/SCRIPTS/WIZARD/wizard.lua b/radio/sdcard/taranis-x9/SCRIPTS/WIZARD/wizard.lua similarity index 100% rename from radio/sdcard/taranis/SCRIPTS/WIZARD/wizard.lua rename to radio/sdcard/taranis-x9/SCRIPTS/WIZARD/wizard.lua diff --git a/radio/sdcard/taranis-x9/SCRIPTS/snake.lua b/radio/sdcard/taranis-x9/SCRIPTS/snake.lua new file mode 100644 index 000000000..2f2cff87a --- /dev/null +++ b/radio/sdcard/taranis-x9/SCRIPTS/snake.lua @@ -0,0 +1,176 @@ +-------------------------------------------------------------- +-- Classic snake game +-- +-- 2009 Led Lab @PUC-Rio www.eluaproject.net +-- Dado Sutter +-- Ives Negreiros +-- To Benjamin +--------------------------------------------------------------- + +local xMax = math.floor( LCD_W / 6 ) - 1 +local yMax = math.floor( LCD_H / 8 ) - 1 +local game_map = {} + +local Head = {} +local Tail = {} + +local highscore = 0 +local size = 3 +Tail.x = 1 +Tail.y = 1 +Head.x = Tail.x + ( size - 1 ) +Head.y = Tail.y + +local Food = {} +Food.x = false +Food.y = false + +Head.dx = 1 +Head.dy = 0 +Tail.dx = Head.dx +Tail.dy = Head.dy +local direction = "right" +local score = 0 + +local function create_food() + Food.x, Food.y = math.random( xMax - 1), math.random( yMax - 1) + while game_map[ Food.x ][ Food.y ] do + Food.x, Food.y = math.random( xMax - 1 ), math.random( yMax - 1 ) + end + game_map[ Food.x ][ Food.y ] = "food" + lcd.drawText( Food.x * 6, Food.y * 8+2, "@", 0 ) +end + +local function eat_food() + playFile("/SCRIPTS/snake.wav") + lcd.drawText( Head.x * 6, Head.y * 8, " ", 0 ) + game_map[ Head.x ][ Head.y ] = nil + create_food() + score = score + 1 +end + +local function check_collision() + if Head.x < 0 or Head.x > xMax then + return true + elseif Head.y < 0 or Head.y > yMax then + return true + elseif ( ( game_map[ Head.x ][ Head.y ] ) and ( game_map[ Head.x ][ Head.y ] ~= "food" ) ) then + return true + end + return false +end + +local function move() + if game_map[ Tail.x ][ Tail.y ] == "right" then + Tail.dx = 1 + Tail.dy = 0 + elseif game_map[ Tail.x ][ Tail.y ] == "left" then + Tail.dx = -1 + Tail.dy = 0 + elseif game_map[ Tail.x ][ Tail.y ] == "up" then + Tail.dx = 0 + Tail.dy = -1 + elseif game_map[ Tail.x ][ Tail.y ] == "down" then + Tail.dx = 0 + Tail.dy = 1 + end + + game_map[ Head.x ][ Head.y ] = direction + Head.x = Head.x + Head.dx + Head.y = Head.y + Head.dy + + if Head.x < 0 or Head.x > xMax or Head.y < 0 or Head.y > yMax then + return + elseif game_map[ Head.x ][ Head.y ] == "food" then + eat_food() + else + lcd.drawText(Tail.x * 6, Tail.y * 8, " ", 16) + game_map[ Tail.x ][ Tail.y ] = nil + Tail.x = Tail.x + Tail.dx + Tail.y = Tail.y + Tail.dy + end + + lcd.drawText(Head.x * 6, Head.y * 8, "*", 0) +end + +local function init() + food = false + lcd.clear() + size = 3 + score = 0 + Tail.x = 1 + Tail.y = 1 + Head.x = Tail.x + ( size - 1 ) + Head.y = Tail.y + Head.dx = 1 + Head.dy = 0 + Tail.dx = Head.dx + Tail.dy = Head.dy + direction = "right" + + for i = 0, xMax, 1 do + game_map[ i ] = {} + end + + for i = 0, size - 1, 1 do + game_map[ Tail.x + ( i * Tail.dx ) ][ Tail.y + ( i * Tail.dy ) ] = direction + lcd.drawText( ( Tail.x + ( i * Tail.dx ) ) * 6, ( Tail.y + ( i * Tail.dy ) ) * 8, "*", 0 ) + end + + create_food() +end + +local snakeCounter = 0 + +local function run(event) + if event == nil then + raise("Cannot be run as a model script!") + end + + if event == EVT_EXIT_BREAK then + return 2 + end + + snakeCounter = snakeCounter + 1 + if snakeCounter < 30 then + return 0 + end + + snakeCounter = 0 + + local dir = direction + if getValue('rud') > 100 and direction ~= "left" then + dir = "right" + Head.dx = 1 + Head.dy = 0 + end + if getValue('rud') < -100 and direction ~= "right" then + dir = "left" + Head.dx = -1 + Head.dy = 0 + end + if getValue('ele') > 100 and direction ~= "down" then + dir = "up" + Head.dx = 0 + Head.dy = -1 + end + if getValue('ele') < -100 and direction ~= "up" then + dir = "down" + Head.dx = 0 + Head.dy = 1 + end + + direction = dir + move() + + lcd.refresh() + + if check_collision() then + return 1 + end + + return 0 +end + +return { init=init, run=run } + diff --git a/tools/nightly22/build-sdcard.sh b/tools/nightly22/build-sdcard.sh index f77d4fe53..ea343ea39 100644 --- a/tools/nightly22/build-sdcard.sh +++ b/tools/nightly22/build-sdcard.sh @@ -9,7 +9,8 @@ output=/var/www/html/2.2/nightly # Handle opentx.sdcard.version sdcard_version="2.2V"$(grep 'set(SDCARD_REVISION' ${workdir}/code/CMakeLists.txt | grep -o '".*"' | sed 's/"//g') echo $sdcard_version > ${workdir}/code/radio/sdcard/horus/opentx.sdcard.version -echo $sdcard_version > ${workdir}/code/radio/sdcard/taranis/opentx.sdcard.version +echo $sdcard_version > ${workdir}/code/radio/sdcard/taranis-x9/opentx.sdcard.version +echo $sdcard_version > ${workdir}/code/radio/sdcard/taranis-x7/opentx.sdcard.version if cmp --silent ${workdir}/code/radio/sdcard/horus/opentx.sdcard.version ${workdir}/opentx.sdcard.version then @@ -35,11 +36,12 @@ else # Create sdcards.zips for supported platforms mv /tmp/SOUNDS ${workdir}/sdcard/horus/ - mkdir ${workdir}/sdcard/taranis/SOUNDS - cp -r ${workdir}/sdcard/horus/SOUNDS ${workdir}/sdcard/taranis/ + mkdir ${workdir}/sdcard/taranis-x9/SOUNDS + mkdir ${workdir}/sdcard/taranis-x7/SOUNDS + cp -r ${workdir}/sdcard/horus/SOUNDS ${workdir}/sdcard/taranis-x9/ + cp -r ${workdir}/sdcard/horus/SOUNDS ${workdir}/sdcard/taranis-x7/ cd ${workdir}/sdcard/horus && zip -r ${output}/sdcard/sdcard-horus-$sdcard_version.zip * - cd ${workdir}/sdcard/taranis && zip -r ${output}/sdcard/sdcard-taranis-x9-$sdcard_version.zip * - rm -rf CROSSFIRE IMAGES S6R SCRIPTS/WIZARD - zip -r ${output}/sdcard/sdcard-taranis-x7-$sdcard_version.zip * + cd ${workdir}/sdcard/taranis-x9 && zip -r ${output}/sdcard/sdcard-taranis-x9-$sdcard_version.zip * + cd ${workdir}/sdcard/taranis-x7 && zip -r ${output}/sdcard/sdcard-taranis-x7-$sdcard_version.zip * rm -Rf ${workdir}/sdcard fi