Skip to content

Commit

Permalink
fix settings use and adapt code to new eslint styles w/prettier forma…
Browse files Browse the repository at this point in the history
…tting (now using code-standard typeScript)

Update P1 & P2

- Adjust settings/configuration mechanism (turn on/off elastic tabs no longer requires vscode restart/reload)
- Adjust text-cursor colors for our themes (Make them more visible and consistent with other themes)
  - NOTE: this does NOT affect the mouse pointer (arrow, or I-beam) which is controlled from your operating-system settings

Update P2 Only

- Minor DAT block highlighting fixes
- Adjusted duplicate variable declaration message (clarified meaning)
  • Loading branch information
ironsheep committed Jan 11, 2024
1 parent 120f2f8 commit ffc17f8
Show file tree
Hide file tree
Showing 71 changed files with 10,074 additions and 7,205 deletions.
15 changes: 14 additions & 1 deletion spin2/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,25 @@ Work to appear in upcoming releases:

Possible next additions:

- More features comming. We're looking for what's next...
- More features coming. We're looking for what's next...
- Investigate and possibly add unique coloring for method pointers
- Add spin2 instruction templates as Snippets (_for instructions with two or more parameters_)
- Add new-file templates as Snippets
- Add additional Snippets as the community identifies them

## [2.2.14] 2024-01-11

Update P1 & P2

- Adjust settings/configuration mechanism (turn on/off elastic tabs no longer requires vscode restart/reload)
- Adjust text-cursor colors for our themes (Make them more visible and consistent with other themes)
- NOTE: this does NOT affect the mouse pointer (arrow, or I-beam) which is controlled from your operating-system settings

Update P2 Only

- Minor DAT block highlighting fixes
- Adjusted duplicate variable declaration message (clarified meaning)

## [2.2.13] 2024-01-09

Update P2
Expand Down
2 changes: 1 addition & 1 deletion spin2/LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2023 Iron Sheep Productions, LLC.
Copyright (c) 2024 Iron Sheep Productions, LLC.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion spin2/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# VSCode support for the Parallax Propeller v1 & v2 8-Core MCU's
# VSCode support for the Parallax Propeller v1 & v2 8-Core MCU's

Spin/Spin2 Language-Server based VSCode Extension

Expand Down
2 changes: 1 addition & 1 deletion spin2/TEST_LANG_SERVER/spin/param_test_p1.spin
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ PUB main3(param1, myvar2) | myVar1
myvar1 := 4


PRI main4() : ok
PRI main4 : ok
2 changes: 1 addition & 1 deletion spin2/TEST_LANG_SERVER/spin/test_declarations.spin
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ OBJ vga : "VGA_DRIVER"
mouse : "USB_Mouse"
v[16] : "VocalSynth" ' instantiate array of 16 objects

PUB null()
PUB null

'' This is NOT a top level object

Expand Down
2 changes: 1 addition & 1 deletion spin2/TEST_LANG_SERVER/spin/test_pasm.spin
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

'' this is our full PASM (P1) instruction set

PUB null() : nRet
PUB null : nRet

'' This is NOT a top level object
CON
Expand Down
14 changes: 7 additions & 7 deletions spin2/TEST_LANG_SERVER/spin/test_spin.spin
Original file line number Diff line number Diff line change
Expand Up @@ -108,11 +108,11 @@ chkBffr long 0[vga.MAX_BUFFER_LEN]
long 0[vga.MAX_COG_BUFFER_SIZE_IN_LONGS]

'}
PUB null()
PUB null

'' This is NOT a top level object

PUB allSpinLanguageParts()
PUB allSpinLanguageParts
'{
' core spin verbs
ABORT
Expand Down Expand Up @@ -196,7 +196,7 @@ PUB allSpinLanguageParts()
xtal2
xtal3
'}
PUB allHubVariableNames()
PUB allHubVariableNames
'{
CLKFREQ
CLKMODE
Expand All @@ -220,7 +220,7 @@ PUB allHubVariableNames()
'}


