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

Merge remote-tracking branch 'upstream/next' into internalPPM_2306

Browse Source
This commit is contained in:
Cedric Marzer
2015-05-18 19:47:50 +02:00
parent e9e717a271 366bb5c962
commit 81835d476d
6 changed files with 1295 additions and 1075 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/translations/companion_pl.ts
+1278 -1062
View File
File diff suppressed because it is too large Load Diff
radio/src/lua_api.cpp
+1 -1
View File
@@ -778,7 +778,7 @@ static int luaModelInsertInput(lua_State *L)
unsigned int first = getFirstInput(chn);
unsigned int count = getInputsCountFromFirst(chn, first);
if (chn<MAX_INPUTS && getExpoMixCount(1)<MAX_INPUTS && idx<=count) {
if (chn<MAX_INPUTS && getExpoMixCount(1)<MAX_EXPOS && idx<=count) {
idx = first + idx;
s_currCh = chn + 1;
insertExpoMix(1, idx);
radio/src/pulses/pulses_avr.cpp
+1 -1
View File
@@ -427,7 +427,7 @@ FORCEINLINE void setupPulsesDSM2()
}
ptr++;
*ptr++ = g_model.header.modelId;
*ptr++ = g_model.header.modelId[0];
for (uint8_t i=0; i<DSM2_CHANS; i++) {
uint16_t pulse = limit(0, ((channelOutputs[i]*13)>>5)+512,1023);
radio/src/targets/taranis/hal.h
+1
View File
@@ -320,6 +320,7 @@
#define I2C_GPIO GPIOB
#define I2C_GPIO_PIN_SCL GPIO_Pin_6 // PB.06
#define I2C_GPIO_PIN_SDA GPIO_Pin_7 // PB.07
#define I2C_GPIO_PIN_WP GPIO_Pin_9 // PB.09
#define I2C_GPIO_AF GPIO_AF_I2C1
#define I2C_GPIO_PinSource_SCL GPIO_PinSource6
#define I2C_GPIO_PinSource_SDA GPIO_PinSource7
radio/src/targets/taranis/i2c_driver.cpp
+10 -7
View File
@@ -3,12 +3,12 @@
#define EE_CMD_WRITE (0)
#define EE_CMD_READ (1)
#define SCL_H do{I2C_GPIO->BSRRL = I2C_GPIO_PIN_SCL;}while(0)
#define SCL_L do{I2C_GPIO->BSRRH = I2C_GPIO_PIN_SCL;}while(0)
#define SDA_H do{I2C_GPIO->BSRRL = I2C_GPIO_PIN_SDA;}while(0)
#define SDA_L do{I2C_GPIO->BSRRH = I2C_GPIO_PIN_SDA;}while(0)
#define SCL_read (I2C_GPIO->IDR & I2C_GPIO_PIN_SCL)
#define SDA_read (I2C_GPIO->IDR & I2C_GPIO_PIN_SDA)
#define SCL_H do { I2C_GPIO->BSRRL = I2C_GPIO_PIN_SCL; } while(0)
#define SCL_L do { I2C_GPIO->BSRRH = I2C_GPIO_PIN_SCL; } while(0)
#define SDA_H do { I2C_GPIO->BSRRL = I2C_GPIO_PIN_SDA; } while(0)
#define SDA_L do { I2C_GPIO->BSRRH = I2C_GPIO_PIN_SDA; } while(0)
#define SCL_read (I2C_GPIO->IDR & I2C_GPIO_PIN_SCL)
#define SDA_read (I2C_GPIO->IDR & I2C_GPIO_PIN_SDA)
void I2C_EE_PageWrite(uint8_t* pBuffer, uint16_t WriteAddr, uint8_t NumByteToWrite);
void I2C_EE_WaitEepromStandbyState(void);
@@ -139,7 +139,7 @@ void eepromInit(void)
RCC_APB1PeriphClockCmd(I2C_RCC_APB1Periph_I2C, ENABLE);
GPIO_InitTypeDef GPIO_InitStructure;
GPIO_InitStructure.GPIO_Pin = I2C_GPIO_PIN_SCL | I2C_GPIO_PIN_SDA;
GPIO_InitStructure.GPIO_Pin = I2C_GPIO_PIN_SCL | I2C_GPIO_PIN_SDA | I2C_GPIO_PIN_WP;
GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz;
GPIO_InitStructure.GPIO_Mode = GPIO_Mode_OUT;
GPIO_InitStructure.GPIO_OType = GPIO_OType_OD;
@@ -159,6 +159,9 @@ void eepromInit(void)
I2C_Init(I2C, &I2C_InitStructure);
I2C_Cmd(I2C, ENABLE);
#endif
GPIO_ResetBits(I2C_GPIO, I2C_GPIO_PIN_WP);
// Set Idle levels
SDA_H;
SCL_H;
radio/src/translations/pl.h.txt
+4 -4
View File
@@ -101,7 +101,7 @@
#define TR_VLCD "NormalOptrex"
#define LEN_VPERSISTENT "\014" /*12 decimal*/
#define TR_VPERSISTENT "Wyłącz\0 ""Lot\0 ""Ręczny Reset"
#define TR_VPERSISTENT "Wyłącz\0 ""Lot\0 ""Ręczny Reset"
#define LEN_COUNTRYCODES TR("\002", "\007")
#define TR_COUNTRYCODES TR("US""JP""EU", "Ameryka""Japonia""Europa\0")
@@ -528,7 +528,7 @@
#define TR_VTRAINERMODES "Trener/Jack\0 ""Uczeń/Jack\0 ""Trener/SBUS Moduł ""Trener/CPPM Moduł ""Trener/Bateria\0 "
#define LEN_VFAILSAFE "\011" /*9 decimal*/
#define TR_VFAILSAFE "Not set\0 ""Utrzymuj\0""Własne\0 ""0 sygnału""Odbiornik"
#define TR_VFAILSAFE "Brak \0 ""Utrzymuj\0""Własne \0""0 sygnału""Odbiornik"
#if defined(MAVLINK)
#define LEN_MAVLINK_BAUDS "\006"
@@ -606,7 +606,7 @@
#define TR_BEEPCTR TR("ŚrodBeep", "Pikn.Środka")
#define TR_USE_GLOBAL_FUNCS TR("Funk.Glb.","Użyj Funkcji Glb")
#if defined(PCBSKY9X) && defined(REVX)
#define TR_OUTPUT_TYPE INDENT "Output"
#define TR_OUTPUT_TYPE INDENT "Wyjście"
#endif
#define TR_PROTO TR(INDENT "Proto", INDENT "Protokół")
#if defined(CPUARM)
@@ -827,7 +827,7 @@
#define TR_ALARMSWARN "ALARM"
#define TR_SWITCHWARN TR("Przełą","Kontrola")
#define TR_FAILSAFEWARN "FAILSAFE"
#define TR_NO_FAILSAFE "Failsafe not set"
#define TR_NO_FAILSAFE "Brak Failsafe"
#define TR_KEYSTUCK "Blokada klucza"
#define TR_INVERT_THR TR("Odw.Gaz?","Odwróć gaz?")
#define TR_SPEAKER_VOLUME INDENT "Głośność"