renamed project ADIS_Sumo_Styger to ADIS_Sumo

to be able to have ADIS_Sumo_Styger in same Eclipse workspace
main
Jonas Arnold 4 years ago
parent 27cb9df55d
commit 2404d9a09d
  1. 2
      ADIS_Sumo/.cproject
  2. 0
      ADIS_Sumo/.gitignore
  3. 2
      ADIS_Sumo/.project
  4. 0
      ADIS_Sumo/CMSIS/MK22F12.h
  5. 0
      ADIS_Sumo/CMSIS/MK22F12_features.h
  6. 0
      ADIS_Sumo/CMSIS/arm_common_tables.h
  7. 0
      ADIS_Sumo/CMSIS/arm_const_structs.h
  8. 0
      ADIS_Sumo/CMSIS/arm_math.h
  9. 0
      ADIS_Sumo/CMSIS/cmsis_armcc.h
  10. 0
      ADIS_Sumo/CMSIS/cmsis_armclang.h
  11. 0
      ADIS_Sumo/CMSIS/cmsis_compiler.h
  12. 0
      ADIS_Sumo/CMSIS/cmsis_gcc.h
  13. 0
      ADIS_Sumo/CMSIS/cmsis_version.h
  14. 0
      ADIS_Sumo/CMSIS/core_armv8mbl.h
  15. 0
      ADIS_Sumo/CMSIS/core_armv8mml.h
  16. 0
      ADIS_Sumo/CMSIS/core_cm4.h
  17. 0
      ADIS_Sumo/CMSIS/fsl_device_registers.h
  18. 0
      ADIS_Sumo/CMSIS/mpu_armv7.h
  19. 0
      ADIS_Sumo/CMSIS/system_MK22F12.c
  20. 0
      ADIS_Sumo/CMSIS/system_MK22F12.h
  21. 0
      ADIS_Sumo/Sumo/AdoptToHW.c
  22. 0
      ADIS_Sumo/Sumo/AdoptToHW.h
  23. 0
      ADIS_Sumo/Sumo/Application.c
  24. 0
      ADIS_Sumo/Sumo/Application.h
  25. 0
      ADIS_Sumo/Sumo/Battery.c
  26. 0
      ADIS_Sumo/Sumo/Battery.h
  27. 0
      ADIS_Sumo/Sumo/Buzzer.c
  28. 0
      ADIS_Sumo/Sumo/Buzzer.h
  29. 0
      ADIS_Sumo/Sumo/Drive.c
  30. 0
      ADIS_Sumo/Sumo/Drive.h
  31. 0
      ADIS_Sumo/Sumo/Event.c
  32. 0
      ADIS_Sumo/Sumo/Event.h
  33. 0
      ADIS_Sumo/Sumo/Identify.c
  34. 0
      ADIS_Sumo/Sumo/Identify.h
  35. 0
      ADIS_Sumo/Sumo/LineFollow.c
  36. 0
      ADIS_Sumo/Sumo/LineFollow.h
  37. 0
      ADIS_Sumo/Sumo/LineHistory.c
  38. 0
      ADIS_Sumo/Sumo/LineHistory.h
  39. 0
      ADIS_Sumo/Sumo/Maze.c
  40. 0
      ADIS_Sumo/Sumo/Maze.h
  41. 0
      ADIS_Sumo/Sumo/Motor.c
  42. 0
      ADIS_Sumo/Sumo/Motor.h
  43. 0
      ADIS_Sumo/Sumo/NVM_Config.c
  44. 0
      ADIS_Sumo/Sumo/NVM_Config.h
  45. 0
      ADIS_Sumo/Sumo/Pid.c
  46. 0
      ADIS_Sumo/Sumo/Pid.h
  47. 0
      ADIS_Sumo/Sumo/QuadCounter.c
  48. 0
      ADIS_Sumo/Sumo/QuadCounter.h
  49. 0
      ADIS_Sumo/Sumo/Reflectance.c
  50. 0
      ADIS_Sumo/Sumo/Reflectance.h
  51. 53
      ADIS_Sumo/Sumo/Remote.c
  52. 0
      ADIS_Sumo/Sumo/Remote.h
  53. 0
      ADIS_Sumo/Sumo/Tacho.c
  54. 0
      ADIS_Sumo/Sumo/Tacho.h
  55. 0
      ADIS_Sumo/Sumo/Timer.c
  56. 0
      ADIS_Sumo/Sumo/Timer.h
  57. 0
      ADIS_Sumo/Sumo/Trigger.c
  58. 0
      ADIS_Sumo/Sumo/Trigger.h
  59. 0
      ADIS_Sumo/Sumo/Turn.c
  60. 0
      ADIS_Sumo/Sumo/Turn.h
  61. 0
      ADIS_Sumo/board/board.c
  62. 0
      ADIS_Sumo/board/board.h
  63. 0
      ADIS_Sumo/board/clock_config.c
  64. 0
      ADIS_Sumo/board/clock_config.h
  65. 0
      ADIS_Sumo/board/peripherals.c
  66. 0
      ADIS_Sumo/board/peripherals.h
  67. 0
      ADIS_Sumo/board/pin_mux.c
  68. 0
      ADIS_Sumo/board/pin_mux.h
  69. 0
      ADIS_Sumo/drivers/fsl_adc16.c
  70. 0
      ADIS_Sumo/drivers/fsl_adc16.h
  71. 0
      ADIS_Sumo/drivers/fsl_clock.c
  72. 0
      ADIS_Sumo/drivers/fsl_clock.h
  73. 0
      ADIS_Sumo/drivers/fsl_common.c
  74. 0
      ADIS_Sumo/drivers/fsl_common.h
  75. 0
      ADIS_Sumo/drivers/fsl_dspi.c
  76. 0
      ADIS_Sumo/drivers/fsl_dspi.h
  77. 0
      ADIS_Sumo/drivers/fsl_flash.c
  78. 0
      ADIS_Sumo/drivers/fsl_flash.h
  79. 0
      ADIS_Sumo/drivers/fsl_ftm.c
  80. 0
      ADIS_Sumo/drivers/fsl_ftm.h
  81. 0
      ADIS_Sumo/drivers/fsl_gpio.c
  82. 0
      ADIS_Sumo/drivers/fsl_gpio.h
  83. 0
      ADIS_Sumo/drivers/fsl_i2c.c
  84. 0
      ADIS_Sumo/drivers/fsl_i2c.h
  85. 0
      ADIS_Sumo/drivers/fsl_pit.c
  86. 0
      ADIS_Sumo/drivers/fsl_pit.h
  87. 0
      ADIS_Sumo/drivers/fsl_port.h
  88. 0
      ADIS_Sumo/drivers/fsl_rtc.c
  89. 0
      ADIS_Sumo/drivers/fsl_rtc.h
  90. 0
      ADIS_Sumo/drivers/fsl_sim.c
  91. 0
      ADIS_Sumo/drivers/fsl_sim.h
  92. 0
      ADIS_Sumo/drivers/fsl_sysmpu.c
  93. 0
      ADIS_Sumo/drivers/fsl_sysmpu.h
  94. 0
      ADIS_Sumo/drivers/fsl_uart.c
  95. 0
      ADIS_Sumo/drivers/fsl_uart.h
  96. 0
      ADIS_Sumo/part-support/MK22FX512xxx12_manifest_v3_2.xml
  97. 0
      ADIS_Sumo/part-support/devices/MK21FA12/MK21FA12.xml
  98. 0
      ADIS_Sumo/part-support/devices/MK21FA12/mcuxpresso/FTFE_4K.cfx
  99. 0
      ADIS_Sumo/part-support/devices/MK22F12/MK22F12.xml
  100. 0
      ADIS_Sumo/part-support/devices/MK22F12/mcuxpresso/FTFE_4K.cfx
  101. Some files were not shown because too many files have changed in this diff Show More

