Skip to content

Commit

Permalink
strange u_int type
Browse files Browse the repository at this point in the history
  • Loading branch information
pat1 committed Nov 2, 2023
1 parent 3649762 commit 9c79c69
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion platformio/stima_v4/master/include/rpc_class.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ class RegisterRPC {
inline static RpcParam_t param;

inline static char boardName[BOARDSLUG_LENGTH] = {0}; // Name board (boardslug) pre loaded for saving in config param
inline static u_int64_t boardSN = {0}; // S.N. board pre loaded for saving in config param
inline static uint64_t boardSN = {0}; // S.N. board pre loaded for saving in config param
inline static bool isSlaveConfigure = false; // is module actual in reconfiguration
inline static bool isMasterConfigure = false; // is master actual in reconfiguration
inline static bool is_configuration_changed = false; // configuration was changed (Need reset PNP Slave?)
Expand Down
4 changes: 2 additions & 2 deletions platformio/stima_v4/master/src/tasks/can_task.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1079,7 +1079,7 @@ CanTask::CanTask(const char *taskName, uint16_t stackSize, uint8_t priority, Can
/// @brief local stack Monitor (optional)
void CanTask::TaskMonitorStack()
{
u_int16_t stackUsage = (u_int16_t)uxTaskGetStackHighWaterMark( NULL );
uint16_t stackUsage = (uint16_t)uxTaskGetStackHighWaterMark( NULL );
if((stackUsage) && (stackUsage < param.system_status->tasks[LOCAL_TASK_ID].stack)) {
param.systemStatusLock->Take();
param.system_status->tasks[LOCAL_TASK_ID].stack = stackUsage;
Expand Down Expand Up @@ -3435,4 +3435,4 @@ void CanTask::Run() {
}
}

#endif
#endif
4 changes: 2 additions & 2 deletions platformio/stima_v4/master/src/tasks/http_task.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ HttpTask::HttpTask(const char *taskName, uint16_t stackSize, uint8_t priority, H
/// @brief local stack Monitor (optional)
void HttpTask::TaskMonitorStack()
{
u_int16_t stackUsage = (u_int16_t)uxTaskGetStackHighWaterMark( NULL );
uint16_t stackUsage = (uint16_t)uxTaskGetStackHighWaterMark( NULL );
if((stackUsage) && (stackUsage < param.system_status->tasks[LOCAL_TASK_ID].stack)) {
param.systemStatusLock->Take();
param.system_status->tasks[LOCAL_TASK_ID].stack = stackUsage;
Expand Down Expand Up @@ -898,4 +898,4 @@ bool HttpTask::do_firmware_end_data(void) {

}

#endif
#endif
2 changes: 1 addition & 1 deletion platformio/stima_v4/master/src/tasks/lcd_task.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ LCDTask::LCDTask(const char* taskName, uint16_t stackSize, uint8_t priority, LCD
#if (ENABLE_STACK_USAGE)
/// @brief local stack Monitor (optional)
void LCDTask::TaskMonitorStack() {
u_int16_t stackUsage = (u_int16_t)uxTaskGetStackHighWaterMark(NULL);
uint16_t stackUsage = (uint16_t)uxTaskGetStackHighWaterMark(NULL);
if ((stackUsage) && (stackUsage < param.system_status->tasks[LOCAL_TASK_ID].stack)) {
param.systemStatusLock->Take();
param.system_status->tasks[LOCAL_TASK_ID].stack = stackUsage;
Expand Down
4 changes: 2 additions & 2 deletions platformio/stima_v4/master/src/tasks/mqtt_task.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ MqttTask::MqttTask(const char *taskName, uint16_t stackSize, uint8_t priority, M
/// @brief local stack Monitor (optional)
void MqttTask::TaskMonitorStack()
{
u_int16_t stackUsage = (u_int16_t)uxTaskGetStackHighWaterMark( NULL );
uint16_t stackUsage = (uint16_t)uxTaskGetStackHighWaterMark( NULL );
if((stackUsage) && (stackUsage < param.system_status->tasks[LOCAL_TASK_ID].stack)) {
param.systemStatusLock->Take();
param.system_status->tasks[LOCAL_TASK_ID].stack = stackUsage;
Expand Down Expand Up @@ -3229,4 +3229,4 @@ void MqttTask::mqttPublishCallback(MqttClientContext *context, const char_t *top
}
}

#endif
#endif
4 changes: 2 additions & 2 deletions platformio/stima_v4/master/src/tasks/ntp_task.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ NtpTask::NtpTask(const char *taskName, uint16_t stackSize, uint8_t priority, Ntp
/// @brief local stack Monitor (optional)
void NtpTask::TaskMonitorStack()
{
u_int16_t stackUsage = (u_int16_t)uxTaskGetStackHighWaterMark( NULL );
uint16_t stackUsage = (uint16_t)uxTaskGetStackHighWaterMark( NULL );
if((stackUsage) && (stackUsage < param.system_status->tasks[LOCAL_TASK_ID].stack)) {
param.systemStatusLock->Take();
param.system_status->tasks[LOCAL_TASK_ID].stack = stackUsage;
Expand Down Expand Up @@ -304,4 +304,4 @@ void NtpTask::Run() {
}
}

#endif
#endif
4 changes: 2 additions & 2 deletions platformio/stima_v4/master/src/tasks/sd_task.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ SdTask::SdTask(const char *taskName, uint16_t stackSize, uint8_t priority, SdPar
/// @brief local stack Monitor (optional)
void SdTask::TaskMonitorStack()
{
u_int16_t stackUsage = (u_int16_t)uxTaskGetStackHighWaterMark( NULL );
uint16_t stackUsage = (uint16_t)uxTaskGetStackHighWaterMark( NULL );
if((stackUsage) && (stackUsage < param.system_status->tasks[LOCAL_TASK_ID].stack)) {
param.systemStatusLock->Take();
param.system_status->tasks[LOCAL_TASK_ID].stack = stackUsage;
Expand Down Expand Up @@ -1641,4 +1641,4 @@ void SdTask::Run()
}
}

#endif
#endif
8 changes: 4 additions & 4 deletions platformio/stima_v4/master/src/tasks/wdt_task.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ WdtTask::WdtTask(const char *taskName, uint16_t stackSize, uint8_t priority, Wdt

void WdtTask::Run() {
bool firsCheck = true;
u_int16_t stackUsage;
uint16_t stackUsage;
char strTask[12] = {0};
u_int8_t last_day_boot_rst;
uint8_t last_day_boot_rst;

// WDT Start to Normal...
param.systemStatusLock->Take();
Expand Down Expand Up @@ -113,7 +113,7 @@ void WdtTask::Run() {
// Logging Stack (Only ready module task controlled)
#if (ENABLE_STACK_USAGE)
// Update This Task
stackUsage = (u_int16_t)uxTaskGetStackHighWaterMark( NULL );
stackUsage = (uint16_t)uxTaskGetStackHighWaterMark( NULL );
if((stackUsage) && (stackUsage < param.system_status->tasks[WDT_TASK_ID].stack)) {
param.systemStatusLock->Take();
param.system_status->tasks[WDT_TASK_ID].stack = stackUsage;
Expand Down Expand Up @@ -213,4 +213,4 @@ void WdtTask::Run() {
// Exit WDT
DelayUntil(Ticks::MsToTicks(WDT_TASK_WAIT_DELAY_MS));
}
}
}

0 comments on commit 9c79c69

Please sign in to comment.