Fix nightlies (#7765)
This commit is contained in:
@@ -744,12 +744,8 @@ PACK(struct RadioData {
|
|||||||
uint8_t backlightMode:3;
|
uint8_t backlightMode:3;
|
||||||
int8_t antennaMode:2;
|
int8_t antennaMode:2;
|
||||||
uint8_t disableRtcWarning:1;
|
uint8_t disableRtcWarning:1;
|
||||||
#if defined(KEYS_BACKLIGHT_GPIO)
|
|
||||||
uint8_t keysBacklight:1;
|
uint8_t keysBacklight:1;
|
||||||
int8_t spare1:1;
|
int8_t spare1:1;
|
||||||
#else
|
|
||||||
int8_t spare1:2;
|
|
||||||
#endif
|
|
||||||
NOBACKUP(TrainerData trainer);
|
NOBACKUP(TrainerData trainer);
|
||||||
NOBACKUP(uint8_t view); // index of view in main screen
|
NOBACKUP(uint8_t view); // index of view in main screen
|
||||||
NOBACKUP(BUZZER_FIELD); /* 2bits */
|
NOBACKUP(BUZZER_FIELD); /* 2bits */
|
||||||
|
|||||||
@@ -341,7 +341,7 @@ void PulsesData::putFrame(COMMAND command, FRAME_TYPE frame, uint8_t* data, uint
|
|||||||
if (frameIndex == nullptr) {
|
if (frameIndex == nullptr) {
|
||||||
frameIndex = &this->frame_index;
|
frameIndex = &this->frame_index;
|
||||||
}
|
}
|
||||||
uint8_t buffer[] = { FrameAddress, *frameIndex, frame, command };
|
uint8_t buffer[] = {FrameAddress, *frameIndex, frame, command};
|
||||||
putBytes(buffer, 4);
|
putBytes(buffer, 4);
|
||||||
|
|
||||||
//payload
|
//payload
|
||||||
|
|||||||
@@ -43,7 +43,7 @@
|
|||||||
// 1s = 1 000 000 us
|
// 1s = 1 000 000 us
|
||||||
// 1000000/115200 = 8,68 us
|
// 1000000/115200 = 8,68 us
|
||||||
// actual timer is ticking in 0,5 us = 8,68*2 = 17,36 because it must be integer take 17
|
// actual timer is ticking in 0,5 us = 8,68*2 = 17,36 because it must be integer take 17
|
||||||
// difference 1000000 / x = 8.5 --> x = 117 647 = difference = 1.2 %
|
// difference 1000000 / x = 8.5 --> x = 117 647 = difference = 1.2 %
|
||||||
// allowed half a bit difference on the last bit -- should be fine
|
// allowed half a bit difference on the last bit -- should be fine
|
||||||
#define AFHDS3_BAUDRATE 115200
|
#define AFHDS3_BAUDRATE 115200
|
||||||
//Because timer is ticking with 0.5us
|
//Because timer is ticking with 0.5us
|
||||||
@@ -176,7 +176,7 @@ enum DeviceAddress
|
|||||||
MODULE = 0x03,
|
MODULE = 0x03,
|
||||||
};
|
};
|
||||||
|
|
||||||
enum FRAME_TYPE
|
enum FRAME_TYPE: uint8_t
|
||||||
{
|
{
|
||||||
REQUEST_GET_DATA = 0x01, //Get data response: ACK + DATA
|
REQUEST_GET_DATA = 0x01, //Get data response: ACK + DATA
|
||||||
REQUEST_SET_EXPECT_DATA = 0x02, //Set data response: ACK + DATA
|
REQUEST_SET_EXPECT_DATA = 0x02, //Set data response: ACK + DATA
|
||||||
@@ -187,7 +187,7 @@ enum FRAME_TYPE
|
|||||||
NOT_USED = 0xff
|
NOT_USED = 0xff
|
||||||
};
|
};
|
||||||
|
|
||||||
enum COMMAND
|
enum COMMAND: uint8_t
|
||||||
{
|
{
|
||||||
MODULE_READY = 0x01,
|
MODULE_READY = 0x01,
|
||||||
MODULE_STATE = 0x02,
|
MODULE_STATE = 0x02,
|
||||||
|
|||||||
@@ -153,6 +153,9 @@ static void delay3(uint32_t nCount)
|
|||||||
|
|
||||||
static void lcd_reset(void)
|
static void lcd_reset(void)
|
||||||
{
|
{
|
||||||
|
#if defined(RADIO_T18) // T18 screen has issues if NRST is ever brought low
|
||||||
|
NRST_HIGH();
|
||||||
|
#else
|
||||||
NRST_HIGH();
|
NRST_HIGH();
|
||||||
delay3(1);
|
delay3(1);
|
||||||
|
|
||||||
@@ -161,6 +164,7 @@ static void lcd_reset(void)
|
|||||||
|
|
||||||
NRST_HIGH();
|
NRST_HIGH();
|
||||||
delay3(30);
|
delay3(30);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
void LCD_Init_LTDC(void)
|
void LCD_Init_LTDC(void)
|
||||||
@@ -326,11 +330,7 @@ void LCD_Init(void)
|
|||||||
{
|
{
|
||||||
/* Reset the LCD --------------------------------------------------------*/
|
/* Reset the LCD --------------------------------------------------------*/
|
||||||
LCD_NRSTConfig();
|
LCD_NRSTConfig();
|
||||||
#if defined(RADIO_T18) // T18 seems to have eractic display issue if NRST is ever driven low
|
|
||||||
NRST_HIGH();
|
|
||||||
#else
|
|
||||||
lcd_reset();
|
lcd_reset();
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Configure the LCD Control pins */
|
/* Configure the LCD Control pins */
|
||||||
LCD_AF_GPIOConfig();
|
LCD_AF_GPIOConfig();
|
||||||
|
|||||||
Reference in New Issue
Block a user