add simulator fork

Author: NanoCodeBug

.gitignore

@@ -5,6 +5,6 @@
 
 /.vscode
 /build*
-
+SDL2
 arduino-cli*
 bootloader-feather_m0-*

README.md

@@ -21,19 +21,19 @@ tools/osx/build.ps1
 
 1. flash adafruit bootloader https://github.com/adafruit/uf2-samdx1
 2. set boot brotection fuses to 8kb (bootprot fuse value 0x2)
-3. (optional) flash pawos_setup.hex
-4. disable BOD33 fuse via pawos_setup.hex or preffered programmer device
+3. (optional) flash `pawos_setup.hex`
+4. disable BOD33 fuse via `pawos_setup.hex` or preffered programmer device
 
 # Flash Instructions
 
 1. connect device via usb
 2. double click reset button to enter bootloader
-3. flash pawos via arduino-cli (tools/<plat>/flash.sh)
+3. flash pawos via arduino-cli (`tools/<plat>/flash.sh`)
 
 # Update Instructions
 1. wake PawPet from sleep
 2. connect via USB
-3. flash pawos via arduino-cli (tools/<plat>/flash.sh)
+3. flash pawos via arduino-cli (`tools/<plat>/flash.sh`)
 
 TODO: update instructions that use UF2 instead, should be possible to use a script to put the device into bootloader mode, and then copy the file over via system file browser, or dynamically detect the device attach via usb id and drive name.
 
@@ -42,6 +42,18 @@ TODO: consider a self packaged C# exe or python script?
 TODO: look into using openocd for flashing bootloader
 TODO: fork adafruit bootloader to have low power operation enabled by default, bootloader blocks startup below 2.2v right now. in theory device can operate to 1.9v before display cuts out
 
+
+# Simulator
+SDL2 and Webasm wrappers.
+
+`tools/win/build.ps1 -simulator`
+
+builds a SDL2 exe version of the pawpet
+
+`tools/win/build.ps1 -webSimulator`
+
+builds a webasm version of the pawpet
+
 # Licensing 
 
 ## Code

board/package_pawpet_index.json

