Merge branch 'dev' into epr-pinecil-og

This commit is contained in:
discip
2023-03-11 15:34:38 +01:00
committed by GitHub
329 changed files with 98850 additions and 31787 deletions

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) {

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); }