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

Cosmetics

Browse Source
This commit is contained in:
Andre Bernet
2016-01-12 11:23:58 +04:00
parent a3fac6049f
commit 7fe39791ff
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/targets/horus/hal.h
+2 -2
View File
@@ -212,7 +212,7 @@
#define AUDIO_TIMER TIM6
#define AUDIO_TIMER_DAC_IRQn TIM6_DAC_IRQn
// I2C Bus: CAT5137
// I2C Bus: TPL0401A-10DCK digital pot for volume control
#define I2C_RCC_AHB1Periph RCC_AHB1Periph_GPIOB
#define I2C_RCC_APB1Periph RCC_APB1Periph_I2C1
#define I2C I2C1
@@ -223,7 +223,7 @@
#define I2C_GPIO_PinSource_SCL GPIO_PinSource8
#define I2C_GPIO_PinSource_SDA GPIO_PinSource9
#define I2C_SPEED 400000
#define I2C_ADDRESS_CAT5137 0x5C
#define I2C_ADDRESS_VOLUME 0x5C
// Haptic
#define HAPTIC_RCC_AHB1Periph RCC_AHB1Periph_GPIOA
radio/src/targets/horus/i2c_driver.cpp
+1 -1
View File
@@ -129,5 +129,5 @@ void setVolume(uint8_t volume)
volume = VOLUME_LEVEL_MAX;
}
i2cWriteRegister(I2C_ADDRESS_CAT5137, 0, volumeScale[volume]);
i2cWriteRegister(I2C_ADDRESS_VOLUME, 0, volumeScale[volume]);
}
radio/src/targets/taranis/hal.h
+2 -2
View File
@@ -484,7 +484,7 @@
#define LCD_GPIO_PIN_RST GPIO_Pin_12 // PD.12
#endif
// I2C Bus: EEPROM and CAT5137
// I2C Bus: EEPROM and CAT5137 digital pot for volume control
#define I2C_RCC_AHB1Periph RCC_AHB1Periph_GPIOB
#define I2C_RCC_APB1Periph RCC_APB1Periph_I2C1
#define I2C I2C1
@@ -501,7 +501,7 @@
#define I2C_SPEED 400000
#endif
#define I2C_ADDRESS_EEPROM 0xA2
#define I2C_ADDRESS_CAT5137 0x5C
#define I2C_ADDRESS_VOLUME 0x5C
#define I2C_FLASH_PAGESIZE 64
// SD - SPI2
radio/src/targets/taranis/i2c_driver.cpp
+2 -2
View File
@@ -276,12 +276,12 @@ uint8_t I2C_read_volume()
{
uint8_t volume ;
I2C_START();
I2C_SEND_DATA(I2C_ADDRESS_CAT5137|EE_CMD_WRITE);
I2C_SEND_DATA(I2C_ADDRESS_VOLUME|EE_CMD_WRITE);
I2C_WAIT_ACK();
I2C_SEND_DATA(0);
I2C_WAIT_ACK();
I2C_START();
I2C_SEND_DATA(I2C_ADDRESS_CAT5137|EE_CMD_READ);
I2C_SEND_DATA(I2C_ADDRESS_VOLUME|EE_CMD_READ);
I2C_WAIT_ACK();
volume = I2C_READ();
I2C_NO_ACK();