Merge branch 'master' into develop

README.md

@@ -8,9 +8,12 @@ http://www.rcarduino.de/doku.php?id=en:arduino:arduinosps
 And there is now a print book at amazon 
 https://www.amazon.com/dp/1731232535
 
+**Version 0.12.3**
+  10.06.2021
+  - adding auto programming feature for the SPS Emulator
+
 **Version 0.12.2**
   07.06.2021
-
   - bug with servo in 4-bit mode, evaluate the full 8 bit.
 
 **Version 0.12.1**
@@ -22,8 +25,11 @@ https://www.amazon.com/dp/1731232535
 **Version 0.12**
   27.01.2019
   - Release
+
   - automatically adding demo program to new mcu
-    11.01.2018
+
+  11.01.2018
+
   - some refactoring
 
   07.01.2018

SPS/SPS.ino

@@ -1,5 +1,9 @@
 /*
   SPS System mit dem Arduino.
+  Version 0.12.3
+  10.06.2021
+  - adding auto programming feature for the SPS Emulator
+  
   Version 0.12.2
   07.06.2021
   - bug with servo in 4-bit mode, evaluate the full 8 bit.
@@ -7,13 +11,13 @@
   Version 0.12.1
   03.09.2019
   - changing the variable names in debug mode
-  
+
   Version 0.12
   27.01.2019
   - adding demo program,
   11.01.2018
   - some refactoring
-  
+
   07.01.2018
   - programming: 1/2 duty cycle for 0 values in address display
 
@@ -78,16 +82,16 @@
 */
 
 /*
- * Here are the defines used in this software to control special parts of the implementation
- * #define SPS_USE_DISPLAY: using a external TM1637 Display for displaying address and data at one time
- * #define SPS_RECEIVER: using a RC receiver input
- * #define SPS_ENHANCEMENT: all of the other enhancments
- * #define SPS_SERVO: using servo outputs
- * #define SPS_TONE: using a tone output
- * #define SPS_SERIAL_PRG: activates the serial programming feature
- */
+   Here are the defines used in this software to control special parts of the implementation
+   #define SPS_USE_DISPLAY: using a external TM1637 Display for displaying address and data at one time
+   #define SPS_RECEIVER: using a RC receiver input
+   #define SPS_ENHANCEMENT: all of the other enhancments
+   #define SPS_SERVO: using servo outputs
+   #define SPS_TONE: using a tone output
+   #define SPS_SERIAL_PRG: activates the serial programming feature
+*/
 // Program im Debugmodus kompilieren, dann werden zus. Ausgaben auf die serielle Schnittstelle geschrieben.
-//#define debug
+#define debug
 
 // defining different hardware platforms
 #ifdef __AVR_ATmega328P__
