From a627898b84d2c0e00b6e28726177df5a357d5703 Mon Sep 17 00:00:00 2001 From: Leo Trottier Date: Fri, 4 Oct 2019 14:56:51 -0400 Subject: [PATCH 1/3] renaming done --- README.md | 4 ++-- games.json | 2 +- games/{017_Simon => 017_Symon}/README.md | 0 games/{017_Simon => 017_Symon}/project.properties | 2 +- .../{017_Simon/src/simon.cpp => 017_Symon/src/symon.cpp} | 8 ++++---- 5 files changed, 8 insertions(+), 8 deletions(-) rename games/{017_Simon => 017_Symon}/README.md (100%) rename games/{017_Simon => 017_Symon}/project.properties (72%) rename games/{017_Simon/src/simon.cpp => 017_Symon/src/symon.cpp} (99%) diff --git a/README.md b/README.md index 9ef7495..00a5624 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ you've made yourself! | 14. | [**ColorMatchGame**](./games/014_ColorMatchGame)
CleverPet |[![Install ColorMatchGame](./docs/images/install.png)][ColorMatchGame]| Touching a touchpad toggles it to a different color, the game ends when all the touchpad colors match. | ![]() | | 15. | [**WhackAMole**](./games/015_WhackAMole)
CleverPet |[![Install WhackAMole](./docs/images/install.png)][WhackAMole]| This is a more "active" game for the Hub that challenges your player's "paw-eye" coordination. | ![]() | | 16. | [**ControlPet**](./games/016_ControlPet)
Michael Gschwandtner  | [![Install ControlPet](./docs/images/install.png)][ControlPet] | Remote control app for the hub. Control the hub either via a webinterface or from a python program. Enables rapid prototyping of new ideas and guided learning of the hub | ![]() | - | 17. | [**Simon**](./games/017_Simon)
Jelmer Tiete  | [![Install Simon](./docs/images/install.png)][Simon] | The classic Simon game, but now for your pet! | ![]() | + | 17. | [**Symon**](./games/017_Symon)
Jelmer Tiete  | [![Install Symon](./docs/images/install.png)][Symon] | CleverPet's take on the classic Simon game! | ![]() | -------- @@ -152,4 +152,4 @@ in specific ways: [ColorMatchGame]: https://install.hackerpet.com/?name=ColorMatchGame&f=https://raw.githubusercontent.com/CleverPet/hackerpet-games/master/games/014_ColorMatchGame/src/ColorMatchGame.cpp&f=https://raw.githubusercontent.com/CleverPet/hackerpet-games/master/games/014_ColorMatchGame/project.properties [WhackAMole]: https://install.hackerpet.com/?name=WhackAMole&f=https://raw.githubusercontent.com/CleverPet/hackerpet-games/master/games/015_WhackAMole/src/WhackAMole.cpp&f=https://raw.githubusercontent.com/CleverPet/hackerpet-games/master/games/015_WhackAMole/project.properties [ControlPet]: https://install.hackerpet.com/?name=ControlPet&f=https://raw.githubusercontent.com/CleverPet/hackerpet-games/master/games/016_ControlPet/SocketIOclient.cpp&f=https://raw.githubusercontent.com/CleverPet/hackerpet-games/master/games/016_ControlPet/SocketIOclient.h&f=https://raw.githubusercontent.com/CleverPet/hackerpet-games/master/games/016_ControlPet/WebSockets.cpp&f=https://raw.githubusercontent.com/CleverPet/hackerpet-games/master/games/016_ControlPet/WebSockets.h&f=https://raw.githubusercontent.com/CleverPet/hackerpet-games/master/games/016_ControlPet/WebSocketsClient.cpp&f=https://raw.githubusercontent.com/CleverPet/hackerpet-games/master/games/016_ControlPet/WebSocketsClient.h&f=https://raw.githubusercontent.com/CleverPet/hackerpet-games/master/games/016_ControlPet/WebSocketsServer.cpp&f=https://raw.githubusercontent.com/CleverPet/hackerpet-games/master/games/016_ControlPet/WebSocketsServer.h&f=https://raw.githubusercontent.com/CleverPet/hackerpet-games/master/games/016_ControlPet/cdecode.c&f=https://raw.githubusercontent.com/CleverPet/hackerpet-games/master/games/016_ControlPet/cdecode_inc.h&f=https://raw.githubusercontent.com/CleverPet/hackerpet-games/master/games/016_ControlPet/cencode.h&f=https://raw.githubusercontent.com/CleverPet/hackerpet-games/master/games/016_ControlPet/cencode_inc.h&f=https://raw.githubusercontent.com/CleverPet/hackerpet-games/master/games/016_ControlPet/controlpet.cpp&f=https://raw.githubusercontent.com/CleverPet/hackerpet-games/master/games/016_ControlPet/controlpet_util.cpp&f=https://raw.githubusercontent.com/CleverPet/hackerpet-games/master/games/016_ControlPet/controlpet_util.h&f=https://raw.githubusercontent.com/CleverPet/hackerpet-games/master/games/016_ControlPet/libsha1.c&f=https://raw.githubusercontent.com/CleverPet/hackerpet-games/master/games/016_ControlPet/libsha1.h&f=https://raw.githubusercontent.com/CleverPet/hackerpet-games/master/games/016_ControlPet/project.properties -[Simon]: https://install.hackerpet.com/?name=Simon&f=https://raw.githubusercontent.com/CleverPet/hackerpet-games/master/games/017_Simon/src/simon.cpp&f=https://raw.githubusercontent.com/CleverPet/hackerpet-games/master/games/017_Simon/project.properties +[Symon]: https://install.hackerpet.com/?name=Symon&f=https://raw.githubusercontent.com/CleverPet/hackerpet-games/master/games/017_Symon/src/symon.cpp&f=https://raw.githubusercontent.com/CleverPet/hackerpet-games/master/games/017_Symon/project.properties diff --git a/games.json b/games.json index d1c58cc..250f98f 100644 --- a/games.json +++ b/games.json @@ -164,7 +164,7 @@ { "title": "Symon", "author": "Jelmer Tiete ", - "description_sentence":"The classic Simon game, but now for your pet!", + "description_sentence":"CleverPet's take on the classic Simon game!", "description_paragraph":"", "url": "https://github.com/CleverPet/HackerPet-games/games/017_Simon/", "media": "", diff --git a/games/017_Simon/README.md b/games/017_Symon/README.md similarity index 100% rename from games/017_Simon/README.md rename to games/017_Symon/README.md diff --git a/games/017_Simon/project.properties b/games/017_Symon/project.properties similarity index 72% rename from games/017_Simon/project.properties rename to games/017_Symon/project.properties index 1ddace0..f1ba765 100644 --- a/games/017_Simon/project.properties +++ b/games/017_Symon/project.properties @@ -1,2 +1,2 @@ -name=simon +name=Symon dependencies.hackerpet=0.2.2 diff --git a/games/017_Simon/src/simon.cpp b/games/017_Symon/src/symon.cpp similarity index 99% rename from games/017_Simon/src/simon.cpp rename to games/017_Symon/src/symon.cpp index d89f178..4e4c55e 100644 --- a/games/017_Simon/src/simon.cpp +++ b/games/017_Symon/src/symon.cpp @@ -1,5 +1,5 @@ /** - Simon + Symon ========================= @@ -230,7 +230,7 @@ int buttonToAudio(unsigned char button){ } /// The actual LearningLongerSequences function. This function needs to be called in a loop. -bool playSimon(){ +bool playSymon(){ yield_begin(); static const int SEQUENCE_LENGTHMAX = 20; @@ -288,7 +288,7 @@ bool playSimon(){ responseMisses = 0; Log.info("-------------------------------------------"); - Log.info("Starting new \"Simon\" challenge"); + Log.info("Starting new \"Symon\" challenge"); // before starting interaction, wait until: // 1. device layer is ready (in a good state) @@ -757,7 +757,7 @@ void loop() // Play 1 interaction of the Learning Longer Sequences challenge // Will return true if level is done - gameIsComplete = playSimon(); + gameIsComplete = playSymon(); if(gameIsComplete){ // Interaction end From 9356043b5f67c3803a10b7d7576bdabc72211ca6 Mon Sep 17 00:00:00 2001 From: Leo Trottier Date: Fri, 4 Oct 2019 14:56:51 -0400 Subject: [PATCH 2/3] renaming done --- games.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/games.json b/games.json index 250f98f..01aa9c5 100644 --- a/games.json +++ b/games.json @@ -166,7 +166,7 @@ "author": "Jelmer Tiete ", "description_sentence":"CleverPet's take on the classic Simon game!", "description_paragraph":"", - "url": "https://github.com/CleverPet/HackerPet-games/games/017_Simon/", + "url": "https://github.com/CleverPet/HackerPet-games/games/017_Symon/", "media": "", "tags":["Community","CleverPet"] }] From 064b230bacc17aac0796d654f6d55a1f4a6997b0 Mon Sep 17 00:00:00 2001 From: Jelmer Tiete Date: Fri, 4 Oct 2019 14:00:43 -0700 Subject: [PATCH 3/3] Added Symon readme and corrected project.properties --- games/017_Symon/README.md | 35 ++++++++++++++++++++++++++++++ games/017_Symon/project.properties | 2 +- 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/games/017_Symon/README.md b/games/017_Symon/README.md index e69de29..6ac389b 100644 --- a/games/017_Symon/README.md +++ b/games/017_Symon/README.md @@ -0,0 +1,35 @@ +# symon + +A Particle project named Symon + +## Welcome to your project! + +Every new Particle project is composed of 3 important elements that you'll see have been created in your project directory for hello-world. + +#### ```/src``` folder: +This is the source folder that contains the firmware files for your project. It should *not* be renamed. +Anything that is in this folder when you compile your project will be sent to our compile service and compiled into a firmware binary for the Particle device that you have targeted. + +If your application contains multiple files, they should all be included in the `src` folder. If your firmware depends on Particle libraries, those dependencies are specified in the `project.properties` file referenced below. + +#### ```.ino``` file: +This file is the firmware that will run as the primary application on your Particle device. It contains a `setup()` and `loop()` function, and can be written in Wiring or C/C++. For more information about using the Particle firmware API to create firmware for your Particle device, refer to the [Firmware Reference](https://docs.particle.io/reference/firmware/) section of the Particle documentation. + +#### ```project.properties``` file: +This is the file that specifies the name and version number of the libraries that your project depends on. Dependencies are added automatically to your `project.properties` file when you add a library to a project using the `particle library add` command in the CLI or add a library in the Desktop IDE. + +## Adding additional files to your project + +#### Projects with multiple sources +If you would like add additional files to your application, they should be added to the `/src` folder. All files in the `/src` folder will be sent to the Particle Cloud to produce a compiled binary. + +#### Projects with external libraries +If your project includes a library that has not been registered in the Particle libraries system, you should create a new folder named `/lib//src` under `/` and add the `.h`, `.cpp` & `library.properties` files for your library there. Read the [Firmware Libraries guide](https://docs.particle.io/guide/tools-and-features/libraries/) for more details on how to develop libraries. Note that all contents of the `/lib` folder and subfolders will also be sent to the Cloud for compilation. + +## Compiling your project + +When you're ready to compile your project, make sure you have the correct Particle device target selected and run `particle compile ` in the CLI or click the Compile button in the Desktop IDE. The following files in your project folder will be sent to the compile service: + +- Everything in the `/src` folder, including your `.cpp` application file +- The `project.properties` file for your project +- Any libraries stored under `lib//src` diff --git a/games/017_Symon/project.properties b/games/017_Symon/project.properties index f1ba765..377d6a3 100644 --- a/games/017_Symon/project.properties +++ b/games/017_Symon/project.properties @@ -1,2 +1,2 @@ -name=Symon +name=symon dependencies.hackerpet=0.2.2