Problem with CWNANO course SCA-101

I did the training last year with a Chipwhisrer lite. I’m going back through it with a CWNANO.

  1. I’m having a problem on the Connecting to Hardware.
    a. I can get everything to work up to 1.7
    b. I cannot get 1.7 to work

Environment
VirtualBox using ChipWhisperer.Jupyter.7z (v5.5.2) downloaded yesterday

Code that I’m using

I re run through 1.6 then in 1.7

print("arm")
scope.arm()
print("running")
target.simpleserial_write('p', msg)
print("ran")
scope.capture()
print("capture done")

where msg is being set in previous steps.

Output

arm
running
ran
---------------------------------------------------------------------------
KeyError                                  Traceback (most recent call last)
~/.pyenv/versions/3.7.7/envs/cw/lib/python3.7/site-packages/pyusb-1.1.1-py3.7.egg/usb/core.py in get_interface_and_endpoint(self, device, endpoint_address)
    235         try:
--> 236             return self._ep_info[endpoint_address]
    237         except KeyError:

KeyError: None

During handling of the above exception, another exception occurred:

TypeError                                 Traceback (most recent call last)
<ipython-input-62-61d59d6b15b7> in <module>
      4 target.simpleserial_write('p', msg)
      5 print("ran")
----> 6 scope.capture()
      7 print("capture done")
      8 

~/work/projects/chipwhisperer/software/chipwhisperer/capture/scopes/cwnano.py in capture(self)
    694                     return True
    695 
--> 696             self._lasttrace = self._cwusb.cmdReadMem(0, self.adc.samples)
    697 
    698             # can just keep rerunning this until it works I think

~/work/projects/chipwhisperer/software/chipwhisperer/hardware/naeusb/naeusb.py in cmdReadMem(self, addr, dlen)
    798         """
    799 
--> 800         return self.usbseralizer.cmdReadMem(addr, dlen)
    801 
    802     def cmdWriteMem(self, addr, data):

~/work/projects/chipwhisperer/software/chipwhisperer/hardware/naeusb/naeusb.py in cmdReadMem(self, addr, dlen)
    202         cmdpacket = self.make_cmd(self.CMD_READ_MEM, payload)
    203 
--> 204         return self.process_rx(self.txrx(tx=cmdpacket))
    205 
    206     def cmdWriteMem(self, addr, data):

~/work/projects/chipwhisperer/software/chipwhisperer/hardware/naeusb/naeusb.py in txrx(self, tx)
    311                 addr = payload[0]
    312                 dlen = payload[1]
--> 313                 response = self.cmdReadMem(addr, dlen)
    314                 naeusb_logger.debug("CMD_READ_MEM: addr: {:08X}, dlen: {:08X}, response: {}".format(addr, dlen, response))
    315             elif cmd == self.CMD_WRITE_MEM:

~/work/projects/chipwhisperer/software/chipwhisperer/hardware/naeusb/naeusb.py in cmdReadMem(self, addr, dlen)
    531         # Get data
    532         if cmd == self.CMD_READMEM_BULK:
--> 533             data = self.usbdev().read(self.rep, dlen, timeout=self._timeout)
    534             # XXX Husky debug:
    535             naeusb_logger.info('YYY BULK rep=%d, dlen=%d, got len=%d' % (self.rep, dlen, len(data)))

~/.pyenv/versions/3.7.7/envs/cw/lib/python3.7/site-packages/pyusb-1.1.1-py3.7.egg/usb/core.py in read(self, endpoint, size_or_buffer, timeout)
   1009                 }
   1010 
-> 1011         intf, ep = self._ctx.setup_request(self, endpoint)
   1012         fn = fn_map[util.endpoint_type(ep.bmAttributes)]
   1013 

~/.pyenv/versions/3.7.7/envs/cw/lib/python3.7/site-packages/pyusb-1.1.1-py3.7.egg/usb/core.py in wrapper(self, *args, **kwargs)
    111         try:
    112             self.lock.acquire()
--> 113             return f(self, *args, **kwargs)
    114         finally:
    115             self.lock.release()

~/.pyenv/versions/3.7.7/envs/cw/lib/python3.7/site-packages/pyusb-1.1.1-py3.7.egg/usb/core.py in setup_request(self, device, endpoint)
    226             endpoint_address = endpoint
    227 
--> 228         intf, ep = self.get_interface_and_endpoint(device, endpoint_address)
    229         self.managed_claim_interface(device, intf)
    230         return (intf, ep)

~/.pyenv/versions/3.7.7/envs/cw/lib/python3.7/site-packages/pyusb-1.1.1-py3.7.egg/usb/core.py in wrapper(self, *args, **kwargs)
    111         try:
    112             self.lock.acquire()
--> 113             return f(self, *args, **kwargs)
    114         finally:
    115             self.lock.release()

~/.pyenv/versions/3.7.7/envs/cw/lib/python3.7/site-packages/pyusb-1.1.1-py3.7.egg/usb/core.py in get_interface_and_endpoint(self, device, endpoint_address)
    242                     return intf, ep
    243 
--> 244             raise ValueError('Invalid endpoint address ' + hex(endpoint_address))
    245 
    246     @synchronized

TypeError: 'NoneType' object cannot be interpreted as an integer

As troubleshooting I went back and ran the upgrade firmware code

import chipwhisperer as cw
scope = cw.scope()
prog = cw.SAMFWLoader(scope)
prog.auto_program()

this is what I got

Entering bootloader mode...
            Please wait until the ChipWhisperer shows up as a serial port. Once it has, call
            the program(COMPORT, FWPATH) to program the ChipWhisperer

            Default firmware can be found at chipwhisperer/hardware/capture/chipwhisperer-lite/sam3u_fw/SAM3U_VendorExample/Debug/SAM3U_CW1173.bin
Detected com port /dev/ttyACM1
Loading cwnano firmware...
Opened!
Connecting...
b'\n\r'
Connected!
Erasing...
Erased!
Programming file SAM3U_CWNANO.bin...
Programmed!
Verifying...
Verify OK!
Bootloader disabled. Please power cycle device.

then came back and tried again, same thing.

Since I have about 20 of these I tried a second on and got the same problem. I upgraded the firmware on that one too.

I pulled out my CWLite and the XMega target board, and 1.7 in Connecting to Hardware worked as expected. So next I connected the XMega target to my CWNANO (one that I added SMA and 20 pin header to. That got the same thing as the single board CWNANO.

arm
running
ran
---------------------------------------------------------------------------
KeyError                                  Traceback (most recent call last)
~/.pyenv/versions/3.7.7/envs/cw/lib/python3.7/site-packages/pyusb-1.1.1-py3.7.egg/usb/core.py in get_interface_and_endpoint(self, device, endpoint_address)
    235         try:
--> 236             return self._ep_info[endpoint_address]
    237         except KeyError:

KeyError: None

During handling of the above exception, another exception occurred:

TypeError                                 Traceback (most recent call last)
<ipython-input-155-f477a637be60> in <module>
      4 target.simpleserial_write('p', msg)
      5 print("ran")
----> 6 scope.capture()
      7 print("capture done")
      8 print(scope.get_last_trace())

~/work/projects/chipwhisperer/software/chipwhisperer/capture/scopes/cwnano.py in capture(self)
    694                     return True
    695 
--> 696             self._lasttrace = self._cwusb.cmdReadMem(0, self.adc.samples)
    697 
    698             # can just keep rerunning this until it works I think

~/work/projects/chipwhisperer/software/chipwhisperer/hardware/naeusb/naeusb.py in cmdReadMem(self, addr, dlen)
    798         """
    799 
