Commit Graph

2092 Commits (469d174c6896d2b70a87d6940e191cbd0d9a849c)

Author SHA1 Message Date
Dominic Clifton 4539404a98 Merge branch 'failsafe_tab_style_to_css' of https://github.com/ProDrone/cleanflight-configurator into ProDrone-failsafe_tab_style_to_css 2015-12-18 02:05:53 +01:00
Dominic Clifton 251712c85d Merge branch 'development' into thenickdude-private-development
Conflicts:
	js/msp.js
2015-12-18 01:56:57 +01:00
Dominic Clifton 6289328f18 Merge pull request #302 from qfather/development
Fix sponsor URL on welcome tab.
2015-12-18 01:55:36 +01:00
skaman82 47bf426c29 fix 2015-12-18 00:07:00 +01:00
skaman82 f07cea070e error fix 2015-12-17 23:50:51 +01:00
skaman82 ba18e4eee1 Merge branch 'cleanflight/development' into NewPIDFunctions
# Conflicts:
#	js/backup_restore.js
#	js/msp.js
2015-12-17 23:46:09 +01:00
Dominic Clifton 4f4f8a5805 Merge pull request #303 from ProDrone/safe_save_for_rxfail_values
MSP_SET_RXFAIL_CONFIG changed to allow more future RX channels
2015-12-17 18:12:28 +01:00
skaman82 3318ad1555 Merge branch 'cleanflight/development' into NewPIDFunctions 2015-12-17 11:41:20 +01:00
skaman82 2641770300 fixed indention 2015-12-17 11:41:02 +01:00
ProDrone 1a0c6735a9 RXFAIL send method that allows more future RX channels
- Fixed the bug found by Nighthawk32
- Correction for camelCase
- Some bugfixes
2015-12-17 11:33:39 +01:00
Dominic Clifton 31fa4bfaa2 Change VCP reconnect delay to 2.5 seconds. 2 seconds was not long
enough.
2015-12-17 09:52:10 +01:00
qfather a420998799 Fix sponsor URL on welcome tab. 2015-12-16 23:47:38 +00:00
skaman82 70b35f22c9 msp corrections 2015-12-17 00:32:59 +01:00
Albert Kravcov 5160855b93 Merge pull request #76 from NightHawk32/NewPIDFunctions
Hint by ProDrone: fixing double-save on backup restore
2015-12-16 22:47:13 +01:00
skaman82 c58335bd5b msp.js change (thanks ProDrone) 2015-12-16 22:34:10 +01:00
NightHawk32 dc8f06fcc9 Hint by ProDrone: fixing double-save on backup restore 2015-12-16 16:19:27 -05:00
Albert Kravcov 129635bc8b Merge pull request #75 from NightHawk32/NewPIDFunctions
Fixed JS bug where variable for sensor alginment gets undefined and i…
2015-12-16 22:07:20 +01:00
NightHawk32 0fa241b462 Fixed JS bug where variable for sensor alginment gets undefined and improved backwards compatibility 2015-12-16 15:41:52 -05:00
skaman82 0b3f1a48fb Merge branch 'cleanflight/development' into NewPIDFunctions 2015-12-16 20:53:37 +01:00
ProDrone 849654a0ff Failsafe TAB - moved styling from HTML to CSS 2015-12-16 15:43:51 +01:00
Dominic Clifton b4730034c8 Disconnect on F1 boards when 'break' is received if connected. This
happens when the device reboots due to incorrect hardware
initialisation.  This prevents the GUI saying 'waiting for data'.

See https://github.com/cleanflight/cleanflight/pull/1436

Since the problem is already fixed in firmware there's not much reason
to spent development working on additional GUI fixes.  A disconnect will
suffice.
2015-12-16 14:49:58 +01:00
Dominic Clifton f0144b3d99 Fix initialisation of allowTestMode. Without this if you connected to a
board that had 3D API support and then connected to another board
without the 3D API support the test mode would be incorrectly enabled.
2015-12-16 14:46:07 +01:00
skaman82 843e42e826 Merge branch 'cleanflight/development' into NewPIDFunctions 2015-12-16 13:59:29 +01:00
Dominic Clifton 7618363449 Improve CLI mode entry/exit detection. Fixes #285.
Disconnects and reconnects for VCP boards.  After manually saving or
exiting on non VCP boards the setup tab will be shown.

