Skip to content

Commit 5bf8782

Browse files
Flag for remote dev hex (#204)
Co-authored-by: Carlos Pereira Atencio <[email protected]>
1 parent 8311b17 commit 5bf8782

File tree

8 files changed

+48420
-15162
lines changed

8 files changed

+48420
-15162
lines changed

public/firmware/radio-sender.hex renamed to public/firmware/local-sensors-v0.1.0.hex

Lines changed: 7616 additions & 7591 deletions
Large diffs are not rendered by default.

public/firmware/radio-bridge-v0.1.0.hex

Lines changed: 16507 additions & 0 deletions
Large diffs are not rendered by default.

public/firmware/radio-bridge.hex renamed to public/firmware/radio-remote-v0.1.0-dev.hex

Lines changed: 7703 additions & 7561 deletions
Large diffs are not rendered by default.

public/firmware/radio-remote-v0.1.0.hex

Lines changed: 16573 additions & 0 deletions
Large diffs are not rendered by default.

src/__tests__/microbit-facade.test.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,9 @@ describe('Microbit facade tests', () => {
7171
'firmware/ml-microbit-cpp-version-combined.hex',
7272
);
7373
expect(getHexFileUrl(2, 'bluetooth')).toEqual('firmware/MICROBIT.hex');
74-
expect(getHexFileUrl(2, 'radio-bridge')).toEqual('firmware/radio-bridge.hex');
75-
expect(getHexFileUrl(2, 'radio-sender')).toEqual('firmware/radio-sender.hex');
76-
expect(getHexFileUrl(2, 'radio-local')).toEqual('firmware/radio-local.hex');
74+
expect(getHexFileUrl(2, 'radio-bridge')).toMatch(/^firmware\/radio-bridge-v.*\.hex$/);
75+
expect(getHexFileUrl(2, 'radio-sender')).toMatch(/^firmware\/radio-remote-v.*\.hex$/);
76+
expect(getHexFileUrl(2, 'radio-local')).toMatch(/^firmware\/local-sensors-v.*\.hex$/);
7777
});
7878

7979
test('Input should not be connected before connecting', () => {

src/components/connection-prompt/ConnectDialogContainer.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
return 'radio-local';
5252
}
5353
if (flashStage === 'radio-sender') {
54-
return 'radio-sender';
54+
return flags.radioRemoteDev ? 'radio-sender-dev' : 'radio-sender';
5555
}
5656
return 'radio-bridge';
5757
};

src/script/flags.ts

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,13 @@ import { Stage, stage as stageFromEnvironment } from './environment';
1717
*/
1818
export type Flag =
1919
/**
20-
* Flashes a hex that acts as a sender and receiver for radio bridge testing.
20+
* Changes radio bridge hexes to one that acts as a sender and receiver for radio bridge testing.
2121
*/
22-
'radioLocal';
22+
| 'radioLocal'
23+
/**
24+
* Changes the remote radio bridge hex to one that uses button A to stop sending data.
25+
*/
26+
| 'radioRemoteDev';
2327

2428
interface FlagMetadata {
2529
defaultOnStages: Stage[];
@@ -29,6 +33,7 @@ interface FlagMetadata {
2933
const allFlags: FlagMetadata[] = [
3034
// Alphabetical order.
3135
{ name: 'radioLocal', defaultOnStages: [] },
36+
{ name: 'radioRemoteDev', defaultOnStages: [] },
3237
];
3338

3439
type Flags = Record<Flag, boolean>;

src/script/microbit-interfacing/Microbits.ts

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,12 @@ export enum HexOrigin {
3131
}
3232

3333
export type FlashStage = 'bluetooth' | 'radio-sender' | 'radio-bridge';
34-
export type HexType = 'bluetooth' | 'radio-sender' | 'radio-bridge' | 'radio-local';
34+
export type HexType =
35+
| 'bluetooth'
36+
| 'radio-sender'
37+
| 'radio-bridge'
38+
| 'radio-local'
39+
| 'radio-sender-dev';
3540

3641
type UARTMessageType = 'g' | 's';
3742

@@ -47,9 +52,10 @@ export const getHexFileUrl = (version: 1 | 2 | 'universal', type: HexType) => {
4752
throw new Error('Only V2 is supported');
4853
}
4954
return {
50-
'radio-sender': 'firmware/radio-sender.hex',
51-
'radio-bridge': 'firmware/radio-bridge.hex',
52-
'radio-local': 'firmware/radio-local.hex',
55+
'radio-sender-dev': 'firmware/radio-remote-v0.1.0-dev.hex',
56+
'radio-sender': 'firmware/radio-remote-v0.1.0.hex',
57+
'radio-bridge': 'firmware/radio-bridge-v0.1.0.hex',
58+
'radio-local': 'firmware/local-sensors-v0.1.0.hex',
5359
}[type];
5460
};
5561

0 commit comments

Comments
 (0)