diff --git a/tests/platform/MD380_blink.c b/tests/platform/MD380_blink.c deleted file mode 100644 index 2976ea43..00000000 --- a/tests/platform/MD380_blink.c +++ /dev/null @@ -1,102 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2020 by Federico Izzo IU2NUO, Niccolò Izzo IU2KIN and * - * Silvano Seva IU2KWO * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 3 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, see * - ***************************************************************************/ - -#include -#include -#include -#include -#include -#include -#include "stm32f4xx.h" -#include -#include -#include - -static OS_TCB t1TCB; -static CPU_STK_SIZE t1Stk[128]; -static void t1(void *arg); - -static OS_TCB t2TCB; -static CPU_STK_SIZE t2Stk[128]; -static void t2(void *arg); - -int main(void) -{ - OS_ERR err; - - gpio_setMode(GPIOE, 0, OUTPUT); - gpio_setMode(GPIOE, 1, OUTPUT); - - CPU_Init(); - OS_CPU_SysTickInitFreq(SystemCoreClock); - - OSTaskCreate((OS_TCB *)&t1TCB, - (CPU_CHAR *)" ", - (OS_TASK_PTR ) t1, - (void *) 0, - (OS_PRIO ) 5, - (CPU_STK *)&t1Stk[0], - (CPU_STK ) 0, - (CPU_STK_SIZE) 128, - (OS_MSG_QTY ) 0, - (OS_TICK ) 0, - (void *) 0, - (OS_OPT )(OS_OPT_TASK_STK_CHK | OS_OPT_TASK_STK_CLR), - (OS_ERR *)&err); - - OSTaskCreate((OS_TCB *)&t2TCB, - (CPU_CHAR *)" ", - (OS_TASK_PTR ) t2, - (void *) 0, - (OS_PRIO ) 5, - (CPU_STK *)&t2Stk[0], - (CPU_STK ) 0, - (CPU_STK_SIZE) 128, - (OS_MSG_QTY ) 0, - (OS_TICK ) 0, - (void *) 0, - (OS_OPT )(OS_OPT_TASK_STK_CHK | OS_OPT_TASK_STK_CLR), - (OS_ERR *)&err); - - while(1) ; - return 0; -} - -static void t1(void *arg) -{ - (void) arg; - OS_ERR os_err; - - while(1) - { - gpio_togglePin(GPIOE, 0); - OSTimeDlyHMSM(0u, 0u, 1u, 0u, OS_OPT_TIME_HMSM_STRICT, &os_err); - } -} - -static void t2(void *arg) -{ - (void) arg; - OS_ERR os_err; - - while(1) - { - gpio_togglePin(GPIOE, 1); - OSTimeDlyHMSM(0u, 0u, 2u, 0u, OS_OPT_TIME_HMSM_STRICT, &os_err); - } -} diff --git a/tests/platform/MD380_display.c b/tests/platform/MD380_display.c deleted file mode 100644 index 88369111..00000000 --- a/tests/platform/MD380_display.c +++ /dev/null @@ -1,134 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2020 by Federico Izzo IU2NUO, Niccolò Izzo IU2KIN and * - * Silvano Seva IU2KWO * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 3 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, see * - ***************************************************************************/ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "hwconfig.h" -#include - -static OS_TCB t1TCB; -static CPU_STK_SIZE t1Stk[128]; -static void t1(void *arg); - -static OS_TCB t2TCB; -static CPU_STK_SIZE t2Stk[128]; -static void t2(void *arg); - -void drawRect(int x, int y, int width, int height, uint16_t color) -{ - int x_max = x + width; - int y_max = y + height; - uint16_t *buf = (uint16_t *)(display_getFrameBuffer()); - - for(int i=y; i < y_max; i++) - { - for(int j=x; j < x_max; j++) - { - buf[j + i*SCREEN_WIDTH] = color; - } - } -} - -int main(void) -{ - OS_ERR err; - - gpio_setMode(GPIOE, 0, OUTPUT); - gpio_setMode(GPIOE, 1, OUTPUT); - - CPU_Init(); - OS_CPU_SysTickInitFreq(SystemCoreClock); - - OSTaskCreate((OS_TCB *)&t1TCB, - (CPU_CHAR *)" ", - (OS_TASK_PTR ) t1, - (void *) 0, - (OS_PRIO ) 5, - (CPU_STK *)&t1Stk[0], - (CPU_STK ) 0, - (CPU_STK_SIZE) 128, - (OS_MSG_QTY ) 0, - (OS_TICK ) 0, - (void *) 0, - (OS_OPT )(OS_OPT_TASK_STK_CHK | OS_OPT_TASK_STK_CLR), - (OS_ERR *)&err); - - OSTaskCreate((OS_TCB *)&t2TCB, - (CPU_CHAR *)" ", - (OS_TASK_PTR ) t2, - (void *) 0, - (OS_PRIO ) 5, - (CPU_STK *)&t2Stk[0], - (CPU_STK ) 0, - (CPU_STK_SIZE) 128, - (OS_MSG_QTY ) 0, - (OS_TICK ) 0, - (void *) 0, - (OS_OPT )(OS_OPT_TASK_STK_CHK | OS_OPT_TASK_STK_CLR), - (OS_ERR *)&err); - - while(1) ; - return 0; -} - -static void t1(void *arg) -{ - (void) arg; - OS_ERR os_err; - - while(1) - { - gpio_togglePin(GPIOE, 0); - OSTimeDlyHMSM(0u, 0u, 1u, 0u, OS_OPT_TIME_HMSM_STRICT, &os_err); - } -} - -static void t2(void *arg) -{ - (void) arg; - OS_ERR os_err; - - display_init(); - platform_init(); - platform_setBacklightLevel(254); - - while(1) - { - /* Horizontal red line */ - drawRect(0, 10, SCREEN_WIDTH, 20, 0xF800); - - /* Vertical blue line */ - drawRect(10, 0, 20, SCREEN_HEIGHT, 0x001F); - - /* Vertical green line */ - drawRect(80, 0, 20, SCREEN_HEIGHT, 0x07e0); - - display_render(); - - gpio_togglePin(GPIOE, 1); - OSTimeDlyHMSM(0u, 0u, 2u, 0u, OS_OPT_TIME_HMSM_STRICT, &os_err); - } -} diff --git a/tests/platform/printCalib_MDx.c b/tests/platform/printCalib_MDx.c index f7ecffe9..a87dd682 100644 --- a/tests/platform/printCalib_MDx.c +++ b/tests/platform/printCalib_MDx.c @@ -134,7 +134,7 @@ int main() { getchar(); - #if defined(PLATFORM_MD380) || defined(PLATFORM_MD390) + #ifdef PLATFORM_MD3x0 printMD3x0calibration(); #else printMDUV3x0calibration();