--> 800         return self.usbseralizer.cmdReadMem(addr, dlen)
    801 
    802     def cmdWriteMem(self, addr, data):

~/work/projects/chipwhisperer/software/chipwhisperer/hardware/naeusb/naeusb.py in cmdReadMem(self, addr, dlen)
    202         cmdpacket = self.make_cmd(self.CMD_READ_MEM, payload)
    203 
--> 204         return self.process_rx(self.txrx(tx=cmdpacket))
    205 
    206     def cmdWriteMem(self, addr, data):

~/work/projects/chipwhisperer/software/chipwhisperer/hardware/naeusb/naeusb.py in txrx(self, tx)
    311                 addr = payload[0]
    312                 dlen = payload[1]
--> 313                 response = self.cmdReadMem(addr, dlen)
    314                 naeusb_logger.debug("CMD_READ_MEM: addr: {:08X}, dlen: {:08X}, response: {}".format(addr, dlen, response))
    315             elif cmd == self.CMD_WRITE_MEM:

~/work/projects/chipwhisperer/software/chipwhisperer/hardware/naeusb/naeusb.py in cmdReadMem(self, addr, dlen)
    531         # Get data
    532         if cmd == self.CMD_READMEM_BULK:
--> 533             data = self.usbdev().read(self.rep, dlen, timeout=self._timeout)
    534             # XXX Husky debug:
    535             naeusb_logger.info('YYY BULK rep=%d, dlen=%d, got len=%d' % (self.rep, dlen, len(data)))

~/.pyenv/versions/3.7.7/envs/cw/lib/python3.7/site-packages/pyusb-1.1.1-py3.7.egg/usb/core.py in read(self, endpoint, size_or_buffer, timeout)
   1009                 }
   1010 
-> 1011         intf, ep = self._ctx.setup_request(self, endpoint)
   1012         fn = fn_map[util.endpoint_type(ep.bmAttributes)]
   1013 

~/.pyenv/versions/3.7.7/envs/cw/lib/python3.7/site-packages/pyusb-1.1.1-py3.7.egg/usb/core.py in wrapper(self, *args, **kwargs)
    111         try:
    112             self.lock.acquire()
--> 113             return f(self, *args, **kwargs)
    114         finally:
    115             self.lock.release()

~/.pyenv/versions/3.7.7/envs/cw/lib/python3.7/site-packages/pyusb-1.1.1-py3.7.egg/usb/core.py in setup_request(self, device, endpoint)
    226             endpoint_address = endpoint
    227 
--> 228         intf, ep = self.get_interface_and_endpoint(device, endpoint_address)
    229         self.managed_claim_interface(device, intf)
    230         return (intf, ep)

~/.pyenv/versions/3.7.7/envs/cw/lib/python3.7/site-packages/pyusb-1.1.1-py3.7.egg/usb/core.py in wrapper(self, *args, **kwargs)
    111         try:
    112             self.lock.acquire()
--> 113             return f(self, *args, **kwargs)
    114         finally:
    115             self.lock.release()

~/.pyenv/versions/3.7.7/envs/cw/lib/python3.7/site-packages/pyusb-1.1.1-py3.7.egg/usb/core.py in get_interface_and_endpoint(self, device, endpoint_address)
    242                     return intf, ep
    243 
--> 244             raise ValueError('Invalid endpoint address ' + hex(endpoint_address))
    245 
    246     @synchronized

TypeError: 'NoneType' object cannot be interpreted as an integer

Hi,

This is an issue that has been fixed, but hasn’t made it to a full update yet. Try running through jupyter/ChipWhisperer Updating.ipynb to get some updates.

Alex

I started over. I deleted my VM, imported it again.

This time I logged in and changed to the directory
/home/vagrant/work/projects/chipwhisperer/

and ran
git pull

It pulled a lot of files down.