PUB allClockVariabless()
PUB allClockVariabless
' value can be set with HUBSET
' - these are the compiled values
' set via CLKSET()
Expand All @@ -231,7 +231,7 @@ PUB allClockVariabless()
CHIPVER
cnt

PUB allSpinConstants()
PUB allSpinConstants
'{
TRUE
FALSE
Expand All @@ -240,7 +240,7 @@ PUB allSpinConstants()
PI
'}

PUB allnamedOperators()
PUB allnamedOperators
'{
NOT
AND
Expand All @@ -254,7 +254,7 @@ PUB allnamedOperators()



PRI allFlowControl()
PRI allFlowControl
'{
ABORT
CASE
Expand Down
3 changes: 1 addition & 2 deletions spin2/TEST_LANG_SERVER/spin2/220316-fixes.spin2
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ CON _clkfreq = 250_000_000 'system clock frequency
gtzl_base = 16 'must be a multiple of 8

DAT org
' org (above) is not colored correctly unless comment follows?!
' org (above) is not colored correctly unless comment follows?! (fixed)
asmclk 'set clock

setq #gtzl_base 'launch Goertzel
Expand All @@ -29,7 +29,6 @@ DAT org
jmp #.loop

DAT org
' org is not colored correctly unless comment follows?!

pgm_gtzl add ptra,#7 'init ADC pin
wrpin adcmode,ptra
Expand Down
4 changes: 3 additions & 1 deletion spin2/TEST_LANG_SERVER/spin2/chk_code_comment_demo.spin2
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,9 @@ CON { driver interface Constants}
' DCS_ESTOP - motor in emergency stop (external stop requested)
#0, DCS_Unknown, DCS_STOPPED, DCS_SPIN_UP, DCS_AT_SPEED, DCS_SPIN_DN, DCS_SLOW_TO_CHG, DCS_FAULTED, DCS_ESTOP

user2 = trunc() ' <<< SHOULD be RED trunc without ()! or with empty ()'s
user2 = trunc ' <<< SHOULD be RED trunc without ()! or with empty ()'s
user3 = trunc() ' <<< SHOULD be RED trunc without ()! or with empty ()'s
user4 = trunc(6) ' <<< SHOULD be RED trunc without ()! or with empty ()'s

OBJ { included objects }

Expand Down
3 changes: 3 additions & 0 deletions spin2/TEST_LANG_SERVER/spin2/chk_missing_objPrefixes.spin2
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,16 @@ CON
OBJ
Flash : "dummy_Draft_flash_fs"
utils : "dummy_UT_utilities"
testAr[2]: "dummy_isp_hub75_7seg"

DAT

testfile byte "seektest.bin", 0

PUB go() : status, handle, longValue, longOffset

testAr[1].showDigit()

status := Flash.format() ' Comment out this line to not erase all files
if status < 0
utils.showError(@"format()", status)
Expand Down
3 changes: 3 additions & 0 deletions spin2/TEST_LANG_SERVER/spin2/dummy_isp_hub75_7seg.spin2
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@


pub showDigit()
4 changes: 2 additions & 2 deletions spin2/TEST_LANG_SERVER/spin2/test-file-001.spin2
Original file line number Diff line number Diff line change
Expand Up @@ -67,14 +67,14 @@ VAR CogNum ' the default variable size is LONG.

BYTE StringChar ' byte variable
BYTE StringBuffer[64] ' byte variable array (64 bytes)
BYTE a,b,c[1000],d ' command separated declarations
BYTE a,b1,c1[1000],d1 ' command separated declarations

WORD CurrentCycle ' word variable
WORD Cycles[200] ' word variable array (200 words)
WORD ev,fv[5],gv,hv[10] ' command separated declarations
WORD iv[1],jv,kv,lv[92] ' command separated declarations

LONG values ' long variable
LONG values0 ' long variable
LONG values[15] ' long variable array (15 longs)
LONG il[100],jl,kl,ll ' command separated declarations

Expand Down
Loading

0 comments on commit ffc17f8

Please sign in to comment.