Merge pull request #66 from LifeEmu/main

Minor typo fixing
ExistOS-Team · Oct 9, 2022 · 13b69bf · 13b69bf
2 parents bb628b1 + c9d3e74
commit 13b69bf
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 17 deletions.
diff --git a/OSLoader/HAL/Hardware/stmp_irqController.c b/OSLoader/HAL/Hardware/stmp_irqController.c
@@ -112,7 +112,7 @@ bool portIRQDecode(IRQNumber* IRQNum, IRQTypes *IRQType, IRQInfo *IRQInfo)
     break;
 
     default:
-        PANNIC("ERR IRQNum:%d\n", *IRQNum);
+        PANIC("ERR IRQNum:%d\n", *IRQNum);
         return false;
     }
     return true;

diff --git a/OSLoader/HAL/interrupt_up.c b/OSLoader/HAL/interrupt_up.c
@@ -62,7 +62,7 @@ void up_isr( void )
         portPowerIRQ(IRQInfo);
         break;
     default:
-        PANNIC("Unknown IRQ:%d,%d\n", CurrentIRQNumber, IRQInfo);
+        PANIC("Unknown IRQ:%d,%d\n", CurrentIRQNumber, IRQInfo);
         break;
     }
 

diff --git a/OSLoader/debug.h b/OSLoader/debug.h
@@ -8,7 +8,7 @@ volatile uint32_t isIRQAllowed();
 
 void dbg_printf(char *fmt, ...);
 
-#define PANNIC(...)  do{printf(__VA_ARGS__);while(1);}while(0)
+#define PANIC(...)  do{printf(__VA_ARGS__);while(1);}while(0)
 
 
 //#define INFO(...) do{dbg_printf(__VA_ARGS__);}while(0)