@@ -10,13 +10,13 @@
         {
           "name": "PawPet SAMD Boards",
           "architecture": "samd",
-          "version": "1.0.3",
+          "version": "1.0.4",
           "deprecated": false,
           "category": "NanoCodeBug",
-          "url": "https://raw.githubusercontent.com/NanoCodeBug/pawpet/main/board/pawpet-1.0.3.zip",
-          "archiveFileName": "pawpet-1.0.3.zip",
-          "checksum": "SHA-256:061C10BEE6CAC85BA6FB0A2F53FAC917100C759A9CE35F11C0DA7A544DF53317",
-          "size": 627443,
+          "url": "https://raw.githubusercontent.com/NanoCodeBug/pawpet/main/board/pawpet-1.0.4.zip",
+          "archiveFileName": "pawpet-1.0.4.zip",
+          "checksum": "SHA-256:F8EE1905EF56EE5ABFABCC8B6159EF8E2750E2422919F064744CCBE5AA42CC9A",
+          "size": 626244,
           "boards": [
             {
               "name": "PawPet M0"
@@ -34,7 +34,7 @@
             {
               "packager": "arduino",
               "name": "bossac",
-              "version": "1.8.0-48-gb176eee"
+              "version": "1.9.1-arduino2"
             },
             {
               "packager": "arduino",

board/pawpet-1.0.3.zip renamed to board/pawpet-1.0.4.zip

@@ -30,7 +30,7 @@ pawpet_m0.vid.1=0x239A
 pawpet_m0.pid.1=0x0015
 
 # Upload
-pawpet_m0.upload.tool=bossac18
+pawpet_m0.upload.tool=bossac19
 pawpet_m0.upload.protocol=sam-ba
 pawpet_m0.upload.maximum_size=262144
 pawpet_m0.upload.offset=0x2000
@@ -62,8 +62,6 @@ pawpet_m0.menu.opt.faster=Faster (-O3)
 pawpet_m0.menu.opt.faster.build.flags.optimize=-O3
 pawpet_m0.menu.opt.fastest=Fastest (-Ofast)
 pawpet_m0.menu.opt.fastest.build.flags.optimize=-Ofast
-pawpet_m0.menu.opt.dragons=Here be dragons (-Ofast -funroll-loops)
-pawpet_m0.menu.opt.dragons.build.flags.optimize=-Ofast -funroll-loops
 pawpet_m0.menu.debug.off=Off
 pawpet_m0.menu.debug.on=On
 pawpet_m0.menu.debug.on.build.flags.debug=-g

board/pawpet/boards.txt

@@ -20,7 +20,7 @@
 # https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5---3rd-party-Hardware-specification
 
 name=PawPet SAMD Boards
-version=1.0.0
+version=1.0.4
 
 # Compile variables
 # -----------------
@@ -80,13 +80,12 @@ compiler.libraries.ldflags=
 build.usb_flags=-DUSB_VID={build.vid} -DUSB_PID={build.pid} -DUSBCON -DUSB_CONFIG_POWER={build.usb_power} '-DUSB_MANUFACTURER={build.usb_manufacturer}' '-DUSB_PRODUCT={build.usb_product}' {build.flags.usbstack} {build.flags.debug} "-I{runtime.platform.path}/libraries/Adafruit_TinyUSB_Arduino/src/arduino"
 
 # Default advertised device power setting in mA
-build.usb_power=100
+build.usb_power=20
 
 # Default usb manufacturer will be replaced at compile time using
 # numeric vendor ID if available or by board's specific value.
 build.usb_manufacturer="Unknown"
 
-
 # Compile patterns
 # ----------------
 
@@ -99,11 +98,6 @@ recipe.cpp.o.pattern="{compiler.path}{compiler.cpp.cmd}" {compiler.cpp.flags} -D
 ## Compile S files
 recipe.S.o.pattern="{compiler.path}{compiler.S.cmd}" {compiler.S.flags} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} -DARDUINO_SAMD_ADAFRUIT {compiler.S.extra_flags} {build.extra_flags} {build.cache_flags} {compiler.arm.cmsis.c.flags} {includes} "{source_file}" -o "{object_file}"
 
-## Create archives
-# archive_file_path is needed for backwards compatibility with IDE 1.6.5 or older, IDE 1.6.6 or newer overrides this value
-archive_file_path={build.path}/{archive_file}
-recipe.ar.pattern="{compiler.path}{compiler.ar.cmd}" {compiler.ar.flags} {compiler.ar.extra_flags} "{archive_file_path}" "{object_file}"
-
 ## Combine gc-sections, archives, and objects
 recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}"  "-L{build.path}" {compiler.c.elf.flags} {compiler.c.elf.extra_flags} "-T{build.variant.path}/{build.ldscript}" "-Wl,-Map,{build.path}/{build.project_name}.map" --specs=nano.specs --specs=nosys.specs {compiler.ldflags} -o "{build.path}/{build.project_name}.elf" {object_files} {compiler.libraries.ldflags} -Wl,--start-group {compiler.arm.cmsis.ldflags} "-L{build.variant.path}" -lm "{build.path}/{archive_file}" -Wl,--end-group
 
@@ -123,17 +117,13 @@ recipe.output.save_file={build.project_name}.{build.variant}.{build.preferred_ou
 recipe.size.pattern="{compiler.path}{compiler.size.cmd}" -A "{build.path}/{build.project_name}.elf"
 recipe.size.regex=\.text\s+([0-9]+).*
 
-
 #
 # BOSSA
 #
 
-tools.bossac18.path={runtime.tools.bossac-1.8.0-48-gb176eee.path}
-tools.bossac18.cmd=bossac
-
-tools.bossac18.upload.params.verbose=-i -d
-tools.bossac18.upload.params.quiet=
-tools.bossac18.upload.pattern="{path}/{cmd}" {upload.verbose} --port={serial.port.file} -U -i --offset={upload.offset} -w -v "{build.path}/{build.project_name}.bin" -R
+tools.bossac19.path={runtime.tools.bossac-1.9.1-arduino2.path}
+tools.bossac19.cmd=bossac
 
-tools.bossac18.network_cmd={runtime.tools.arduinoOTA.path}/bin/arduinoOTA
-tools.bossac18.upload.network_pattern="{network_cmd}" -address {serial.port} -port 65280 -username arduino -password "{network.password}" -sketch "{build.path}/{build.project_name}.bin" -upload /sketch -b
+tools.bossac19.upload.params.verbose=-i -d
+tools.bossac19.upload.params.quiet=
+tools.bossac19.upload.pattern="{path}/{cmd}" {upload.verbose} --port={serial.port.file} -U -i --offset={upload.offset} -w -v "{build.path}/{build.project_name}.bin" -R

board/pawpet/platform.txt

@@ -210,7 +210,11 @@ void setup(void)
 
 #ifdef INSTALLER
     InstallUtils::SetFuses(false, 0x2);
-    InstallUtils::format();
+    
+    if(!g::g_stats.filesysFound)
+    {
+        InstallUtils::format();
+    }
 #endif
 
 // disable and re-enable usb to get serial and usb msc at the same time

board/pawpet/variants/pawpet_m0/debug_scripts/variant.gdb

@@ -0,0 +1,10 @@
+# Executables
+*.exe
+*.out
+*.app
+
+/.vscode
+build
+
+arduino-cli*
+bootloader-feather_m0-*

pawos.ino

@@ -0,0 +1,60 @@
+cmake_minimum_required(VERSION 3.7)
+
+project(pawpet)
+
+set(PROJECT_ROOT "../")
+
+set(CORE_SRC 
+    ${PROJECT_ROOT}/src/global.cpp
+    ${PROJECT_ROOT}/src/states/gamestate.cpp
+    ${PROJECT_ROOT}/src/graphics/graphics.cpp
+)
+
+set(CORE_INC
+    ${PROJECT_ROOT}/src/common.h
+    ${PROJECT_ROOT}/src/config.h
+    ${PROJECT_ROOT}/src/global.h
+    ${PROJECT_ROOT}/src/states/gamestate.h
+    ${PROJECT_ROOT}/src/sounds/pitches.h
+    ${PROJECT_ROOT}/src/graphics/display.h
+    ${PROJECT_ROOT}/src/graphics/graphics.h
+    ${PROJECT_ROOT}/src/graphics/sprites.h
+)
+
+set(SIM_SRC 
+    ${PROJECT_ROOT}/simulator/fork/Adafruit_GFX.cpp
+    ${PROJECT_ROOT}/simulator/fork/glcdfont.c
+    ${PROJECT_ROOT}/simulator/fork/Print.cpp
+    ${PROJECT_ROOT}/simulator/fork/display.cpp
+
+)
+
+add_executable(pawpet main.cpp pawos.cpp pawos.h ${SIM_SRC} ${SIM_INC} ${CORE_SRC} ${CORE_INC})
+
+target_include_directories(pawpet
+    PRIVATE ${PROJECT_ROOT}/simulator/fork
+)
+
+add_compile_definitions(SIMULATOR)
+
+if (CMAKE_CXX_PLATFORM_ID STREQUAL "emscripten")
+    set(ASSETS_PATH ${CMAKE_CURRENT_BINARY_DIR}\\..\\assets@)
+
+    set(USE_FLAGS "-s USE_SDL=2 --preload-file ${ASSETS_PATH}")
+
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${USE_FLAGS}")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${USE_FLAGS}")
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${USE_FLAGS}")
+    set(CMAKE_EXECUTABLE_SUFFIX .js)
+    configure_file(${PROJECT_ROOT}/simulator/pawpet.html ${CMAKE_CURRENT_BINARY_DIR} COPYONLY)
+    configure_file(${PROJECT_ROOT}/simulator/case-front-graphic.png ${CMAKE_CURRENT_BINARY_DIR} COPYONLY)
+
+else()
+    find_package(SDL2 REQUIRED)
+    include_directories(${SDL2_INCLUDE_DIRS})
+    target_link_libraries(pawpet ${SDL2_LIBRARIES})
+    # target_compile_options(pawpet PRIVATE -W0)
+
+    configure_file(${SDL2_DIR}/lib/x64/SDL2.dll ${CMAKE_CURRENT_BINARY_DIR} COPYONLY)
+endif()
+