Skip to content

Commit

Permalink
Version 0.1.2
Browse files Browse the repository at this point in the history
 - Change application name, folder name, and launcher icon
 - Modify licence notification
  • Loading branch information
obono committed Apr 30, 2018
1 parent 1efef87 commit bd8cb97
Show file tree
Hide file tree
Showing 8 changed files with 37 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .project
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>ArduboyUtility</name>
<name>ArbyUtility</name>
<comment></comment>
<projects>
</projects>
Expand Down
4 changes: 2 additions & 2 deletions AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.obnsoft.arduboyutil"
android:versionCode="11"
android:versionName="0.1.1" >
android:versionCode="12"
android:versionName="0.1.2" >


<uses-sdk
Expand Down
11 changes: 7 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Arduboy Utility
# Arby Utility
This is an android application to upload Flash image data to Arduboy. \
https://play.google.com/store/apps/details?id=com.obnsoft.arduboyutil \
![picture](https://obono.github.io/ArduboyUtility/img/picture.jpg)
![picture](docs/img/picture.jpg)

## Functions
- Upload Flash or/and EEPROM to Arduboy.
Expand All @@ -12,17 +12,20 @@ https://play.google.com/store/apps/details?id=com.obnsoft.arduboyutil \
## How to use
- Assumption: your Android device has the capability of USB host and you have a USB OTG cable.
- Connect Arduboy and Android device like following: \
![connection image](https://obono.github.io/ArduboyUtility/img/connection.png)
![connection image](docs/img/connection.png)
- If confirm dialog is appeared when Arduboy is connected, check "Use by default for this USB device".

## Acknowledgement

### Notice
Arduboy is a registered trademark of Arduboy, Inc. This application is not created by or licensed by Arduboy, Inc. So, DO NOT inquire of Arduboy, Inc. about this.
This comes with no warranties. This should be used at your own risk. The author of this has no responsibility.

### Libraries
- [Physicaloid Library](https://github.com/ksksue/PhysicaloidLibrary)
- [Java IntelHex Parser Library](https://github.com/j123b567/java-intelhex-parser)

### Image resources
- Pixelart of Arduboy device by [Piquesel (@huard_olivier)](https://twitter.com/huard_olivier).
- Some icons are generated by [無料素材サービス](https://sozai.cman.jp/).

## License
Expand Down
Binary file modified res/drawable-xhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 5 additions & 3 deletions res/raw/license.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright © 2017 OBONO
Copyright © 2017, 2018 OBONO
http://d.hatena.ne.jp/OBONO

Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
Expand All @@ -9,8 +9,10 @@ Unless required by applicable law or agreed to in writing, software distributed
See the License for the specific language governing permissions and limitations under the License.

------
Pixelart of Arduboy device by Piquesel (@huard_olivier).
https://twitter.com/huard_olivier
Acknowledgement

Arduboy is a registered trademark of Arduboy, Inc. This application is not created by or licensed by Arduboy, Inc. So, DO NOT inquire of Arduboy, Inc. about this.
This comes with no warranties. This should be used at your own risk. The author of this has no responsibility.

Some icons are generated by 無料素材サービス.
https://sozai.cman.jp/
Expand Down
2 changes: 1 addition & 1 deletion res/values/strings.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="appCode">OBN-A18</string>
<string name="appName">Arduboy Utility</string>
<string name="appName">Arby Utility</string>
<string name="appNameFilePickerRead">Choose file to read</string>
<string name="appNameFilePickerWrite">Choose file to write</string>
<string name="appNameConsole">Serial monitor</string>
Expand Down
15 changes: 11 additions & 4 deletions src/com/obnsoft/arduboyutil/FilePickerActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*
*
* This source code was modified by OBONO in November 2017.
* This source code was modified by OBONO in April 2018.
*/

package com.obnsoft.arduboyutil;
Expand Down Expand Up @@ -234,16 +234,22 @@ public boolean onCreateOptionsMenu(Menu menu) {
return super.onCreateOptionsMenu(menu);
}

@Override
public boolean onPrepareOptionsMenu(Menu menu) {
super.onPrepareOptionsMenu(menu);
MenuItem item = menu.findItem(R.id.menuFilePickerBack);
item.setVisible(!mStackPath.isEmpty());
return true;
}

@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case android.R.id.home:
finish();
break;
case R.id.menuFilePickerBack:
if (!mStackPath.isEmpty()) {
onBackPressed();
}
onBackPressed();
return true;
case R.id.menuFilePickerGoUpper:
goToUpperDirectory();
Expand All @@ -264,6 +270,7 @@ public void setCurrentDirectory(String path) {
public void onCurrentDirectoryChanged(String path) {
TextView tv = (TextView) findViewById(R.id.textViewCurrentDirectory);
tv.setText(getTrimmedCurrentDirectory(path));
invalidateOptionsMenu();
}

public void onFileSelected(String path) {
Expand Down
12 changes: 10 additions & 2 deletions src/com/obnsoft/arduboyutil/Utils.java
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,12 @@
public class Utils {

public static final File TOP_DIRECTORY =
new File(Environment.getExternalStorageDirectory(), "ArduboyUtility");
new File(Environment.getExternalStorageDirectory(), "ArbyUtility");
public static final File FLASH_DIRECTORY = new File(TOP_DIRECTORY, "Flash");
public static final File EEPROM_DIRECTORY = new File(TOP_DIRECTORY, "EEPROM");
public static final File SHOT_DIRECTORY = new File(TOP_DIRECTORY, "ScreenShot");
public static final File OLD_TOP_DIRECTORY =
new File(Environment.getExternalStorageDirectory(), "ArduboyUtility");

private static final String SCHEME_FILE = "file";
private static final String SCHEME_CONTENT = "content";
Expand Down Expand Up @@ -123,7 +125,13 @@ public static void showToast(Context context, String msg) {
/*-----------------------------------------------------------------------*/

public static void generateFolders() {
TOP_DIRECTORY.mkdir();
if (!TOP_DIRECTORY.exists()) {
if (OLD_TOP_DIRECTORY.exists()) {
OLD_TOP_DIRECTORY.renameTo(TOP_DIRECTORY);
} else {
TOP_DIRECTORY.mkdir();
}
}
FLASH_DIRECTORY.mkdir();
EEPROM_DIRECTORY.mkdir();
SHOT_DIRECTORY.mkdir();
Expand Down

0 comments on commit bd8cb97

Please sign in to comment.