See
https://github.com/cleanflight/cleanflight-configurator/issues/285#issuecomment-165096715
2015-12-16 13:55:35 +01:00
skaman82 61ef07a46f sync 2015-12-16 12:59:30 +01:00
Dominic Clifton 18fd5d01ec Disable use of switchery on motors tab for motor control checkbox.
Switchery sliders do not respect the 'disabled' property.
2015-12-16 12:12:02 +01:00
Dominic Clifton cccb0423b5 Merge branch 'development' into thenickdude-private-development 2015-12-16 11:04:43 +01:00
Dominic Clifton af2089e38c fix API version check when loading 3D settings on configuration tab. 2015-12-16 11:03:33 +01:00
Dominic Clifton 1f6f81485e Merge pull request #295 from tricopterY/latest_development_merges_patch
Minor typo fixes and cleanup
2015-12-16 10:19:37 +01:00
skaman82 63dde67097 correction 2015-12-16 02:53:43 +01:00
skaman82 d214b30d2e Correcting Labels 2015-12-15 22:37:40 +01:00
Albert Kravcov bcdc9727d6 Merge pull request #74 from NightHawk32/NewPIDFunctions
Messed up some brackets
2015-12-15 22:02:34 +01:00
NightHawk32 da1f456b87 Messed up some brackets 2015-12-15 16:00:01 -05:00
tricopterY 84ef7f23d7 Minor typo fixes and cleanup 2015-12-16 07:16:25 +11:00
Albert Kravcov af33775d49 Merge pull request #73 from NightHawk32/NewPIDFunctions
Fixing backwards compatibility of prodrone's failsafe tab
2015-12-15 21:03:56 +01:00
NightHawk32 a72a00a2de Fixing backwards compatibility of prodrone's failsafe tab 2015-12-15 14:45:09 -05:00
skaman82 6799fca20b Merge branch 'cleanflight/development' into NewPIDFunctions
# Conflicts:
#	tabs/configuration.html
#	tabs/receiver.css
2015-12-15 19:07:16 +01:00
Albert Kravcov fa02c4ca18 Merge pull request #71 from NightHawk32/NewPIDFunctions
added MSP support for sensor orientation, some fixes for 3D backup and restore
2015-12-15 15:11:20 +01:00
Dominic Clifton f21c169d74 Add support for SPRacingF3Mini. 2015-12-15 13:22:21 +01:00
Dominic Clifton e492e6d3ff Replace reference to .tab-dataflash with.tab-onboard_logging 2015-12-15 13:20:22 +01:00
Dominic Clifton 8e72333a83 Fix doctype causing rendering issues. 2015-12-15 13:18:09 +01:00
Dominic Clifton 55a2677a2b Merge branch 'development' into thenickdude-private-development
Conflicts:
	js/data_storage.js
	js/gui.js
	js/msp.js
	main.html
	tabs/dataflash.css
	tabs/dataflash.js
2015-12-15 12:35:52 +01:00
Dominic Clifton 1273bd9440 Update changelog and bump version. 2015-12-15 11:58:21 +01:00
Dominic Clifton 587a1025d9 Add anonymous tracking of used features and serial rx provider so we can
better understand what features to focus on.
2015-12-15 11:56:10 +01:00
NightHawk32 c1a7452b27 Merge remote-tracking branch 'upstream/NewPIDFunctions' into NewPIDFunctions
Conflicts:
	js/backup_restore.js
	js/data_storage.js
	js/msp.js
2015-12-15 01:27:55 -05:00
skaman82 d4969d73a1 resolving conflicts 2015-12-15 01:59:58 +01:00
skaman82 2d6feb0e6a Merge branch 'cleanflight/development' into NewPIDFunctions
# Conflicts:
#	_locales/en/messages.json
#	js/backup_restore.js
#	js/data_storage.js
#	js/msp.js
#	tabs/configuration.html
2015-12-15 01:43:24 +01:00
Dominic Clifton be58e56b20 Merge branch 'skaman82-new_stuff' into development 2015-12-15 00:53:58 +01:00
Dominic Clifton e7ef71c244 Add Serial RX IBUS Support. 2015-12-15 00:53:01 +01:00
Dominic Clifton bd98aca67f Merge branch 'new_stuff' of
https://github.com/skaman82/cleanflight-configurator into
skaman82-new_stuff

Fix up messages.json formatting.

Conflicts:
	_locales/en/messages.json
2015-12-15 00:51:42 +01:00