@@ -236,6 +240,7 @@ void setup() {
 #endif
 
 #ifdef SPS_SERIAL_PRG
+  initSerialPrg();
   if (digitalRead(SW_SEL) == 0) {
     serialPrg();
   }
@@ -278,13 +283,9 @@ void readProgram() {
     byte value = readbyte(addr);
 
 #ifdef debug
-    dbgOut2(value, HEX);
-    if (((addr + 1) % 16) == 0) {
-      dbgOutLn();
-    }
-    else {
-      dbgOut(",");
-    }
+    dbgOutLn();
+    dbgOut2(addr, HEX);
+    dbgOut(": ");
 #endif
 
     if (value == 0xFF) {
@@ -294,10 +295,8 @@ void readProgram() {
     byte cmd = (value & 0xF0);
     byte data = (value & 0x0F);
 
-    dbgOut("(");
-    dbgOut2(cmd, HEX);
+    dbgOut2(cmd>>4, HEX);
     dbgOut2(data, HEX);
-    dbgOut(")");
 
     if (cmd == CALL_SUB) {
       if (data >= 8) {
@@ -308,22 +307,22 @@ void readProgram() {
 #ifdef SPS_SERVO
     if ((cmd == IS_A) && (data == 0x0B)) {
       if (!servo1.attached()) {
-        dbgOutLn("attach Srv1");
+        dbgOutLn(": attach Srv1");
         servo1.attach(SERVO_1);
       }
     } else if ((cmd == CMD_BYTE) && (data == 0x06)) {
       if (!servo1.attached()) {
-        dbgOutLn("attach Srv1");
+        dbgOutLn(": attach Srv1");
         servo1.attach(SERVO_1);
       }
     } else if ((cmd == IS_A) && (data == 0x0C)) {
       if (!servo2.attached()) {
-        dbgOutLn("attach Srv2");
+        dbgOutLn(": attach Srv2");
         servo2.attach(SERVO_2);
       }
     } else if ((cmd == CMD_BYTE) && (data == 0x07)) {
       if (!servo2.attached()) {
-        dbgOutLn("attach Srv2");
+        dbgOutLn(": attach Srv2");
         servo2.attach(SERVO_2);
       }
     }
@@ -336,6 +335,18 @@ void readProgram() {
   main loop
 */
 void loop() {
+#ifdef SPS_SERIAL_PRG
+  if (Serial.available() > 0) {
+    while (Serial.available() > 0) {
+      char myChar = Serial.read();
+      if (myChar == 'p') {
+        serialPrg();
+        Serial.println("end of inline programming");
+        doReset();
+      }
+    }
+  }
+#endif
   byte value = readbyte(addr);
   byte cmd = (value & 0xF0);
   byte data = (value & 0x0F);

SPS/serialprg.ino

@@ -1,240 +1,251 @@
-#ifdef SPS_SERIAL_PRG
-#ifdef __AVR_ATtiny861__
-#define BAUDRATE 9600
-#endif
-
-#ifdef __AVR_ATtiny84__
-#define BAUDRATE 9600
-#endif
-
-#ifdef __AVR_ATmega328P__
-#define BAUDRATE 9600
-#endif
-
-void serialPrg() {
-  byte value;
-  bool endOfPrg = false;
-  bool endOfFile = false;
-  byte data[32];
-  word readAddress;
-  int crc, readcrc;
-  byte count;
-  byte type;
-
-  addr = 0;
-  Serial.end();
-  Serial.begin(BAUDRATE);
-  Serial.println();
-#ifdef __AVR_ATtiny84__
-  Serial.println("TinySPS");
-#endif
-#ifdef __AVR_ATmega328P__
-  Serial.println("ArduinoSPS");
-#endif
-  Serial.println("waiting for command:");
-  Serial.println("w: write HEX file, r: read EPPROM, e: end");
-  while (!endOfPrg) {
-    while (Serial.available() > 0) {
-      // look for the next valid integer in the incoming serial stream:
-      char myChar = Serial.read();
-      if (myChar == 'w') {
-        // hexfile is comming to programm
-        endOfFile = false;
-        Serial.println("ready");
-        addr = 0;
-        do {
-          for (byte i = 0; i < 8; i++) {
-            data[i] = 0xFF;
-          }
-          do {
-            c = getNextChar();
-          } while (!(c == ':'));
-
-#ifdef debug
-          Serial.print(".");
-#endif
-          // read counter
-          c = getNextChar();
-          count = hexToByte(c) << 4;
-          c = getNextChar();
-          count += hexToByte(c);
-#ifdef debug
-          printHex8(count);
-#endif
-
-          crc = count;
-#ifdef debug
-          Serial.print(".");
-#endif
-          // address
-          c = getNextChar();
-          readAddress = hexToByte(c) << 12;
-          c = getNextChar();
-          readAddress += hexToByte(c) << 8;
-          c = getNextChar();
-          readAddress += hexToByte(c) << 4;
-          c = getNextChar();
-          readAddress += hexToByte(c);
-
-#ifdef debug
-          printHex16(readAddress);
-#endif
-
-          crc += readAddress >> 8;
-          crc += readAddress & 0x00FF;
-#ifdef debug
-          Serial.print(".");
-#endif
-
-          // reading data type
-          c = getNextChar();
-          type = hexToByte(c) << 4;
-          c = getNextChar();
-          type += hexToByte(c);
-#ifdef debug
-          printHex8(type);
-#endif
-
-          crc += type;
-
-#ifdef debug
-          Serial.print(".");
-#endif
-
-          if (type == 0x01) {
-            endOfFile = true;
-          }
-
-          // read data bytes
-          for (byte x = 0; x < count; x++) {
-            c = getNextChar();
-            value = hexToByte(c) << 4;
-            c = getNextChar();
-            value += hexToByte(c);
-
-#ifdef debug
-            printHex8(value);
-            Serial.print(".");
-#endif
-
-            data[x] = value;
-            crc += value;
-          }
-          // read CRC
-          c = getNextChar();
-          readcrc = hexToByte(c) << 4;
-          c = getNextChar();
-          readcrc += hexToByte(c);
-
-#ifdef debug
-          printHex8(readcrc);
-          Serial.print(".");
-#endif
-          
-
-          crc += readcrc;
-          // check CRC
-          value = crc & 0x00FF;
-#ifdef debug
-          printHex8(value);
-#endif
-
-          if (value == 0) {
-            Serial.print("ok");
-            // adding value to EEPROM
-            for (byte x = 0; x < count; x++) {
-              EEPROM.write(readAddress + x, data[x]);
-            }
-          } else {
-            Serial.println(", CRC Error");
-            endOfFile = true;
-          }
-
-          Serial.println();
-        } while (!(endOfFile));
-        Serial.println("endOfFile");
-      }
-      if (myChar == 'r') {
-        // write eeprom as hexfile to receiver
-        Serial.println("EEPROM data:");
-        int checksum = 0;
-        for (int addr = 0; addr <= E2END; addr++) {
-          value = EEPROM.read(addr);
-          if ((addr % 8) == 0) {
-            printCheckSum(checksum);
-            checksum = 0;
-            Serial.print(":08");
-            checksum += 0x08;
-            printHex16(addr);
-            checksum += (addr >> 8);
-            checksum += (addr & 0x00FF);
-            Serial.print("00");
-          }
-          printHex8(value);
-          checksum += value;
-        }
-        printCheckSum(checksum);
-        // ending
-        Serial.println(":00000001FF");
-      }
-      if (myChar == 'e') {
-        // end of programm
-        endOfPrg = true;
-      }
-    }
-  }
-  Serial.println("end");
-  Serial.end();
-  doReset();
-}
-
-char getNextChar() {
-  while (!Serial.available()) {
-  }
-  return  Serial.read();
-}
-
-void printCheckSum(int value) {
-  int checksum = value & 0xFF;
-  checksum = (checksum ^ 0xFF) + 1;
-  printHex8(checksum);
-  Serial.println();
-}
-
-void printHex8(int num) {
-  char tmp[3];
-  tmp[0] = nibbleToHex(num >> 4);
-  tmp[1] = nibbleToHex(num);
-  tmp[2] = 0x00;
-  Serial.print(tmp);
-}
-
-void printHex16(int num) {
-  char tmp[5];
-  tmp[0] = nibbleToHex(num >> 12);
-  tmp[1] = nibbleToHex(num >> 8);
-  tmp[2] = nibbleToHex(num >> 4);
-  tmp[3] = nibbleToHex(num);
-  tmp[4] = 0x00;
-  Serial.print(tmp);
-}
-
-byte hexToByte (char c) {
-  if ( (c >= '0') && (c <= '9') ) {
-    return c - '0';
-  }
-  if ( (c >= 'A') && (c <= 'F') ) {
-    return (c - 'A') + 10;
-  }
-}
-
-byte nibbleToHex (byte value) {
-  byte c = value & 0x0F;
-  if ( (c >= 0) && (c <= 9) ) {
-    return c + '0';
-  }
-  if ( (c >= 10) && (c <= 15) ) {
-    return (c + 'A') - 10;
-  }
-}
+#ifdef SPS_SERIAL_PRG
+#ifdef __AVR_ATtiny861__
+#define BAUDRATE 9600
+#endif
+
+#ifdef __AVR_ATtiny84__
+#define BAUDRATE 9600
+#endif
+
+#ifdef __AVR_ATmega328P__
+#define BAUDRATE 9600
+#endif
+
+void initSerialPrg() {
+  Serial.end();
+  Serial.begin(BAUDRATE);  
+  Serial.println();
+}
+
+void sendHeader() {
+#ifdef __AVR_ATtiny84__
+  Serial.println("TinySPS");
+#endif
+#ifdef __AVR_ATmega328P__
+  Serial.println("ArduinoSPS");
+#endif
+  Serial.print("max prg size:");
+  Serial.print(STORESIZE, HEX);
+  Serial.println();
+  Serial.println("waiting for command:");
+  Serial.println("w: write HEX file, r: read EPPROM, e: end");  
+}
+
+void serialPrg() {
+  byte value;
+  bool endOfPrg = false;
+  bool endOfFile = false;
+  byte data[32];
+  word readAddress;
+  int crc, readcrc;
+  byte count;
+  byte type;
+
+  addr = 0;
+  sendHeader();
+  while (!endOfPrg) {
+    while (Serial.available() > 0) {
+      // look for the next valid integer in the incoming serial stream:
+      char myChar = Serial.read();
+      if (myChar == 'w') {
+        // hexfile is comming to programm
+        endOfFile = false;
+        Serial.println("ready");
+        addr = 0;
+        do {
+          for (byte i = 0; i < 8; i++) {
+            data[i] = 0xFF;
+          }
+          do {
+            c = getNextChar();
+          } while (!(c == ':'));
+
+#ifdef debug
+          Serial.print(".");
+#endif
+          // read counter
+          c = getNextChar();
+          count = hexToByte(c) << 4;
+          c = getNextChar();
+          count += hexToByte(c);
+#ifdef debug
+          printHex8(count);
+#endif
+
+          crc = count;
+#ifdef debug
+          Serial.print(".");
+#endif
+          // address
+          c = getNextChar();
+          readAddress = hexToByte(c) << 12;
+          c = getNextChar();
+          readAddress += hexToByte(c) << 8;
+          c = getNextChar();
+          readAddress += hexToByte(c) << 4;
+          c = getNextChar();
+          readAddress += hexToByte(c);
+
+#ifdef debug
+          printHex16(readAddress);
+#endif
+
+          crc += readAddress >> 8;
+          crc += readAddress & 0x00FF;
+#ifdef debug
+          Serial.print(".");
+#endif
+
+          // reading data type
+          c = getNextChar();
+          type = hexToByte(c) << 4;
+          c = getNextChar();
+          type += hexToByte(c);
+#ifdef debug
+          printHex8(type);
+#endif
+
+          crc += type;
+
+#ifdef debug
+          Serial.print(".");
+#endif
+
+          if (type == 0x01) {
+            endOfFile = true;
+          }
+
+          // read data bytes
+          for (byte x = 0; x < count; x++) {
+            c = getNextChar();
+            value = hexToByte(c) << 4;
+            c = getNextChar();
+            value += hexToByte(c);
+
+#ifdef debug
+            printHex8(value);
+            Serial.print(".");
+#endif
+
+            data[x] = value;
+            crc += value;
+          }
+          // read CRC
+          c = getNextChar();
+          readcrc = hexToByte(c) << 4;
+          c = getNextChar();
+          readcrc += hexToByte(c);
+
+#ifdef debug
+          printHex8(readcrc);
+          Serial.print(".");
+#endif
+          
+
+          crc += readcrc;
+          // check CRC
+          value = crc & 0x00FF;
+#ifdef debug
+          printHex8(value);
+#endif
+
+          if (value == 0) {
+            Serial.print("ok");
+            // adding value to EEPROM
+            for (byte x = 0; x < count; x++) {
+              EEPROM.write(readAddress + x, data[x]);
+            }
+          } else {
+            Serial.println(", CRC Error");
+            endOfFile = true;
+          }
+
+          Serial.println();
+        } while (!(endOfFile));
+        Serial.println("endOfFile");
+      }
+      if (myChar == 'r') {
+        // write eeprom as hexfile to receiver
+        Serial.println("EEPROM data:");
+        int checksum = 0;
+        for (int addr = 0; addr <= E2END; addr++) {
+          value = EEPROM.read(addr);
+          if ((addr % 8) == 0) {
+            printCheckSum(checksum);
+            checksum = 0;
+            Serial.print(":08");
+            checksum += 0x08;
+            printHex16(addr);
+            checksum += (addr >> 8);
+            checksum += (addr & 0x00FF);
+            Serial.print("00");
+          }
+          printHex8(value);
+          checksum += value;
+        }
+        printCheckSum(checksum);
+        // ending
+        Serial.println(":00000001FF");
+      }
+      if (myChar == 'e') {
+        // end of programm
+        endOfPrg = true;
+      }
+      if (myChar == 'h') {
+        sendHeader();
+      }
+    }
+  }
+  Serial.println("end");
+}
+
+char getNextChar() {
+  while (!Serial.available()) {
+  }
+  return  Serial.read();
+}
+
+void printCheckSum(int value) {
+  int checksum = value & 0xFF;
+  checksum = (checksum ^ 0xFF) + 1;
+  printHex8(checksum);
+  Serial.println();
+}
+
+void printHex8(int num) {
+  char tmp[3];
+  tmp[0] = nibbleToHex(num >> 4);
+  tmp[1] = nibbleToHex(num);
+  tmp[2] = 0x00;
+  Serial.print(tmp);
+}
+
+void printHex16(int num) {
+  char tmp[5];
+  tmp[0] = nibbleToHex(num >> 12);
+  tmp[1] = nibbleToHex(num >> 8);
+  tmp[2] = nibbleToHex(num >> 4);
+  tmp[3] = nibbleToHex(num);
+  tmp[4] = 0x00;
+  Serial.print(tmp);
+}
+
+byte hexToByte (char c) {
+  if ( (c >= '0') && (c <= '9') ) {
+    return c - '0';
+  }
+  if ( (c >= 'A') && (c <= 'F') ) {
+    return (c - 'A') + 10;
+  }
+}
+
+byte nibbleToHex (byte value) {
+  byte c = value & 0x0F;
+  if ( (c >= 0) && (c <= 9) ) {
+    return c + '0';
+  }
+  if ( (c >= 10) && (c <= 15) ) {
+    return (c + 'A') - 10;
+  }
+}
 #endif