I rebooted the VM, logged into the jupyter notebook. Same error as mentioned above.

Clearly I’m doing something wrong.

What does the following print?

import chipwhisperer as cw
print(cw.__version__)

If you’re on 5.6.1 and still get that error, try doing scope._getNAEUSB().usbtx.rep = 0x81; scope._getNAEUSB().usbtx.wep = 0x02

Alex

running

import chipwhisperer as cw
print(cw.__version__)

responds

5.5

Clearly something is not updating.

I deleted the VM again. Started from scratch and ran from the ChipWhisperer%20Updating.ipynb page:

%%bash
cd ..
git pull
git checkout

and this is what I saw

Updating b1cd27ad..638b6033
M	.gitignore
M	LICENSE.txt
M	hardware/capture/chipwhisperer-lite/pcb/bom/DIGIKEY_UPLOAD.txt
M	hardware/capture/chipwhisperer-lite/pcb/bom/readme.txt
M	hardware/capture/chipwhisperer-lite/pcb/gerbers/README.txt
M	hardware/capture/chipwhisperer-lite/pcb/gerbers/cw-lite-main.BOTSTENCIL.GBP
M	hardware/capture/chipwhisperer-lite/pcb/gerbers/cw-lite-main.BOTTOMCOPPER.GBL
M	hardware/capture/chipwhisperer-lite/pcb/gerbers/cw-lite-main.BOTTOMMASK.GBS
M	hardware/capture/chipwhisperer-lite/pcb/gerbers/cw-lite-main.BOTTOMSILKSCREEN.GBO
M	hardware/capture/chipwhisperer-lite/pcb/gerbers/cw-lite-main.INNERCOPPER.G2
M	hardware/capture/chipwhisperer-lite/pcb/gerbers/cw-lite-main.INNERCOPPER.G3
M	hardware/capture/chipwhisperer-lite/pcb/gerbers/cw-lite-main.MILL.GML
M	hardware/capture/chipwhisperer-lite/pcb/gerbers/cw-lite-main.NCDRILL.DRD
M	hardware/capture/chipwhisperer-lite/pcb/gerbers/cw-lite-main.TOPCOPPER.GTL
M	hardware/capture/chipwhisperer-lite/pcb/gerbers/cw-lite-main.TOPMASK.GTS
M	hardware/capture/chipwhisperer-lite/pcb/gerbers/cw-lite-main.TOPSILKSCREEN.GTO
M	hardware/capture/chipwhisperer-lite/pcb/gerbers/cw-lite-main.TOPSTENCIL.GTP
M	hardware/capture/chipwhisperer-lite/pcb/picknplace/cw-lite-main-04.mnb
M	hardware/capture/chipwhisperer-lite/pcb/picknplace/cw-lite-main-04.mnt
M	hardware/capture/chipwhisperer-lite/sam3u_fw/SAM3U_CW1173.atsln
M	hardware/capture/chipwhisperer-lite/sam3u_fw/SAM3U_VendorExample/SAM3U_CW1173.componentinfo.xml
M	hardware/capture/chipwhisperer-lite/sam3u_fw/SAM3U_VendorExample/SAM3U_CW1173.cproj
M	hardware/capture/chipwhisperer-nano/firmware/cwnano-firmware.atsln
M	hardware/capture/chipwhisperer-nano/firmware/cwnano-firmware/cwnano-firmware.componentinfo.xml
M	hardware/capture/chipwhisperer-nano/firmware/cwnano-firmware/cwnano-firmware.cproj
M	hardware/capture/sakura-g/adapter-pcb/gerbers/adapter-pcb.BOTTOMCOPPER.GBR
M	hardware/capture/sakura-g/adapter-pcb/gerbers/adapter-pcb.BOTTOMMASK.GBR
M	hardware/capture/sakura-g/adapter-pcb/gerbers/adapter-pcb.BOTTOMSILKSCREEN.GBR
M	hardware/capture/sakura-g/adapter-pcb/gerbers/adapter-pcb.MILL.GBR
M	hardware/capture/sakura-g/adapter-pcb/gerbers/adapter-pcb.NCDRILL
M	hardware/capture/sakura-g/adapter-pcb/gerbers/adapter-pcb.TOPCOPPER.GBR
M	hardware/capture/sakura-g/adapter-pcb/gerbers/adapter-pcb.TOPMASK.GBR
M	hardware/capture/sakura-g/adapter-pcb/gerbers/adapter-pcb.TOPSILKSCREEN.GBR
M	hardware/capture/sakura-g/adapter-pcb/movegerbers.bat
M	hardware/capture/sakura-g/sakurag_ise_project/chipwhisperer-sakurag/chip_sakurag.v
M	hardware/capture/sakura-g/sakurag_ise_project/chipwhisperer-sakurag/chipwhisperer-sakurag.gise
M	hardware/capture/sakura-g/sakurag_ise_project/chipwhisperer-sakurag/ipcore_dir/fifoonly_adcfifo.xco
M	hardware/capture/sakura-g/sakurag_ise_project/chipwhisperer-sakurag/sakura_g_ctrl_r1.ucf
M	hardware/capture/sakura-g/sakurag_ise_project/chipwhisperer-sakurag/setup.v
M	hardware/capture/sakura-g/sakurag_ise_project/sakurag-chipwhisperer.cfi
M	hardware/capture/sakura-g/sakurag_ise_project/sakurag-chipwhisperer.mcs
M	hardware/capture/sakura-g/sakurag_ise_project/sakurag-chipwhisperer.prm
M	hardware/capture/xmega/Atmel Studio/MouseHID/ChipWhisperer_XMegaADC.atsln
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/Debug/CWADC_HID.hex
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/Debug/CWADC_HID.lss
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/Debug/CWADC_HID.map
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/Debug/CWADC_HID.srec
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/Debug/Makefile
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/Debug/MouseHID.eep
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/Debug/MouseHID.hex
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/Debug/MouseHID.lss
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/Debug/MouseHID.map
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/Debug/MouseHID.srec
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/Debug/XPlainA3BU.eep
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/Debug/makedep.mk
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/XPlainA3BU.cproj
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/common/boards/board.h
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/common/services/clock/genclk.h
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/common/services/clock/osc.h
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/common/services/clock/pll.h
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/common/services/clock/sysclk.h
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/common/services/clock/xmega/osc.h
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/common/services/clock/xmega/pll.h
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/common/services/clock/xmega/sysclk.c
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/common/services/clock/xmega/sysclk.h
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/common/services/gpio/gpio.h
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/common/services/gpio/xmega_gpio/xmega_gpio.h
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/common/services/hugemem/avr8/avr8_hugemem.c
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/common/services/hugemem/avr8/hugemem.h
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/common/services/hugemem/generic/hugemem.h
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/common/services/hugemem/hugemem.h
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/common/services/ioport/ioport.h
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/common/services/ioport/xmega/ioport.h
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/common/services/ioport/xmega/ioport_compat.c
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/common/services/ioport/xmega/ioport_compat.h
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/common/services/sleepmgr/sleepmgr.h
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/common/services/sleepmgr/xmega/sleepmgr.c
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/common/services/sleepmgr/xmega/sleepmgr.h
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/common/services/usb/class/hid/device/generic/udi_hid_generic.c
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/common/services/usb/class/hid/device/generic/udi_hid_generic.h
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/common/services/usb/class/hid/device/generic/udi_hid_generic_conf.h
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/common/services/usb/class/hid/device/generic/udi_hid_generic_desc.c
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/common/services/usb/class/hid/device/udi_hid.c
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/common/services/usb/class/hid/device/udi_hid.h
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/common/services/usb/class/hid/usb_protocol_hid.h
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/common/services/usb/udc/udc.c
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/common/services/usb/udc/udc.h
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/common/services/usb/udc/udc_desc.h
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/common/services/usb/udc/udd.h
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/common/services/usb/udc/udi.h
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/common/services/usb/usb_atmel.h
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/common/services/usb/usb_protocol.h
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/common/utils/interrupt.h
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/common/utils/interrupt/interrupt_avr8.h
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/common/utils/make/Makefile.avr.in
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/common/utils/parts.h
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/xmega/boards/xmega_a3bu_xplained/init.c
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/xmega/boards/xmega_a3bu_xplained/led.h
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/xmega/boards/xmega_a3bu_xplained/xmega_a3bu_xplained.h
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/xmega/drivers/adc/adc.c
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/xmega/drivers/adc/adc.h
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/xmega/drivers/adc/xmega_aau/adc_aau.c
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/xmega/drivers/cpu/ccp.h
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/xmega/drivers/cpu/ccp.s
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/xmega/drivers/cpu/xmega_reset_cause.h
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/xmega/drivers/dma/dma.c
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/xmega/drivers/dma/dma.h
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/xmega/drivers/nvm/nvm.c
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/xmega/drivers/nvm/nvm.h
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/xmega/drivers/nvm/nvm_asm.s
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/xmega/drivers/pmic/pmic.h
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/xmega/drivers/sleep/sleep.h
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/xmega/drivers/tc/tc.c
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/xmega/drivers/tc/tc.h
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/xmega/drivers/usb/usb_device.c
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/xmega/drivers/usb/usb_device.h
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/xmega/utils/assembler.h
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/xmega/utils/assembler/gas.h
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/xmega/utils/bit_handling/clz_ctz.h
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/xmega/utils/compiler.h
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/xmega/utils/preprocessor/mrepeat.h
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/xmega/utils/preprocessor/preprocessor.h
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/xmega/utils/preprocessor/stringz.h
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/xmega/utils/preprocessor/tpaste.h
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/xmega/utils/progmem.h
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/xmega/utils/status_codes.h
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/Config/conf_adc.h
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/Config/conf_board.h
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/Config/conf_clock.h
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/Config/conf_sleepmgr.h
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/Config/conf_usb.h
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/adc_dma.h
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/asf.h
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/main.c
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/main.h
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ui.c
M	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ui.h
M	hardware/common/hdl/clockglitch/clockglitch_s6.v
M	hardware/common/hdl/clockglitch/reg_clockglitch.v
M	hardware/common/hdl/io_trigger/reg_iotrigger.v
M	hardware/common/hdl/io_trigger/trigger_system.v
M	hardware/common/hdl/io_trigger/trigger_system_tb.v
M	hardware/common/hdl/reg_chipwhisperer.v
M	hardware/common/hdl/sakura/coregen/syncfifo_8x31.xco
M	hardware/common/hdl/sakura/registers_sakura_lbus.v
M	hardware/common/hdl/sakura/syncfifo_8x31.v
M	hardware/common/hdl/serialtarget/reg_serialtarget.v
M	hardware/common/hdl/serialtarget/targ_async_receiver.v
M	hardware/common/hdl/serialtarget/targ_async_transmitter.v
M	hardware/common/hdl/smartcard/async_receiver_scard.v
M	hardware/common/hdl/smartcard/async_transmitter_scard.v
M	hardware/common/hdl/smartcard/reg_smartcards.v
M	hardware/common/hdl/smartcard/serial_scard_hls_iface.v
M	hardware/common/hdl/smartcard/vivado_hls_source/smartcard.c
M	hardware/common/hdl/smartcard/vivado_hls_source/smartcard.h
M	hardware/common/hdl/smartcard/vivado_hls_source/smartcard_tb.c
M	hardware/common/hdl/smartcard/vivado_hls_source/test_smartcard/.apc/autopilot.apfmapping
M	hardware/common/hdl/smartcard/vivado_hls_source/test_smartcard/.cproject
M	hardware/common/hdl/smartcard/vivado_hls_source/test_smartcard/.project
M	hardware/common/hdl/smartcard/vivado_hls_source/test_smartcard/.settings/test_smartcard.Debug.launch
M	hardware/common/hdl/smartcard/vivado_hls_source/test_smartcard/.settings/test_smartcard.Release.launch
M	hardware/common/hdl/smartcard/vivado_hls_source/test_smartcard/smartcard_test/csim/build/csim.mk
M	hardware/common/hdl/smartcard/vivado_hls_source/test_smartcard/smartcard_test/csim/build/run_sim.tcl
M	hardware/common/hdl/smartcard/vivado_hls_source/test_smartcard/smartcard_test/directives.tcl
M	hardware/common/hdl/smartcard/vivado_hls_source/test_smartcard/smartcard_test/script.tcl
M	hardware/common/hdl/smartcard/vivado_hls_source/test_smartcard/smartcard_test/smartcard_test.aps
M	hardware/common/hdl/smartcard/vivado_hls_source/test_smartcard/smartcard_test/smartcard_test.directive
M	hardware/common/hdl/smartcard/vivado_hls_source/test_smartcard/smartcard_test/smartcard_test.log
M	hardware/common/hdl/smartcard/vivado_hls_source/test_smartcard/smartcard_test/syn/verilog/smartcard.v
M	hardware/common/hdl/smartcard/vivado_hls_source/test_smartcard/vivado_hls.app
M	hardware/common/hdl/universal_serial/reg_usi.v
M	hardware/common/hdl/universal_serial/usi.v
M	hardware/common/hdl/universal_serial/usi_tb_rx.v
M	hardware/common/hdl/universal_serial/usi_tb_tx.v
M	hardware/tools/clockextractor/lnafilter-pcb/gerbers/lna-plug.BOTTOMCOPPER.GBR
M	hardware/tools/clockextractor/lnafilter-pcb/gerbers/lna-plug.BOTTOMMASK.GBR
M	hardware/tools/clockextractor/lnafilter-pcb/gerbers/lna-plug.BOTTOMSILKSCREEN.GBR
M	hardware/tools/clockextractor/lnafilter-pcb/gerbers/lna-plug.MILL.GBR
M	hardware/tools/clockextractor/lnafilter-pcb/gerbers/lna-plug.NCDRILL
M	hardware/tools/clockextractor/lnafilter-pcb/gerbers/lna-plug.TOPCOPPER.GBR
M	hardware/tools/clockextractor/lnafilter-pcb/gerbers/lna-plug.TOPMASK.GBR
M	hardware/tools/clockextractor/lnafilter-pcb/gerbers/lna-plug.TOPSILKSCREEN.GBR
M	hardware/tools/clockextractor/lnafilter-pcb/movegerbers.bat
M	hardware/tools/diffprobe/simpleversion_eagle/movegerbers.bat
M	hardware/tools/diffprobe/simpleversion_eagle/simplediff_gengerbers.cam
M	hardware/tools/lna_3v/lna3v_eagleproj/lna_gengerbers.cam
M	hardware/tools/lna_3v/lna3v_eagleproj/movegerbers.bat
M	hardware/tools/papillio_target/movegerbers.bat
M	hardware/victims/cw305_artixtarget/fw/dmm/xmega_vcc_asf.atsln
M	hardware/victims/cw305_artixtarget/fw/dmm/xmega_vcc_asf/xmega_vcc_asf.componentinfo.xml
M	hardware/victims/cw305_artixtarget/fw/dmm/xmega_vcc_asf/xmega_vcc_asf.cproj
M	hardware/victims/cw305_artixtarget/fw/sam3u/CW305_SAM3U_FW.atsln
M	hardware/victims/cw305_artixtarget/fw/sam3u/CW305_SAM3U_FW/CW305_SAM3UFW.componentinfo.xml
M	hardware/victims/cw305_artixtarget/fw/sam3u/CW305_SAM3U_FW/CW305_SAM3UFW.cproj
M	hardware/victims/cw305_artixtarget/usb_driver/cw305_artix.inf
M	hardware/victims/cw308_ufo_target/87c51/87c51_avr_fw/87c51_avr_fw.atsln
M	hardware/victims/cw308_ufo_target/87c51/87c51_avr_fw/87c51_avr_fw/87c51_avr_fw.componentinfo.xml
M	hardware/victims/cw308_ufo_target/87c51/87c51_avr_fw/87c51_avr_fw/87c51_avr_fw.cproj
M	hardware/victims/firmware/87c51/avr/87c51_avr_fw/87c51_avr_fw.atsln
M	hardware/victims/firmware/87c51/avr/87c51_avr_fw/87c51_avr_fw/87c51_avr_fw.componentinfo.xml
M	hardware/victims/firmware/87c51/avr/87c51_avr_fw/87c51_avr_fw/87c51_avr_fw.cproj
M	hardware/victims/firmware/crypto/aes-independant.c
M	hardware/victims/firmware/crypto/aes-independant.h
M	hardware/victims/firmware/hal/cc2538/cpu.c
M	hardware/victims/firmware/hal/cc2538/cpu.h
M	hardware/victims/firmware/hal/cc2538/cx2538_setup.c
M	hardware/victims/firmware/hal/cc2538/debug.c
M	hardware/victims/firmware/hal/cc2538/debug.h
M	hardware/victims/firmware/hal/cc2538/gpio.c
M	hardware/victims/firmware/hal/cc2538/gpio.h
M	hardware/victims/firmware/hal/cc2538/hw_aes.h
M	hardware/victims/firmware/hal/cc2538/hw_ana_regs.h
M	hardware/victims/firmware/hal/cc2538/hw_cctest.h
M	hardware/victims/firmware/hal/cc2538/hw_flash_ctrl.h
M	hardware/victims/firmware/hal/cc2538/hw_gpio.h
M	hardware/victims/firmware/hal/cc2538/hw_gptimer.h
M	hardware/victims/firmware/hal/cc2538/hw_i2cm.h
M	hardware/victims/firmware/hal/cc2538/hw_i2cs.h
M	hardware/victims/firmware/hal/cc2538/hw_ints.h
M	hardware/victims/firmware/hal/cc2538/hw_ioc.h
M	hardware/victims/firmware/hal/cc2538/hw_memmap.h
M	hardware/victims/firmware/hal/cc2538/hw_nvic.h
M	hardware/victims/firmware/hal/cc2538/hw_pka.h
M	hardware/victims/firmware/hal/cc2538/hw_rfcore_ffsm.h
M	hardware/victims/firmware/hal/cc2538/hw_rfcore_sfr.h
M	hardware/victims/firmware/hal/cc2538/hw_rfcore_xreg.h
M	hardware/victims/firmware/hal/cc2538/hw_smwdthrosc.h
M	hardware/victims/firmware/hal/cc2538/hw_soc_adc.h
M	hardware/victims/firmware/hal/cc2538/hw_ssi.h
M	hardware/victims/firmware/hal/cc2538/hw_sys_ctrl.h
M	hardware/victims/firmware/hal/cc2538/hw_types.h
M	hardware/victims/firmware/hal/cc2538/hw_uart.h
M	hardware/victims/firmware/hal/cc2538/hw_udma.h
M	hardware/victims/firmware/hal/cc2538/hw_udmachctl.h
M	hardware/victims/firmware/hal/cc2538/hw_usb.h
M	hardware/victims/firmware/hal/cc2538/interrupt.c
M	hardware/victims/firmware/hal/cc2538/interrupt.h
M	hardware/victims/firmware/hal/cc2538/ioc.c
M	hardware/victims/firmware/hal/cc2538/ioc.h
M	hardware/victims/firmware/hal/cc2538/sys_ctrl.c
M	hardware/victims/firmware/hal/cc2538/sys_ctrl.h
M	hardware/victims/firmware/hal/cc2538/uart.c
M	hardware/victims/firmware/hal/cc2538/uart.h
M	hardware/victims/firmware/hal/stm32f4/stm32f4xx_hal_cryp.c
M	hardware/victims/firmware/hal/stm32f4/stm32f4xx_hal_cryp.h
M	hardware/victims/firmware/hal/stm32f4/stm32f4xx_hal_cryp_ex.h
M	hardware/victims/firmware/hal/stm32f4/stm32f4xx_hal_rng.c
M	hardware/victims/firmware/hal/stm32f4/stm32f4xx_hal_rng.h
M	hardware/victims/firmware/simpleserial-aes/ide_projects/asf/sam4l-simpleserial-aes/sam4l-simpleserial-aes.atsln
M	hardware/victims/ztex_multivictim/bom_generic_victim.csv
M	hardware/victims/ztex_multivictim/movegerbers.bat
M	hardware/victims/ztex_multivictim/smartcard/movegerbers.bat
Your branch is behind 'origin/develop' by 406 commits, and can be fast-forwarded.
  (use "git pull" to update your local branch)
