sv/IronOS
1
0
Fork 0
forked from me/IronOS
Code Pull Requests Activity

Merge branch 'dev' into BLE

Browse Source
This commit is contained in:
Ben V. Brown
2023-01-22 22:35:51 +11:00
committed by GitHub
parent 7c8664fb22 b96dbb2377
commit c5d92efa60
43 changed files with 393 additions and 552 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -125,6 +125,6 @@ const int32_t uVtoDegC[] = {
38137, 500, //
};
#endif
const int uVtoDegCItems = sizeof(uVtoDegC) / (2 * sizeof(uint16_t));
const int uVtoDegCItems = sizeof(uVtoDegC) / (2 * sizeof(uVtoDegC[0]));
uint32_t TipThermoModel::convertuVToDegC(uint32_t tipuVDelta) { return Utils::InterpolateLookupTable(uVtoDegC, uVtoDegCItems, tipuVDelta); }

5
source/Core/BSP/Pinecil/BSP.cpp
View File

@@ -72,10 +72,7 @@ void unstick_I2C() {
uint8_t getButtonA() { return (gpio_input_bit_get(KEY_A_GPIO_Port, KEY_A_Pin) == SET) ? 1 : 0; }
uint8_t getButtonB() { return (gpio_input_bit_get(KEY_B_GPIO_Port, KEY_B_Pin) == SET) ? 1 : 0; }
void reboot() {
// Spin for watchdog
for (;;) {}
}
void reboot() { eclic_system_reset(); }
void delay_ms(uint16_t count) { delay_1ms(count); }
uint32_t __get_IPSR(void) {

2
source/Core/BSP/Pinecil/ThermoModel.cpp
View File

@@ -67,6 +67,6 @@ const int32_t uVtoDegC[] = {
};
#endif
const int uVtoDegCItems = sizeof(uVtoDegC) / (2 * sizeof(uint16_t));
const int uVtoDegCItems = sizeof(uVtoDegC) / (2 * sizeof(uVtoDegC[0]));
uint32_t TipThermoModel::convertuVToDegC(uint32_t tipuVDelta) { return Utils::InterpolateLookupTable(uVtoDegC, uVtoDegCItems, tipuVDelta); }

3
source/Core/BSP/Pinecilv2/BSP.cpp
View File

@@ -126,8 +126,7 @@ uint8_t getButtonB() {
}
void reboot() {
// Spin for watchdog
for (;;) {}
hal_system_reset();
}
void delay_ms(uint16_t count) {