Updated 1.1

Author: howellivy

Quest_CLI/Quest_CLI_V1.0.ino renamed to Quest_CLI/Quest_CLI_V1.1.ino

@@ -41,14 +41,17 @@
                   user_text buffer text size same now.. Need to clean up code for humans..
   20231120 CLI_V1.0 Required to make a complete program - this file, CLI_V1.0,Quest_CLI.h, Quest_Flight.h,Quest_flight.cpp
                   cmd_takeSphot , cmd_takeSpiphoto, nophotophoto, nophoto30K --,clean up code for understanding.
-
+  20231207 CLI_V1.1 Required to make a complete program - this file, CLI_V1.1,Quest_CLI.h, Quest_Flight.h,Quest_flight.cpp
+                  Fixed Bug of crrupted file names when being uploaded to the McMek.  added terminal countdown for the "T" 
+                  command during startup.  Only affected file is CLI.V1.1 all other files
+                  do not need to change...Flight or libraries...
  * *****************************************************************************
 */
 //
-int Qversion = 20230715;  //Program version
+char Qversion [] = "CLI_V1.1";  //Program version
 const char compile_date[] = __DATE__ " " __TIME__;
 const char source_file[] = __FILE__;
-
+//
 //-----includes--------------------
 #include <Wire.h>
 #include <i2cdetect.h>
