Compare commits

..

No commits in common. "ef42031c87dddf5aed77063da91d590d2caaafca" and "30b11d0e5ec6de8347686c9b2704adf1996bc418" have entirely different histories.

4 changed files with 4 additions and 29 deletions

View File

@ -5,11 +5,10 @@ cp -r ../src/dimensioner/* workspace/src/dimensioner/
cd workspace cd workspace
git clone https://github.com/micropython/micropython.git --branch=master --depth=1 git clone https://github.com/micropython/micropython.git --branch=master --depth=1
cd micropython cd micropython
make -C ports/rp2 clean
make -C ports/rp2 submodules make -C ports/rp2 submodules
make -C mpy-cross make -C mpy-cross
cd ports/rp2 cd ports/rp2
make FROZEN_MANIFEST=../../../../src/dimensioner/manifest.py make FROZEN_MANIFEST=../../../src/dimensioner/manifest.py
cd ../../../../ cd ../../../../
mkdir -p out mkdir -p out
mv workspace/micropython/ports/rp2/build-RPI_PICO/firmware.uf2 out/dimensioner.uf2 mv workspace/micropython/ports/rp2/build-RPI_PICO/firmware.uf2 out/dimensioner.uf2

View File

@ -1,16 +0,0 @@
#!/bin/bash
mkdir -p workspace/src/kiosk-hid
cp ../src/kiosk/kiosk-hid.py workspace/src/kiosk-hid/main.py
cp ../src/kiosk/manifest-hid.py workspace/src/kiosk-hid/manifest.py
cd workspace
git clone https://github.com/micropython/micropython.git --branch=master --depth=1
cd micropython
make -C ports/rp2 clean
make -C ports/rp2 submodules
make -C mpy-cross
cd ports/rp2
make FROZEN_MANIFEST=../../../../src/kiosk-hid/manifest.py
cd ../../../../
mkdir -p out
mv workspace/micropython/ports/rp2/build-RPI_PICO/firmware.uf2 out/kiosk-hid.uf2

View File

@ -44,7 +44,7 @@ from micropython import const
from usb.device.hid import HIDInterface from usb.device.hid import HIDInterface
print("PostalPoint(r) Shipping Kiosk Door Controller") print("PostalPoint(r) Shipping Kiosk Door Controller")
print("Firmware version 1.2.1") print("Firmware version 1.2.0")
print("USB HID build") print("USB HID build")
led = Pin(25, Pin.OUT) # Onboard LED led = Pin(25, Pin.OUT) # Onboard LED
@ -122,11 +122,7 @@ class USBHIDInterface(HIDInterface):
) )
def on_set_report(self, report_data, _report_id, _report_type): def on_set_report(self, report_data, _report_id, _report_type):
if report_data[1] == 0x50: unlockDoor(False)
print("Entering firmware update mode, power cycle to undo. Goodbye for now!")
machine.bootloader()
else:
unlockDoor(False)
def send_data(self, data=None): def send_data(self, data=None):
while self.busy(): while self.busy():
@ -179,4 +175,4 @@ try:
except KeyboardInterrupt: # trap Ctrl-C input except KeyboardInterrupt: # trap Ctrl-C input
terminateThread = True # signal second 'background' thread to terminate terminateThread = True # signal second 'background' thread to terminate
exit() exit()

View File

@ -1,4 +0,0 @@
# Build manifest for PostalPoint Kiosk Controller (USB HID)
include("$(MPY_DIR)/ports/rp2/boards/manifest.py")
require("usb-device-hid")
module("main.py")