From https://github.com/newaetech/chipwhisperer
   b1cd27ad..638b6033  develop             -> origin/develop
 * [new branch]        blackhat2021        -> origin/blackhat2021
 * [new branch]        double_glitch_fix   -> origin/double_glitch_fix
   a72cb9b6..969da30f  husky               -> origin/husky
 * [new branch]        minimal             -> origin/minimal
 * [new branch]        mpsse               -> origin/mpsse
 * [new branch]        tw_clocking_updates -> origin/tw_clocking_updates
 * [new tag]           BHUSA2021           -> BHUSA2021
Fetching submodule jupyter
From https://github.com/newaetech/chipwhisperer-jupyter
 * [new branch]      blackhat2021        -> origin/blackhat2021
   f7aa41f..b517e17  master              -> origin/master
 * [new branch]      tw_clocking_updates -> origin/tw_clocking_updates
error: Your local changes to the following files would be overwritten by merge:
	.gitignore
	hardware/capture/chipwhisperer-lite/pcb/bom/DIGIKEY_UPLOAD.txt
	hardware/capture/chipwhisperer-lite/pcb/bom/readme.txt
	hardware/capture/chipwhisperer-lite/pcb/gerbers/README.txt
	hardware/capture/chipwhisperer-lite/pcb/gerbers/cw-lite-main.BOTSTENCIL.GBP
	hardware/capture/chipwhisperer-lite/pcb/gerbers/cw-lite-main.BOTTOMCOPPER.GBL
	hardware/capture/chipwhisperer-lite/pcb/gerbers/cw-lite-main.BOTTOMMASK.GBS
	hardware/capture/chipwhisperer-lite/pcb/gerbers/cw-lite-main.BOTTOMSILKSCREEN.GBO
	hardware/capture/chipwhisperer-lite/pcb/gerbers/cw-lite-main.INNERCOPPER.G2
	hardware/capture/chipwhisperer-lite/pcb/gerbers/cw-lite-main.INNERCOPPER.G3
	hardware/capture/chipwhisperer-lite/pcb/gerbers/cw-lite-main.MILL.GML
	hardware/capture/chipwhisperer-lite/pcb/gerbers/cw-lite-main.NCDRILL.DRD
	hardware/capture/chipwhisperer-lite/pcb/gerbers/cw-lite-main.TOPCOPPER.GTL
	hardware/capture/chipwhisperer-lite/pcb/gerbers/cw-lite-main.TOPMASK.GTS
	hardware/capture/chipwhisperer-lite/pcb/gerbers/cw-lite-main.TOPSILKSCREEN.GTO
	hardware/capture/chipwhisperer-lite/pcb/gerbers/cw-lite-main.TOPSTENCIL.GTP
	hardware/capture/chipwhisperer-lite/pcb/picknplace/cw-lite-main-04.mnb
	hardware/capture/chipwhisperer-lite/pcb/picknplace/cw-lite-main-04.mnt
	hardware/capture/chipwhisperer-lite/sam3u_fw/SAM3U_VendorExample/SAM3U_CW1173.cproj
	hardware/capture/chipwhisperer-nano/firmware/cwnano-firmware/cwnano-firmware.cproj
	hardware/capture/sakura-g/adapter-pcb/gerbers/adapter-pcb.BOTTOMCOPPER.GBR
	hardware/capture/sakura-g/adapter-pcb/gerbers/adapter-pcb.BOTTOMMASK.GBR
	hardware/capture/sakura-g/adapter-pcb/gerbers/adapter-pcb.BOTTOMSILKSCREEN.GBR
	hardware/capture/sakura-g/adapter-pcb/gerbers/adapter-pcb.MILL.GBR
	hardware/capture/sakura-g/adapter-pcb/gerbers/adapter-pcb.NCDRILL
	hardware/capture/sakura-g/adapter-pcb/gerbers/adapter-pcb.TOPCOPPER.GBR
	hardware/capture/sakura-g/adapter-pcb/gerbers/adapter-pcb.TOPMASK.GBR
	hardware/capture/sakura-g/adapter-pcb/gerbers/adapter-pcb.TOPSILKSCREEN.GBR
	hardware/capture/sakura-g/adapter-pcb/movegerbers.bat
	hardware/capture/sakura-g/sakurag_ise_project/chipwhisperer-sakurag/chip_sakurag.v
	hardware/capture/sakura-g/sakurag_ise_project/chipwhisperer-sakurag/chipwhisperer-sakurag.gise
	hardware/capture/sakura-g/sakurag_ise_project/chipwhisperer-sakurag/ipcore_dir/fifoonly_adcfifo.xco
	hardware/capture/sakura-g/sakurag_ise_project/chipwhisperer-sakurag/sakura_g_ctrl_r1.ucf
	hardware/capture/sakura-g/sakurag_ise_project/chipwhisperer-sakurag/setup.v
	hardware/capture/sakura-g/sakurag_ise_project/sakurag-chipwhisperer.cfi
	hardware/capture/sakura-g/sakurag_ise_project/sakurag-chipwhisperer.mcs
	hardware/capture/sakura-g/sakurag_ise_project/sakurag-chipwhisperer.prm
	hardware/capture/xmega/Atmel Studio/MouseHID/ChipWhisperer_XMegaADC.atsln
	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/Debug/CWADC_HID.hex
	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/Debug/CWADC_HID.lss
	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/Debug/CWADC_HID.map
	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/Debug/CWADC_HID.srec
	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/Debug/Makefile
	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/Debug/MouseHID.eep
	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/Debug/MouseHID.hex
	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/Debug/MouseHID.lss
	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/Debug/MouseHID.map
	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/Debug/MouseHID.srec
	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/Debug/XPlainA3BU.eep
	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/Debug/makedep.mk
	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/XPlainA3BU.cproj
	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/common/boards/board.h
	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/common/services/clock/genclk.h
	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/common/services/clock/osc.h
	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/common/services/clock/pll.h
	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/common/services/clock/sysclk.h
	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/common/services/clock/xmega/osc.h
	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/common/services/clock/xmega/pll.h
	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/common/services/clock/xmega/sysclk.c
	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/common/services/clock/xmega/sysclk.h
	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/common/services/gpio/gpio.h
	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/common/services/gpio/xmega_gpio/xmega_gpio.h
	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/common/services/hugemem/avr8/avr8_hugemem.c
	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/common/services/hugemem/avr8/hugemem.h
	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/common/services/hugemem/generic/hugemem.h
	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/common/services/hugemem/hugemem.h
	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/common/services/ioport/ioport.h
	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/common/services/ioport/xmega/ioport.h
	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/common/services/ioport/xmega/ioport_compat.c
	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/common/services/ioport/xmega/ioport_compat.h
	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/common/services/sleepmgr/sleepmgr.h
	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/common/services/sleepmgr/xmega/sleepmgr.c

