piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Issue #713 - 64 custom functions instead of 32. 8chars only filenames in

Browse Source 
PlayTrack function
This commit is contained in:
Bertrand Songis
2014-02-18 22:46:30 +01:00
parent d02d78101c
commit fbd0744431
5 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/eeprom_conversions.cpp
+3 -3
View File
@@ -144,7 +144,7 @@ PACK(typedef struct {
int8_t swtch;
uint8_t func;
PACK(union {
char name[LEN_CFN_NAME];
char name[10];
struct {
int16_t val;
int16_t ext1;
@@ -193,7 +193,7 @@ PACK(typedef struct {
int8_t points[NUM_POINTS];
LogicalSwitchData_v215 customSw[NUM_CSW];
CustomFnData_v215 funcSw[NUM_CFN];
CustomFnData_v215 funcSw[32];
SwashRingData swashR;
PhaseData_v215 phaseData[MAX_PHASES];
@@ -575,7 +575,7 @@ void ConvertModel_215_to_216(ModelData &model)
}
if (fn.func == FUNC_PLAY_TRACK || fn.func == FUNC_BACKGND_MUSIC) {
memcpy(fn.play.name, oldModel.funcSw[i].param.name, LEN_CFN_NAME);
memcpy(fn.play.name, oldModel.funcSw[i].param.name, 8);
}
else {
fn.all.val = oldModel.funcSw[i].param.composite.val;
radio/src/myeeprom.h
+3 -3
View File
@@ -74,7 +74,7 @@
#define MAX_MIXERS 64
#define MAX_EXPOS 64
#define NUM_CSW 32 // number of custom switches
#define NUM_CFN 32 // number of functions assigned to switches
#define NUM_CFN 64 // number of functions assigned to switches
#define MAX_SCRIPTS 3
#define MAX_INPUTS 32
#elif defined(CPUARM)
@@ -84,7 +84,7 @@
#define MAX_MIXERS 64
#define MAX_EXPOS 32
#define NUM_CSW 32 // number of custom switches
#define NUM_CFN 32 // number of functions assigned to switches
#define NUM_CFN 64 // number of functions assigned to switches
#elif defined(CPUM2560) || defined(CPUM2561)
#define MAX_MODELS 30
#define NUM_CHNOUT 16 // number of real output channels CH1-CH16
@@ -806,7 +806,7 @@ enum AdjustGvarFunctionParam {
#if defined(CPUARM)
#if defined(PCBTARANIS)
#define LEN_CFN_NAME 10
#define LEN_CFN_NAME 8
#else
#define LEN_CFN_NAME 6
#endif