me/IronOS
1
0
Fork 1
mirror of https://github.com/Ralim/IronOS.git synced 2025-02-26 07:53:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into master

Browse Source
This commit is contained in:
Ben V. Brown
2022-02-05 08:55:50 +11:00
committed by GitHub
parent 1dfeeca01e 7b8240d9b5
commit 73266054d1
5 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -176,3 +176,4 @@ fabric.properties
CoreCompileInputs.cache
.vscode/settings.json
source/compile_commands.json

2
Bootup Logo/Logos/README.md
View File

@@ -1,4 +1,4 @@
# Preview of the Logos
# Preview of the logos
||   TS100   |   TS80    |   TS80P    |   Pinecil    |   IronOS    
-|-|-|-|-|-

2
source/Core/BSP/Miniware/I2C_Wrapper.cpp
View File

@@ -56,7 +56,7 @@ bool FRToSI2C::Mem_Write(uint16_t DevAddress, uint16_t MemAddress, uint8_t *pDat
bool FRToSI2C::Transmit(uint16_t DevAddress, uint8_t *pData, uint16_t Size) {
if (!lock())
return false;
if (HAL_I2C_Master_Transmit_DMA(&hi2c1, DevAddress, pData, Size) != HAL_OK) {
if (HAL_I2C_Master_Transmit_IT(&hi2c1, DevAddress, pData, Size) != HAL_OK) {
I2C_Unstick();
unlock();
return false;

4
source/Core/BSP/Miniware/stm32f1xx_hal_msp.c
View File

@@ -7,7 +7,7 @@
void HAL_MspInit(void) {
__HAL_RCC_AFIO_CLK_ENABLE();
HAL_NVIC_SetPriorityGrouping(NVIC_PRIORITYGROUP_4);
// HAL_NVIC_SetPriorityGrouping(NVIC_PRIORITYGROUP_4);
/* System interrupt init*/
/* MemoryManagement_IRQn interrupt configuration */
@@ -82,7 +82,7 @@ void HAL_I2C_MspInit(I2C_HandleTypeDef *hi2c) {
GPIO_InitStruct.Pin = SCL_Pin | SDA_Pin;
GPIO_InitStruct.Mode = GPIO_MODE_AF_OD;
GPIO_InitStruct.Pull = GPIO_PULLUP;
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
/* Peripheral clock enable */

4
source/Core/Src/gui.cpp
View File

@@ -72,6 +72,7 @@ static void settings_displayInvertColor(void);
#ifdef HALL_SENSOR
static void settings_displayHallEffect(void);
static bool settings_showHallEffect(void);
#endif
// Menu functions
@@ -206,7 +207,7 @@ const menuitem PowerSavingMenu[] = {
{SETTINGS_DESC(SettingsItemIndex::ShutdownTimeout), nullptr, settings_displayShutdownTime, settings_showSleepOptions, SettingsOptions::ShutdownTime}, /*Shutdown Time*/
#endif
#ifdef HALL_SENSOR
{SETTINGS_DESC(SettingsItemIndex::HallEffSensitivity), nullptr, settings_displayHallEffect, nullptr, SettingsOptions::HallEffectSensitivity}, /* HallEffect Sensitivity*/
{SETTINGS_DESC(SettingsItemIndex::HallEffSensitivity), nullptr, settings_displayHallEffect, settings_showHallEffect, SettingsOptions::HallEffectSensitivity}, /* HallEffect Sensitivity*/
#endif
{0, nullptr, nullptr, nullptr, SettingsOptions::SettingsOptionsLength} // end of menu marker. DO NOT REMOVE
};
@@ -790,6 +791,7 @@ static void settings_displayHallEffect(void) {
break;
}
}
static bool settings_showHallEffect(void) { return getHallSensorFitted(); }
#endif
// Indicates whether a menu transition is in progress, so that the menu icon