Skip to content

Commit

Permalink
Minor updates ready for release.
Browse files Browse the repository at this point in the history
  • Loading branch information
@MikeBland
MikeBland committed Nov 25, 2016
1 parent 2916d1f commit 92b5d5d
Show file tree
Hide file tree
Showing 8 changed files with 278 additions and 149 deletions.
2 changes: 1 addition & 1 deletion eepe/eepe/src/helpers.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1532,7 +1532,7 @@ int getTimerSwitchCbValue( QComboBox *b, int eepromType )
int getTimerSwitchCbValue( QComboBox *b, int eepromType )
{
int value ;
int x = ( (eepromType == 1 ) || ( eepromType == 2 ) ) ? 1 : 0 ;
// int x = ( (eepromType == 1 ) || ( eepromType == 2 ) ) ? 1 : 0 ;
int limit = MaxSwitchIndex ;
value = b->currentIndex()-(limit-1) ;
if ( value > limit-1 )
Expand Down
5 changes: 3 additions & 2 deletions eepe/eepe/src/simulatordialog.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -883,6 +883,7 @@ void simulatorDialog::getValues()
if ( g_model.gvars[i].gvsource )
{
int value ;
value = 0 ;
uint8_t src = g_model.gvars[i].gvsource ;
if ( src <= 4 )
{
Expand Down Expand Up @@ -1710,7 +1711,7 @@ void simulatorDialog::timerTick()
// val = chanOut[tm-TMR_VAROFS] ;
// }
int8_t tmb ;
uint8_t switch_b ;
// uint8_t switch_b ;
uint8_t max_drswitch ;
max_drswitch = ( ee_type ) ? MAX_DRSWITCH+EXTRA_CSW : MAX_DRSWITCH ;

Expand Down Expand Up @@ -1835,7 +1836,7 @@ void simulatorDialog::timerTick()

#ifndef V2
s_timerVal[0] = g_model.tmrVal;
uint8_t tmrM = abs(g_model.tmrMode);
// uint8_t tmrM = abs(g_model.tmrMode);
uint16_t subtrahend = 0 ;
if(tma==TMRMODE_NONE)// s_timerState[0] = TMR_OFF;
{
Expand Down
6 changes: 3 additions & 3 deletions eepe/eepe/src/wizarddata.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ void WizMix::addMix(ModelData &model, Input input, int weight, int channel, int
mix.destCh = channel+1;
if (isTaranis){
// int channel = settings.getDefaultChannel(input-1);
int channel = 1 ;
// int channel = 1 ;
// mix.srcRaw = RawSource(SOURCE_TYPE_VIRTUAL_INPUT, channel);
}
else
Expand Down Expand Up @@ -132,7 +132,7 @@ WizMix::operator ModelData()
{
int throttleChannel = -1;
// bool isTaranis = IS_TARANIS(GetEepromInterface()->getBoard());
bool isTaranis = false ;
// bool isTaranis = false ;

ModelData model;
memset(&model, 0, sizeof(model));
Expand All @@ -142,7 +142,7 @@ WizMix::operator ModelData()
// model.setDefaultInputs(settings);

int mixIndex = 0;
int switchIndex = 0;
// int switchIndex = 0;
int timerIndex = 0;

// Safe copy model name
Expand Down
2 changes: 2 additions & 0 deletions eepe/eepe/winbuildessentials/eePe.nsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ Section "eePe" SecDummy
File "license.txt"
File "eepe.exe"
File "eepskye.exe"
File "SportSet.exe"
File "libgcc_s_dw2-1.dll"
File "mingwm10.dll"
File "QtCore4.dll"
Expand Down Expand Up @@ -121,6 +122,7 @@ Section "eePe" SecDummy
CreateDirectory "$SMPROGRAMS\$StartMenuFolder"
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\eePe.lnk" "$INSTDIR\eePe.exe"
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\eePskye.lnk" "$INSTDIR\eePskye.exe"
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\eePskye.lnk" "$INSTDIR\SportSet.exe"
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\er9x Users Manual.lnk" "$INSTDIR\ER9x_Manual_2015-v01.pdf"
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk" "$INSTDIR\Uninstall.exe"

Expand Down
2 changes: 1 addition & 1 deletion eepe/eepskye/src/eeprom_rlc.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ void EeFsFormat( uint8_t *eeprom )
{
EeFsSetLink(i, i+1) ;
}
EeFsSetLink(BLOCKS-1, 0);
EeFsSetLink((uint8_t)BLOCKS-1, 0);
eeFs.freeList = FIRSTBLK;
freeBlocks = BLOCKS ;
EeFsFlush();
Expand Down
355 changes: 213 additions & 142 deletions eepe/eepskye/src/eepskye.pro.user
View file

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions radio/ersky9x/src/menus.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15150,6 +15150,15 @@ int16_t scaleAnalog( int16_t v, uint8_t channel )
}
}
}
else if ( channel < 7 )
{
if ( ( channel - 3 ) == ( ( g_eeGeneral.analogMapping & MASK_6POS ) >> 2 ) )
{
// Pot mapped as 6-pos switch
v = ((int32_t)switchPosition( HSW_Ele6pos0 ) * (int32_t)RESX*2 - (int32_t)RESX*5)/5 ;
return v ;
}
}

//#ifdef REVX
// if ( channel < 4 )
Expand Down
46 changes: 46 additions & 0 deletions radio/ersky9x/src/s6rimg.lbm
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
PROGMEM S6Rimg1[] = {
36,18,108,
0x00,0x00,0x00,0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x01,0x99,0x35,0x25,0x65,0xC9,0x01,0xF9,
0x25,0x25,0xC9,0x01,0xFD,0x65,0xA5,0x19,0x01,0x01,0x01,0x81,0x41,0x21,0x11,0x49,0x05,0xFF,
0xFC,0x06,0x05,0x04,0x04,0x04,0x04,0x04,0x04,0x04,0x04,0x04,0x05,0x05,0x05,0x04,0x04,0x04,
0x05,0x05,0x04,0x04,0x05,0x04,0x04,0x05,0xFC,0x82,0x41,0x24,0x10,0x09,0x04,0x02,0x01,0x00,
0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,
0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,

0x00,0x00,0x00,0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,
0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x81,0x41,0x21,0x11,0x49,0x05,0xFF,
0xFC,0x06,0x05,0x04,0x04,0x04,0x04,0x04,0x04,0x04,0x04,0x04,0x04,0x04,0x04,0x04,0x04,0x04,
0x04,0x04,0x04,0x04,0x04,0x04,0x04,0x04,0xFC,0x82,0x41,0x24,0x10,0x09,0x04,0x02,0x01,0x00,
0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,
0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
};

PROGMEM S6Rimg2[] = {
19,32,76,
0xF0,0x18,0x14,0x12,0x11,0x15,0x11,0x11,0x11,0x15,0x11,0x11,0x11,0x15,0xF1,0x09,0x05,0x03,0xFF,
0xFF,0x00,0x00,0x00,0x38,0xA4,0x24,0x38,0xB0,0xA8,0x24,0x00,0x00,0x00,0xFF,0x00,0x00,0x00,0xFF,
0xFF,0x00,0x00,0x00,0xE3,0x14,0x04,0xE7,0x14,0x14,0xE3,0x00,0x00,0x00,0xFF,0x00,0x00,0x00,0xFF,
0x7F,0x40,0x40,0x40,0x40,0x41,0x41,0x40,0x40,0x41,0x40,0x40,0x40,0x40,0x7F,0x20,0x10,0x08,0x07,

0xF0,0x18,0x14,0x12,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0xF1,0x09,0x05,0x03,0xFF,
0xFF,0x00,0x00,0x00,0x1C,0xA2,0xA0,0x9C,0x82,0xA2,0x1C,0x00,0x00,0x00,0xFF,0x00,0x00,0x00,0xFF,
0xFF,0x00,0x00,0x00,0x93,0x54,0x34,0x73,0x90,0x94,0x73,0x00,0x00,0x00,0xFF,0x00,0x00,0x00,0xFF,
0x7F,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x7F,0x20,0x10,0x08,0x07,
};

PROGMEM S6Rimg3[] = {
31,19,93,
0xF0,0x18,0x14,0x12,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,
0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0xF1,0x09,0x25,0x03,0xFF,
0xFF,0x00,0x00,0x00,0x00,0x00,0x26,0x49,0x49,0x49,0x32,0x00,0x3E,0x49,0x49,0x32,
0x00,0x7F,0x19,0x29,0x46,0x00,0x00,0x00,0x00,0x00,0xFF,0x00,0x22,0x80,0x7F,
0x07,0x04,0x04,0x04,0x04,0x04,0x04,0x04,0x04,0x04,0x04,0x04,0x04,0x04,0x04,0x04,
0x04,0x04,0x04,0x04,0x04,0x04,0x04,0x04,0x04,0x04,0x07,0x02,0x01,0x00,0x00,

0xF0,0x18,0x14,0x12,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,
0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0xF1,0x09,0x05,0x03,0xFF,
0xFF,0x00,0x00,0x00,0x00,0x00,0x31,0x4A,0x4C,0x7F,0x00,0x26,0x49,0x49,0x3E,0x00,
0x26,0x49,0x49,0x49,0x32,0x00,0x00,0x00,0x00,0x00,0xFF,0x00,0x00,0x80,0x7F,
0x07,0x04,0x04,0x04,0x04,0x04,0x04,0x04,0x04,0x04,0x04,0x04,0x04,0x04,0x04,0x04,
0x04,0x04,0x04,0x04,0x04,0x04,0x04,0x04,0x04,0x04,0x07,0x02,0x01,0x00,0x00
};

0 comments on commit 92b5d5d

Please sign in to comment.