**[removed a number of lines, I was over in allowed characters]**

	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/xmega/drivers/cpu/ccp.h
	hardware/capture/xmega/Atmel Studio/MouseHID/MouseHID/src/ASF/xmega/drivers/cpu/ccp.s
	hardware/capture/xmega/Atmel 
	hardware/common/hdl/serialtarget/targ_async_receiver.v
	hardware/common/hdl/serialtarget/targ_async_transmitter.v
	hardware/common/hdl/smartcard/async_receiver_scard.v
	hardware/common/hdl/smartcard/async_transmitter_scard.v
	hardware/common/hdl/smartcard/reg_smartcards.v
	hardware/common/hdl/smartcard/serial_scard_hls_iface.v
	hardware/common/hdl/smartcard/vivado_hls_source/smartcard.c
	hardware/common/hdl/smartcard/vivado_hls_source/smartcard.h
	hardware/common/hdl/smartcard/vivado_hls_source/smartcard_tb.c
	hardware/common/hdl/smartcard/vivado_hls_source/test_smartcard/.apc/autopilot.apfmapping
	hardware/common/hdl/smartcard/vivado_hls_source/test_smartcard/.cproject
	hardware/common/hdl/smartcard/vivado_hls_source/test_smartcard/.project
	hardware/common/hdl/smartcard/vivado_hls_source/test_smartcard/.settings/test_smartcard.Debug.launch
	hardware/common/hdl/smartcard/vivado_hls_source/test_smartcard/.settings/test_smartcard.Release.launch
	hardware/common/hdl/smartcard/vivado_hls_source/test_smartcard/smartcard_test/csim/build/csim.mk
	hardware/common/hdl/smartcard/vivado_hls_source/test_smartcard/smartcard_test/csim/build/run_sim.tcl
	hardware/common/hdl/smartcard/vivado_hls_source/test_smartcard/smartcard_test/directives.tcl
	hardware/common/hdl/smartcard/vivado_hls_source/test_smartcard/smartcard_test/script.tcl
	hardware/common/hdl/smartcard/vivado_hls_source/test_smartcard/smartcard_test/smartcard_test.aps
	hardware/common/hdl/smartcard/vivado_hls_source/test_smartcard/smartcard_test/smartcard_test.directive
	hardware/common/hdl/smartcard/vivado_hls_source/test_smartcard/smartcard_test/smartcard_test.log
	hardware/common/hdl/smartcard/vivado_hls_source/test_smartcard/smartcard_test/syn/verilog/smartcard.v
	hardware/common/hdl/smartcard/vivado_hls_source/test_smartcard/vivado_hls.app
	hardware/common/hdl/universal_serial/reg_usi.v
	hardware/common/hdl/universal_serial/usi.v
	hardware/common/hdl/universal_serial/usi_tb_rx.v
	hardware/common/hdl/universal_serial/usi_tb_tx.v
	hardware/tools/clockextractor/lnafilter-pcb/gerbers/lna-plug.BOTTOMCOPPER.GBR
	hardware/tools/clockextractor/lnafilter-pcb/gerbers/lna-plug.BOTTOMMASK.GBR