@@ -634,9 +637,9 @@ void setup() {
   //
   //
   Serial.println("\r\n\n----------------------------------------------------------");
-  Serial.println("\nSystem Startup - S3_40 Testing Command line interface 20220710");
+  Serial.println("\nSystem Startup - S3_40 Testing Command line interface CLI_V1.1");
   Serial.println("interface not complete, look for future cleaner updates, Thank you!");
-  Serial.println("add to change this is your playground to learn the S3_40 system\n");
+  Serial.println("add to change this is your flight playground to learn the S3_40 system\n");
   //
   //------------ set digital IO to output and high ------------
   pinMode(IO7, OUTPUT);      //
@@ -709,31 +712,7 @@ void setup() {
   Serial.println("SD installed OK");
   initSD();                             //set up SD files and system files for operation
   //
-  /*
-    //----------------------------------------------------------------------
-    //-------- Check for Cumulitive Mission Time file if no exist Create it
-    //
-    File CumMisClk = SD.open("CumMisClk.txt");   //name of file
-    if (CumMisClk){
-      Serial.println("CumMisClk file exist");
-    }
-    else{
-      Serial.println("Made CumMisClk file");
-      FsDateTime::setCallback(dateTime);            //set time and date for file
-      File CumMisClk = SD.open("CumMisClk.txt", FILE_WRITE);
-      str=String(1);
-          Serial.println(str);
-          str.toCharArray(text_buf,11);
-          CumMisClk.print(text_buf);
-
-      }
-    CumMisClk.close();
-    //
-    Serial.println("CumMisClk.tct written");
-  */
   //----------------------------------------------------------------------
-  //
-  //
   //----------- System test flages ---------------------------------------
   //
   testing = false;    //reset active command line processing flag
@@ -755,13 +734,12 @@ void loop() {
   Serial.println();
   Serial.print("Free Memory = "); Serial.print(freeMemory(), HEX);
   Serial.print(" HEX or "); Serial.print(freeMemory()); Serial.println(" DEC");
-  cmd_stackandheap();
   //
-
   Serial.println("\r\n\nInput 'T' to enter test within 15 seconds");
   //
   uint32_t currentMillis = millis();          //this is time now
-
+  uint16_t countdown = 15;                    //tet countdown clock
+  long unsigned int milliscountdown = millis();       //countdown counter for test
   //??????????????????????????????????????????????????????????????????????????????????????????????????????
   //   test for Flying();                           //Set Flying active and go to flight programming
   //??????????????????????????????????????????????????????????????????????????????????????????????????????
@@ -776,6 +754,11 @@ void loop() {
         SoftwareReset();
       }
     }
+    if(millis() - milliscountdown > 1000){      //count every second in waiting for test
+        milliscountdown = millis();
+        countdown--;                            //decrease count for test
+        Serial.print("Enter 'T' for test else enter flying  Wait time = "); Serial.print(countdown); Serial.print("   version = ");Serial.println(Qversion);
+    }
   }
   if (testing == true) {
     SoftwareReset();
@@ -2350,8 +2333,9 @@ void Hostinterupt() {
             uint16_t retval;                              //meke return error test reg
             retval = getFilefromQue(args[1]);             //get the file name in args[1]
             if (retval == 0) {                            //returned value ==0, got a regonized name
-              //Serial.print("got filename:");              //sayso
-              //Serial.println(args[1]);                    //print out the name
+             // Serial.print("got filename:");              //sayso
+             // Serial.println(args[1]);                    //print out the name
+              Chardelay();           //delay to let master to recover
             } else {
               Serial.println("err: got no filename");     //error does not know file
               EIC->INTFLAG.reg = EIC_INTFLAG_EXTINT(0);   //abort reset the IRQ Flag

Quest_CLI/Quest_Flight.ino

@@ -1,15 +1,39 @@
-/**
- * 
- *                 20231110 Version 1.0
-   @file flying.ino
-   @author howell ivy
-   @brief Logic for experiment My-Cool-Experiment
-   @version 1.0
-   @date 2023-07-15
-
-  20231120 CLI_V1.0 Required to make a complete program - this file, CLI_V1.0,Quest_CLI.h, Quest_Flight.h,Quest_flight.cpp
-                  cmd_takeSphot , cmd_takeSpiphoto, nophotophoto, nophoto30K --,clean up code for understanding.
-                  
+/*
+****************************************************************************************
+****************************************************************************************
+20231121
+Files Required to make a complete program - 
+  CLI_V1.0, Quest_CLI.h, Quest_Flight.h, Quest_flight.cpp
+      Important Functions and their use:
+          cmd_takeSphot
+              This function will use the serial camera (the one with the cable) to take a photo (jpg)
+              on the transfer of this photo to the Host controller it will create a text file (txt)
+              with the same file name as the jpg file of the conditions of when the jpg was taken.
+              NOTE: add2text can be used with this command
+          cmd_takeSpiphoto
+              This function is for the SPI camera (the one that plugges directly on the microlab board)
+              it will take a jpg the same as the serial camera, also creating a txt file.  Also NOTE: the
+              add2text function can be used on the photo text file.
+          nophotophoto
+              if a camera is not being used, then this will simulate the camera photo operation. The text file 
+              is still created, so the add2text function can be used the get data downloaded in the text file
+          nophoto30K
+              this dois not use a camera, instead it uses the file space for the photo the containe ascii data
+              using dataappend function defined below.  The data will still have a jpg etension, but the file
+              will contain ascii of the data put in buy the dataappend unction. Plus a text file is generated,
+              and the add2text function will add more data.
+          -----
+          add2text(int value1,int value2,int value3)
+              this function will take the three varables and place them at the end of the text file (the file is
+              limited the 1024 charators),  if you look at the function the text output can be formatted is almost
+              any way.  Look at it and change it to acccomadate your data...
+          dataappend(int counts,int ampli,int SiPM,int Deadtime)
+              this function will add ascii data to the 30K byte data buffer that was used a a jpg photo.  look at
+              the data formating and change it necessary for you project information.  To view the data, you can
+              use a hex/ascii file viewer or change the ext to a txt.  then it should be viewable with a text exitor.
+.
+******************************************************************************************                                   
+******************************************************************************************                  
 */
 
 #include "Quest_Flight.h"
@@ -48,8 +72,8 @@
 //
 //
 void Flying() {
-  Serial.println("Here to Run flight program, not done yet 20230718");
-  Serial.println(" 20231116 working on it");
+  //
+  Serial.println("\n\rRun flight program\n\r");
   //
   uint32_t TimeEvent1 = millis();               //set TimeEvent1 to effective 0
   uint32_t Sensor1Timer = millis();             //clear sensor1Timer to effective 0

libraries/Adafruit_BME680_Library/Adafruit_BME680.h

@@ -32,7 +32,7 @@
 #include <Adafruit_Sensor.h>
 #include <Wire.h>
 
-#define BME68X_DEFAULT_ADDRESS (0x77)    ///< The default I2C address
+#define BME68X_DEFAULT_ADDRESS (0x76)    ///< The default I2C address
 #define BME68X_DEFAULT_SPIFREQ (1000000) ///< The default SPI Clock speed
 
 #define BME680_OS_16X BME68X_OS_16X   ///< Alias for BME680 existing examples

libraries/Quest_fram/Quest_fram.cpp

@@ -175,7 +175,7 @@ int initfram(){
   Serial.println("\n\rFram Memory bad or not intalled\r\n Program will not function correctly\n\r");
  } 
   Serial.println("Initing Fram Memory");
-  writeIDfram('B');                              //default ID = XY into Fram
+  writeIDfram('I');                              //default ID = XY into Fram
   //
  // uint16_t x =  readIDfram();
  // if(x!=0x5859){
@@ -188,7 +188,8 @@ int initfram(){
   writeintfram( 0, Resetaddress);
   writeintfram( 0, PCSaddress); 
   writeintfram( 0, PCPaddress); 
-  writeintfram( 0, PCDaddress);   
+  writeintfram( 0, PCDaddress);
+  writeintfram( 0, W24HOURS);   
   //
   // head of Que pointer
 //  writelongfram(0x55555555, CumUnix);       //total unix
@@ -202,6 +203,7 @@ int initfram(){
   Serial.print("PCSaddress = ");Serial.println(PCSaddress);
   Serial.print("PCPaddress = ");Serial.println(PCPaddress);
   Serial.print("PCDaddress = ");Serial.println(PCDaddress);
+  Serial.print("W24HOURS = ");Serial.println(W24HOURS);
 //
   Serial.println("***** TEAM ID MUST NOW BE SET *****");
   return 0; 

libraries/Quest_fram/Quest_fram.h

@@ -40,6 +40,7 @@ const uint16_t PCPaddress = (PCSaddress + PCSsize);          //PCDaddress number
 const uint16_t PCPsize = (2);                                  //Size of PCDaddress
 const uint16_t PCDaddress = (PCPaddress + PCPsize);          //PCMaddress number address Spi photos
 const uint16_t PCDsize = (2);                                  //Size of PCMaddress
+const uint16_t W24HOURS = (PCDaddress+PCDsize);			// Wait 24hour flag 0=not 24 hours yet
 //
 //
 //const statement[] = "this is an array in fram"

libraries/c329-SPI/QuestCameraC329SPI.cpp

@@ -186,7 +186,7 @@ bool QuestCameraC329SPI::getPictureSPI(PictureType pictureType, void (*callback)
 {
   uint32_t pictureSize = 0;
 
-  resetSPI(RT_STATE);		//hai
+ // resetSPI(RT_STATE);		//hai
 
 //  while (!waitForACK(SPIRESPONSE_DELAY, CMD_GETPICTURE) && ack_counter < 100) {
 //    delay(10);

libraries/c329-SPI/QuestCameraC329SPI.h

@@ -72,7 +72,7 @@ class QuestCameraC329SPI
       CT_RGB16 = 0x06,
       CT_RGB24 = 0x08,
       CT_YUV16 = 0x09,
-      CT_JPEG = 0x07
+      CT_JPEG = 0x87
     };
     enum PreviewResolution
     {
@@ -82,7 +82,7 @@ class QuestCameraC329SPI
       PR_176x144 = 0x04,
       PR_320x240 = 0x05,
       PR_352x288 = 0x06,
-      PR_640x480 = 0x87,
+      PR_640x480 = 0x07,
       PR_80x64 = 0x08,
       PR_128x96 = 0x09,
       PR_128x128 = 0x0A,
@@ -96,7 +96,7 @@ class QuestCameraC329SPI
       JR_176x144 = 0x04,
       JR_320x240 = 0x05,
       JR_352x288 = 0x06,
-      JR_640x480 = 0x87,
+      JR_640x480 = 0x07,
       JR_80x64 = 0x08,
       JR_128x96 = 0x09,
       JR_128x128 = 0x0A,