diff --git a/OSLoader/start.c b/OSLoader/start.c
@@ -1125,11 +1125,11 @@ volatile void _startup() {
 }
 
 void vApplicationStackOverflowHook(TaskHandle_t xTask, char *pcTaskName) {
-    PANNIC("StackOverflowHook:%s\n", pcTaskName);
+    PANIC("StackOverflowHook:%s\n", pcTaskName);
 }
 
 void vAssertCalled(char *file, int line) {
-    PANNIC("ASSERT %s:%d\n", file, line);
+    PANIC("ASSERT %s:%d\n", file, line);
 }
 
 void vApplicationGetTimerTaskMemory(StaticTask_t **ppxTimerTaskTCBBuffer,
@@ -1141,5 +1141,5 @@ void vApplicationGetTimerTaskMemory(StaticTask_t **ppxTimerTaskTCBBuffer,
 }
 
 void vApplicationMallocFailedHook() {
-    PANNIC("ASSERT: Out of Memory.\n");
+    PANIC("ASSERT: Out of Memory.\n");
 }
diff --git a/System/debug.h b/System/debug.h
@@ -2,7 +2,7 @@
 
 #include <stdio.h>
 
-#define PANNIC(...)          \
+#define PANIC(...)          \
     do {                     \
         printf(__VA_ARGS__); \
         while (1)            \

diff --git a/System/main.c b/System/main.c
@@ -106,7 +106,7 @@ void check_emulator_status() {
             UINT br;
             char *fname = (char *)&EMU_DATA_PORT[10];
             uint32_t fsz = ((uint32_t *)(&EMU_DATA_PORT[4]))[0];
-            printf("Files send command detected.\n");
+            printf("File send command detected.\n");
             printf("Receive file:%s\n", fname);
             printf("file size:%d\n", fsz);
 
@@ -368,7 +368,7 @@ static void charge_chb_handler(lv_event_t *e) {
             lv_group_remove_all_objs(group_msgbox);
             lv_group_set_default(group_msgbox);
 
-            lv_obj_t *mbox = lv_msgbox_create(lv_scr_act(), "!!! Warning !!!", "[Experimental Features] PLEASE make sure use \n1.2 V Rechargeable Battery, i.e. NiCd, NiMH, etc.", (const char **)msgbox_button, false);
+            lv_obj_t *mbox = lv_msgbox_create(lv_scr_act(), "!!! Warning !!!", "[Experimental Features]\nPLEASE make sure to use \n1.2 V Rechargeable Battery, i.e. NiCd, NiMH, etc.", (const char **)msgbox_button, false);
 
             lv_obj_add_event_cb(mbox, charge_msgbox_event_cb, LV_EVENT_ALL, NULL);
             lv_obj_align(mbox, LV_ALIGN_CENTER, 0, 0);
@@ -389,7 +389,7 @@ static void charge_chb_handler(lv_event_t *e) {
 }
 
 lv_obj_t *label_cpuminirac;
-void slider_cpu_minimum_frac_event_cb(lv_event_t *e) {
+void slider_cpu_minimal_frac_event_cb(lv_event_t *e) {
     lv_event_code_t code = lv_event_get_code(e);
     lv_obj_t *obj = lv_event_get_target(e);
 
@@ -400,7 +400,7 @@ void slider_cpu_minimum_frac_event_cb(lv_event_t *e) {
         lv_obj_t *slider = lv_event_get_target(e);
         char buf[32];
         int val = (int)lv_slider_get_value(slider);
-        lv_snprintf(buf, sizeof(buf), "CPU Freq Minimum Frac: %d", val);
+        lv_snprintf(buf, sizeof(buf), "CPU Freq Minimal Frac: %d", val);
         lv_label_set_text(label_cpuminirac, buf);
         ll_cpu_slowdown_min_frac(val);
     }
@@ -1003,15 +1003,15 @@ void main_thread() {
     SET_LABEL_TEXT(info_line5, "Build time:%s", system_build_time);
 
     label_cpuminirac = lv_label_create(t2);
-    SET_LABEL_TEXT(label_cpuminirac, "CPU Freq Minimum Frac: 6");
+    SET_LABEL_TEXT(label_cpuminirac, "CPU Freq Minimal Frac: 6");
     lv_obj_set_flex_grow(label_cpuminirac, 0);
 
     lv_obj_t *cpu_minpwr_slider = lv_slider_create(t2);
     lv_obj_set_flex_grow(cpu_minpwr_slider, 0);
     lv_slider_set_range(cpu_minpwr_slider, 2, 14);
     lv_obj_add_flag(cpu_minpwr_slider, LV_OBJ_FLAG_SCROLL_ON_FOCUS);
     lv_slider_set_value(cpu_minpwr_slider, 6, false);
-    lv_obj_add_event_cb(cpu_minpwr_slider, slider_cpu_minimum_frac_event_cb, LV_EVENT_VALUE_CHANGED, NULL);
+    lv_obj_add_event_cb(cpu_minpwr_slider, slider_cpu_minimal_frac_event_cb, LV_EVENT_VALUE_CHANGED, NULL);
     lv_group_add_obj(group_status, cpu_minpwr_slider);
 
     slow_down_chb = lv_checkbox_create(t2);
@@ -1022,7 +1022,7 @@ void main_thread() {
     lv_group_add_obj(group_status, slow_down_chb);
 
     charge_chb = lv_checkbox_create(t2);
-    lv_checkbox_set_text(charge_chb, "Enable Charge");
+    lv_checkbox_set_text(charge_chb, "Enable Charging");
     lv_obj_set_flex_grow(charge_chb, 0);
     lv_obj_add_event_cb(charge_chb, charge_chb_handler, LV_EVENT_ALL, NULL);
     lv_group_add_obj(group_status, charge_chb);
@@ -1154,11 +1154,11 @@ void main() {
 }
 
 void vApplicationStackOverflowHook(TaskHandle_t xTask, char *pcTaskName) {
-    PANNIC("StackOverflowHook:%s\n", pcTaskName);
+    PANIC("StackOverflowHook:%s\n", pcTaskName);
 }
 
 void vAssertCalled(char *file, int line) {
-    PANNIC("ASSERT FAILED AT %s:%d\n", file, line);
+    PANIC("ASSERTION FAILED AT %s:%d\n", file, line);
 }
 
 void vApplicationGetTimerTaskMemory(StaticTask_t **ppxTimerTaskTCBBuffer,
@@ -1170,5 +1170,5 @@ void vApplicationGetTimerTaskMemory(StaticTask_t **ppxTimerTaskTCBBuffer,
 }
 
 void vApplicationMallocFailedHook() {
-    PANNIC("ASSERT: Out of Memory.\n");
+    PANIC("ASSERT: Out of Memory.\n");
 }