**[removed a number of lines, I was over in allowed characters]**

	hardware/victims/firmware/hal/cc2538/sys_ctrl.h
	hardware/victims/firmware/hal/cc2538/uart.c
	hardware/victims/firmware/hal/cc2538/uart.h
	hardware/victims/firmware/hal/stm32f4/stm32f4xx_hal_cryp.c
	hardware/victims/firmware/hal/stm32f4/stm32f4xx_hal_cryp.h
	hardware/victims/firmware/hal/stm32f4/stm32f4xx_hal_cryp_ex.h
	hardware/victims/firmware/hal/stm32f4/stm32f4xx_hal_rng.c
	hardware/victims/firmware/hal/stm32f4/stm32f4xx_hal_rng.h
	hardware/victims/ztex_multivictim/bom_generic_victim.csv
	hardware/victims/ztex_multivictim/movegerbers.bat
	hardware/victims/ztex_multivictim/smartcard/movegerbers.bat
Please commit your changes or stash them before you merge.
Aborting

notice at the end

Please commit your changes or stash them before you merge.

This was a fresh VM, I changed nothing.

So I’m guessing that needs to be addressed before I move forward. However, like I said I didnt change anything. I’m sure you don’t want me checking my stuff into the repo.

Try running:

%%bash
cd ..
git add .
git stash
git pull
git checkout

