WebSVN – chibiosIgnition – Diff – /trunk/main.c

  a combined work that includes ChibiOS/RT, without being obliged to provide
  the source code for any proprietary components. See the file exception.txt
  for full details of how and when the exception can be applied.
  */
+#include <stdio.h>
 #include <string.h>
 #include "ch.h"
 #include "hal.h"
-#include "test.h"
+//#include "test.h"
 #include "shell.h"
 #include "evtimer.h"
 #include "chprintf.h"
+#include "usbcfg.h"
 #include "ap_math.h"
 #include "hardware.h"
 #include "useAdc.h"
 #include "spiInterface.h"
 /*===========================================================================*/
 /* Command line related.                                                     */
 /*===========================================================================*/
-#define SHELL_WA_SIZE   THD_WA_SIZE(2048)
+#define SHELL_WA_SIZE   THD_WORKING_AREA_SIZE(2048)
-#define TEST_WA_SIZE    THD_WA_SIZE(256)
+#define TEST_WA_SIZE    THD_WORKING_AREA_SIZE(256)
 static void cmd_mem(BaseChannel *chp, int argc, char *argv[]) {
-        size_t n, size;
+        size_t n, size , largest;
         (void) argv;
         if (argc > 0) {
                 chprintf(chp, "Usage: mem\r\n");
                 return;
+        }
-        n = chHeapStatus(NULL, &size);
+        n = chHeapStatus(NULL, &size, &largest);
         chprintf(chp, "core free memory : %u bytes\r\n", chCoreStatus());
-        chprintf(chp, "heap fragments   : %u\r\n", n);
+        chprintf(chp, "heap fragments   : %u \r\n",n);
+        chprintf(chp, "largest fragment : %u \r\n",largest);
         chprintf(chp, "heap free total  : %u bytes\r\n", size);
+}
-static void cmd_threads(BaseChannel *chp, int argc, char *argv[]) {
+static void cmd_threads(BaseSequentialStream *chp, int argc, char *argv[]) {
-        static const char *states[] = { THD_STATE_NAMES };
+          static const char *states[] = {CH_STATE_NAMES};
-        Thread *tp;
+          thread_t *tp;
-        (void) argv;
+          (void)argv;
-        if (argc > 0) {
+          if (argc > 0) {
-                chprintf(chp, "Usage: threads\r\n");
+            shellUsage(chp, "threads");
-                return;
+            return;
+          }
+          chprintf(chp, "stklimit    stack     addr refs prio     state         name\r\n" SHELL_NEWLINE_STR);
+          tp = chRegFirstThread();
+          do {
+        #if (CH_DBG_ENABLE_STACK_CHECK == TRUE) || (CH_CFG_USE_DYNAMIC == TRUE)
+            uint32_t stklimit = (uint32_t)tp->wabase;
+        #else
+            uint32_t stklimit = 0U;
+        #endif
+            chprintf(chp, "%08lx %08lx %08lx %4lu %4lu %9s %12s" SHELL_NEWLINE_STR,
+                     stklimit, (uint32_t)tp->ctx.sp, (uint32_t)tp,
+                     (uint32_t)tp->refs - 1, (uint32_t)tp->prio, states[tp->state],
+                     tp->name == NULL ? "" : tp->name);
+            tp = chRegNextThread(tp);
+          } while (tp != NULL);
+        }
-        chprintf(chp, "    addr    stack prio refs     state time\r\n");
-        tp = chRegFirstThread();
-        do {
-                chprintf(chp, "%.8lx %.8lx %4lu %4lu %9s %lu\r\n", (uint32_t) tp,
-                                (uint32_t) tp->p_ctx.r13, (uint32_t) tp->p_prio,
-                                (uint32_t)(tp->p_refs - 1), states[tp->p_state],
-                                (uint32_t) tp->p_time);
-                tp = chRegNextThread(tp);
-        } while (tp != NULL);
-}
 static void cmd_test(BaseChannel *chp, int argc, char *argv[]) {
-        Thread *tp;
+        thread_t *tp;
         (void) argv;
         if (argc > 0) {
                 chprintf(chp, "Usage: test\r\n");
                 return;
+        }
-        tp = chThdCreateFromHeap(NULL, TEST_WA_SIZE, chThdGetPriority(), TestThread,
+//tp = chThdCreateFromHeap(NULL, TEST_WA_SIZE, chThdGetPriority(), TestThread,
-                        chp);
+//      chp);
         if (tp == NULL) {
                 chprintf(chp, "out of memory\r\n");
                 return;
+        }
         chThdWait(tp);
+}
 static const ShellCommand commands[] = { { "mem", cmd_mem }, { "threads",
                 cmd_threads }, { "test", cmd_test }, { NULL, NULL } };
-static const ShellConfig shell_cfg1 = { (BaseChannel *) &SD2, commands };
+static const ShellConfig shell_cfg1 = { (BaseChannel *) &SDU1, commands };
 /*
  * Red LEDs blinker thread, times are in milliseconds.
  */
 uint16_t sampleVal;
-static WORKING_AREA(waThread1, 128);
+static THD_WORKING_AREA(waThread1, 128);
 static msg_t Thread1(void *arg) {
         (void) arg;
         chRegSetThreadName("PLL ");
         while (TRUE) {
+        }
         return 0;
+}
 /*
+ * USB Bulk thread, times are in milliseconds.
+ */
+static THD_WORKING_AREA(waThread2, 128);
+static msg_t Thread2(void *arg) {
+        chThdSleep(TIME_INFINITE);
+}
+/*
  * Application entry point.
  */
 int main(void) {
-        Thread *shelltp = NULL;
+        thread_t *shelltp = NULL;
 //  struct EventListener el0, el1;
         /*
          * System initializations.
          * - HAL initialization, this also initializes the configured device drivers
          *   RTOS is active.
          */
         halInit();
         chSysInit();
+        /*
+           * Initializes a serial-over-USB CDC driver.
+           */
+          sduObjectInit(&SDU1);
+          sduStart(&SDU1, &serusbcfg);
+          /*
+           * Activates the USB driver and then the USB bus pull-up on D+.
+           * Note, a delay is inserted in order to not have to disconnect the cable
+           * after a reset.
+           */
+          usbDisconnectBus(serusbcfg.usbp);
+          chThdSleepMilliseconds(1500);
+          usbStart(serusbcfg.usbp, &usbcfg);
+          usbConnectBus(serusbcfg.usbp);
+          // Ignition timing code
         initTimer2();
- useAdc();
+     useAdc();
         /*
          * Activates the serial driver 2 using the driver default configuration.
          */
         sdStart(&SD2, NULL);
     font_sig_digits(12, 0,1,-1, sampleVal);
          display();
-         chMtxUnlock();
+         chMtxUnlock(&mutexDisplay);
          //
 //       invertDisplay(x & 32);
-         chThdSleep(MS2ST(10));
+         chThdSleep(chTimeMS2I(10));
+}
+ // shell thread  code . dead at present
-        /*
+//        /*
-         * Normal main() thread activity, in this demo it does nothing except
+//         * Normal main() thread activity, spawning shells.
-         * sleeping in a loop and listen for events.
-         */
+//         */
-        while (TRUE) {
+//        while (true) {
-                if (!shelltp)
+//          if (SDU1.config->usbp->state == USB_ACTIVE) {
-                        shelltp = shellCreate(&shell_cfg1, SHELL_WA_SIZE, NORMALPRIO);
+//            thread_t *shelltp = chThdCreateFromHeap(NULL, SHELL_WA_SIZE,
-                else if (chThdTerminated(shelltp)) {
+//                                                    "shell", NORMALPRIO + 1,
-                        chThdRelease(shelltp); /* Recovers memory of the previous shell.   */
+//                                                    shellThread, (void *)&shell_cfg1);
-                        shelltp = NULL; /* Triggers spawning of a new shell.        */
+//            chThdWait(shelltp);               /* Waiting termination.             */
-                }
+//          }
-                chThdSleep(MS2ST(100));
+//          chThdSleepMilliseconds(1000);
-                //   chEvtDispatch(evhndl, chEvtWaitOne(ALL_EVENTS));
-        }
+//        }
-        return 0;
+}

Subversion Repositories chibiosIgnition

(root)/trunk/main.c – Rev 6 → 7