added stk500v2 protocol and mega tests

Author: mrfrase3

src/avr/index.ts

@@ -3,11 +3,12 @@ import { ProgramConfig } from '../index.d';
 
 import intelHex from 'intel-hex';
 import getCpuData from './avr-cpu-data';
-import STK500v1 from './stk500-v1';
+import STK500v1 from './stk500-v1/stk500-v1';
+import STK500v2 from './stk500-v2/stk500-v2';
 
 export const upload = async (serial: SerialPort, config: ProgramConfig) => {
   const cpuData = getCpuData(config.cpu);
-  let uploader = null as STK500v1 | null;
+  let uploader = null as STK500v2 | STK500v1 | null;
   switch (cpuData.protocol) {
     case 'stk500v1':
       uploader = new STK500v1(serial, { quiet: !config.verbose });
@@ -20,6 +21,13 @@ export const upload = async (serial: SerialPort, config: ProgramConfig) => {
         },
       );
       break;
+      case 'stk500v2':
+        uploader = new STK500v2(serial, { quiet: !config.verbose });
+        await uploader.bootload(
+          intelHex.parse(config.hex || '').data,
+          cpuData,
+        );
+        break;
     default:
       throw new Error(`Protocol ${cpuData.protocol} not supported`);
   }

src/avr/stk500-v1.ts src/avr/stk500-v1/stk500-v1.tssrc/avr/stk500-v1.ts renamed to src/avr/stk500-v1/stk500-v1.ts

@@ -2,7 +2,8 @@
 // converted to typescript/modernised by mrfrase3 (GPL-3.0 license)
 
 import { SerialPort } from 'serialport/dist/index.d';
-import { setDTRRTS } from '../util/serial-helpers';
+import { setDTRRTS } from '../../util/serial-helpers';
+import asyncTimeout from '../../util/asyncTimeout';
 
 interface STK500v1Options {
   quiet?: boolean;
@@ -64,8 +65,6 @@ const statics = {
 };
 statics.OK_RESPONSE = Buffer.from([statics.RES_STK_INSYNC, statics.RES_STK_OK]);
 
-const asyncTimeout = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms));
-
 export default class STK500v1 {
   opts: STK500v1Options;
   quiet: boolean;
@@ -291,7 +290,7 @@ export default class STK500v1 {
       responseData: statics.OK_RESPONSE,
       timeout,
     });
-  };
+  }
 
   async upload(hex: Buffer, pageSize: number, timeout = 400) {
     this.log('upload');
@@ -302,14 +301,14 @@ export default class STK500v1 {
       await promise;
       const pageaddr = i * pageSize;
       const useaddr = pageaddr >> 1;
-      const writeBytes = hex.slice(pageaddr, Math.min(pageaddr + pageSize, hex.length - 1));
+      const writeBytes = hex.subarray(pageaddr, (hex.length > pageSize ? (pageaddr + pageSize) : hex.length - 1));
       await this.loadAddress(useaddr, timeout);
       await this.loadPage(writeBytes, timeout);
       this.log(`uploaded page ${i + 1} of ${pages.length}`);
-      asyncTimeout(4);
+      await asyncTimeout(4);
     }, Promise.resolve());
     this.log('upload complete');
-  };
+  }
 
   exitProgrammingMode(timeout = 400): Promise<Buffer|null> {
     this.log('exiting programming mode');
@@ -320,7 +319,7 @@ export default class STK500v1 {
       responseData: statics.OK_RESPONSE,
       timeout,
     });
-  };
+  }
 
   async verify(hex: Buffer, pageSize: number, timeout = 400) {
     this.log('verify');
@@ -331,14 +330,14 @@ export default class STK500v1 {
       await promise;
       const pageaddr = i * pageSize;
       const useaddr = pageaddr >> 1;
-      const writeBytes = hex.slice(pageaddr, Math.min(pageaddr + pageSize, hex.length - 1));
+      const writeBytes = hex.subarray(pageaddr, (hex.length > pageSize ? (pageaddr + pageSize) : hex.length - 1));
       await this.loadAddress(useaddr, timeout);
       await this.verifyPage(writeBytes, pageSize, timeout);
       this.log(`verified page ${i + 1} of ${pages.length}`);
       asyncTimeout(4);
     }, Promise.resolve());
     this.log('verification complete');
-  };
+  }
 
   verifyPage(writeBytes: Buffer, pageSize: number, timeout: number) {
     this.log("verify page");
@@ -361,7 +360,7 @@ export default class STK500v1 {
       responseLength: expectedResponse.length,
       timeout,
     }); 
-  };
+  }
 
   async reset() {
     this.log('reset');
@@ -392,5 +391,5 @@ export default class STK500v1 {
     await this.exitProgrammingMode(opt.timeout);
 
     this.log('bootload complete');
-  };
+  }
 }

src/avr/stk500-v2/constants.ts

