Switch to FreeRTOS 8.2.2

This is needed for fixing ADC overrun bug (see next commit).

diff --git a/Makefile.var b/Makefile.var
index 810fb9ee3924ce4fbfee688103c436824b6f591c..bf3e1034dd4b0bd4c4f87dbf5d20a4e7e8e71620 100644 (file)
--- a/Makefile.var
+++ b/Makefile.var
@@ -12,7 +12,7 @@
 # Abstract:
 #      Definitions of variables used by Makefile
 
-rpp_lib_OS ?= 7.0.2
+rpp_lib_OS ?= 8.2.2
 
 rpp_lib_SOURCES =                                                              \
        rpp/src/rpp/rpp.c                                               \

diff --git a/apps/helloworld/main.c b/apps/helloworld/main.c
index b2d6fc5234b408c451c2079f9b78e02238a8bd3c..535eddd023a9e96eca1174088a1cc224861316b7 100644 (file)
--- a/apps/helloworld/main.c
+++ b/apps/helloworld/main.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2013 Czech Technical University in Prague
+/* Copyright (C) 2013, 2015 Czech Technical University in Prague
  *
  * Authors:
  *     - Carlos Jenkins <carlos@jenkins.co.cr>
@@ -41,7 +41,7 @@ void main(void)
        rpp_init();
 
        /* Spawn tasks */
-       if (xTaskCreate(my_task, (const signed char *)"my_task",
+       if (xTaskCreate(my_task, FREERTOS_TASK_NAME("my_task"),
                                        512, NULL, 0, NULL) != pdPASS) {
                #ifdef DEBUG
                rpp_sci_printf((const char *)

diff --git a/apps/rpp-test-suite/ain.c b/apps/rpp-test-suite/ain.c
index 52247cc77b538ed9126a9244a2cbb5f2336c0b9e..0603a3e6df1faa49c5eac4dc5a024ce92478fe68 100644 (file)
--- a/apps/rpp-test-suite/ain.c
+++ b/apps/rpp-test-suite/ain.c
@@ -103,7 +103,7 @@ void test_adc()
        xTaskHandle test_task_handle;
 
        portBASE_TYPE task_created = xTaskCreate(adc_test_task,
-                                                                                        (const signed char *)"adc_test_task",
+                                                                                        "adc_test_task",
                                                                                         TEST_TASK_STACK, NULL, TEST_TASK_PRIORITY,
                                                                                         &test_task_handle
                                                                                         );

diff --git a/apps/rpp-test-suite/main.c b/apps/rpp-test-suite/main.c
index 382e285162c1e14a159ad9bdda35ef5b5d4c2f3b..0d76a955af482a9c6e2f956f0fdf88ff44f26e02 100644 (file)
--- a/apps/rpp-test-suite/main.c
+++ b/apps/rpp-test-suite/main.c
@@ -201,7 +201,7 @@ int main(void)
        // Spawn tasks
        portBASE_TYPE task_created =
                xTaskCreate(test_cmdproc,
-                                       (const signed char *)"test_cmdproc",
+                                       "test_cmdproc",
                                        1024, NULL, TEST_TASK_PRIORITY, NULL
                                        );
 

diff --git a/rpp/include/sys/sys_vim.h b/rpp/include/sys/sys_vim.h
index 2b4c778a0b4f6ddc3df8168e680f3882edd98fe0..706f1e7935d4086d041b822620069d8cee03dcd6 100644 (file)
--- a/rpp/include/sys/sys_vim.h
+++ b/rpp/include/sys/sys_vim.h
@@ -39,6 +39,8 @@ FREERTOS_VERSION_NUMBER_REV   == 2
 extern void vPreemptiveTick(void); // FreeRTOS 7.0.2
 #else    
 extern void vPortPreemptiveTick(void); // FreeRTOS 7.4 and higher
+extern void vPortYeildWithinAPI(void);
+extern void vPortNonPreemptiveTick(void);
 #endif
 extern void linHighLevelInterrupt(void);
 extern void mibspi1HighLevelInterrupt(void);

diff --git a/rpp/src/drv/hbridge.c b/rpp/src/drv/hbridge.c
index 0c8066e6cae11cb8151ceccb526dce4a5c1bfc52..7e9158aa51b92452b281add3c0928ff0cfba3333 100644 (file)
--- a/rpp/src/drv/hbridge.c
+++ b/rpp/src/drv/hbridge.c
@@ -147,7 +147,7 @@ int8_t drv_hbr_wdg_start()
                if (wdg_sync == NULL )
                        return -RPP_ENOMEM;
                if (xTaskCreate(drv_hbr_wdg_task,
-                                               (const signed char *)"hbr_wdg_task",
+                                               "hbr_wdg_task",
                                                1024, NULL, 1, &wdg_handle) != pdPASS) {
                        wdg_start = FALSE;
                        return -RPP_ENOMEM;

diff --git a/rpp/src/rpp/sdr.c b/rpp/src/rpp/sdr.c
index d8005a225f1aae0799049226805cd62afbd84388..f47576fab1c0b96acb70c1ca291e8a0d77167376 100644 (file)
--- a/rpp/src/rpp/sdr.c
+++ b/rpp/src/rpp/sdr.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2013, 2014 Czech Technical University in Prague
+/* Copyright (C) 2013, 2014, 2015 Czech Technical University in Prague
  *
  * Authors:
  *     - Carlos Jenkins <carlos@jenkins.co.cr>
@@ -355,13 +355,13 @@ int8_t rpp_sdr_setup(boolean_t enable)
        }
        else {
                if (xTaskCreate(rpp_sdr_showtask,
-                                               (const signed char *)"rpp_sdr_showtask",
+                                               "rpp_sdr_showtask",
                                                256, NULL, 2, &show_handle) != pdPASS)
                        return FAILURE;
                tasks_running++;
 
                if (xTaskCreate(rpp_sdr_cmdproc,
-                                               (const signed char *)"rpp_sdr_cmdproc",
+                                               "rpp_sdr_cmdproc",
                                                512, NULL, 2, &cmdproc_handle) != pdPASS) {
                        wait_tasks_to_finish();
                        return FAILURE;

diff --git a/rpp/src/sys/_rm48_hdk/sys_startup.c b/rpp/src/sys/_rm48_hdk/sys_startup.c
index f6bb5796dec858ccc4fba8746b49d51d9cff2d7e..c288dd535596b9bd81968d6324be96648f1a9f12 100644 (file)
--- a/rpp/src/sys/_rm48_hdk/sys_startup.c
+++ b/rpp/src/sys/_rm48_hdk/sys_startup.c
@@ -108,7 +108,7 @@ static const t_isrFuncPTR s_vim_init[] =
     &phantomInterrupt,
     &phantomInterrupt,
     &phantomInterrupt,      // 20
-    &phantomInterrupt,
+    &vPortYeildWithinAPI, // Software interrupt
     &phantomInterrupt,
     &phantomInterrupt,
     &phantomInterrupt,
@@ -734,7 +734,7 @@ void _c_int00()
                         | (0U << 18U)
                         | (0U << 19U)
                         | (0U << 20U)
-                        | (0U << 21U)
+                        | (1U << 21U)
                         | (0U << 22U)
                         | (0U << 23U)
                         | (0U << 24U)