instead of what you had before.

Alex

That worked now I have 5.6.1.
I entered the two lines and ran them

scope._getNAEUSB().usbtx.rep = 0x81; 
scope._getNAEUSB().usbtx.wep = 0x02

I also rebuilt the firmware for the nano attached target,

cw.program_target(scope, cw.programmers.STM32FProgrammer, "../hardware/victims/firmware/simpleserial-base/simpleserial-base-CWNANO.hex")

and that finished ok.

I ran

print(target.simpleserial_read('r', 16))

and got

WARNING:ChipWhisperer Target:Unexpected start to command: 

also ran this

print(target.simpleserial_wait_ack()) #should return 0

and got

`ERROR:ChipWhisperer Target:Target did not ack`

It looks like you’re not receiving any serial messages back from the target, but it does look like programming went okay. Can you try uncommenting:

	putch('h');
	putch('e');
	putch('l');
	putch('l');
	putch('o');
	putch('\n');

in simpleserial-base.c, rebuilding, and running print(target.read()) after programming the target?

Alex

It prints hello

Here is the rest. It is still not Ack (though I believe it worked at one point.

If you’re getting serial stuff back, that’s a good sign (i.e. the target.simpleserial_read()) line. The reason you’re not getting an ack is because the ack from the 'p' command is processed by the simpleserial_read() command. Try doing a target.simpleserial_write('k', msg) in a block before the target.simpleserial_wait_ack().

Alex

Ok I guess I forgot to comment out the Hello. I just did and pushed the new code, now this is what I’m seeing. It is a little better. Here is the output now:

image

You need to use a list or a bytearray. I believe the way you have it, ChipWhisperer will interpret that string of bytes as a normal string and encode each character in ASCII, meaning you’re sending 32 bytes there instead of 16.

Alex

Isnt that what I’m sending b’0011…eeff’ that is a byte array.

No, a bytearray is what you see in the line msg = bytearray([0]*16). b'...' is a bytes object, which behaves differently. b'00' is equivalent to 0x3030, while bytearray([0]) is 0x00.

Alex

Regarding the original problem with

TypeError: 'NoneType' object cannot be interpreted as an integer

I encountered the same issue trying to run scope.capture() on my CW NANO on a Windows 10 when installing from the 5.5.2 msi install in the release page.

Turns out the chipwhisperer python package which was installed was 5.5.0 and I had to manually python setup.py install to get the latest 5.6.1 version

Now I do not encounter this issue and everything seems to work fine.

I did not install any special driver or anything.