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 remote-tracking branch 'upstream/dev' into magic

Browse Source
This commit is contained in:
Ben V. Brown
2022-07-25 21:08:00 +10:00
parent a68779307d 543107e48c
commit bab66acaad
22 changed files with 81 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/Core/BSP/BSP_Power.h
View File

@@ -17,7 +17,7 @@ extern "C" {
void power_check();
// Returns the tip resistance in x10 ohms, so 7.5 = 75; 14=140 etc
uint8_t getTipResitanceX10();
uint8_t getTipResistanceX10();
uint8_t getTipThermalMass();

2
source/Core/BSP/MHP30/Power.cpp
View File

@@ -17,3 +17,5 @@ void power_check() {
}
bool getIsPoweredByDCIN() { return false; }
uint8_t getTipResistanceX10() { return TIP_RESISTANCE; }

3
source/Core/BSP/MHP30/portmacro.h
View File

@@ -27,7 +27,8 @@
#ifndef PORTMACRO_H
#define PORTMACRO_H
#include "FreeRTOSConfig.h"
#include "projdefs.h"
#ifdef __cplusplus
extern "C" {
#endif

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

@@ -288,3 +288,5 @@ uint64_t getDeviceID() {
//
return HAL_GetUIDw0() | ((uint64_t)HAL_GetUIDw1() << 32);
}
uint8_t getTipResistanceX10() { return TIP_RESISTANCE; }

2
source/Core/BSP/Miniware/FreeRTOSConfig.h
View File

@@ -100,7 +100,7 @@ extern uint32_t SystemCoreClock;
#define configUSE_IDLE_HOOK 1
#define configUSE_TICK_HOOK 0
#define configCPU_CLOCK_HZ (SystemCoreClock)
#define configTICK_RATE_HZ ((TickType_t)1000)
#define configTICK_RATE_HZ (1000)
#define configMAX_PRIORITIES (6)
#define configMINIMAL_STACK_SIZE ((uint16_t)256)
#define configTOTAL_HEAP_SIZE ((size_t)1024 * 14) /*Currently use about 9000*/

2
source/Core/BSP/Miniware/portmacro.h
View File

@@ -27,6 +27,8 @@
#ifndef PORTMACRO_H
#define PORTMACRO_H
#include "FreeRTOSConfig.h"
#include "projdefs.h"
#ifdef __cplusplus
extern "C" {

2
source/Core/BSP/Pine64/BSP.cpp
View File

@@ -93,3 +93,5 @@ void setStatusLED(const enum StatusLED state) {}
uint8_t preStartChecks() { return 0; }
uint64_t getDeviceID() { return dbg_id_get(); }
uint8_t getTipResistanceX10() { return TIP_RESISTANCE; }

5
source/Core/BSP/Pine64/Vendor/OS/FreeRTOS/Source/portable/GCC/portmacro.h vendored
View File

@@ -58,14 +58,9 @@ typedef portSTACK_TYPE StackType_t;
typedef long BaseType_t;
typedef unsigned long UBaseType_t;
#if (configUSE_16_BIT_TICKS == 1)
typedef uint16_t TickType_t;
#define portMAX_DELAY (TickType_t)0xffff
#else
/* RISC-V TIMER is 64-bit long */
typedef uint64_t TickType_t;
#define portMAX_DELAY (TickType_t)0xFFFFFFFFFFFFFFFFULL
#endif
/*-----------------------------------------------------------*/
/* Architecture specifics. */