Commit Graph
131 Commits
Author SHA1 Message Date
Damjan AdamicandBertrand Songis f7543e3220 Projectkk2glider/simu tmp sd path (#4231)
* Re #4224: Introduced settingsPath and use std::string for paths in simpgmspace.

* Re #4224: Relevant parts of simpgmspace.cpp moved into simufatfs.cpp and simudisk.cpp

* Removed "/" from "mask_monitor_logsw.png"

* Re #4224: findTrueFileName() refactoring

* Faster gtests (less waiting for eeprom operations to finish)

* Re #4224: Radio settings and models directories now taken from alternate path (if set) [simu]

* Fixes #3322: together with previous changes to the SD browser this prevents the simulator from browsing higher than SD card root path.

* f_chdir() debug traces
2017-01-15 21:53:18 +01:00
3djcandBertrand Songis 1642732e8f 3djc/horus checklist improvement (#4195)
* Add the possibility of modelfilename.txt to Horus checklist

* Typo

* Cosmetics
2017-01-08 19:00:45 +01:00
Max PapernoandBertrand Songis 4f988babbf Fix initializer list issue with ZoneOptionValue (#4203)
* [480x272] Fix initializer list issue with ZoneOptionValue (technically not C++11), now works x-platform as well, lowers Flash use; Spit out Zone, ZoneOption, ZoneOptionValue to own unit. (Fixes https://github.com/opentx/opentx/pull/4199/files#r94867147)

* [480x272] Revert to Flash usage for ZoneOptionValue types (still fixes MSVC build). (Ref: https://github.com/opentx/opentx/commit/82dce3ee601049cf548ff4518902ab8e8fa62a0b#commitcomment-20388918 & https://github.com/opentx/opentx/pull/4199#discussion_r94835251)

* Cosmetics.

* [480x272] Cosmetics.
2017-01-08 09:48:37 +01:00
Damjan Adamic 865ec6eca3 Remove extra NULL from OutputsWidget::options[] 2017-01-07 09:04:26 +01:00
Damjan AdamicandBertrand Songis 82dce3ee60 Projectkk2glider/flash savings (#4199)
* Flash savings: getFileExtension() de-templated, saves 160 bytes

* Flash savings: several variables moved to rodata, RGB macro optimization (speed and can now be used to initialize rodata)

Result for Horus:
   text	   data	    bss	    dec
1261182	 808603	  42020	2111805   before
1267149	 803335	  42124	2112608   after (data size also counts .sram section)

5kB saved in .data section (RAM and FLASH)

* Removed compiler warnings

* RGB() and ARGB() gtests added

* ARGB() optimized
2017-01-05 21:44:59 +01:00
Bertrand Songis 0933a258e3 [Horus] Categories names were written in SMLSIZE when selected, that was weird 2017-01-04 18:32:08 +01:00
Bertrand Songis 1d9c9a6cdb Cosmetics 2017-01-04 18:31:10 +01:00
Bertrand Songis b77332e75a [Horus] Fixes #4177 2017-01-04 09:27:57 +01:00
3djc bdf3d17652 Move fix to a better place 2017-01-03 11:42:12 +01:00
3djc 406a568c2c This fixes #4191 while maintaining 2.1 and 2.2 taranis behavious (ie instant trim can go up to extended trim, ignoring if extending trim is activ or not) 2017-01-03 10:57:34 +01:00
Damjan AdamicandBertrand Songis afe3d4a1e9 Custom OpenTX types moved to separate file opentx_types.h, fixes linker problem with lcdDrawBitmapPattern() in release build (#4188) 2017-01-02 11:29:20 +01:00
3djcandBertrand Songis b931b0c85c Add handling of negative width (#4187) 2017-01-02 11:20:56 +01:00
3djcandBertrand Songis 1d3b6721c6 If no WIZARD are present, do not display anything (#4173)
* If no WIZARD are present, do not display anything

* Cosmetics

* More cosmetics ;)

* String cleanup

* Bertrand's feedbacks
2016-12-30 18:20:46 +01:00
joaquinsandBertrand Songis 5e00436b79 Horus outputs widget: display channel name when available (issue #4145) (#4147)
* Display channel name instead of number, when name is non-empty

* Bars made full width, channel + name on left side, output value on right side. Background color added.

* Reverted redefinition of chanString, background color changed to BARGRAPH_BGCOLOR

* Added borders around bars

* Added BG border configuration. Refactored RECT_OFFSET into RECT_BORDER to allow easy change in border thickness.

* Fixed vertical line offset.

* BG settings affecting actual BG, not the border
2016-12-27 22:07:49 +01:00
Arne SchwabeandBertrand Songis 06b0694f03 Schwabe/multi telemetry (#4151)
* Add FY805 protocol

* Fix stray space

* Fix multi sending 120% instead of 100%.

* Implement a custom telemetry for the multi module

The custom telemetry allows the module to tell the telemetry protocol to OpenTX and also allows signaling the status of the Module (e.g. invalid protocol) to OpenTX

This should also close #3979.

* Cosmetics and a few small bugfixes

* remove empty if

* Move status line directly below the mode to be always visible when selecting a protocol

* warn if internal RF module is on

* Replace sprint with small helper function to build on AVR ARM (AR9X, 9XPRO, …)

* TR in wrong order, RF_PROTO_OFF inverted

* Refactor definition of Multimodule protocols to have one central place to define all multi protocol properties

* Also update protocols in companion

* Update multi version number to display as a.b.c.d
2016-12-24 00:04:11 +01:00
Bertrand Songis fa0cc546e4 Compilation fix 2016-12-18 09:45:37 +01:00
Bertrand Songis 66fb949c82 [HORUS] Arbitrary limit for themes / layouts / widgets now removed 2016-12-17 23:33:47 +01:00
Max PapernoandBertrand Songis bce42bb25c Fix static initialization order problem with Horus GUI (#4141)
* [480x272] Fix static initialization order problem with Layout, Theme, & Widget factories.

* [480x272] Fix return from drawTimerMode().

* [480x272] Remove use of macros for registered Layout, Widget, & Theme class lists; remove extern declarations (cosmetic).

* [480x272] Convert Layout and Theme registry to dynamic lists (still max. of 10 each);
  Hide indicator arrow when user is at start/end of available widgets in spinner UI;
  Add some sanity checking to pointer usage in screens_setup;
  Add an (arbitrary) limit of 20 Widgets;
  And a line break! :)
2016-12-17 23:29:26 +01:00
Max PapernoandBertrand Songis a2e37c5dbc Minor build fixes (#4142)
* [480x272] Fix compiler warnings with awkward extern define in layout.h.

* [firmware][misc] Fix build error with undefined SPLASH; Fix 128x64 syntax error in model_setup.cpp; Fix compiler warning on static init in diskio.cpp.

* [480x272] Revert "Fix compiler warnings with awkward extern define in layout.h." and modify lcd::drawSource() to use mixsrc_t for consistency.

This reverts commit d85d994c877a94c1933c6ece806565ca822d0f54.

* [firmware] Cleanup struct init in diskio modules.
2016-12-17 13:48:55 +01:00
Max PapernoandBertrand Songis 5d5dc67605 Add runtime Lua script pre-compilation and general .luac file support (#3318) (#4119)
* [simu] simpgmspace: Populate file date/time/size  in f_stat(); Add f_utime(); Fix f_getcwd() on Windows; Fix f_mkdir() build error on Windows.

* [Lua] Add runtime support for script pre-compilation. Changes behavior with LUA_COMPILER (Re: https://github.com/opentx/opentx/issues/3318):
  All .lua scripts are now compiled and saved to binary "bytecode" file (.luac extension) upon first execution;
  Scripts are also automatically re-compiled if .lua source file is newer than existing .luac file;
  The pre-compiled .luac version is loaded if modification time is newer or equivalent to .lua source file;
  If a .luac version of a script exists, then the .lua version does not need to be present;
  Guards against bytecode compatibility issues (binaries from 64-bit sim will not run on 32-bit sim/radio);
  In SIMU and DEBUG builds, the source .lua file is always preferred in order to preserve full debug info (this is is controlled with new LUA_SCRIPT_LOAD_MODE macro, see lua_api.h);
  GC is now run after each script is loaded.

* [Lua] Add loadScript() API function as alternative to loadfile() from Lua base. This can take advantage of the new OTx script pre-compilation features to reduce memory footprint when loading functions dynamically. This is an interface to luaLoadScriptFileToState(). Fully documented.

* [SD][Lua] Flexible file extensions support:
  Allow for variable length file extensions throughout system (no longer hard-coded in LEN_FILE_EXTENSION);
  Fixes issues with renaming files in SD manager which have file extensions longer than ".ext";
  Expand general support for multiple file extensions per file type in sdListFiles() (eg. .lua and .luac for scripts);
  Lua scripts with .luac extensions can now be selected in custom/telemetry/function menus even if no .lua version exists (duplicates are not shown);
  .luac files can now also be executed from SD file manager UI.

* [Build] Added CMake options for LUA_COMPILER and LUA_SCRIPT_LOAD_MODE.

* Cosmetics.

* [SD][gui] Improve efficiency of some file name handling routines in sdmanager GUI and sdListFiles() by extending getFileExtension() function. Use shared isExtensionMatching() in place of isImageFileExtension(). Only allow executing .luac files when LUA_COMPILER defined (as per request).

* [simpgmspace] Fix f_mkdir() for MSVC build and misc. cleanup.

* [Lua] Use getFileExtension() in script loader to determine file type and check for buffer overflow.
2016-12-17 10:56:40 +01:00
3djcandBertrand Songis e2a18d3fdc Deletion confirm changed from filename to modelname(filename) (#4100)
* Deletion confirm chnaged from filename to modelname(filename)

* Improvements based on Bsongis remarks

* Fix taranis confirm that was not displaying anything

* Got carried away, back to a simpler requirement

* Cosmetics

* Bertrand's feedbacks, take 2 :)

* Use reusable buffer
2016-12-15 20:14:33 +01:00
Arne SchwabeandBertrand Songis 85f3e3510e Update protocols of Multi module (#4093)
* Update protocols of Multi module

* Fix missing ;
2016-12-08 21:33:59 +01:00
Bertrand Songis 705823a9a6 [X7D] UI fixes 2016-12-02 18:37:53 +01:00
3djc a5e8994028 Cosmetics 2016-11-30 12:01:42 +01:00
3djcandBertrand Songis 9f0f79469a 3djc/horus wizard plane (#4082)
* Introduce plane Wizard

* Simplify code
2016-11-30 11:51:23 +01:00
Bertrand Songis d59fc2999b [X7D/SKY9X] Order changed in About screens 2016-11-29 20:05:36 +01:00
Andre Bernet d052caf65a Horus Multimodule compilation fix 2016-11-29 12:08:57 +01:00
Damjan AdamicandBertrand Songis 92553b6589 Projectkk2glider/lua bitmap free (#4075)
* Better memory stats (CLI)

* Bitmap buffer overflow check added

* Lua bitmap improvements

* Proper handling of symbolic links in simulator

* S6R Lua script fixes:
 * added progress screen while loading bitmaps
 * memory for bitmaps is now freed when leaving the script

* S6R Lua script: improved bitmap loading

* * Lua Themes and Widgets moved to separate file and separate Lua state
* Stand-alone, mixer and function scripts now behave the same as on Taranis (restarted after the stand-alone script was run)
* both Lua states are independent: Themes and Widgets is initialized only at the start, the other one is initialized before and after the stand-alone script is run

* Better leak test and report in BitmapBuffer

* Re #3318: Lua compiler enabled in simu and Companion simulator. Usage:
 * any time <xxx>.lua file is about to be loaded and if file <xxx>.lua.src exists:
   * load contents of <xxx>.lua.src
   * compile Lua code
   * save compiled code into <xxx>.lua (effectively overwrites existing file)
 * immediately following the compilation the real file loading is done from <xxx>.lua (which by now contains compiled Lua bytecode)
2016-11-28 23:08:18 +01:00
Arne SchwabeandBertrand Songis 7a8f8d611e [FlySky IBUS] Fix some sensor interpretation (#4077)
Also use SNR instead RSSI for FlySky since SNR gives a better indication of signal quality and also our current implementation of RSSI warning cannot really handle negative values
2016-11-27 18:50:46 +01:00
3djcandBertrand Songis 03bb622456 Fine tune model select screen (#4059) 2016-11-21 21:11:10 +01:00
3djcandBertrand Songis a6bdf58619 Fix two column handling (#4061) 2016-11-21 20:09:09 +01:00
Bertrand Songis 4b84cd27b2 [Horus] Protection against buffer overflow 2016-11-21 18:40:22 +01:00
3djcandBertrand Songis a35d6b6a05 3djc/horus fix #4041 (#4042)
* Reduce model name size until they fit into the buffer

* SMLSIZE is better (but cut is still needed)

* Rework screen layout to handle up to 15 chars

* Allow for the two scroolbars (models and cats)
2016-11-19 13:07:06 +01:00
3djc 32581568d3 Follow up clean 2016-11-18 18:59:49 +01:00
3djcandBertrand Songis 6c006c3e2c Horus/fix #4036 (#4038)
* Remove 'static' from bitmapbuffer that where causing issues when changing theme. I have checked that this does not create extra sdcard access

* Cosmetics

* Move calibration bitmaps to theme

* Overlaping PR

* There no theme changing during shutdown

* Cosmetics
2016-11-18 18:51:11 +01:00
3djcandBertrand Songis d59fdc07c4 Catch up for Dark Blue theme (#4040) 2016-11-18 18:43:14 +01:00
3djcandBertrand Songis cf10ab5f20 3djc/horus wizard (#4034)
* Initial commit

* Cosmetics

* Add dummy wizard for testing purposes

* Graphics enhancement by MHotar

* Only if LUA + cosmetics

* cosmetics on the sample wizards

* Remove warning
2016-11-17 23:13:56 +01:00
Bertrand Songis 00447e5fe6 Fixes #3972 2016-11-16 23:23:20 +01:00
Arne SchwabeandBertrand Songis 6b57f7afa7 Add FlySky Telemetry (#3997)
Add FlySky Telemetry
2016-11-13 19:09:33 +01:00
3djcandBertrand Songis c0837a59a6 Add back model bin name, currently needed if you want to use model notes (#3994)
* Add back model bin name, currently needed if you want to use model notes

* Turn into code graphics by Mhotar(tm)
2016-11-10 21:45:07 +01:00
Andre Bernet 23ee9d1d6b [Horus] An empty GF line would default to Override the first time it is used, but Override is not available in GFs. 2016-11-10 21:45:37 +04:00
3djcandAndre Bernet b06d14b4c7 Add bottom mixer status bar when editing mixer (#4001)
* Add bottom mixer status bar when editing mixer

* Cosmetics
2016-11-08 15:32:29 +04:00
3djcandBertrand Songis 00b23a4210 3djc/fix #3777 (#3986)
* Models notes where overwritten before even having a chance to be displayed

* Models notes where overwritten before even having a chance to be displayed (reverted from commit 0834894b61ed527c3c65d6356793a08ff6e3be6a)

* Delay the checks until after the main menu is launched to avoid the model notes to be overwritten even before appearing
2016-11-03 22:06:18 +01:00
Damjan AdamicandBertrand Songis 5ba14734cb Projectkk2glider/gps misc fixes (#3970)
* Fixed Lua GPS date (year is now kept with four digits)

* * GPS year displayed with two digits
* GPS date/time handling fixes
2016-11-02 13:03:26 +01:00
Damjan Adamic 258b8adfb9 Fixes #3912: Deleting file in SD manager updates the list wrongly (Horus) 2016-10-31 11:07:44 +01:00
Damjan Adamic c043c377a7 Fixes #3935: overlapping display of EDGE logical switch parameters (Horus) 2016-10-30 16:50:50 +01:00
Damjan Adamic 37ea272bd4 Replaced all 1900 with TM_YEAR_BASE 2016-10-30 11:35:12 +01:00
Arne SchwabeandBertrand Songis 92dde79dec New protocol and telemetry: FlySky AFHDS2A (#3948)
* New protocol for multimode FlySky AFHDS2A

* Also add AFHDS2A protocol to companion

* fix compile error
2016-10-25 22:51:34 +02:00
Andre Bernet 978867d509 Merge branch 'next' into schwabe/spektrum_dsm2_bind
# Conflicts:
#	radio/src/translations/de.h.txt
2016-10-21 19:36:31 +02:00
Arne Schwabe c4ad38670f Fix french translation and move custom protocol string in its own string 2016-10-21 17:00:59 +02:00