@ -394,7 +394,7 @@
<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/> <storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
<storageModule moduleId="refreshScope" versionNumber="2"> <storageModule moduleId="refreshScope" versionNumber="2">
<configuration configurationName="Debug"> <configuration configurationName="Debug">
<resource resourceType="PROJECT" workspacePath="/ADIS_Sumo_Styger"/> <resource resourceType="PROJECT" workspacePath="/ADIS_Sumo"/>
</configuration> </configuration>
<configuration configurationName="Release"> <configuration configurationName="Release">
<resource resourceType="PROJECT" workspacePath="/MK22FX512xxx12_SumoV2"/> <resource resourceType="PROJECT" workspacePath="/MK22FX512xxx12_SumoV2"/>

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<projectDescription> <projectDescription>
<name>ADIS_Sumo_Styger</name> <name>ADIS_Sumo</name>
<comment></comment> <comment></comment>
<projects> <projects>
</projects> </projects>

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2019-2021, Erich Styger * Copyright (c) 2019-2022, Erich Styger
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -12,7 +12,6 @@
#include "Shell.h" #include "Shell.h"
#include "Buzzer.h" #include "Buzzer.h"
#include "McuESP32.h" #include "McuESP32.h"
#include "McuLog.h"
/*! \todo ADIS: This is a (mostly empty) template where the remote commands from the ESP32 could be handled. This module should be extended to send data back to the ESP32 */ /*! \todo ADIS: This is a (mostly empty) template where the remote commands from the ESP32 could be handled. This module should be extended to send data back to the ESP32 */
@ -31,11 +30,7 @@ void REMOTE_GatewayRxFromESP(unsigned char ch) {
static void RemoteTask(void *pv) { static void RemoteTask(void *pv) {
unsigned char ch; unsigned char ch;
BaseType_t res; BaseType_t res;
unsigned char espMsg[McuShell_DEFAULT_SHELL_BUFFER_SIZE] = "";
const char espMsgPrefix[] = "@robot:cmd ";
const char espMsgPostfix[] = "!\r\n";
uint8_t saveChar = 0;
uint8_t writeIndex = 0;
(void)pv; /* not used */ (void)pv; /* not used */
#if 0 /* example making a beep */ #if 0 /* example making a beep */
BUZ_Beep(200, 500); BUZ_Beep(200, 500);
@ -57,52 +52,20 @@ static void RemoteTask(void *pv) {
} }
#endif #endif
for(;;) { for(;;) {
res = xQueueReceive(REMOTE_RxFromESP_Queue, &ch, pdMS_TO_TICKS(10)); /* wait max 10 ms */ res = xQueueReceive(REMOTE_RxFromESP_Queue, &ch, portMAX_DELAY); /* make sure we empty the queue */
if (res==errQUEUE_EMPTY) { /*! \todo ADIS: implement handling remote stream from ESP **/
ch = '\0'; /* nothing received */
}
else if(res == pdPASS) {
/* something was received */
/* handle remote stream from ESP */
// uint8_t mCh = (uint8_t)ch;
// uint8_t mCh[10] = "Char: ";
// unsigned char newLine = '\n';
// McuUtility_strcat(mCh, 10, &ch);
// McuUtility_strcat(mCh, 10, &newLine);
// McuShell_SendStr(mCh, McuShell_GetStdio()->stdOut);
if(ch == '@'){
saveChar = 1;
writeIndex = 0;
BUZ_Beep(200, 500);
}
if(saveChar == 1){
espMsg[writeIndex++] = ch;
}
if(ch == '!' && saveChar == 1){
saveChar = 0;
McuShell_SendStr(espMsg, McuShell_GetStdio()->stdOut);
McuShell_SendStr((uint8_t*)" okok.\r\n", McuShell_GetStdio()->stdOut);
if (McuUtility_strncmp(espMsg, espMsgPrefix, sizeof(espMsgPrefix)-1) == 0) { /* check prefix */
unsigned char recCmd[32] = {0};
memmove(recCmd,espMsg+strlen(espMsgPrefix),REMOTE_RX_FROM_ESP_QUEUE_LENGTH-strlen(espMsgPrefix)-1);
McuUtility_strCutTail(recCmd, (uint8_t*)"!\0");
McuShell_SendStr(recCmd, McuShell_GetStdio()->stdOut);
}
}else if(writeIndex == McuShell_DEFAULT_SHELL_BUFFER_SIZE && saveChar == 1){
saveChar = 0;
McuShell_SendStr(espMsg, McuShell_GetStdio()->stdOut);
McuShell_SendStr((uint8_t*)" Error in cmd.\r\n", McuShell_GetStdio()->stdOut);
}
}
} }
} }
uint8_t REMOTE_ParseCommand(const unsigned char *cmd, bool *handled, const McuShell_StdIOType *io) { uint8_t REMOTE_ParseCommand(const unsigned char *cmd, bool *handled, const McuShell_StdIOType *io) {
(void)cmd;
(void)handled;
(void)io;
return ERR_OK; return ERR_OK;
} }
void REMOTE_Deinit(void) { void REMOTE_Deinit(void) {
/* nothing needed */
} }
void REMOTE_Init(void) { void REMOTE_Init(void) {

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save