@@ -0,0 +1,97 @@
+interface ConstantsMap {
+  [constant: string]: number
+}
+
+export default {
+  // STK message constants
+  MESSAGE_START: 0x1B,
+  TOKEN: 0x0E,
+
+  // STK general command constants
+  CMD_SIGN_ON: 0x01,
+  CMD_SET_PARAMETER: 0x02,
+  CMD_GET_PARAMETER: 0x03,
+  CMD_SET_DEVICE_PARAMETERS: 0x04,
+  CMD_OSCCAL: 0x05,
+  CMD_LOAD_ADDRESS: 0x06,
+  CMD_FIRMWARE_UPGRADE: 0x07,
+
+  // STK ISP command constants
+  CMD_ENTER_PROGMODE_ISP: 0x10,
+  CMD_LEAVE_PROGMODE_ISP: 0x11,
+  CMD_CHIP_ERASE_ISP: 0x12,
+  CMD_PROGRAM_FLASH_ISP: 0x13,
+  CMD_READ_FLASH_ISP: 0x14,
+  CMD_PROGRAM_EEPROM_ISP: 0x15,
+  CMD_READ_EEPROM_ISP: 0x16,
+  CMD_PROGRAM_FUSE_ISP: 0x17,
+  CMD_READ_FUSE_ISP: 0x18,
+  CMD_PROGRAM_LOCK_ISP: 0x19,
+  CMD_READ_LOCK_ISP: 0x1A,
+  CMD_READ_SIGNATURE_ISP: 0x1B,
+  CMD_READ_OSCCAL_ISP: 0x1C,
+  CMD_SPI_MULTI: 0x1D,
+
+  // STK PP command constants
+  CMD_ENTER_PROGMODE_PP: 0x20,
+  CMD_LEAVE_PROGMODE_PP: 0x21,
+  CMD_CHIP_ERASE_PP: 0x22,
+  CMD_PROGRAM_FLASH_PP: 0x23,
+  CMD_READ_FLASH_PP: 0x24,
+  CMD_PROGRAM_EEPROM_PP: 0x25,
+  CMD_READ_EEPROM_PP: 0x26,
+  CMD_PROGRAM_FUSE_PP: 0x27,
+  CMD_READ_FUSE_PP: 0x28,
+  CMD_PROGRAM_LOCK_PP: 0x29,
+  CMD_READ_LOCK_PP: 0x2A,
+  CMD_READ_SIGNATURE_PP: 0x2B,
+  CMD_READ_OSCCAL_PP: 0x2C,
+  CMD_SET_CONTROL_STACK: 0x2D,
+
+  // STK HVSP command constants
+  CMD_ENTER_PROGMODE_HVSP: 0x30,
+  CMD_LEAVE_PROGMODE_HVSP: 0x31,
+  CMD_CHIP_ERASE_HVSP: 0x32,
+  CMD_PROGRAM_FLASH_HVSP: 0x33,
+  CMD_READ_FLASH_HVSP: 0x34,
+  CMD_PROGRAM_EEPROM_HVSP: 0x35,
+  CMD_READ_EEPROM_HVSP: 0x36,
+  CMD_PROGRAM_FUSE_HVSP: 0x37,
+  CMD_READ_FUSE_HVSP: 0x38,
+  CMD_PROGRAM_LOCK_HVSP: 0x39,
+  CMD_READ_LOCK_HVSP: 0x3A,
+  CMD_READ_SIGNATURE_HVSP: 0x3B,
+  CMD_READ_OSCCAL_HVSP: 0x3C,
+
+  // STK status constants
+  // Success
+  STATUS_CMD_OK: 0x00,
+  // Warnings
+  STATUS_CMD_TOUT: 0x80,
+  STATUS_RDY_BSY_TOUT: 0x81,
+  STATUS_SET_PARAM_MISSING: 0x82,
+  // Errors
+  STATUS_CMD_FAILED: 0xC0,
+  STATUS_CKSUM_ERROR: 0xC1,
+  STATUS_CMD_UNKNOWN: 0xC9,
+
+  // STK parameter constants
+  STATUS_BUILD_NUMBER_LOW: 0x80,
+  STATUS_BUILD_NUMBER_HIGH: 0x81,
+  STATUS_HW_VER: 0x90,
+  STATUS_SW_MAJOR: 0x91,
+  STATUS_SW_MINOR: 0x92,
+  STATUS_VTARGET: 0x94,
+  STATUS_VADJUST: 0x95,
+  STATUS_OSC_PSCALE: 0x96,
+  STATUS_OSC_CMATCH: 0x97,
+  STATUS_SCK_DURATION: 0x98,
+  STATUS_TOPCARD_DETECT: 0x9A,
+  STATUS_STATUS: 0x9C,
+  STATUS_DATA: 0x9D,
+  STATUS_RESET_POLARITY: 0x9E,
+  STATUS_CONTROLLER_INIT: 0x9F,
+
+  // STK answer constants
+  ANSWER_CKSUM_ERROR: 0xB0,
+} as ConstantsMap;